296 files changed, 11857 insertions, 6749 deletions

diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index dd5e04813b76..545c09ed9079 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -936,7 +936,7 @@ static int cops_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
         struct cops_local *lp = netdev_priv(dev);
         struct sockaddr_at *sa = (struct sockaddr_at *)&ifr->ifr_addr;
-        struct atalk_addr *aa = (struct atalk_addr *)&lp->node_addr;
+        struct atalk_addr *aa = &lp->node_addr;
 
         switch(cmd)
         {
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 3463b469e657..3031e0413114 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2460,18 +2460,21 @@ out:
         return NETDEV_TX_OK;
 }
 
-int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
-                          struct slave *slave)
+int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,
+                         struct slave *slave)
 {
         int ret = RX_HANDLER_ANOTHER;
+        struct lacpdu *lacpdu, _lacpdu;
+
         if (skb->protocol != PKT_TYPE_LACPDU)
                 return ret;
 
-        if (!pskb_may_pull(skb, sizeof(struct lacpdu)))
+        lacpdu = skb_header_pointer(skb, 0, sizeof(_lacpdu), &_lacpdu);
+        if (!lacpdu)
                 return ret;
 
         read_lock(&bond->lock);
-        ret = bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);
+        ret = bond_3ad_rx_indication(lacpdu, slave, skb->len);
         read_unlock(&bond->lock);
         return ret;
 }
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
index 5ee7e3c45db7..0cfaa4afdece 100644
--- a/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@ -274,8 +274,8 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave);
 void bond_3ad_handle_link_change(struct slave *slave, char link);
 int  bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info);
 int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev);
-int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
-                          struct slave *slave);
+int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,
+                         struct slave *slave);
 int bond_3ad_set_carrier(struct bonding *bond);
 void bond_3ad_update_lacp_rate(struct bonding *bond);
 #endif //__BOND_3AD_H__
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 0f59c1564e53..ef3791a09ad8 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -342,27 +342,17 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)
         _unlock_rx_hashtbl_bh(bond);
 }
 
-static int rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,
-                         struct slave *slave)
+static int rlb_arp_recv(const struct sk_buff *skb, struct bonding *bond,
+                        struct slave *slave)
 {
-        struct arp_pkt *arp;
+        struct arp_pkt *arp, _arp;
 
         if (skb->protocol != cpu_to_be16(ETH_P_ARP))
                 goto out;
 
-        arp = (struct arp_pkt *) skb->data;
-        if (!arp) {
-                pr_debug("Packet has no ARP data\n");
+        arp = skb_header_pointer(skb, 0, sizeof(_arp), &_arp);
+        if (!arp)
                 goto out;
-        }
-
-        if (!pskb_may_pull(skb, arp_hdr_len(bond->dev)))
-                goto out;
-
-        if (skb->len < sizeof(struct arp_pkt)) {
-                pr_debug("Packet is too small to be an ARP\n");
-                goto out;
-        }
 
         if (arp->op_code == htons(ARPOP_REPLY)) {
                 /* update rx hash table for this ARP */
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index b9c2ae62166d..af506321500b 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1445,8 +1445,8 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
         struct sk_buff *skb = *pskb;
         struct slave *slave;
         struct bonding *bond;
-        int (*recv_probe)(struct sk_buff *, struct bonding *,
-                                struct slave *);
+        int (*recv_probe)(const struct sk_buff *, struct bonding *,
+                          struct slave *);
         int ret = RX_HANDLER_ANOTHER;
 
         skb = skb_share_check(skb, GFP_ATOMIC);
@@ -1463,15 +1463,10 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
 
         recv_probe = ACCESS_ONCE(bond->recv_probe);
         if (recv_probe) {
-                struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC);
-
-                if (likely(nskb)) {
-                        ret = recv_probe(nskb, bond, slave);
-                        dev_kfree_skb(nskb);
-                        if (ret == RX_HANDLER_CONSUMED) {
-                                consume_skb(skb);
-                                return ret;
-                        }
+                ret = recv_probe(skb, bond, slave);
+                if (ret == RX_HANDLER_CONSUMED) {
+                        consume_skb(skb);
+                        return ret;
                 }
         }
 
@@ -2738,25 +2733,31 @@ static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32
         }
 }
 
-static int bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
-                         struct slave *slave)
+static int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond,
+                        struct slave *slave)
 {
-        struct arphdr *arp;
+        struct arphdr *arp = (struct arphdr *)skb->data;
         unsigned char *arp_ptr;
         __be32 sip, tip;
+        int alen;
 
         if (skb->protocol != __cpu_to_be16(ETH_P_ARP))
                 return RX_HANDLER_ANOTHER;
 
         read_lock(&bond->lock);
+        alen = arp_hdr_len(bond->dev);
 
         pr_debug("bond_arp_rcv: bond %s skb->dev %s\n",
                  bond->dev->name, skb->dev->name);
 
-        if (!pskb_may_pull(skb, arp_hdr_len(bond->dev)))
-                goto out_unlock;
+        if (alen > skb_headlen(skb)) {
+                arp = kmalloc(alen, GFP_ATOMIC);
+                if (!arp)
+                        goto out_unlock;
+                if (skb_copy_bits(skb, 0, arp, alen) < 0)
+                        goto out_unlock;
+        }
 
-        arp = arp_hdr(skb);
         if (arp->ar_hln != bond->dev->addr_len ||
             skb->pkt_type == PACKET_OTHERHOST ||
             skb->pkt_type == PACKET_LOOPBACK ||
@@ -2791,6 +2792,8 @@ static int bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
 
 out_unlock:
         read_unlock(&bond->lock);
+        if (arp != (struct arphdr *)skb->data)
+                kfree(arp);
         return RX_HANDLER_ANOTHER;
 }
 
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 4581aa5ccaba..f8af2fcd3d16 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -218,8 +218,8 @@ struct bonding {
         struct   slave *primary_slave;
         bool     force_primary;
         s32      slave_cnt; /* never change this value outside the attach/detach wrappers */
-        int     (*recv_probe)(struct sk_buff *, struct bonding *,
-                               struct slave *);
+        int     (*recv_probe)(const struct sk_buff *, struct bonding *,
+                              struct slave *);
         rwlock_t lock;
         rwlock_t curr_slave_lock;
         u8       send_peer_notif;
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
index 3f88473423e9..ea3143895e6d 100644
--- a/drivers/net/can/bfin_can.c
+++ b/drivers/net/can/bfin_can.c
@@ -597,7 +597,7 @@ static int __devinit bfin_can_probe(struct platform_device *pdev)
         dev_info(&pdev->dev,
                 "%s device registered"
                 "(&reg_base=%p, rx_irq=%d, tx_irq=%d, err_irq=%d, sclk=%d)\n",
-                DRV_NAME, (void *)priv->membase, priv->rx_irq,
+                DRV_NAME, priv->membase, priv->rx_irq,
                 priv->tx_irq, priv->err_irq, priv->can.clock.freq);
         return 0;
 
diff --git a/drivers/net/can/c_can/Kconfig b/drivers/net/can/c_can/Kconfig
index ffb9773d102d..25d371cf98dd 100644
--- a/drivers/net/can/c_can/Kconfig
+++ b/drivers/net/can/c_can/Kconfig
@@ -1,15 +1,16 @@
 menuconfig CAN_C_CAN
-        tristate "Bosch C_CAN devices"
+        tristate "Bosch C_CAN/D_CAN devices"
         depends on CAN_DEV && HAS_IOMEM
 
 if CAN_C_CAN
 
 config CAN_C_CAN_PLATFORM
-        tristate "Generic Platform Bus based C_CAN driver"
+        tristate "Generic Platform Bus based C_CAN/D_CAN driver"
         ---help---
-          This driver adds support for the C_CAN chips connected to
-          the "platform bus" (Linux abstraction for directly to the
+          This driver adds support for the C_CAN/D_CAN chips connected
+          to the "platform bus" (Linux abstraction for directly to the
           processor attached devices) which can be found on various
-          boards from ST Microelectronics (http://www.st.com)
-          like the SPEAr1310 and SPEAr320 evaluation boards.
+          boards from ST Microelectronics (http://www.st.com) like the
+          SPEAr1310 and SPEAr320 evaluation boards & TI (www.ti.com)
+          boards like am335x, dm814x, dm813x and dm811x.
 endif
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
index 8dc84d66eea1..e2ce508c2753 100644
--- a/drivers/net/can/c_can/c_can.c
+++ b/drivers/net/can/c_can/c_can.c
@@ -41,6 +41,10 @@
 
 #include "c_can.h"
 
+/* Number of interface registers */
+#define IF_ENUM_REG_LEN         11
+#define C_CAN_IFACE(reg, iface) (C_CAN_IF1_##reg + (iface) * IF_ENUM_REG_LEN)
+
 /* control register */
 #define CONTROL_TEST            BIT(7)
 #define CONTROL_CCE             BIT(6)
@@ -209,10 +213,10 @@ static inline int get_tx_echo_msg_obj(const struct c_can_priv *priv)
                         C_CAN_MSG_OBJ_TX_FIRST;
 }
 
-static u32 c_can_read_reg32(struct c_can_priv *priv, void *reg)
+static u32 c_can_read_reg32(struct c_can_priv *priv, enum reg index)
 {
-        u32 val = priv->read_reg(priv, reg);
-        val |= ((u32) priv->read_reg(priv, reg + 2)) << 16;
+        u32 val = priv->read_reg(priv, index);
+        val |= ((u32) priv->read_reg(priv, index + 1)) << 16;
         return val;
 }
 
@@ -220,14 +224,14 @@ static void c_can_enable_all_interrupts(struct c_can_priv *priv,
                                                 int enable)
 {
         unsigned int cntrl_save = priv->read_reg(priv,
-                                                &priv->regs->control);
+                                                C_CAN_CTRL_REG);
 
         if (enable)
                 cntrl_save |= (CONTROL_SIE | CONTROL_EIE | CONTROL_IE);
         else
                 cntrl_save &= ~(CONTROL_EIE | CONTROL_IE | CONTROL_SIE);
 
-        priv->write_reg(priv, &priv->regs->control, cntrl_save);
+        priv->write_reg(priv, C_CAN_CTRL_REG, cntrl_save);
 }
 
 static inline int c_can_msg_obj_is_busy(struct c_can_priv *priv, int iface)
@@ -235,7 +239,7 @@ static inline int c_can_msg_obj_is_busy(struct c_can_priv *priv, int iface)
         int count = MIN_TIMEOUT_VALUE;
 
         while (count && priv->read_reg(priv,
-                                &priv->regs->ifregs[iface].com_req) &
+                                C_CAN_IFACE(COMREQ_REG, iface)) &
                                 IF_COMR_BUSY) {
                 count--;
                 udelay(1);
@@ -258,9 +262,9 @@ static inline void c_can_object_get(struct net_device *dev,
          * register and message RAM must be complete in 6 CAN-CLK
          * period.
          */
-        priv->write_reg(priv, &priv->regs->ifregs[iface].com_mask,
+        priv->write_reg(priv, C_CAN_IFACE(COMMSK_REG, iface),
                         IFX_WRITE_LOW_16BIT(mask));
-        priv->write_reg(priv, &priv->regs->ifregs[iface].com_req,
+        priv->write_reg(priv, C_CAN_IFACE(COMREQ_REG, iface),
                         IFX_WRITE_LOW_16BIT(objno));
 
         if (c_can_msg_obj_is_busy(priv, iface))
@@ -278,9 +282,9 @@ static inline void c_can_object_put(struct net_device *dev,
          * register and message RAM must be complete in 6 CAN-CLK
          * period.
          */
-        priv->write_reg(priv, &priv->regs->ifregs[iface].com_mask,
+        priv->write_reg(priv, C_CAN_IFACE(COMMSK_REG, iface),
                         (IF_COMM_WR | IFX_WRITE_LOW_16BIT(mask)));
-        priv->write_reg(priv, &priv->regs->ifregs[iface].com_req,
+        priv->write_reg(priv, C_CAN_IFACE(COMREQ_REG, iface),
                         IFX_WRITE_LOW_16BIT(objno));
 
         if (c_can_msg_obj_is_busy(priv, iface))
@@ -306,18 +310,18 @@ static void c_can_write_msg_object(struct net_device *dev,
 
         flags |= IF_ARB_MSGVAL;
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].arb1,
+        priv->write_reg(priv, C_CAN_IFACE(ARB1_REG, iface),
                                 IFX_WRITE_LOW_16BIT(id));
-        priv->write_reg(priv, &priv->regs->ifregs[iface].arb2, flags |
+        priv->write_reg(priv, C_CAN_IFACE(ARB2_REG, iface), flags |
                                 IFX_WRITE_HIGH_16BIT(id));
 
         for (i = 0; i < frame->can_dlc; i += 2) {
-                priv->write_reg(priv, &priv->regs->ifregs[iface].data[i / 2],
+                priv->write_reg(priv, C_CAN_IFACE(DATA1_REG, iface) + i / 2,
                                 frame->data[i] | (frame->data[i + 1] << 8));
         }
 
         /* enable interrupt for this message object */
-        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+        priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface),
                         IF_MCONT_TXIE | IF_MCONT_TXRQST | IF_MCONT_EOB |
                         frame->can_dlc);
         c_can_object_put(dev, iface, objno, IF_COMM_ALL);
@@ -329,7 +333,7 @@ static inline void c_can_mark_rx_msg_obj(struct net_device *dev,
 {
         struct c_can_priv *priv = netdev_priv(dev);
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+        priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface),
                         ctrl_mask & ~(IF_MCONT_MSGLST | IF_MCONT_INTPND));
         c_can_object_put(dev, iface, obj, IF_COMM_CONTROL);
 
@@ -343,7 +347,7 @@ static inline void c_can_activate_all_lower_rx_msg_obj(struct net_device *dev,
         struct c_can_priv *priv = netdev_priv(dev);
 
         for (i = C_CAN_MSG_OBJ_RX_FIRST; i <= C_CAN_MSG_RX_LOW_LAST; i++) {
-                priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+                priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface),
                                 ctrl_mask & ~(IF_MCONT_MSGLST |
                                         IF_MCONT_INTPND | IF_MCONT_NEWDAT));
                 c_can_object_put(dev, iface, i, IF_COMM_CONTROL);
@@ -356,7 +360,7 @@ static inline void c_can_activate_rx_msg_obj(struct net_device *dev,
 {
         struct c_can_priv *priv = netdev_priv(dev);
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+        priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface),
                         ctrl_mask & ~(IF_MCONT_MSGLST |
                                 IF_MCONT_INTPND | IF_MCONT_NEWDAT));
         c_can_object_put(dev, iface, obj, IF_COMM_CONTROL);
@@ -374,7 +378,7 @@ static void c_can_handle_lost_msg_obj(struct net_device *dev,
 
         c_can_object_get(dev, iface, objno, IF_COMM_ALL & ~IF_COMM_TXRQST);
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+        priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface),
                         IF_MCONT_CLR_MSGLST);
 
         c_can_object_put(dev, 0, objno, IF_COMM_CONTROL);
@@ -410,8 +414,8 @@ static int c_can_read_msg_object(struct net_device *dev, int iface, int ctrl)
 
         frame->can_dlc = get_can_dlc(ctrl & 0x0F);
 
-        flags = priv->read_reg(priv, &priv->regs->ifregs[iface].arb2);
-        val = priv->read_reg(priv, &priv->regs->ifregs[iface].arb1) |
+        flags = priv->read_reg(priv, C_CAN_IFACE(ARB2_REG, iface));
+        val = priv->read_reg(priv, C_CAN_IFACE(ARB1_REG, iface)) |
                 (flags << 16);
 
         if (flags & IF_ARB_MSGXTD)
@@ -424,7 +428,7 @@ static int c_can_read_msg_object(struct net_device *dev, int iface, int ctrl)
         else {
                 for (i = 0; i < frame->can_dlc; i += 2) {
                         data = priv->read_reg(priv,
-                                &priv->regs->ifregs[iface].data[i / 2]);
+                                C_CAN_IFACE(DATA1_REG, iface) + i / 2);
                         frame->data[i] = data;
                         frame->data[i + 1] = data >> 8;
                 }
@@ -444,40 +448,40 @@ static void c_can_setup_receive_object(struct net_device *dev, int iface,
 {
         struct c_can_priv *priv = netdev_priv(dev);
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].mask1,
+        priv->write_reg(priv, C_CAN_IFACE(MASK1_REG, iface),
                         IFX_WRITE_LOW_16BIT(mask));
-        priv->write_reg(priv, &priv->regs->ifregs[iface].mask2,
+        priv->write_reg(priv, C_CAN_IFACE(MASK2_REG, iface),
                         IFX_WRITE_HIGH_16BIT(mask));
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].arb1,
+        priv->write_reg(priv, C_CAN_IFACE(ARB1_REG, iface),
                         IFX_WRITE_LOW_16BIT(id));
-        priv->write_reg(priv, &priv->regs->ifregs[iface].arb2,
+        priv->write_reg(priv, C_CAN_IFACE(ARB2_REG, iface),
                         (IF_ARB_MSGVAL | IFX_WRITE_HIGH_16BIT(id)));
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl, mcont);
+        priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface), mcont);
         c_can_object_put(dev, iface, objno, IF_COMM_ALL & ~IF_COMM_TXRQST);
 
         netdev_dbg(dev, "obj no:%d, msgval:0x%08x\n", objno,
-                        c_can_read_reg32(priv, &priv->regs->msgval1));
+                        c_can_read_reg32(priv, C_CAN_MSGVAL1_REG));
 }
 
 static void c_can_inval_msg_object(struct net_device *dev, int iface, int objno)
 {
         struct c_can_priv *priv = netdev_priv(dev);
 
-        priv->write_reg(priv, &priv->regs->ifregs[iface].arb1, 0);
-        priv->write_reg(priv, &priv->regs->ifregs[iface].arb2, 0);
-        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl, 0);
+        priv->write_reg(priv, C_CAN_IFACE(ARB1_REG, iface), 0);
+        priv->write_reg(priv, C_CAN_IFACE(ARB2_REG, iface), 0);
+        priv->write_reg(priv, C_CAN_IFACE(MSGCTRL_REG, iface), 0);
 
         c_can_object_put(dev, iface, objno, IF_COMM_ARB | IF_COMM_CONTROL);
 
         netdev_dbg(dev, "obj no:%d, msgval:0x%08x\n", objno,
-                        c_can_read_reg32(priv, &priv->regs->msgval1));
+                        c_can_read_reg32(priv, C_CAN_MSGVAL1_REG));
 }
 
 static inline int c_can_is_next_tx_obj_busy(struct c_can_priv *priv, int objno)
 {
-        int val = c_can_read_reg32(priv, &priv->regs->txrqst1);
+        int val = c_can_read_reg32(priv, C_CAN_TXRQST1_REG);
 
         /*
          * as transmission request register's bit n-1 corresponds to
@@ -540,12 +544,12 @@ static int c_can_set_bittiming(struct net_device *dev)
         netdev_info(dev,
                 "setting BTR=%04x BRPE=%04x\n", reg_btr, reg_brpe);
 
-        ctrl_save = priv->read_reg(priv, &priv->regs->control);
-        priv->write_reg(priv, &priv->regs->control,
+        ctrl_save = priv->read_reg(priv, C_CAN_CTRL_REG);
+        priv->write_reg(priv, C_CAN_CTRL_REG,
                         ctrl_save | CONTROL_CCE | CONTROL_INIT);
-        priv->write_reg(priv, &priv->regs->btr, reg_btr);
-        priv->write_reg(priv, &priv->regs->brp_ext, reg_brpe);
-        priv->write_reg(priv, &priv->regs->control, ctrl_save);
+        priv->write_reg(priv, C_CAN_BTR_REG, reg_btr);
+        priv->write_reg(priv, C_CAN_BRPEXT_REG, reg_brpe);
+        priv->write_reg(priv, C_CAN_CTRL_REG, ctrl_save);
 
         return 0;
 }
@@ -587,36 +591,36 @@ static void c_can_chip_config(struct net_device *dev)
         struct c_can_priv *priv = netdev_priv(dev);
 
         /* enable automatic retransmission */
-        priv->write_reg(priv, &priv->regs->control,
+        priv->write_reg(priv, C_CAN_CTRL_REG,
                         CONTROL_ENABLE_AR);
 
         if (priv->can.ctrlmode & (CAN_CTRLMODE_LISTENONLY &
                                         CAN_CTRLMODE_LOOPBACK)) {
                 /* loopback + silent mode : useful for hot self-test */
-                priv->write_reg(priv, &priv->regs->control, CONTROL_EIE |
+                priv->write_reg(priv, C_CAN_CTRL_REG, CONTROL_EIE |
                                 CONTROL_SIE | CONTROL_IE | CONTROL_TEST);
-                priv->write_reg(priv, &priv->regs->test,
+                priv->write_reg(priv, C_CAN_TEST_REG,
                                 TEST_LBACK | TEST_SILENT);
         } else if (priv->can.ctrlmode & CAN_CTRLMODE_LOOPBACK) {
                 /* loopback mode : useful for self-test function */
-                priv->write_reg(priv, &priv->regs->control, CONTROL_EIE |
+                priv->write_reg(priv, C_CAN_CTRL_REG, CONTROL_EIE |
                                 CONTROL_SIE | CONTROL_IE | CONTROL_TEST);
-                priv->write_reg(priv, &priv->regs->test, TEST_LBACK);
+                priv->write_reg(priv, C_CAN_TEST_REG, TEST_LBACK);
         } else if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) {
                 /* silent mode : bus-monitoring mode */
-                priv->write_reg(priv, &priv->regs->control, CONTROL_EIE |
+                priv->write_reg(priv, C_CAN_CTRL_REG, CONTROL_EIE |
                                 CONTROL_SIE | CONTROL_IE | CONTROL_TEST);
-                priv->write_reg(priv, &priv->regs->test, TEST_SILENT);
+                priv->write_reg(priv, C_CAN_TEST_REG, TEST_SILENT);
         } else
                 /* normal mode*/
-                priv->write_reg(priv, &priv->regs->control,
+                priv->write_reg(priv, C_CAN_CTRL_REG,
                                 CONTROL_EIE | CONTROL_SIE | CONTROL_IE);
 
         /* configure message objects */
         c_can_configure_msg_objects(dev);
 
         /* set a `lec` value so that we can check for updates later */
-        priv->write_reg(priv, &priv->regs->status, LEC_UNUSED);
+        priv->write_reg(priv, C_CAN_STS_REG, LEC_UNUSED);
 
         /* set bittiming params */
         c_can_set_bittiming(dev);
@@ -669,7 +673,7 @@ static int c_can_get_berr_counter(const struct net_device *dev,
         unsigned int reg_err_counter;
         struct c_can_priv *priv = netdev_priv(dev);
 
-        reg_err_counter = priv->read_reg(priv, &priv->regs->err_cnt);
+        reg_err_counter = priv->read_reg(priv, C_CAN_ERR_CNT_REG);
         bec->rxerr = (reg_err_counter & ERR_CNT_REC_MASK) >>
                                 ERR_CNT_REC_SHIFT;
         bec->txerr = reg_err_counter & ERR_CNT_TEC_MASK;
@@ -697,12 +701,12 @@ static void c_can_do_tx(struct net_device *dev)
 
         for (/* nix */; (priv->tx_next - priv->tx_echo) > 0; priv->tx_echo++) {
                 msg_obj_no = get_tx_echo_msg_obj(priv);
-                val = c_can_read_reg32(priv, &priv->regs->txrqst1);
+                val = c_can_read_reg32(priv, C_CAN_TXRQST1_REG);
                 if (!(val & (1 << (msg_obj_no - 1)))) {
                         can_get_echo_skb(dev,
                                         msg_obj_no - C_CAN_MSG_OBJ_TX_FIRST);
                         stats->tx_bytes += priv->read_reg(priv,
-                                        &priv->regs->ifregs[0].msg_cntrl)
+                                        C_CAN_IFACE(MSGCTRL_REG, 0))
                                         & IF_MCONT_DLC_MASK;
                         stats->tx_packets++;
                         c_can_inval_msg_object(dev, 0, msg_obj_no);
@@ -744,11 +748,11 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota)
         u32 num_rx_pkts = 0;
         unsigned int msg_obj, msg_ctrl_save;
         struct c_can_priv *priv = netdev_priv(dev);
-        u32 val = c_can_read_reg32(priv, &priv->regs->intpnd1);
+        u32 val = c_can_read_reg32(priv, C_CAN_INTPND1_REG);
 
         for (msg_obj = C_CAN_MSG_OBJ_RX_FIRST;
                         msg_obj <= C_CAN_MSG_OBJ_RX_LAST && quota > 0;
-                        val = c_can_read_reg32(priv, &priv->regs->intpnd1),
+                        val = c_can_read_reg32(priv, C_CAN_INTPND1_REG),
                         msg_obj++) {
                 /*
                  * as interrupt pending register's bit n-1 corresponds to
@@ -758,7 +762,7 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota)
                         c_can_object_get(dev, 0, msg_obj, IF_COMM_ALL &
                                         ~IF_COMM_TXRQST);
                         msg_ctrl_save = priv->read_reg(priv,
-                                        &priv->regs->ifregs[0].msg_cntrl);
+                                        C_CAN_IFACE(MSGCTRL_REG, 0));
 
                         if (msg_ctrl_save & IF_MCONT_EOB)
                                 return num_rx_pkts;
@@ -819,7 +823,7 @@ static int c_can_handle_state_change(struct net_device *dev,
                 return 0;
 
         c_can_get_berr_counter(dev, &bec);
-        reg_err_counter = priv->read_reg(priv, &priv->regs->err_cnt);
+        reg_err_counter = priv->read_reg(priv, C_CAN_ERR_CNT_REG);
         rx_err_passive = (reg_err_counter & ERR_CNT_RP_MASK) >>
                                 ERR_CNT_RP_SHIFT;
 
@@ -935,7 +939,7 @@ static int c_can_handle_bus_err(struct net_device *dev,
         }
 
         /* set a `lec` value so that we can check for updates later */
-        priv->write_reg(priv, &priv->regs->status, LEC_UNUSED);
+        priv->write_reg(priv, C_CAN_STS_REG, LEC_UNUSED);
 
         netif_receive_skb(skb);
         stats->rx_packets++;
@@ -959,15 +963,15 @@ static int c_can_poll(struct napi_struct *napi, int quota)
         /* status events have the highest priority */
         if (irqstatus == STATUS_INTERRUPT) {
                 priv->current_status = priv->read_reg(priv,
-                                        &priv->regs->status);
+                                        C_CAN_STS_REG);
 
                 /* handle Tx/Rx events */
                 if (priv->current_status & STATUS_TXOK)
-                        priv->write_reg(priv, &priv->regs->status,
+                        priv->write_reg(priv, C_CAN_STS_REG,
                                         priv->current_status & ~STATUS_TXOK);
 
                 if (priv->current_status & STATUS_RXOK)
-                        priv->write_reg(priv, &priv->regs->status,
+                        priv->write_reg(priv, C_CAN_STS_REG,
                                         priv->current_status & ~STATUS_RXOK);
 
                 /* handle state changes */
@@ -1033,7 +1037,7 @@ static irqreturn_t c_can_isr(int irq, void *dev_id)
         struct net_device *dev = (struct net_device *)dev_id;
         struct c_can_priv *priv = netdev_priv(dev);
 
-        priv->irqstatus = priv->read_reg(priv, &priv->regs->interrupt);
+        priv->irqstatus = priv->read_reg(priv, C_CAN_INT_REG);
         if (!priv->irqstatus)
                 return IRQ_NONE;
 
diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h
index 5f32d34af507..01a7049ab990 100644
--- a/drivers/net/can/c_can/c_can.h
+++ b/drivers/net/can/c_can/c_can.h
@@ -22,43 +22,129 @@
 #ifndef C_CAN_H
 #define C_CAN_H
 
-/* c_can IF registers */
-struct c_can_if_regs {
-        u16 com_req;
-        u16 com_mask;
-        u16 mask1;
-        u16 mask2;
-        u16 arb1;
-        u16 arb2;
-        u16 msg_cntrl;
-        u16 data[4];
-        u16 _reserved[13];
+enum reg {
+        C_CAN_CTRL_REG = 0,
+        C_CAN_STS_REG,
+        C_CAN_ERR_CNT_REG,
+        C_CAN_BTR_REG,
+        C_CAN_INT_REG,
+        C_CAN_TEST_REG,
+        C_CAN_BRPEXT_REG,
+        C_CAN_IF1_COMREQ_REG,
+        C_CAN_IF1_COMMSK_REG,
+        C_CAN_IF1_MASK1_REG,
+        C_CAN_IF1_MASK2_REG,
+        C_CAN_IF1_ARB1_REG,
+        C_CAN_IF1_ARB2_REG,
+        C_CAN_IF1_MSGCTRL_REG,
+        C_CAN_IF1_DATA1_REG,
+        C_CAN_IF1_DATA2_REG,
+        C_CAN_IF1_DATA3_REG,
+        C_CAN_IF1_DATA4_REG,
+        C_CAN_IF2_COMREQ_REG,
+        C_CAN_IF2_COMMSK_REG,
+        C_CAN_IF2_MASK1_REG,
+        C_CAN_IF2_MASK2_REG,
+        C_CAN_IF2_ARB1_REG,
+        C_CAN_IF2_ARB2_REG,
+        C_CAN_IF2_MSGCTRL_REG,
+        C_CAN_IF2_DATA1_REG,
+        C_CAN_IF2_DATA2_REG,
+        C_CAN_IF2_DATA3_REG,
+        C_CAN_IF2_DATA4_REG,
+        C_CAN_TXRQST1_REG,
+        C_CAN_TXRQST2_REG,
+        C_CAN_NEWDAT1_REG,
+        C_CAN_NEWDAT2_REG,
+        C_CAN_INTPND1_REG,
+        C_CAN_INTPND2_REG,
+        C_CAN_MSGVAL1_REG,
+        C_CAN_MSGVAL2_REG,
 };
 
-/* c_can hardware registers */
-struct c_can_regs {
-        u16 control;
-        u16 status;
-        u16 err_cnt;
-        u16 btr;
-        u16 interrupt;
-        u16 test;
-        u16 brp_ext;
-        u16 _reserved1;
-        struct c_can_if_regs ifregs[2]; /* [0] = IF1 and [1] = IF2 */
-        u16 _reserved2[8];
-        u16 txrqst1;
-        u16 txrqst2;
-        u16 _reserved3[6];
-        u16 newdat1;
-        u16 newdat2;
-        u16 _reserved4[6];
-        u16 intpnd1;
-        u16 intpnd2;
-        u16 _reserved5[6];
-        u16 msgval1;
-        u16 msgval2;
-        u16 _reserved6[6];
+static const u16 reg_map_c_can[] = {
+        [C_CAN_CTRL_REG]        = 0x00,
+        [C_CAN_STS_REG]         = 0x02,
+        [C_CAN_ERR_CNT_REG]     = 0x04,
+        [C_CAN_BTR_REG]         = 0x06,
+        [C_CAN_INT_REG]         = 0x08,
+        [C_CAN_TEST_REG]        = 0x0A,
+        [C_CAN_BRPEXT_REG]      = 0x0C,
+        [C_CAN_IF1_COMREQ_REG]  = 0x10,
+        [C_CAN_IF1_COMMSK_REG]  = 0x12,
+        [C_CAN_IF1_MASK1_REG]   = 0x14,
+        [C_CAN_IF1_MASK2_REG]   = 0x16,
+        [C_CAN_IF1_ARB1_REG]    = 0x18,
+        [C_CAN_IF1_ARB2_REG]    = 0x1A,
+        [C_CAN_IF1_MSGCTRL_REG] = 0x1C,
+        [C_CAN_IF1_DATA1_REG]   = 0x1E,
+        [C_CAN_IF1_DATA2_REG]   = 0x20,
+        [C_CAN_IF1_DATA3_REG]   = 0x22,
+        [C_CAN_IF1_DATA4_REG]   = 0x24,
+        [C_CAN_IF2_COMREQ_REG]  = 0x40,
+        [C_CAN_IF2_COMMSK_REG]  = 0x42,
+        [C_CAN_IF2_MASK1_REG]   = 0x44,
+        [C_CAN_IF2_MASK2_REG]   = 0x46,
+        [C_CAN_IF2_ARB1_REG]    = 0x48,
+        [C_CAN_IF2_ARB2_REG]    = 0x4A,
+        [C_CAN_IF2_MSGCTRL_REG] = 0x4C,
+        [C_CAN_IF2_DATA1_REG]   = 0x4E,
+        [C_CAN_IF2_DATA2_REG]   = 0x50,
+        [C_CAN_IF2_DATA3_REG]   = 0x52,
+        [C_CAN_IF2_DATA4_REG]   = 0x54,
+        [C_CAN_TXRQST1_REG]     = 0x80,
+        [C_CAN_TXRQST2_REG]     = 0x82,
+        [C_CAN_NEWDAT1_REG]     = 0x90,
+        [C_CAN_NEWDAT2_REG]     = 0x92,
+        [C_CAN_INTPND1_REG]     = 0xA0,
+        [C_CAN_INTPND2_REG]     = 0xA2,
+        [C_CAN_MSGVAL1_REG]     = 0xB0,
+        [C_CAN_MSGVAL2_REG]     = 0xB2,
+};
+
+static const u16 reg_map_d_can[] = {
+        [C_CAN_CTRL_REG]        = 0x00,
+        [C_CAN_STS_REG]         = 0x04,
+        [C_CAN_ERR_CNT_REG]     = 0x08,
+        [C_CAN_BTR_REG]         = 0x0C,
+        [C_CAN_BRPEXT_REG]      = 0x0E,
+        [C_CAN_INT_REG]         = 0x10,
+        [C_CAN_TEST_REG]        = 0x14,
+        [C_CAN_TXRQST1_REG]     = 0x88,
+        [C_CAN_TXRQST2_REG]     = 0x8A,
+        [C_CAN_NEWDAT1_REG]     = 0x9C,
+        [C_CAN_NEWDAT2_REG]     = 0x9E,
+        [C_CAN_INTPND1_REG]     = 0xB0,
+        [C_CAN_INTPND2_REG]     = 0xB2,
+        [C_CAN_MSGVAL1_REG]     = 0xC4,
+        [C_CAN_MSGVAL2_REG]     = 0xC6,
+        [C_CAN_IF1_COMREQ_REG]  = 0x100,
+        [C_CAN_IF1_COMMSK_REG]  = 0x102,
+        [C_CAN_IF1_MASK1_REG]   = 0x104,
+        [C_CAN_IF1_MASK2_REG]   = 0x106,
+        [C_CAN_IF1_ARB1_REG]    = 0x108,
+        [C_CAN_IF1_ARB2_REG]    = 0x10A,
+        [C_CAN_IF1_MSGCTRL_REG] = 0x10C,
+        [C_CAN_IF1_DATA1_REG]   = 0x110,
+        [C_CAN_IF1_DATA2_REG]   = 0x112,
+        [C_CAN_IF1_DATA3_REG]   = 0x114,
+        [C_CAN_IF1_DATA4_REG]   = 0x116,
+        [C_CAN_IF2_COMREQ_REG]  = 0x120,
+        [C_CAN_IF2_COMMSK_REG]  = 0x122,
+        [C_CAN_IF2_MASK1_REG]   = 0x124,
+        [C_CAN_IF2_MASK2_REG]   = 0x126,
+        [C_CAN_IF2_ARB1_REG]    = 0x128,
+        [C_CAN_IF2_ARB2_REG]    = 0x12A,
+        [C_CAN_IF2_MSGCTRL_REG] = 0x12C,
+        [C_CAN_IF2_DATA1_REG]   = 0x130,
+        [C_CAN_IF2_DATA2_REG]   = 0x132,
+        [C_CAN_IF2_DATA3_REG]   = 0x134,
+        [C_CAN_IF2_DATA4_REG]   = 0x136,
+};
+
+enum c_can_dev_id {
+        C_CAN_DEVTYPE,
+        D_CAN_DEVTYPE,
 };
 
 /* c_can private data structure */
@@ -69,9 +155,10 @@ struct c_can_priv {
         int tx_object;
         int current_status;
         int last_status;
-        u16 (*read_reg) (struct c_can_priv *priv, void *reg);
-        void (*write_reg) (struct c_can_priv *priv, void *reg, u16 val);
-        struct c_can_regs __iomem *regs;
+        u16 (*read_reg) (struct c_can_priv *priv, enum reg index);
+        void (*write_reg) (struct c_can_priv *priv, enum reg index, u16 val);
+        void __iomem *base;
+        const u16 *regs;
         unsigned long irq_flags; /* for request_irq() */
         unsigned int tx_next;
         unsigned int tx_echo;
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index 5e1a5ff6476e..f0921d16f0a9 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -42,27 +42,27 @@
  * Handle the same by providing a common read/write interface.
  */
 static u16 c_can_plat_read_reg_aligned_to_16bit(struct c_can_priv *priv,
-                                                void *reg)
+                                                enum reg index)
 {
-        return readw(reg);
+        return readw(priv->base + priv->regs[index]);
 }
 
 static void c_can_plat_write_reg_aligned_to_16bit(struct c_can_priv *priv,
-                                                void *reg, u16 val)
+                                                enum reg index, u16 val)
 {
-        writew(val, reg);
+        writew(val, priv->base + priv->regs[index]);
 }
 
 static u16 c_can_plat_read_reg_aligned_to_32bit(struct c_can_priv *priv,
-                                                void *reg)
+                                                enum reg index)
 {
-        return readw(reg + (long)reg - (long)priv->regs);
+        return readw(priv->base + 2 * priv->regs[index]);
 }
 
 static void c_can_plat_write_reg_aligned_to_32bit(struct c_can_priv *priv,
-                                                void *reg, u16 val)
+                                                enum reg index, u16 val)
 {
-        writew(val, reg + (long)reg - (long)priv->regs);
+        writew(val, priv->base + 2 * priv->regs[index]);
 }
 
 static int __devinit c_can_plat_probe(struct platform_device *pdev)
@@ -71,6 +71,7 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev)
         void __iomem *addr;
         struct net_device *dev;
         struct c_can_priv *priv;
+        const struct platform_device_id *id;
         struct resource *mem;
         int irq;
 #ifdef CONFIG_HAVE_CLK
@@ -115,26 +116,40 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev)
         }
 
         priv = netdev_priv(dev);
+        id = platform_get_device_id(pdev);
+        switch (id->driver_data) {
+        case C_CAN_DEVTYPE:
+                priv->regs = reg_map_c_can;
+                switch (mem->flags & IORESOURCE_MEM_TYPE_MASK) {
+                case IORESOURCE_MEM_32BIT:
+                        priv->read_reg = c_can_plat_read_reg_aligned_to_32bit;
+                        priv->write_reg = c_can_plat_write_reg_aligned_to_32bit;
+                        break;
+                case IORESOURCE_MEM_16BIT:
+                default:
+                        priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
+                        priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
+                        break;
+                }
+                break;
+        case D_CAN_DEVTYPE:
+                priv->regs = reg_map_d_can;
+                priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;
+                priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
+                priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
+                break;
+        default:
+                ret = -EINVAL;
+                goto exit_free_device;
+        }
 
         dev->irq = irq;
-        priv->regs = addr;
+        priv->base = addr;
 #ifdef CONFIG_HAVE_CLK
         priv->can.clock.freq = clk_get_rate(clk);
         priv->priv = clk;
 #endif
 
-        switch (mem->flags & IORESOURCE_MEM_TYPE_MASK) {
-        case IORESOURCE_MEM_32BIT:
-                priv->read_reg = c_can_plat_read_reg_aligned_to_32bit;
-                priv->write_reg = c_can_plat_write_reg_aligned_to_32bit;
-                break;
-        case IORESOURCE_MEM_16BIT:
-        default:
-                priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
-                priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
-                break;
-        }
-
         platform_set_drvdata(pdev, dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
 
@@ -146,7 +161,7 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev)
         }
 
         dev_info(&pdev->dev, "%s device registered (regs=%p, irq=%d)\n",
-                 KBUILD_MODNAME, priv->regs, dev->irq);
+                 KBUILD_MODNAME, priv->base, dev->irq);
         return 0;
 
 exit_free_device:
@@ -176,7 +191,7 @@ static int __devexit c_can_plat_remove(struct platform_device *pdev)
         platform_set_drvdata(pdev, NULL);
 
         free_c_can_dev(dev);
-        iounmap(priv->regs);
+        iounmap(priv->base);
 
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(mem->start, resource_size(mem));
@@ -188,6 +203,20 @@ static int __devexit c_can_plat_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct platform_device_id c_can_id_table[] = {
+        {
+                .name = KBUILD_MODNAME,
+                .driver_data = C_CAN_DEVTYPE,
+        }, {
+                .name = "c_can",
+                .driver_data = C_CAN_DEVTYPE,
+        }, {
+                .name = "d_can",
+                .driver_data = D_CAN_DEVTYPE,
+        }, {
+        }
+};
+
 static struct platform_driver c_can_plat_driver = {
         .driver = {
                 .name = KBUILD_MODNAME,
@@ -195,6 +224,7 @@ static struct platform_driver c_can_plat_driver = {
         },
         .probe = c_can_plat_probe,
         .remove = __devexit_p(c_can_plat_remove),
+        .id_table = c_can_id_table,
 };
 
 module_platform_driver(c_can_plat_driver);
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 38c0690df5c8..d465fd4546f0 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -1056,6 +1056,42 @@ static struct of_device_id flexcan_of_match[] = {
         {},
 };
 
+#ifdef CONFIG_PM
+static int flexcan_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct flexcan_priv *priv = netdev_priv(dev);
+
+        flexcan_chip_disable(priv);
+
+        if (netif_running(dev)) {
+                netif_stop_queue(dev);
+                netif_device_detach(dev);
+        }
+        priv->can.state = CAN_STATE_SLEEPING;
+
+        return 0;
+}
+
+static int flexcan_resume(struct platform_device *pdev)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct flexcan_priv *priv = netdev_priv(dev);
+
+        priv->can.state = CAN_STATE_ERROR_ACTIVE;
+        if (netif_running(dev)) {
+                netif_device_attach(dev);
+                netif_start_queue(dev);
+        }
+        flexcan_chip_enable(priv);
+
+        return 0;
+}
+#else
+#define flexcan_suspend NULL
+#define flexcan_resume NULL
+#endif
+
 static struct platform_driver flexcan_driver = {
         .driver = {
                 .name = DRV_NAME,
@@ -1064,6 +1100,8 @@ static struct platform_driver flexcan_driver = {
         },
         .probe = flexcan_probe,
         .remove = __devexit_p(flexcan_remove),
+        .suspend = flexcan_suspend,
+        .resume = flexcan_resume,
 };
 
 module_platform_driver(flexcan_driver);
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 346785c56a25..9120a36ec702 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -1020,8 +1020,7 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi)
                                                       GFP_DMA);
 
                 if (priv->spi_tx_buf) {
-                        priv->spi_rx_buf = (u8 *)(priv->spi_tx_buf +
-                                                  (PAGE_SIZE / 2));
+                        priv->spi_rx_buf = (priv->spi_tx_buf + (PAGE_SIZE / 2));
                         priv->spi_rx_dma = (dma_addr_t)(priv->spi_tx_dma +
                                                         (PAGE_SIZE / 2));
                 } else {
diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c
index 923959275a82..912ed7a5f33a 100644
--- a/drivers/net/ethernet/8390/apne.c
+++ b/drivers/net/ethernet/8390/apne.c
@@ -454,7 +454,7 @@ apne_block_input(struct net_device *dev, int count, struct sk_buff *skb, int rin
         buf[count-1] = inb(NE_BASE + NE_DATAPORT);
       }
     } else {
-      ptrc = (char*)buf;
+      ptrc = buf;
       for (cnt = 0; cnt < count; cnt++)
         *ptrc++ = inb(NE_BASE + NE_DATAPORT);
     }
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index 348501178089..9c77c736f171 100644
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -1014,7 +1014,7 @@ static int greth_set_mac_add(struct net_device *dev, void *p)
         struct greth_regs *regs;
 
         greth = netdev_priv(dev);
-        regs = (struct greth_regs *) greth->regs;
+        regs = greth->regs;
 
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
@@ -1036,7 +1036,7 @@ static void greth_set_hash_filter(struct net_device *dev)
 {
         struct netdev_hw_addr *ha;
         struct greth_private *greth = netdev_priv(dev);
-        struct greth_regs *regs = (struct greth_regs *) greth->regs;
+        struct greth_regs *regs = greth->regs;
         u32 mc_filter[2];
         unsigned int bitnr;
 
@@ -1055,7 +1055,7 @@ static void greth_set_multicast_list(struct net_device *dev)
 {
         int cfg;
         struct greth_private *greth = netdev_priv(dev);
-        struct greth_regs *regs = (struct greth_regs *) greth->regs;
+        struct greth_regs *regs = greth->regs;
 
         cfg = GRETH_REGLOAD(regs->control);
         if (dev->flags & IFF_PROMISC)
@@ -1414,7 +1414,7 @@ static int __devinit greth_of_probe(struct platform_device *ofdev)
                 goto error1;
         }
 
-        regs = (struct greth_regs *) greth->regs;
+        regs = greth->regs;
         greth->irq = ofdev->archdata.irqs[0];
 
         dev_set_drvdata(greth->dev, dev);
diff --git a/drivers/net/ethernet/amd/declance.c b/drivers/net/ethernet/amd/declance.c
index 75299f500ee5..7203b522f234 100644
--- a/drivers/net/ethernet/amd/declance.c
+++ b/drivers/net/ethernet/amd/declance.c
@@ -623,7 +623,7 @@ static int lance_rx(struct net_device *dev)
                         skb_put(skb, len);      /* make room */
 
                         cp_from_buf(lp->type, skb->data,
-                                    (char *)lp->rx_buf_ptr_cpu[entry], len);
+                                    lp->rx_buf_ptr_cpu[entry], len);
 
                         skb->protocol = eth_type_trans(skb, dev);
                         netif_rx(skb);
@@ -919,7 +919,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
         *lib_ptr(ib, btx_ring[entry].length, lp->type) = (-len);
         *lib_ptr(ib, btx_ring[entry].misc, lp->type) = 0;
 
-        cp_to_buf(lp->type, (char *)lp->tx_buf_ptr_cpu[entry], skb->data, len);
+        cp_to_buf(lp->type, lp->tx_buf_ptr_cpu[entry], skb->data, len);
 
         /* Now, give the packet to the lance */
         *lib_ptr(ib, btx_ring[entry].tmd1, lp->type) =
diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c
index ab7ff8645ab1..a92ddee7f665 100644
--- a/drivers/net/ethernet/apple/macmace.c
+++ b/drivers/net/ethernet/apple/macmace.c
@@ -228,7 +228,7 @@ static int __devinit mace_probe(struct platform_device *pdev)
          * bits are reversed.
          */
 
-        addr = (void *)MACE_PROM;
+        addr = MACE_PROM;
 
         for (j = 0; j < 6; ++j) {
                 u8 v = bitrev8(addr[j<<4]);
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
index ff9c73859d45..801f0126512d 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
@@ -602,7 +602,7 @@ int atl1c_phy_reset(struct atl1c_hw *hw)
 
 int atl1c_phy_init(struct atl1c_hw *hw)
 {
-        struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
+        struct atl1c_adapter *adapter = hw->adapter;
         struct pci_dev *pdev = adapter->pdev;
         int ret_val;
         u16 mii_bmcr_data = BMCR_RESET;
@@ -696,7 +696,7 @@ int atl1c_get_speed_and_duplex(struct atl1c_hw *hw, u16 *speed, u16 *duplex)
 /* select one link mode to get lower power consumption */
 int atl1c_phy_to_ps_link(struct atl1c_hw *hw)
 {
-        struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
+        struct atl1c_adapter *adapter = hw->adapter;
         struct pci_dev *pdev = adapter->pdev;
         int ret = 0;
         u16 autoneg_advertised = ADVERTISED_10baseT_Half;
@@ -768,7 +768,7 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw)
 
 int atl1c_power_saving(struct atl1c_hw *hw, u32 wufc)
 {
-        struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
+        struct atl1c_adapter *adapter = hw->adapter;
         struct pci_dev *pdev = adapter->pdev;
         u32 master_ctrl, mac_ctrl, phy_ctrl;
         u32 wol_ctrl, speed;
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 9cc15701101b..85717cb306d1 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -989,12 +989,12 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter)
         }
         for (i = 0; i < AT_MAX_TRANSMIT_QUEUE; i++) {
                 tpd_ring[i].buffer_info =
-                        (struct atl1c_buffer *) (tpd_ring->buffer_info + count);
+                        (tpd_ring->buffer_info + count);
                 count += tpd_ring[i].count;
         }
 
         rfd_ring->buffer_info =
-                (struct atl1c_buffer *) (tpd_ring->buffer_info + count);
+                (tpd_ring->buffer_info + count);
         count += rfd_ring->count;
         rx_desc_count += rfd_ring->count;
 
@@ -1227,7 +1227,7 @@ static void atl1c_start_mac(struct atl1c_adapter *adapter)
  */
 static int atl1c_reset_mac(struct atl1c_hw *hw)
 {
-        struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;
+        struct atl1c_adapter *adapter = hw->adapter;
         struct pci_dev *pdev = adapter->pdev;
         u32 ctrl_data = 0;
 
@@ -1531,8 +1531,7 @@ static inline void atl1c_clear_phy_int(struct atl1c_adapter *adapter)
 static bool atl1c_clean_tx_irq(struct atl1c_adapter *adapter,
                                 enum atl1c_trans_queue type)
 {
-        struct atl1c_tpd_ring *tpd_ring = (struct atl1c_tpd_ring *)
-                                &adapter->tpd_ring[type];
+        struct atl1c_tpd_ring *tpd_ring = &adapter->tpd_ring[type];
         struct atl1c_buffer *buffer_info;
         struct pci_dev *pdev = adapter->pdev;
         u16 next_to_clean = atomic_read(&tpd_ring->next_to_clean);
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c b/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
index 6e61f9f9ebb5..82b23861bf55 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
@@ -268,7 +268,7 @@ static int atl1e_set_eeprom(struct net_device *netdev,
         if (eeprom_buff == NULL)
                 return -ENOMEM;
 
-        ptr = (u32 *)eeprom_buff;
+        ptr = eeprom_buff;
 
         if (eeprom->offset & 3) {
                 /* need read/modify/write of first changed EEPROM word */
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index 1220e511ced6..0aed82e1bb3e 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -641,8 +641,7 @@ static int __devinit atl1e_sw_init(struct atl1e_adapter *adapter)
  */
 static void atl1e_clean_tx_ring(struct atl1e_adapter *adapter)
 {
-        struct atl1e_tx_ring *tx_ring = (struct atl1e_tx_ring *)
-                                &adapter->tx_ring;
+        struct atl1e_tx_ring *tx_ring = &adapter->tx_ring;
         struct atl1e_tx_buffer *tx_buffer = NULL;
         struct pci_dev *pdev = adapter->pdev;
         u16 index, ring_count;
@@ -686,7 +685,7 @@ static void atl1e_clean_tx_ring(struct atl1e_adapter *adapter)
 static void atl1e_clean_rx_ring(struct atl1e_adapter *adapter)
 {
         struct atl1e_rx_ring *rx_ring =
-                (struct atl1e_rx_ring *)&adapter->rx_ring;
+                &adapter->rx_ring;
         struct atl1e_rx_page_desc *rx_page_desc = rx_ring->rx_page_desc;
         u16 i, j;
 
@@ -884,14 +883,12 @@ failed:
         return err;
 }
 
-static inline void atl1e_configure_des_ring(const struct atl1e_adapter *adapter)
+static inline void atl1e_configure_des_ring(struct atl1e_adapter *adapter)
 {
 
-        struct atl1e_hw *hw = (struct atl1e_hw *)&adapter->hw;
-        struct atl1e_rx_ring *rx_ring =
-                        (struct atl1e_rx_ring *)&adapter->rx_ring;
-        struct atl1e_tx_ring *tx_ring =
-                        (struct atl1e_tx_ring *)&adapter->tx_ring;
+        struct atl1e_hw *hw = &adapter->hw;
+        struct atl1e_rx_ring *rx_ring = &adapter->rx_ring;
+        struct atl1e_tx_ring *tx_ring = &adapter->tx_ring;
         struct atl1e_rx_page_desc *rx_page_desc = NULL;
         int i, j;
 
@@ -932,7 +929,7 @@ static inline void atl1e_configure_des_ring(const struct atl1e_adapter *adapter)
 
 static inline void atl1e_configure_tx(struct atl1e_adapter *adapter)
 {
-        struct atl1e_hw *hw = (struct atl1e_hw *)&adapter->hw;
+        struct atl1e_hw *hw = &adapter->hw;
         u32 dev_ctrl_data = 0;
         u32 max_pay_load = 0;
         u32 jumbo_thresh = 0;
@@ -975,7 +972,7 @@ static inline void atl1e_configure_tx(struct atl1e_adapter *adapter)
 
 static inline void atl1e_configure_rx(struct atl1e_adapter *adapter)
 {
-        struct atl1e_hw *hw = (struct atl1e_hw *)&adapter->hw;
+        struct atl1e_hw *hw = &adapter->hw;
         u32 rxf_len  = 0;
         u32 rxf_low  = 0;
         u32 rxf_high = 0;
@@ -1224,8 +1221,7 @@ static inline void atl1e_clear_phy_int(struct atl1e_adapter *adapter)
 
 static bool atl1e_clean_tx_irq(struct atl1e_adapter *adapter)
 {
-        struct atl1e_tx_ring *tx_ring = (struct atl1e_tx_ring *)
-                                        &adapter->tx_ring;
+        struct atl1e_tx_ring *tx_ring = &adapter->tx_ring;
         struct atl1e_tx_buffer *tx_buffer = NULL;
         u16 hw_next_to_clean = AT_READ_REGW(&adapter->hw, REG_TPD_CONS_IDX);
         u16 next_to_clean = atomic_read(&tx_ring->next_to_clean);
@@ -1384,15 +1380,14 @@ static struct atl1e_rx_page *atl1e_get_rx_page(struct atl1e_adapter *adapter,
                 (struct atl1e_rx_page_desc *) adapter->rx_ring.rx_page_desc;
         u8 rx_using = rx_page_desc[que].rx_using;
 
-        return (struct atl1e_rx_page *)&(rx_page_desc[que].rx_page[rx_using]);
+        return &(rx_page_desc[que].rx_page[rx_using]);
 }
 
 static void atl1e_clean_rx_irq(struct atl1e_adapter *adapter, u8 que,
                    int *work_done, int work_to_do)
 {
         struct net_device *netdev  = adapter->netdev;
-        struct atl1e_rx_ring *rx_ring = (struct atl1e_rx_ring *)
-                                         &adapter->rx_ring;
+        struct atl1e_rx_ring *rx_ring = &adapter->rx_ring;
         struct atl1e_rx_page_desc *rx_page_desc =
                 (struct atl1e_rx_page_desc *) rx_ring->rx_page_desc;
         struct sk_buff *skb = NULL;
@@ -1576,7 +1571,7 @@ static struct atl1e_tpd_desc *atl1e_get_tpd(struct atl1e_adapter *adapter)
                 tx_ring->next_to_use = 0;
 
         memset(&tx_ring->desc[next_to_use], 0, sizeof(struct atl1e_tpd_desc));
-        return (struct atl1e_tpd_desc *)&tx_ring->desc[next_to_use];
+        return &tx_ring->desc[next_to_use];
 }
 
 static struct atl1e_tx_buffer *
@@ -2061,8 +2056,8 @@ static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)
 
         if (wufc) {
                 /* get link status */
-                atl1e_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data);
-                atl1e_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data);
+                atl1e_read_phy_reg(hw, MII_BMSR, &mii_bmsr_data);
+                atl1e_read_phy_reg(hw, MII_BMSR, &mii_bmsr_data);
 
                 mii_advertise_data = ADVERTISE_10HALF;
 
@@ -2086,7 +2081,7 @@ static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)
                                 for (i = 0; i < AT_SUSPEND_LINK_TIMEOUT; i++) {
                                         msleep(100);
                                         atl1e_read_phy_reg(hw, MII_BMSR,
-                                                        (u16 *)&mii_bmsr_data);
+                                                        &mii_bmsr_data);
                                         if (mii_bmsr_data & BMSR_LSTATUS)
                                                 break;
                                 }
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index 5d10884e5080..149a294d54e9 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -1061,7 +1061,7 @@ static s32 atl1_setup_ring_resources(struct atl1_adapter *adapter)
                 goto err_nomem;
         }
         rfd_ring->buffer_info =
-                (struct atl1_buffer *)(tpd_ring->buffer_info + tpd_ring->count);
+                (tpd_ring->buffer_info + tpd_ring->count);
 
         /*
          * real ring DMA buffer
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index ac7b74488531..ff5d3c1f1217 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -872,8 +872,7 @@ bnx2_alloc_mem(struct bnx2 *bp)
 
                         bnapi = &bp->bnx2_napi[i];
 
-                        sblk = (void *) (status_blk +
-                                         BNX2_SBLK_MSIX_ALIGN_SIZE * i);
+                        sblk = (status_blk + BNX2_SBLK_MSIX_ALIGN_SIZE * i);
                         bnapi->status_blk.msix = sblk;
                         bnapi->hw_tx_cons_ptr =
                                 &sblk->status_tx_quick_consumer_index;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index ddc18ee5c5ae..bf30e2829285 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -177,6 +177,8 @@ static const struct {
                         4, STATS_FLAGS_FUNC, "recoverable_errors" },
         { STATS_OFFSET32(unrecoverable_error),
                         4, STATS_FLAGS_FUNC, "unrecoverable_errors" },
+        { STATS_OFFSET32(eee_tx_lpi),
+                        4, STATS_FLAGS_PORT, "Tx LPI entry count"}
 };
 
 #define BNX2X_NUM_STATS         ARRAY_SIZE(bnx2x_stats_arr)
@@ -1543,6 +1545,136 @@ static const struct {
         { "idle check (online)" }
 };
 
+static u32 bnx2x_eee_to_adv(u32 eee_adv)
+{
+        u32 modes = 0;
+
+        if (eee_adv & SHMEM_EEE_100M_ADV)
+                modes |= ADVERTISED_100baseT_Full;
+        if (eee_adv & SHMEM_EEE_1G_ADV)
+                modes |= ADVERTISED_1000baseT_Full;
+        if (eee_adv & SHMEM_EEE_10G_ADV)
+                modes |= ADVERTISED_10000baseT_Full;
+
+        return modes;
+}
+
+static u32 bnx2x_adv_to_eee(u32 modes, u32 shift)
+{
+        u32 eee_adv = 0;
+        if (modes & ADVERTISED_100baseT_Full)
+                eee_adv |= SHMEM_EEE_100M_ADV;
+        if (modes & ADVERTISED_1000baseT_Full)
+                eee_adv |= SHMEM_EEE_1G_ADV;
+        if (modes & ADVERTISED_10000baseT_Full)
+                eee_adv |= SHMEM_EEE_10G_ADV;
+
+        return eee_adv << shift;
+}
+
+static int bnx2x_get_eee(struct net_device *dev, struct ethtool_eee *edata)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        u32 eee_cfg;
+
+        if (!SHMEM2_HAS(bp, eee_status[BP_PORT(bp)])) {
+                DP(BNX2X_MSG_ETHTOOL, "BC Version does not support EEE\n");
+                return -EOPNOTSUPP;
+        }
+
+        eee_cfg = SHMEM2_RD(bp, eee_status[BP_PORT(bp)]);
+
+        edata->supported =
+                bnx2x_eee_to_adv((eee_cfg & SHMEM_EEE_SUPPORTED_MASK) >>
+                                 SHMEM_EEE_SUPPORTED_SHIFT);
+
+        edata->advertised =
+                bnx2x_eee_to_adv((eee_cfg & SHMEM_EEE_ADV_STATUS_MASK) >>
+                                 SHMEM_EEE_ADV_STATUS_SHIFT);
+        edata->lp_advertised =
+                bnx2x_eee_to_adv((eee_cfg & SHMEM_EEE_LP_ADV_STATUS_MASK) >>
+                                 SHMEM_EEE_LP_ADV_STATUS_SHIFT);
+
+        /* SHMEM value is in 16u units --> Convert to 1u units. */
+        edata->tx_lpi_timer = (eee_cfg & SHMEM_EEE_TIMER_MASK) << 4;
+
+        edata->eee_enabled    = (eee_cfg & SHMEM_EEE_REQUESTED_BIT)     ? 1 : 0;
+        edata->eee_active     = (eee_cfg & SHMEM_EEE_ACTIVE_BIT)        ? 1 : 0;
+        edata->tx_lpi_enabled = (eee_cfg & SHMEM_EEE_LPI_REQUESTED_BIT) ? 1 : 0;
+
+        return 0;
+}
+
+static int bnx2x_set_eee(struct net_device *dev, struct ethtool_eee *edata)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        u32 eee_cfg;
+        u32 advertised;
+
+        if (IS_MF(bp))
+                return 0;
+
+        if (!SHMEM2_HAS(bp, eee_status[BP_PORT(bp)])) {
+                DP(BNX2X_MSG_ETHTOOL, "BC Version does not support EEE\n");
+                return -EOPNOTSUPP;
+        }
+
+        eee_cfg = SHMEM2_RD(bp, eee_status[BP_PORT(bp)]);
+
+        if (!(eee_cfg & SHMEM_EEE_SUPPORTED_MASK)) {
+                DP(BNX2X_MSG_ETHTOOL, "Board does not support EEE!\n");
+                return -EOPNOTSUPP;
+        }
+
+        advertised = bnx2x_adv_to_eee(edata->advertised,
+                                      SHMEM_EEE_ADV_STATUS_SHIFT);
+        if ((advertised != (eee_cfg & SHMEM_EEE_ADV_STATUS_MASK))) {
+                DP(BNX2X_MSG_ETHTOOL,
+                   "Direct manipulation of EEE advertisment is not supported\n");
+                return -EINVAL;
+        }
+
+        if (edata->tx_lpi_timer > EEE_MODE_TIMER_MASK) {
+                DP(BNX2X_MSG_ETHTOOL,
+                   "Maximal Tx Lpi timer supported is %x(u)\n",
+                   EEE_MODE_TIMER_MASK);
+                return -EINVAL;
+        }
+        if (edata->tx_lpi_enabled &&
+            (edata->tx_lpi_timer < EEE_MODE_NVRAM_AGGRESSIVE_TIME)) {
+                DP(BNX2X_MSG_ETHTOOL,
+                   "Minimal Tx Lpi timer supported is %d(u)\n",
+                   EEE_MODE_NVRAM_AGGRESSIVE_TIME);
+                return -EINVAL;
+        }
+
+        /* All is well; Apply changes*/
+        if (edata->eee_enabled)
+                bp->link_params.eee_mode |= EEE_MODE_ADV_LPI;
+        else
+                bp->link_params.eee_mode &= ~EEE_MODE_ADV_LPI;
+
+        if (edata->tx_lpi_enabled)
+                bp->link_params.eee_mode |= EEE_MODE_ENABLE_LPI;
+        else
+                bp->link_params.eee_mode &= ~EEE_MODE_ENABLE_LPI;
+
+        bp->link_params.eee_mode &= ~EEE_MODE_TIMER_MASK;
+        bp->link_params.eee_mode |= (edata->tx_lpi_timer &
+                                    EEE_MODE_TIMER_MASK) |
+                                    EEE_MODE_OVERRIDE_NVRAM |
+                                    EEE_MODE_OUTPUT_TIME;
+
+        /* Restart link to propogate changes */
+        if (netif_running(dev)) {
+                bnx2x_stats_handle(bp, STATS_EVENT_STOP);
+                bnx2x_link_set(bp);
+        }
+
+        return 0;
+}
+
+
 enum {
         BNX2X_CHIP_E1_OFST = 0,
         BNX2X_CHIP_E1H_OFST,
@@ -2472,6 +2604,8 @@ static const struct ethtool_ops bnx2x_ethtool_ops = {
         .get_rxfh_indir_size    = bnx2x_get_rxfh_indir_size,
         .get_rxfh_indir         = bnx2x_get_rxfh_indir,
         .set_rxfh_indir         = bnx2x_set_rxfh_indir,
+        .get_eee                = bnx2x_get_eee,
+        .set_eee                = bnx2x_set_eee,
 };
 
 void bnx2x_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
index a440a8ba85f2..c61aa37298a3 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
@@ -1067,8 +1067,18 @@ struct port_feat_cfg {		    /* port 0: 0x454  port 1: 0x4c8 */
            uses the same defines as link_config */
         u32 mfw_wol_link_cfg2;                              /* 0x480 */
 
-        u32 Reserved2[17];                                  /* 0x484 */
 
+        /*  EEE power saving mode */
+        u32 eee_power_mode;                                 /* 0x484 */
+        #define PORT_FEAT_CFG_EEE_POWER_MODE_MASK                     0x000000FF
+        #define PORT_FEAT_CFG_EEE_POWER_MODE_SHIFT                    0
+        #define PORT_FEAT_CFG_EEE_POWER_MODE_DISABLED                 0x00000000
+        #define PORT_FEAT_CFG_EEE_POWER_MODE_BALANCED                 0x00000001
+        #define PORT_FEAT_CFG_EEE_POWER_MODE_AGGRESSIVE               0x00000002
+        #define PORT_FEAT_CFG_EEE_POWER_MODE_LOW_LATENCY              0x00000003
+
+
+        u32 Reserved2[16];                                  /* 0x488 */
 };
 
 
@@ -1255,6 +1265,8 @@ struct drv_func_mb {
         #define DRV_MSG_CODE_DRV_INFO_ACK               0xd8000000
         #define DRV_MSG_CODE_DRV_INFO_NACK              0xd9000000
 
+        #define DRV_MSG_CODE_EEE_RESULTS_ACK            0xda000000
+
         #define DRV_MSG_CODE_SET_MF_BW                  0xe0000000
         #define REQ_BC_VER_4_SET_MF_BW                  0x00060202
         #define DRV_MSG_CODE_SET_MF_BW_ACK              0xe1000000
@@ -1320,6 +1332,8 @@ struct drv_func_mb {
         #define FW_MSG_CODE_DRV_INFO_ACK                0xd8100000
         #define FW_MSG_CODE_DRV_INFO_NACK               0xd9100000
 
+        #define FW_MSG_CODE_EEE_RESULS_ACK              0xda100000
+
         #define FW_MSG_CODE_SET_MF_BW_SENT              0xe0000000
         #define FW_MSG_CODE_SET_MF_BW_DONE              0xe1000000
 
@@ -1383,6 +1397,8 @@ struct drv_func_mb {
 
         #define DRV_STATUS_DRV_INFO_REQ                 0x04000000
 
+        #define DRV_STATUS_EEE_NEGOTIATION_RESULTS      0x08000000
+
         u32 virt_mac_upper;
         #define VIRT_MAC_SIGN_MASK                      0xffff0000
         #define VIRT_MAC_SIGNATURE                      0x564d0000
@@ -1613,6 +1629,11 @@ struct fw_flr_mb {
         struct fw_flr_ack ack;
 };
 
+struct eee_remote_vals {
+        u32         tx_tw;
+        u32         rx_tw;
+};
+
 /**** SUPPORT FOR SHMEM ARRRAYS ***
  * The SHMEM HSI is aligned on 32 bit boundaries which makes it difficult to
  * define arrays with storage types smaller then unsigned dwords.
@@ -2053,6 +2074,41 @@ struct shmem2_region {
 #define DRV_INFO_CONTROL_OP_CODE_MASK      0x0000ff00
 #define DRV_INFO_CONTROL_OP_CODE_SHIFT     8
         u32 ibft_host_addr; /* initialized by option ROM */
+        struct eee_remote_vals eee_remote_vals[PORT_MAX];
+        u32 reserved[E2_FUNC_MAX];
+
+
+        /* the status of EEE auto-negotiation
+         * bits 15:0 the configured tx-lpi entry timer value. Depends on bit 31.
+         * bits 19:16 the supported modes for EEE.
+         * bits 23:20 the speeds advertised for EEE.
+         * bits 27:24 the speeds the Link partner advertised for EEE.
+         * The supported/adv. modes in bits 27:19 originate from the
+         * SHMEM_EEE_XXX_ADV definitions (where XXX is replaced by speed).
+         * bit 28 when 1'b1 EEE was requested.
+         * bit 29 when 1'b1 tx lpi was requested.
+         * bit 30 when 1'b1 EEE was negotiated. Tx lpi will be asserted iff
+         * 30:29 are 2'b11.
+         * bit 31 when 1'b0 bits 15:0 contain a PORT_FEAT_CFG_EEE_ define as
+         * value. When 1'b1 those bits contains a value times 16 microseconds.
+         */
+        u32 eee_status[PORT_MAX];
+        #define SHMEM_EEE_TIMER_MASK               0x0000ffff
+        #define SHMEM_EEE_SUPPORTED_MASK           0x000f0000
+        #define SHMEM_EEE_SUPPORTED_SHIFT          16
+        #define SHMEM_EEE_ADV_STATUS_MASK          0x00f00000
+                #define SHMEM_EEE_100M_ADV         (1<<0)
+                #define SHMEM_EEE_1G_ADV           (1<<1)
+                #define SHMEM_EEE_10G_ADV          (1<<2)
+        #define SHMEM_EEE_ADV_STATUS_SHIFT         20
+        #define SHMEM_EEE_LP_ADV_STATUS_MASK       0x0f000000
+        #define SHMEM_EEE_LP_ADV_STATUS_SHIFT      24
+        #define SHMEM_EEE_REQUESTED_BIT            0x10000000
+        #define SHMEM_EEE_LPI_REQUESTED_BIT        0x20000000
+        #define SHMEM_EEE_ACTIVE_BIT               0x40000000
+        #define SHMEM_EEE_TIME_OUTPUT_BIT          0x80000000
+
+        u32 sizeof_port_stats;
 };
 
 
@@ -2599,6 +2655,9 @@ struct host_port_stats {
         u32            pfc_frames_tx_lo;
         u32            pfc_frames_rx_hi;
         u32            pfc_frames_rx_lo;
+
+        u32            eee_lpi_count_hi;
+        u32            eee_lpi_count_lo;
 };
 
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index a3fb7215cd89..c7c814db027d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -1305,6 +1305,94 @@ int bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos)
 
         return 0;
 }
+
+/******************************************************************/
+/*                      EEE section                                */
+/******************************************************************/
+static u8 bnx2x_eee_has_cap(struct link_params *params)
+{
+        struct bnx2x *bp = params->bp;
+
+        if (REG_RD(bp, params->shmem2_base) <=
+                   offsetof(struct shmem2_region, eee_status[params->port]))
+                return 0;
+
+        return 1;
+}
+
+static int bnx2x_eee_nvram_to_time(u32 nvram_mode, u32 *idle_timer)
+{
+        switch (nvram_mode) {
+        case PORT_FEAT_CFG_EEE_POWER_MODE_BALANCED:
+                *idle_timer = EEE_MODE_NVRAM_BALANCED_TIME;
+                break;
+        case PORT_FEAT_CFG_EEE_POWER_MODE_AGGRESSIVE:
+                *idle_timer = EEE_MODE_NVRAM_AGGRESSIVE_TIME;
+                break;
+        case PORT_FEAT_CFG_EEE_POWER_MODE_LOW_LATENCY:
+                *idle_timer = EEE_MODE_NVRAM_LATENCY_TIME;
+                break;
+        default:
+                *idle_timer = 0;
+                break;
+        }
+
+        return 0;
+}
+
+static int bnx2x_eee_time_to_nvram(u32 idle_timer, u32 *nvram_mode)
+{
+        switch (idle_timer) {
+        case EEE_MODE_NVRAM_BALANCED_TIME:
+                *nvram_mode = PORT_FEAT_CFG_EEE_POWER_MODE_BALANCED;
+                break;
+        case EEE_MODE_NVRAM_AGGRESSIVE_TIME:
+                *nvram_mode = PORT_FEAT_CFG_EEE_POWER_MODE_AGGRESSIVE;
+                break;
+        case EEE_MODE_NVRAM_LATENCY_TIME:
+                *nvram_mode = PORT_FEAT_CFG_EEE_POWER_MODE_LOW_LATENCY;
+                break;
+        default:
+                *nvram_mode = PORT_FEAT_CFG_EEE_POWER_MODE_DISABLED;
+                break;
+        }
+
+        return 0;
+}
+
+static u32 bnx2x_eee_calc_timer(struct link_params *params)
+{
+        u32 eee_mode, eee_idle;
+        struct bnx2x *bp = params->bp;
+
+        if (params->eee_mode & EEE_MODE_OVERRIDE_NVRAM) {
+                if (params->eee_mode & EEE_MODE_OUTPUT_TIME) {
+                        /* time value in eee_mode --> used directly*/
+                        eee_idle = params->eee_mode & EEE_MODE_TIMER_MASK;
+                } else {
+                        /* hsi value in eee_mode --> time */
+                        if (bnx2x_eee_nvram_to_time(params->eee_mode &
+                                                    EEE_MODE_NVRAM_MASK,
+                                                    &eee_idle))
+                                return 0;
+                }
+        } else {
+                /* hsi values in nvram --> time*/
+                eee_mode = ((REG_RD(bp, params->shmem_base +
+                                    offsetof(struct shmem_region, dev_info.
+                                    port_feature_config[params->port].
+                                    eee_power_mode)) &
+                             PORT_FEAT_CFG_EEE_POWER_MODE_MASK) >>
+                            PORT_FEAT_CFG_EEE_POWER_MODE_SHIFT);
+
+                if (bnx2x_eee_nvram_to_time(eee_mode, &eee_idle))
+                        return 0;
+        }
+
+        return eee_idle;
+}
+
+
 /******************************************************************/
 /*                      PFC section                               */
 /******************************************************************/
@@ -1729,6 +1817,14 @@ static int bnx2x_xmac_enable(struct link_params *params,
         /* update PFC */
         bnx2x_update_pfc_xmac(params, vars, 0);
 
+        if (vars->eee_status & SHMEM_EEE_ADV_STATUS_MASK) {
+                DP(NETIF_MSG_LINK, "Setting XMAC for EEE\n");
+                REG_WR(bp, xmac_base + XMAC_REG_EEE_TIMERS_HI, 0x1380008);
+                REG_WR(bp, xmac_base + XMAC_REG_EEE_CTRL, 0x1);
+        } else {
+                REG_WR(bp, xmac_base + XMAC_REG_EEE_CTRL, 0x0);
+        }
+
         /* Enable TX and RX */
         val = XMAC_CTRL_REG_TX_EN | XMAC_CTRL_REG_RX_EN;
 
@@ -2439,6 +2535,16 @@ static void bnx2x_update_mng(struct link_params *params, u32 link_status)
                         port_mb[params->port].link_status), link_status);
 }
 
+static void bnx2x_update_mng_eee(struct link_params *params, u32 eee_status)
+{
+        struct bnx2x *bp = params->bp;
+
+        if (bnx2x_eee_has_cap(params))
+                REG_WR(bp, params->shmem2_base +
+                       offsetof(struct shmem2_region,
+                                eee_status[params->port]), eee_status);
+}
+
 static void bnx2x_update_pfc_nig(struct link_params *params,
                 struct link_vars *vars,
                 struct bnx2x_nig_brb_pfc_port_params *nig_params)
@@ -3950,6 +4056,20 @@ static void bnx2x_warpcore_set_10G_XFI(struct bnx2x_phy *phy,
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
                          MDIO_WC_REG_DIGITAL4_MISC3, val | 0x8080);
 
+        /* Enable LPI pass through */
+        if ((params->eee_mode & EEE_MODE_ADV_LPI) &&
+            (phy->flags & FLAGS_EEE_10GBT) &&
+            (!(params->eee_mode & EEE_MODE_ENABLE_LPI) ||
+              bnx2x_eee_calc_timer(params)) &&
+            (params->req_duplex[bnx2x_phy_selection(params)] == DUPLEX_FULL)) {
+                DP(NETIF_MSG_LINK, "Configure WC for LPI pass through\n");
+                bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
+                                 MDIO_WC_REG_EEE_COMBO_CONTROL0,
+                                 0x7c);
+                bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD,
+                                         MDIO_WC_REG_DIGITAL4_MISC5, 0xc000);
+        }
+
         /* 10G XFI Full Duplex */
         bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD,
                          MDIO_WC_REG_IEEE0BLK_MIICNTL, 0x100);
@@ -6462,6 +6582,15 @@ static int bnx2x_update_link_down(struct link_params *params,
                (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
         }
         if (CHIP_IS_E3(bp)) {
+                REG_WR(bp, MISC_REG_CPMU_LP_FW_ENABLE_P0 + (params->port << 2),
+                       0);
+                REG_WR(bp, MISC_REG_CPMU_LP_DR_ENABLE, 0);
+                REG_WR(bp, MISC_REG_CPMU_LP_MASK_ENT_P0 + (params->port << 2),
+                       0);
+                vars->eee_status &= ~(SHMEM_EEE_LP_ADV_STATUS_MASK |
+                                      SHMEM_EEE_ACTIVE_BIT);
+
+                bnx2x_update_mng_eee(params, vars->eee_status);
                 bnx2x_xmac_disable(params);
                 bnx2x_umac_disable(params);
         }
@@ -6501,6 +6630,16 @@ static int bnx2x_update_link_up(struct link_params *params,
                         bnx2x_umac_enable(params, vars, 0);
                 bnx2x_set_led(params, vars,
                               LED_MODE_OPER, vars->line_speed);
+
+                if ((vars->eee_status & SHMEM_EEE_ACTIVE_BIT) &&
+                    (vars->eee_status & SHMEM_EEE_LPI_REQUESTED_BIT)) {
+                        DP(NETIF_MSG_LINK, "Enabling LPI assertion\n");
+                        REG_WR(bp, MISC_REG_CPMU_LP_FW_ENABLE_P0 +
+                               (params->port << 2), 1);
+                        REG_WR(bp, MISC_REG_CPMU_LP_DR_ENABLE, 1);
+                        REG_WR(bp, MISC_REG_CPMU_LP_MASK_ENT_P0 +
+                               (params->port << 2), 0xfc20);
+                }
         }
         if ((CHIP_IS_E1x(bp) ||
              CHIP_IS_E2(bp))) {
@@ -6538,7 +6677,7 @@ static int bnx2x_update_link_up(struct link_params *params,
 
         /* update shared memory */
         bnx2x_update_mng(params, vars->link_status);
-
+        bnx2x_update_mng_eee(params, vars->eee_status);
         /* Check remote fault */
         for (phy_idx = INT_PHY; phy_idx < MAX_PHYS; phy_idx++) {
                 if (params->phy[phy_idx].flags & FLAGS_TX_ERROR_CHECK) {
@@ -6582,6 +6721,8 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                 phy_vars[phy_index].phy_link_up = 0;
                 phy_vars[phy_index].link_up = 0;
                 phy_vars[phy_index].fault_detected = 0;
+                /* different consideration, since vars holds inner state */
+                phy_vars[phy_index].eee_status = vars->eee_status;
         }
 
         if (USES_WARPCORE(bp))
@@ -6711,6 +6852,9 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                         vars->link_status |= LINK_STATUS_SERDES_LINK;
                 else
                         vars->link_status &= ~LINK_STATUS_SERDES_LINK;
+
+                vars->eee_status = phy_vars[active_external_phy].eee_status;
+
                 DP(NETIF_MSG_LINK, "Active external phy selected: %x\n",
                            active_external_phy);
         }
@@ -9579,9 +9723,9 @@ static int bnx2x_8481_config_init(struct bnx2x_phy *phy,
 static int bnx2x_84833_cmd_hdlr(struct bnx2x_phy *phy,
                                    struct link_params *params,
                    u16 fw_cmd,
-                   u16 cmd_args[])
+                   u16 cmd_args[], int argc)
 {
-        u32 idx;
+        int idx;
         u16 val;
         struct bnx2x *bp = params->bp;
         /* Write CMD_OPEN_OVERRIDE to STATUS reg */
@@ -9601,7 +9745,7 @@ static int bnx2x_84833_cmd_hdlr(struct bnx2x_phy *phy,
         }
 
         /* Prepare argument(s) and issue command */
-        for (idx = 0; idx < PHY84833_CMDHDLR_MAX_ARGS; idx++) {
+        for (idx = 0; idx < argc; idx++) {
                 bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,
                                 MDIO_84833_CMD_HDLR_DATA1 + idx,
                                 cmd_args[idx]);
@@ -9622,7 +9766,7 @@ static int bnx2x_84833_cmd_hdlr(struct bnx2x_phy *phy,
                 return -EINVAL;
         }
         /* Gather returning data */
-        for (idx = 0; idx < PHY84833_CMDHDLR_MAX_ARGS; idx++) {
+        for (idx = 0; idx < argc; idx++) {
                 bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD,
                                 MDIO_84833_CMD_HDLR_DATA1 + idx,
                                 &cmd_args[idx]);
@@ -9656,7 +9800,7 @@ static int bnx2x_84833_pair_swap_cfg(struct bnx2x_phy *phy,
         data[1] = (u16)pair_swap;
 
         status = bnx2x_84833_cmd_hdlr(phy, params,
-                PHY84833_CMD_SET_PAIR_SWAP, data);
+                PHY84833_CMD_SET_PAIR_SWAP, data, PHY84833_CMDHDLR_MAX_ARGS);
         if (status == 0)
                 DP(NETIF_MSG_LINK, "Pairswap OK, val=0x%x\n", data[1]);
 
@@ -9734,6 +9878,95 @@ static int bnx2x_84833_hw_reset_phy(struct bnx2x_phy *phy,
         return 0;
 }
 
+static int bnx2x_8483x_eee_timers(struct link_params *params,
+                                   struct link_vars *vars)
+{
+        u32 eee_idle = 0, eee_mode;
+        struct bnx2x *bp = params->bp;
+
+        eee_idle = bnx2x_eee_calc_timer(params);
+
+        if (eee_idle) {
+                REG_WR(bp, MISC_REG_CPMU_LP_IDLE_THR_P0 + (params->port << 2),
+                       eee_idle);
+        } else if ((params->eee_mode & EEE_MODE_ENABLE_LPI) &&
+                   (params->eee_mode & EEE_MODE_OVERRIDE_NVRAM) &&
+                   (params->eee_mode & EEE_MODE_OUTPUT_TIME)) {
+                DP(NETIF_MSG_LINK, "Error: Tx LPI is enabled with timer 0\n");
+                return -EINVAL;
+        }
+
+        vars->eee_status &= ~(SHMEM_EEE_TIMER_MASK | SHMEM_EEE_TIME_OUTPUT_BIT);
+        if (params->eee_mode & EEE_MODE_OUTPUT_TIME) {
+                /* eee_idle in 1u --> eee_status in 16u */
+                eee_idle >>= 4;
+                vars->eee_status |= (eee_idle & SHMEM_EEE_TIMER_MASK) |
+                                    SHMEM_EEE_TIME_OUTPUT_BIT;
+        } else {
+                if (bnx2x_eee_time_to_nvram(eee_idle, &eee_mode))
+                        return -EINVAL;
+                vars->eee_status |= eee_mode;
+        }
+
+        return 0;
+}
+
+static int bnx2x_8483x_disable_eee(struct bnx2x_phy *phy,
+                                   struct link_params *params,
+                                   struct link_vars *vars)
+{
+        int rc;
+        struct bnx2x *bp = params->bp;
+        u16 cmd_args = 0;
+
+        DP(NETIF_MSG_LINK, "Don't Advertise 10GBase-T EEE\n");
+
+        /* Make Certain LPI is disabled */
+        REG_WR(bp, MISC_REG_CPMU_LP_FW_ENABLE_P0 + (params->port << 2), 0);
+        REG_WR(bp, MISC_REG_CPMU_LP_DR_ENABLE, 0);
+
+        /* Prevent Phy from working in EEE and advertising it */
+        rc = bnx2x_84833_cmd_hdlr(phy, params,
+                PHY84833_CMD_SET_EEE_MODE, &cmd_args, 1);
+        if (rc != 0) {
+                DP(NETIF_MSG_LINK, "EEE disable failed.\n");
+                return rc;
+        }
+
+        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD, MDIO_AN_REG_EEE_ADV, 0);
+        vars->eee_status &= ~SHMEM_EEE_ADV_STATUS_MASK;
+
+        return 0;
+}
+
+static int bnx2x_8483x_enable_eee(struct bnx2x_phy *phy,
+                                   struct link_params *params,
+                                   struct link_vars *vars)
+{
+        int rc;
+        struct bnx2x *bp = params->bp;
+        u16 cmd_args = 1;
+
+        DP(NETIF_MSG_LINK, "Advertise 10GBase-T EEE\n");
+
+        rc = bnx2x_84833_cmd_hdlr(phy, params,
+                PHY84833_CMD_SET_EEE_MODE, &cmd_args, 1);
+        if (rc != 0) {
+                DP(NETIF_MSG_LINK, "EEE enable failed.\n");
+                return rc;
+        }
+
+        bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD, MDIO_AN_REG_EEE_ADV, 0x8);
+
+        /* Mask events preventing LPI generation */
+        REG_WR(bp, MISC_REG_CPMU_LP_MASK_EXT_P0 + (params->port << 2), 0xfc20);
+
+        vars->eee_status &= ~SHMEM_EEE_ADV_STATUS_MASK;
+        vars->eee_status |= (SHMEM_EEE_10G_ADV << SHMEM_EEE_ADV_STATUS_SHIFT);
+
+        return 0;
+}
+
 #define PHY84833_CONSTANT_LATENCY 1193
 static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,
                                    struct link_params *params,
@@ -9833,7 +10066,8 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,
                 cmd_args[2] = PHY84833_CONSTANT_LATENCY + 1;
                 cmd_args[3] = PHY84833_CONSTANT_LATENCY;
                 rc = bnx2x_84833_cmd_hdlr(phy, params,
-                        PHY84833_CMD_SET_EEE_MODE, cmd_args);
+                        PHY84833_CMD_SET_EEE_MODE, cmd_args,
+                        PHY84833_CMDHDLR_MAX_ARGS);
                 if (rc != 0)
                         DP(NETIF_MSG_LINK, "Cfg AutogrEEEn failed.\n");
         }
@@ -9858,6 +10092,48 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,
                                  MDIO_CTL_REG_84823_USER_CTRL_REG, val);
         }
 
+        bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD,
+                        MDIO_84833_TOP_CFG_FW_REV, &val);
+
+        /* Configure EEE support */
+        if ((val >= MDIO_84833_TOP_CFG_FW_EEE) && bnx2x_eee_has_cap(params)) {
+                phy->flags |= FLAGS_EEE_10GBT;
+                vars->eee_status |= SHMEM_EEE_10G_ADV <<
+                                    SHMEM_EEE_SUPPORTED_SHIFT;
+                /* Propogate params' bits --> vars (for migration exposure) */
+                if (params->eee_mode & EEE_MODE_ENABLE_LPI)
+                        vars->eee_status |= SHMEM_EEE_LPI_REQUESTED_BIT;
+                else
+                        vars->eee_status &= ~SHMEM_EEE_LPI_REQUESTED_BIT;
+
+                if (params->eee_mode & EEE_MODE_ADV_LPI)
+                        vars->eee_status |= SHMEM_EEE_REQUESTED_BIT;
+                else
+                        vars->eee_status &= ~SHMEM_EEE_REQUESTED_BIT;
+
+                rc = bnx2x_8483x_eee_timers(params, vars);
+                if (rc != 0) {
+                        DP(NETIF_MSG_LINK, "Failed to configure EEE timers\n");
+                        bnx2x_8483x_disable_eee(phy, params, vars);
+                        return rc;
+                }
+
+                if ((params->req_duplex[actual_phy_selection] == DUPLEX_FULL) &&
+                    (params->eee_mode & EEE_MODE_ADV_LPI) &&
+                    (bnx2x_eee_calc_timer(params) ||
+                     !(params->eee_mode & EEE_MODE_ENABLE_LPI)))
+                        rc = bnx2x_8483x_enable_eee(phy, params, vars);
+                else
+                        rc = bnx2x_8483x_disable_eee(phy, params, vars);
+                if (rc != 0) {
+                        DP(NETIF_MSG_LINK, "Failed to set EEE advertisment\n");
+                        return rc;
+                }
+        } else {
+                phy->flags &= ~FLAGS_EEE_10GBT;
+                vars->eee_status &= ~SHMEM_EEE_SUPPORTED_MASK;
+        }
+
         if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {
                 /* Bring PHY out of super isolate mode as the final step. */
                 bnx2x_cl45_read(bp, phy,
@@ -9989,6 +10265,31 @@ static u8 bnx2x_848xx_read_status(struct bnx2x_phy *phy,
                 if (val & (1<<11))
                         vars->link_status |=
                                 LINK_STATUS_LINK_PARTNER_10GXFD_CAPABLE;
+
+                /* Determine if EEE was negotiated */
+                if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833) {
+                        u32 eee_shmem = 0;
+
+                        bnx2x_cl45_read(bp, phy, MDIO_AN_DEVAD,
+                                        MDIO_AN_REG_EEE_ADV, &val1);
+                        bnx2x_cl45_read(bp, phy, MDIO_AN_DEVAD,
+                                        MDIO_AN_REG_LP_EEE_ADV, &val2);
+                        if ((val1 & val2) & 0x8) {
+                                DP(NETIF_MSG_LINK, "EEE negotiated\n");
+                                vars->eee_status |= SHMEM_EEE_ACTIVE_BIT;
+                        }
+
+                        if (val2 & 0x12)
+                                eee_shmem |= SHMEM_EEE_100M_ADV;
+                        if (val2 & 0x4)
+                                eee_shmem |= SHMEM_EEE_1G_ADV;
+                        if (val2 & 0x68)
+                                eee_shmem |= SHMEM_EEE_10G_ADV;
+
+                        vars->eee_status &= ~SHMEM_EEE_LP_ADV_STATUS_MASK;
+                        vars->eee_status |= (eee_shmem <<
+                                             SHMEM_EEE_LP_ADV_STATUS_SHIFT);
+                }
         }
 
         return link_up;
@@ -11243,7 +11544,8 @@ static struct bnx2x_phy phy_84833 = {
         .def_md_devad   = 0,
         .flags          = (FLAGS_FAN_FAILURE_DET_REQ |
                            FLAGS_REARM_LATCH_SIGNAL |
-                           FLAGS_TX_ERROR_CHECK),
+                           FLAGS_TX_ERROR_CHECK |
+                           FLAGS_EEE_10GBT),
         .rx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
         .tx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
         .mdio_ctrl      = 0,
@@ -12011,6 +12313,8 @@ int bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                 break;
         }
         bnx2x_update_mng(params, vars->link_status);
+
+        bnx2x_update_mng_eee(params, vars->eee_status);
         return 0;
 }
 
@@ -12023,6 +12327,9 @@ int bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
         /* disable attentions */
         vars->link_status = 0;
         bnx2x_update_mng(params, vars->link_status);
+        vars->eee_status &= ~(SHMEM_EEE_LP_ADV_STATUS_MASK |
+                              SHMEM_EEE_ACTIVE_BIT);
+        bnx2x_update_mng_eee(params, vars->eee_status);
         bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4,
                        (NIG_MASK_XGXS0_LINK_STATUS |
                         NIG_MASK_XGXS0_LINK10G |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
index ea4371f4335f..e920800a7bc5 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
@@ -149,6 +149,7 @@ struct bnx2x_phy {
 #define FLAGS_DUMMY_READ                (1<<9)
 #define FLAGS_MDC_MDIO_WA_B0            (1<<10)
 #define FLAGS_TX_ERROR_CHECK            (1<<12)
+#define FLAGS_EEE_10GBT                 (1<<13)
 
         /* preemphasis values for the rx side */
         u16 rx_preemphasis[4];
@@ -265,6 +266,30 @@ struct link_params {
         u8 num_phys;
 
         u8 rsrv;
+
+        /* Used to configure the EEE Tx LPI timer, has several modes of
+         * operation, according to bits 29:28 -
+         * 2'b00: Timer will be configured by nvram, output will be the value
+         *        from nvram.
+         * 2'b01: Timer will be configured by nvram, output will be in
+         *        microseconds.
+         * 2'b10: bits 1:0 contain an nvram value which will be used instead
+         *        of the one located in the nvram. Output will be that value.
+         * 2'b11: bits 19:0 contain the idle timer in microseconds; output
+         *        will be in microseconds.
+         * Bits 31:30 should be 2'b11 in order for EEE to be enabled.
+         */
+        u32 eee_mode;
+#define EEE_MODE_NVRAM_BALANCED_TIME            (0xa00)
+#define EEE_MODE_NVRAM_AGGRESSIVE_TIME          (0x100)
+#define EEE_MODE_NVRAM_LATENCY_TIME             (0x6000)
+#define EEE_MODE_NVRAM_MASK             (0x3)
+#define EEE_MODE_TIMER_MASK             (0xfffff)
+#define EEE_MODE_OUTPUT_TIME            (1<<28)
+#define EEE_MODE_OVERRIDE_NVRAM         (1<<29)
+#define EEE_MODE_ENABLE_LPI             (1<<30)
+#define EEE_MODE_ADV_LPI                        (1<<31)
+
         u16 hw_led_mode; /* part of the hw_config read from the shmem */
         u32 multi_phy_config;
 
@@ -301,6 +326,7 @@ struct link_vars {
 
         /* The same definitions as the shmem parameter */
         u32 link_status;
+        u32 eee_status;
         u8 fault_detected;
         u8 rsrv1;
         u16 periodic_flags;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index f755a665dab3..a622bb7bf21d 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -3176,6 +3176,12 @@ static void bnx2x_set_mf_bw(struct bnx2x *bp)
         bnx2x_fw_command(bp, DRV_MSG_CODE_SET_MF_BW_ACK, 0);
 }
 
+static void bnx2x_handle_eee_event(struct bnx2x *bp)
+{
+        DP(BNX2X_MSG_MCP, "EEE - LLDP event\n");
+        bnx2x_fw_command(bp, DRV_MSG_CODE_EEE_RESULTS_ACK, 0);
+}
+
 static void bnx2x_handle_drv_info_req(struct bnx2x *bp)
 {
         enum drv_info_opcode op_code;
@@ -3742,6 +3748,8 @@ static void bnx2x_attn_int_deasserted3(struct bnx2x *bp, u32 attn)
                         if (val & DRV_STATUS_AFEX_EVENT_MASK)
                                 bnx2x_handle_afex_cmd(bp,
                                         val & DRV_STATUS_AFEX_EVENT_MASK);
+                        if (val & DRV_STATUS_EEE_NEGOTIATION_RESULTS)
+                                bnx2x_handle_eee_event(bp);
                         if (bp->link_vars.periodic_flags &
                             PERIODIC_FLAGS_LINK_EVENT) {
                                 /*  sync with link */
@@ -10082,7 +10090,7 @@ static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp)
 {
         int port = BP_PORT(bp);
         u32 config;
-        u32 ext_phy_type, ext_phy_config;
+        u32 ext_phy_type, ext_phy_config, eee_mode;
 
         bp->link_params.bp = bp;
         bp->link_params.port = port;
@@ -10149,6 +10157,19 @@ static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp)
                 bp->port.need_hw_lock = bnx2x_hw_lock_required(bp,
                                                         bp->common.shmem_base,
                                                         bp->common.shmem2_base);
+
+        /* Configure link feature according to nvram value */
+        eee_mode = (((SHMEM_RD(bp, dev_info.
+                      port_feature_config[port].eee_power_mode)) &
+                     PORT_FEAT_CFG_EEE_POWER_MODE_MASK) >>
+                    PORT_FEAT_CFG_EEE_POWER_MODE_SHIFT);
+        if (eee_mode != PORT_FEAT_CFG_EEE_POWER_MODE_DISABLED) {
+                bp->link_params.eee_mode = EEE_MODE_ADV_LPI |
+                                           EEE_MODE_ENABLE_LPI |
+                                           EEE_MODE_OUTPUT_TIME;
+        } else {
+                bp->link_params.eee_mode = 0;
+        }
 }
 
 void bnx2x_get_iscsi_info(struct bnx2x *bp)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
index bbd387492a80..bfef98f666c9 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
@@ -1488,6 +1488,121 @@
  * 2:1 - otp_misc_do[51:50]; 0 - otp_misc_do[1]. */
 #define MISC_REG_CHIP_TYPE                                       0xac60
 #define MISC_REG_CHIP_TYPE_57811_MASK                            (1<<1)
+#define MISC_REG_CPMU_LP_DR_ENABLE                               0xa858
+/* [RW 1] FW EEE LPI Enable. When 1 indicates that EEE LPI mode is enabled
+ * by FW. When 0 indicates that the EEE LPI mode is disabled by FW. Clk
+ * 25MHz. Reset on hard reset. */
+#define MISC_REG_CPMU_LP_FW_ENABLE_P0                            0xa84c
+/* [RW 32] EEE LPI Idle Threshold. The threshold value for the idle EEE LPI
+ * counter. Timer tick is 1 us. Clock 25MHz. Reset on hard reset. */
+#define MISC_REG_CPMU_LP_IDLE_THR_P0                             0xa8a0
+/* [RW 18] LPI entry events mask. [0] - Vmain SM Mask. When 1 indicates that
+ * the Vmain SM end state is disabled. When 0 indicates that the Vmain SM
+ * end state is enabled. [1] - FW Queues Empty Mask. When 1 indicates that
+ * the FW command that all Queues are empty is disabled. When 0 indicates
+ * that the FW command that all Queues are empty is enabled. [2] - FW Early
+ * Exit Mask / Reserved (Entry mask). When 1 indicates that the FW Early
+ * Exit command is disabled. When 0 indicates that the FW Early Exit command
+ * is enabled. This bit applicable only in the EXIT Events Mask registers.
+ * [3] - PBF Request Mask. When 1 indicates that the PBF Request indication
+ * is disabled. When 0 indicates that the PBF Request indication is enabled.
+ * [4] - Tx Request Mask. When =1 indicates that the Tx other Than PBF
+ * Request indication is disabled. When 0 indicates that the Tx Other Than
+ * PBF Request indication is enabled. [5] - Rx EEE LPI Status Mask. When 1
+ * indicates that the RX EEE LPI Status indication is disabled. When 0
+ * indicates that the RX EEE LPI Status indication is enabled. In the EXIT
+ * Events Masks registers; this bit masks the falling edge detect of the LPI
+ * Status (Rx LPI is on - off). [6] - Tx Pause Mask. When 1 indicates that
+ * the Tx Pause indication is disabled. When 0 indicates that the Tx Pause
+ * indication is enabled. [7] - BRB1 Empty Mask. When 1 indicates that the
+ * BRB1 EMPTY indication is disabled. When 0 indicates that the BRB1 EMPTY
+ * indication is enabled. [8] - QM Idle Mask. When 1 indicates that the QM
+ * IDLE indication is disabled. When 0 indicates that the QM IDLE indication
+ * is enabled. (One bit for both VOQ0 and VOQ1). [9] - QM LB Idle Mask. When
+ * 1 indicates that the QM IDLE indication for LOOPBACK is disabled. When 0
+ * indicates that the QM IDLE indication for LOOPBACK is enabled. [10] - L1
+ * Status Mask. When 1 indicates that the L1 Status indication from the PCIE
+ * CORE is disabled. When 0 indicates that the RX EEE LPI Status indication
+ * from the PCIE CORE is enabled. In the EXIT Events Masks registers; this
+ * bit masks the falling edge detect of the L1 status (L1 is on - off). [11]
+ * - P0 E0 EEE EEE LPI REQ Mask. When =1 indicates that the P0 E0 EEE EEE
+ * LPI REQ indication is disabled. When =0 indicates that the P0 E0 EEE LPI
+ * REQ indication is enabled. [12] - P1 E0 EEE LPI REQ Mask. When =1
+ * indicates that the P0 EEE LPI REQ indication is disabled. When =0
+ * indicates that the P0 EEE LPI REQ indication is enabled. [13] - P0 E1 EEE
+ * LPI REQ Mask. When =1 indicates that the P0 EEE LPI REQ indication is
+ * disabled. When =0 indicates that the P0 EEE LPI REQ indication is
+ * enabled. [14] - P1 E1 EEE LPI REQ Mask. When =1 indicates that the P0 EEE
+ * LPI REQ indication is disabled. When =0 indicates that the P0 EEE LPI REQ
+ * indication is enabled. [15] - L1 REQ Mask. When =1 indicates that the L1
+ * REQ indication is disabled. When =0 indicates that the L1 indication is
+ * enabled. [16] - Rx EEE LPI Status Edge Detect Mask. When =1 indicates
+ * that the RX EEE LPI Status Falling Edge Detect indication is disabled (Rx
+ * EEE LPI is on - off). When =0 indicates that the RX EEE LPI Status
+ * Falling Edge Detec indication is enabled (Rx EEE LPI is on - off). This
+ * bit is applicable only in the EXIT Events Masks registers. [17] - L1
+ * Status Edge Detect Mask. When =1 indicates that the L1 Status Falling
+ * Edge Detect indication from the PCIE CORE is disabled (L1 is on - off).
+ * When =0 indicates that the L1 Status Falling Edge Detect indication from
+ * the PCIE CORE is enabled (L1 is on - off). This bit is applicable only in
+ * the EXIT Events Masks registers. Clock 25MHz. Reset on hard reset. */
+#define MISC_REG_CPMU_LP_MASK_ENT_P0                             0xa880
+/* [RW 18] EEE LPI exit events mask. [0] - Vmain SM Mask. When 1 indicates
+ * that the Vmain SM end state is disabled. When 0 indicates that the Vmain
+ * SM end state is enabled. [1] - FW Queues Empty Mask. When 1 indicates
+ * that the FW command that all Queues are empty is disabled. When 0
+ * indicates that the FW command that all Queues are empty is enabled. [2] -
+ * FW Early Exit Mask / Reserved (Entry mask). When 1 indicates that the FW
+ * Early Exit command is disabled. When 0 indicates that the FW Early Exit
+ * command is enabled. This bit applicable only in the EXIT Events Mask
+ * registers. [3] - PBF Request Mask. When 1 indicates that the PBF Request
+ * indication is disabled. When 0 indicates that the PBF Request indication
+ * is enabled. [4] - Tx Request Mask. When =1 indicates that the Tx other
+ * Than PBF Request indication is disabled. When 0 indicates that the Tx
+ * Other Than PBF Request indication is enabled. [5] - Rx EEE LPI Status
+ * Mask. When 1 indicates that the RX EEE LPI Status indication is disabled.
+ * When 0 indicates that the RX LPI Status indication is enabled. In the
+ * EXIT Events Masks registers; this bit masks the falling edge detect of
+ * the EEE LPI Status (Rx EEE LPI is on - off). [6] - Tx Pause Mask. When 1
+ * indicates that the Tx Pause indication is disabled. When 0 indicates that
+ * the Tx Pause indication is enabled. [7] - BRB1 Empty Mask. When 1
+ * indicates that the BRB1 EMPTY indication is disabled. When 0 indicates
+ * that the BRB1 EMPTY indication is enabled. [8] - QM Idle Mask. When 1
+ * indicates that the QM IDLE indication is disabled. When 0 indicates that
+ * the QM IDLE indication is enabled. (One bit for both VOQ0 and VOQ1). [9]
+ * - QM LB Idle Mask. When 1 indicates that the QM IDLE indication for
+ * LOOPBACK is disabled. When 0 indicates that the QM IDLE indication for
+ * LOOPBACK is enabled. [10] - L1 Status Mask. When 1 indicates that the L1
+ * Status indication from the PCIE CORE is disabled. When 0 indicates that
+ * the RX EEE LPI Status indication from the PCIE CORE is enabled. In the
+ * EXIT Events Masks registers; this bit masks the falling edge detect of
+ * the L1 status (L1 is on - off). [11] - P0 E0 EEE EEE LPI REQ Mask. When
+ * =1 indicates that the P0 E0 EEE EEE LPI REQ indication is disabled. When
+ * =0 indicates that the P0 E0 EEE LPI REQ indication is enabled. [12] - P1
+ * E0 EEE LPI REQ Mask. When =1 indicates that the P0 EEE LPI REQ indication
+ * is disabled. When =0 indicates that the P0 EEE LPI REQ indication is
+ * enabled. [13] - P0 E1 EEE LPI REQ Mask. When =1 indicates that the P0 EEE
+ * LPI REQ indication is disabled. When =0 indicates that the P0 EEE LPI REQ
+ * indication is enabled. [14] - P1 E1 EEE LPI REQ Mask. When =1 indicates
+ * that the P0 EEE LPI REQ indication is disabled. When =0 indicates that
+ * the P0 EEE LPI REQ indication is enabled. [15] - L1 REQ Mask. When =1
+ * indicates that the L1 REQ indication is disabled. When =0 indicates that
+ * the L1 indication is enabled. [16] - Rx EEE LPI Status Edge Detect Mask.
+ * When =1 indicates that the RX EEE LPI Status Falling Edge Detect
+ * indication is disabled (Rx EEE LPI is on - off). When =0 indicates that
+ * the RX EEE LPI Status Falling Edge Detec indication is enabled (Rx EEE
+ * LPI is on - off). This bit is applicable only in the EXIT Events Masks
+ * registers. [17] - L1 Status Edge Detect Mask. When =1 indicates that the
+ * L1 Status Falling Edge Detect indication from the PCIE CORE is disabled
+ * (L1 is on - off). When =0 indicates that the L1 Status Falling Edge
+ * Detect indication from the PCIE CORE is enabled (L1 is on - off). This
+ * bit is applicable only in the EXIT Events Masks registers.Clock 25MHz.
+ * Reset on hard reset. */
+#define MISC_REG_CPMU_LP_MASK_EXT_P0                             0xa888
+/* [RW 16] EEE LPI Entry Events Counter. A statistic counter with the number
+ * of counts that the SM entered the EEE LPI state. Clock 25MHz. Read only
+ * register. Reset on hard reset. */
+#define MISC_REG_CPMU_LP_SM_ENT_CNT_P0                           0xa8b8
 /* [RW 32] The following driver registers(1...16) represent 16 drivers and
    32 clients. Each client can be controlled by one driver only. One in each
    bit represent that this driver control the appropriate client (Ex: bit 5
@@ -5372,6 +5487,8 @@
 /* [RW 32] Lower 48 bits of ctrl_sa register. Used as the SA in PAUSE/PFC
  * packets transmitted by the MAC */
 #define XMAC_REG_CTRL_SA_LO                                      0x28
+#define XMAC_REG_EEE_CTRL                                        0xd8
+#define XMAC_REG_EEE_TIMERS_HI                                   0xe4
 #define XMAC_REG_PAUSE_CTRL                                      0x68
 #define XMAC_REG_PFC_CTRL                                        0x70
 #define XMAC_REG_PFC_CTRL_HI                                     0x74
@@ -6813,6 +6930,8 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_AN_REG_LP_AUTO_NEG         0x0013
 #define MDIO_AN_REG_LP_AUTO_NEG2        0x0014
 #define MDIO_AN_REG_MASTER_STATUS       0x0021
+#define MDIO_AN_REG_EEE_ADV             0x003c
+#define MDIO_AN_REG_LP_EEE_ADV          0x003d
 /*bcm*/
 #define MDIO_AN_REG_LINK_STATUS         0x8304
 #define MDIO_AN_REG_CL37_CL73           0x8370
@@ -6866,6 +6985,8 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_PMA_REG_84823_LED3_STRETCH_EN                      0x0080
 
 /* BCM84833 only */
+#define MDIO_84833_TOP_CFG_FW_REV                       0x400f
+#define MDIO_84833_TOP_CFG_FW_EEE               0x10b1
 #define MDIO_84833_TOP_CFG_XGPHY_STRAP1                 0x401a
 #define MDIO_84833_SUPER_ISOLATE                0x8000
 /* These are mailbox register set used by 84833. */
@@ -6993,11 +7114,13 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_WC_REG_DIGITAL3_UP1                        0x8329
 #define MDIO_WC_REG_DIGITAL3_LP_UP1                      0x832c
 #define MDIO_WC_REG_DIGITAL4_MISC3                      0x833c
+#define MDIO_WC_REG_DIGITAL4_MISC5                      0x833e
 #define MDIO_WC_REG_DIGITAL5_MISC6                      0x8345
 #define MDIO_WC_REG_DIGITAL5_MISC7                      0x8349
 #define MDIO_WC_REG_DIGITAL5_ACTUAL_SPEED               0x834e
 #define MDIO_WC_REG_DIGITAL6_MP5_NEXTPAGECTRL           0x8350
 #define MDIO_WC_REG_CL49_USERB0_CTRL                    0x8368
+#define MDIO_WC_REG_EEE_COMBO_CONTROL0                  0x8390
 #define MDIO_WC_REG_TX66_CONTROL                        0x83b0
 #define MDIO_WC_REG_RX66_CONTROL                        0x83c0
 #define MDIO_WC_REG_RX66_SCW0                           0x83c2
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index 1e2785cd11d0..0e8bdcb9c748 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
@@ -785,6 +785,10 @@ static int bnx2x_hw_stats_update(struct bnx2x *bp)
 
         pstats->host_port_stats_counter++;
 
+        if (CHIP_IS_E3(bp))
+                estats->eee_tx_lpi += REG_RD(bp,
+                                             MISC_REG_CPMU_LP_SM_ENT_CNT_P0);
+
         if (!BP_NOMCP(bp)) {
                 u32 nig_timer_max =
                         SHMEM_RD(bp, port_mb[BP_PORT(bp)].stat_nig_timer);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
index 93e689fdfeda..24b8e505b60c 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
@@ -203,6 +203,8 @@ struct bnx2x_eth_stats {
         /* Recovery */
         u32 recoverable_error;
         u32 unrecoverable_error;
+        /* src: Clear-on-Read register; Will not survive PMF Migration */
+        u32 eee_tx_lpi;
 };
 
 
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index c95e7b5e2b85..65e66caea50d 100644
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -2585,7 +2585,7 @@ static void cnic_bnx2x_kwqe_err(struct cnic_dev *dev, struct kwqe *kwqe)
                 return;
         }
 
-        cqes[0] = (struct kcqe *) &kcqe;
+        cqes[0] = &kcqe;
         cnic_reply_bnx2x_kcqes(dev, ulp_type, cqes, 1);
 }
 
@@ -4665,9 +4665,9 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev)
 
         cp->kcq1.sw_prod_idx = 0;
         cp->kcq1.hw_prod_idx_ptr =
-                (u16 *) &sblk->status_completion_producer_index;
+                &sblk->status_completion_producer_index;
 
-        cp->kcq1.status_idx_ptr = (u16 *) &sblk->status_idx;
+        cp->kcq1.status_idx_ptr = &sblk->status_idx;
 
         /* Initialize the kernel complete queue context. */
         val = KRNLQ_TYPE_TYPE_KRNLQ | KRNLQ_SIZE_TYPE_SIZE |
@@ -4693,9 +4693,9 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev)
                 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;
+                        &msblk->status_completion_producer_index;
+                cp->kcq1.status_idx_ptr = &msblk->status_idx;
+                cp->kwq_con_idx_ptr = &msblk->status_cmd_consumer_index;
                 cp->int_num = sb_id << BNX2_PCICFG_INT_ACK_CMD_INT_NUM_SHIFT;
                 cnic_ctx_wr(dev, kwq_cid_addr, L5_KRNLQ_HOST_QIDX, sb);
                 cnic_ctx_wr(dev, kcq_cid_addr, L5_KRNLQ_HOST_QIDX, sb);
diff --git a/drivers/net/ethernet/brocade/bna/cna_fwimg.c b/drivers/net/ethernet/brocade/bna/cna_fwimg.c
index cfc22a64157e..6a68e8d93309 100644
--- a/drivers/net/ethernet/brocade/bna/cna_fwimg.c
+++ b/drivers/net/ethernet/brocade/bna/cna_fwimg.c
@@ -67,10 +67,10 @@ bfa_cb_image_get_chunk(enum bfi_asic_gen asic_gen, u32 off)
 {
         switch (asic_gen) {
         case BFI_ASIC_GEN_CT:
-                return (u32 *)(bfi_image_ct_cna + off);
+                return (bfi_image_ct_cna + off);
                 break;
         case BFI_ASIC_GEN_CT2:
-                return (u32 *)(bfi_image_ct2_cna + off);
+                return (bfi_image_ct2_cna + off);
                 break;
         default:
                 return NULL;
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
index 65e4b280619a..55cf72af69ce 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
@@ -575,7 +575,7 @@ static void t3_process_tid_release_list(struct work_struct *work)
                 if (!skb) {
                         spin_lock_bh(&td->tid_release_lock);
                         p->ctx = (void *)td->tid_release_list;
-                        td->tid_release_list = (struct t3c_tid_entry *)p;
+                        td->tid_release_list = p;
                         break;
                 }
                 mk_tid_release(skb, p - td->tid_maps.tid_tab);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index e111d974afd8..8596acaa402b 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -753,7 +753,7 @@ static void write_sgl(const struct sk_buff *skb, struct sge_txq *q,
                 end = (void *)q->desc + part1;
         }
         if ((uintptr_t)end & 8)           /* 0-pad to multiple of 16 */
-                *(u64 *)end = 0;
+                *end = 0;
 }
 
 /**
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index 25e3308fc9d8..9dad56101e23 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -418,7 +418,7 @@ static int fwevtq_handler(struct sge_rspq *rspq, const __be64 *rsp,
                  * restart a TX Ethernet Queue which was stopped for lack of
                  * free TX Queue Descriptors ...
                  */
-                const struct cpl_sge_egr_update *p = (void *)cpl;
+                const struct cpl_sge_egr_update *p = cpl;
                 unsigned int qid = EGR_QID(be32_to_cpu(p->opcode_qid));
                 struct sge *s = &adapter->sge;
                 struct sge_txq *tq;
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
index 0bd585bba39d..f2d1ecdcaf98 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
@@ -934,7 +934,7 @@ static void write_sgl(const struct sk_buff *skb, struct sge_txq *tq,
                 end = (void *)tq->desc + part1;
         }
         if ((uintptr_t)end & 8)           /* 0-pad to multiple of 16 */
-                *(u64 *)end = 0;
+                *end = 0;
 }
 
 /**
@@ -1323,8 +1323,7 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
                  */
                 if (unlikely((void *)sgl == (void *)tq->stat)) {
                         sgl = (void *)tq->desc;
-                        end = (void *)((void *)tq->desc +
-                                       ((void *)end - (void *)tq->stat));
+                        end = ((void *)tq->desc + ((void *)end - (void *)tq->stat));
                 }
 
                 write_sgl(skb, tq, sgl, end, 0, addr);
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index d3cd489d11a2..f879e9224846 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -3973,7 +3973,7 @@ DevicePresent(struct net_device *dev, u_long aprom_addr)
             tmp = srom_rd(aprom_addr, i);
             *p++ = cpu_to_le16(tmp);
         }
-        de4x5_dbg_srom((struct de4x5_srom *)&lp->srom);
+        de4x5_dbg_srom(&lp->srom);
     }
 }
 
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index c5c4c0e83bd1..7b5cc2b212e5 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -34,7 +34,7 @@
 #include "be_hw.h"
 #include "be_roce.h"
 
-#define DRV_VER                 "4.2.220u"
+#define DRV_VER                 "4.2.248.0u"
 #define DRV_NAME                "be2net"
 #define BE_NAME                 "ServerEngines BladeEngine2 10Gbps NIC"
 #define BE3_NAME                "ServerEngines BladeEngine3 10Gbps NIC"
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 8d06ea381741..f8997521b147 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -1132,7 +1132,7 @@ err:
  * Uses MCCQ
  */
 int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags, u32 en_flags,
-                u8 *mac, u32 *if_handle, u32 *pmac_id, u32 domain)
+                     u32 *if_handle, u32 domain)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_if_create *req;
@@ -1152,17 +1152,13 @@ int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags, u32 en_flags,
         req->hdr.domain = domain;
         req->capability_flags = cpu_to_le32(cap_flags);
         req->enable_flags = cpu_to_le32(en_flags);
-        if (mac)
-                memcpy(req->mac_addr, mac, ETH_ALEN);
-        else
-                req->pmac_invalid = true;
+
+        req->pmac_invalid = true;
 
         status = be_mcc_notify_wait(adapter);
         if (!status) {
                 struct be_cmd_resp_if_create *resp = embedded_payload(wrb);
                 *if_handle = le32_to_cpu(resp->interface_id);
-                if (mac)
-                        *pmac_id = le32_to_cpu(resp->pmac_id);
         }
 
 err:
@@ -2330,8 +2326,8 @@ err:
 }
 
 /* Uses synchronous MCCQ */
-int be_cmd_get_mac_from_list(struct be_adapter *adapter, u32 domain,
-                        bool *pmac_id_active, u32 *pmac_id, u8 *mac)
+int be_cmd_get_mac_from_list(struct be_adapter *adapter, u8 *mac,
+                             bool *pmac_id_active, u32 *pmac_id, u8 domain)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_get_mac_list *req;
@@ -2376,8 +2372,9 @@ int be_cmd_get_mac_from_list(struct be_adapter *adapter, u32 domain,
                                                 get_mac_list_cmd.va;
                 mac_count = resp->true_mac_count + resp->pseudo_mac_count;
                 /* Mac list returned could contain one or more active mac_ids
-                 * or one or more pseudo permanant mac addresses. If an active
-                 * mac_id is present, return first active mac_id found
+                 * or one or more true or pseudo permanant mac addresses.
+                 * If an active mac_id is present, return first active mac_id
+                 * found.
                  */
                 for (i = 0; i < mac_count; i++) {
                         struct get_list_macaddr *mac_entry;
@@ -2396,7 +2393,7 @@ int be_cmd_get_mac_from_list(struct be_adapter *adapter, u32 domain,
                                 goto out;
                         }
                 }
-                /* If no active mac_id found, return first pseudo mac addr */
+                /* If no active mac_id found, return first mac addr */
                 *pmac_id_active = false;
                 memcpy(mac, resp->macaddr_list[0].mac_addr_id.macaddr,
                                                                 ETH_ALEN);
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index 9625bf420c16..2f6bb06df9c6 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -1664,8 +1664,7 @@ extern int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,
 extern int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id,
                         int pmac_id, u32 domain);
 extern int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags,
-                        u32 en_flags, u8 *mac, u32 *if_handle, u32 *pmac_id,
-                        u32 domain);
+                            u32 en_flags, u32 *if_handle, u32 domain);
 extern int be_cmd_if_destroy(struct be_adapter *adapter, int if_handle,
                         u32 domain);
 extern int be_cmd_eq_create(struct be_adapter *adapter,
@@ -1751,8 +1750,9 @@ extern int be_cmd_get_cntl_attributes(struct be_adapter *adapter);
 extern int be_cmd_req_native_mode(struct be_adapter *adapter);
 extern int be_cmd_get_reg_len(struct be_adapter *adapter, u32 *log_size);
 extern void be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf);
-extern int be_cmd_get_mac_from_list(struct be_adapter *adapter, u32 domain,
-                                bool *pmac_id_active, u32 *pmac_id, u8 *mac);
+extern int be_cmd_get_mac_from_list(struct be_adapter *adapter, u8 *mac,
+                                    bool *pmac_id_active, u32 *pmac_id,
+                                    u8 domain);
 extern int be_cmd_set_mac_list(struct be_adapter *adapter, u8 *mac_array,
                                                 u8 mac_count, u32 domain);
 extern int be_cmd_set_hsw_config(struct be_adapter *adapter, u16 pvid,
diff --git a/drivers/net/ethernet/emulex/benet/be_hw.h b/drivers/net/ethernet/emulex/benet/be_hw.h
index d9fb0c501fa1..7c8a710eac2f 100644
--- a/drivers/net/ethernet/emulex/benet/be_hw.h
+++ b/drivers/net/ethernet/emulex/benet/be_hw.h
@@ -58,8 +58,6 @@
 
 #define SLI_PORT_CONTROL_IP_MASK        0x08000000
 
-#define PCICFG_CUST_SCRATCHPAD_CSR      0x1EC
-
 /********* Memory BAR register ************/
 #define PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET      0xfc
 /* Host Interrupt Enable, if set interrupts are enabled although "PCI Interrupt
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index fdb50cec6b51..5a34503b6a14 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -719,8 +719,8 @@ static netdev_tx_t be_xmit(struct sk_buff *skb,
          * 60 bytes long.
          * As a workaround disable TX vlan offloading in such cases.
          */
-        if (unlikely(vlan_tx_tag_present(skb) &&
-                     (skb->ip_summed != CHECKSUM_PARTIAL || skb->len <= 60))) {
+        if (vlan_tx_tag_present(skb) &&
+            (skb->ip_summed != CHECKSUM_PARTIAL || skb->len <= 60)) {
                 skb = skb_share_check(skb, GFP_ATOMIC);
                 if (unlikely(!skb))
                         goto tx_drop;
@@ -786,19 +786,12 @@ 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, bool vf, u32 vf_num)
+static int be_vid_config(struct be_adapter *adapter)
 {
-        struct be_vf_cfg *vf_cfg = &adapter->vf_cfg[vf_num];
-        u16 vtag[BE_NUM_VLANS_SUPPORTED];
-        u16 ntags = 0, i;
+        u16 vids[BE_NUM_VLANS_SUPPORTED];
+        u16 num = 0, i;
         int status = 0;
 
-        if (vf) {
-                vtag[0] = cpu_to_le16(vf_cfg->vlan_tag);
-                status = be_cmd_vlan_config(adapter, vf_cfg->if_handle, vtag,
-                                            1, 1, 0);
-        }
-
         /* No need to further configure vids if in promiscuous mode */
         if (adapter->promiscuous)
                 return 0;
@@ -809,10 +802,10 @@ static int be_vid_config(struct be_adapter *adapter, bool vf, u32 vf_num)
         /* Construct VLAN Table to give to HW */
         for (i = 0; i < VLAN_N_VID; i++)
                 if (adapter->vlan_tag[i])
-                        vtag[ntags++] = cpu_to_le16(i);
+                        vids[num++] = cpu_to_le16(i);
 
         status = be_cmd_vlan_config(adapter, adapter->if_handle,
-                                    vtag, ntags, 1, 0);
+                                    vids, num, 1, 0);
 
         /* Set to VLAN promisc mode as setting VLAN filter failed */
         if (status) {
@@ -841,7 +834,7 @@ static int be_vlan_add_vid(struct net_device *netdev, u16 vid)
 
         adapter->vlan_tag[vid] = 1;
         if (adapter->vlans_added <= (adapter->max_vlans + 1))
-                status = be_vid_config(adapter, false, 0);
+                status = be_vid_config(adapter);
 
         if (!status)
                 adapter->vlans_added++;
@@ -863,7 +856,7 @@ static int be_vlan_rem_vid(struct net_device *netdev, u16 vid)
 
         adapter->vlan_tag[vid] = 0;
         if (adapter->vlans_added <= adapter->max_vlans)
-                status = be_vid_config(adapter, false, 0);
+                status = be_vid_config(adapter);
 
         if (!status)
                 adapter->vlans_added--;
@@ -890,7 +883,7 @@ static void be_set_rx_mode(struct net_device *netdev)
                 be_cmd_rx_filter(adapter, IFF_PROMISC, OFF);
 
                 if (adapter->vlans_added)
-                        be_vid_config(adapter, false, 0);
+                        be_vid_config(adapter);
         }
 
         /* Enable multicast promisc if num configured exceeds what we support */
@@ -1057,6 +1050,8 @@ static int be_find_vfs(struct be_adapter *adapter, int vf_state)
         u16 offset, stride;
 
         pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV);
+        if (!pos)
+                return 0;
         pci_read_config_word(pdev, pos + PCI_SRIOV_VF_OFFSET, &offset);
         pci_read_config_word(pdev, pos + PCI_SRIOV_VF_STRIDE, &stride);
 
@@ -1898,6 +1893,12 @@ static int be_rx_cqs_create(struct be_adapter *adapter)
          */
         adapter->num_rx_qs = (num_irqs(adapter) > 1) ?
                                 num_irqs(adapter) + 1 : 1;
+        if (adapter->num_rx_qs != MAX_RX_QS) {
+                rtnl_lock();
+                netif_set_real_num_rx_queues(adapter->netdev,
+                                             adapter->num_rx_qs);
+                rtnl_unlock();
+        }
 
         adapter->big_page_size = (1 << get_order(rx_frag_size)) * PAGE_SIZE;
         for_all_rx_queues(adapter, rxo, i) {
@@ -2544,7 +2545,6 @@ static int be_clear(struct be_adapter *adapter)
         be_cmd_fw_clean(adapter);
 
         be_msix_disable(adapter);
-        pci_write_config_dword(adapter->pdev, PCICFG_CUST_SCRATCHPAD_CSR, 0);
         return 0;
 }
 
@@ -2602,8 +2602,8 @@ static int be_vf_setup(struct be_adapter *adapter)
         cap_flags = en_flags = BE_IF_FLAGS_UNTAGGED | BE_IF_FLAGS_BROADCAST |
                                 BE_IF_FLAGS_MULTICAST;
         for_all_vfs(adapter, vf_cfg, vf) {
-                status = be_cmd_if_create(adapter, cap_flags, en_flags, NULL,
-                                          &vf_cfg->if_handle, NULL, vf + 1);
+                status = be_cmd_if_create(adapter, cap_flags, en_flags,
+                                          &vf_cfg->if_handle, vf + 1);
                 if (status)
                         goto err;
         }
@@ -2643,29 +2643,43 @@ static void be_setup_init(struct be_adapter *adapter)
         adapter->phy.forced_port_speed = -1;
 }
 
-static int be_add_mac_from_list(struct be_adapter *adapter, u8 *mac)
+static int be_get_mac_addr(struct be_adapter *adapter, u8 *mac, u32 if_handle,
+                           bool *active_mac, u32 *pmac_id)
 {
-        u32 pmac_id;
-        int status;
-        bool pmac_id_active;
+        int status = 0;
 
-        status = be_cmd_get_mac_from_list(adapter, 0, &pmac_id_active,
-                                                        &pmac_id, mac);
-        if (status != 0)
-                goto do_none;
+        if (!is_zero_ether_addr(adapter->netdev->perm_addr)) {
+                memcpy(mac, adapter->netdev->dev_addr, ETH_ALEN);
+                if (!lancer_chip(adapter) && !be_physfn(adapter))
+                        *active_mac = true;
+                else
+                        *active_mac = false;
 
-        if (pmac_id_active) {
-                status = be_cmd_mac_addr_query(adapter, mac,
-                                MAC_ADDRESS_TYPE_NETWORK,
-                                false, adapter->if_handle, pmac_id);
+                return status;
+        }
 
-                if (!status)
-                        adapter->pmac_id[0] = pmac_id;
+        if (lancer_chip(adapter)) {
+                status = be_cmd_get_mac_from_list(adapter, mac,
+                                                  active_mac, pmac_id, 0);
+                if (*active_mac) {
+                        status = be_cmd_mac_addr_query(adapter, mac,
+                                                       MAC_ADDRESS_TYPE_NETWORK,
+                                                       false, if_handle,
+                                                       *pmac_id);
+                }
+        } else if (be_physfn(adapter)) {
+                /* For BE3, for PF get permanent MAC */
+                status = be_cmd_mac_addr_query(adapter, mac,
+                                               MAC_ADDRESS_TYPE_NETWORK, true,
+                                               0, 0);
+                *active_mac = false;
         } else {
-                status = be_cmd_pmac_add(adapter, mac,
-                                adapter->if_handle, &adapter->pmac_id[0], 0);
+                /* For BE3, for VF get soft MAC assigned by PF*/
+                status = be_cmd_mac_addr_query(adapter, mac,
+                                               MAC_ADDRESS_TYPE_NETWORK, false,
+                                               if_handle, 0);
+                *active_mac = true;
         }
-do_none:
         return status;
 }
 
@@ -2686,12 +2700,12 @@ static int be_get_config(struct be_adapter *adapter)
 
 static int be_setup(struct be_adapter *adapter)
 {
-        struct net_device *netdev = adapter->netdev;
         struct device *dev = &adapter->pdev->dev;
         u32 cap_flags, en_flags;
         u32 tx_fc, rx_fc;
         int status;
         u8 mac[ETH_ALEN];
+        bool active_mac;
 
         be_setup_init(adapter);
 
@@ -2717,14 +2731,6 @@ static int be_setup(struct be_adapter *adapter)
         if (status)
                 goto err;
 
-        memset(mac, 0, ETH_ALEN);
-        status = be_cmd_mac_addr_query(adapter, mac, MAC_ADDRESS_TYPE_NETWORK,
-                        true /*permanent */, 0, 0);
-        if (status)
-                return status;
-        memcpy(adapter->netdev->dev_addr, mac, ETH_ALEN);
-        memcpy(adapter->netdev->perm_addr, mac, ETH_ALEN);
-
         en_flags = BE_IF_FLAGS_UNTAGGED | BE_IF_FLAGS_BROADCAST |
                         BE_IF_FLAGS_MULTICAST | BE_IF_FLAGS_PASS_L3L4_ERRORS;
         cap_flags = en_flags | BE_IF_FLAGS_MCAST_PROMISCUOUS |
@@ -2734,27 +2740,29 @@ static int be_setup(struct be_adapter *adapter)
                 cap_flags |= BE_IF_FLAGS_RSS;
                 en_flags |= BE_IF_FLAGS_RSS;
         }
+
         status = be_cmd_if_create(adapter, cap_flags, en_flags,
-                        netdev->dev_addr, &adapter->if_handle,
-                        &adapter->pmac_id[0], 0);
+                                  &adapter->if_handle, 0);
         if (status != 0)
                 goto err;
 
-         /* The VF's permanent mac queried from card is incorrect.
-          * For BEx: Query the mac configued by the PF using if_handle
-          * For Lancer: Get and use mac_list to obtain mac address.
-          */
-        if (!be_physfn(adapter)) {
-                if (lancer_chip(adapter))
-                        status = be_add_mac_from_list(adapter, mac);
-                else
-                        status = be_cmd_mac_addr_query(adapter, mac,
-                                        MAC_ADDRESS_TYPE_NETWORK, false,
-                                        adapter->if_handle, 0);
-                if (!status) {
-                        memcpy(adapter->netdev->dev_addr, mac, ETH_ALEN);
-                        memcpy(adapter->netdev->perm_addr, mac, ETH_ALEN);
-                }
+        memset(mac, 0, ETH_ALEN);
+        active_mac = false;
+        status = be_get_mac_addr(adapter, mac, adapter->if_handle,
+                                 &active_mac, &adapter->pmac_id[0]);
+        if (status != 0)
+                goto err;
+
+        if (!active_mac) {
+                status = be_cmd_pmac_add(adapter, mac, adapter->if_handle,
+                                         &adapter->pmac_id[0], 0);
+                if (status != 0)
+                        goto err;
+        }
+
+        if (is_zero_ether_addr(adapter->netdev->dev_addr)) {
+                memcpy(adapter->netdev->dev_addr, mac, ETH_ALEN);
+                memcpy(adapter->netdev->perm_addr, mac, ETH_ALEN);
         }
 
         status = be_tx_qs_create(adapter);
@@ -2763,7 +2771,8 @@ static int be_setup(struct be_adapter *adapter)
 
         be_cmd_get_fw_ver(adapter, adapter->fw_ver, NULL);
 
-        be_vid_config(adapter, false, 0);
+        if (adapter->vlans_added)
+                be_vid_config(adapter);
 
         be_set_rx_mode(adapter->netdev);
 
@@ -2773,8 +2782,6 @@ static int be_setup(struct be_adapter *adapter)
                 be_cmd_set_flow_control(adapter, adapter->tx_fc,
                                         adapter->rx_fc);
 
-        pcie_set_readrq(adapter->pdev, 4096);
-
         if (be_physfn(adapter) && num_vfs) {
                 if (adapter->dev_num_vfs)
                         be_vf_setup(adapter);
@@ -2788,8 +2795,6 @@ static int be_setup(struct be_adapter *adapter)
 
         schedule_delayed_work(&adapter->work, msecs_to_jiffies(1000));
         adapter->flags |= BE_FLAGS_WORKER_SCHEDULED;
-
-        pci_write_config_dword(adapter->pdev, PCICFG_CUST_SCRATCHPAD_CSR, 1);
         return 0;
 err:
         be_clear(adapter);
@@ -3727,10 +3732,7 @@ reschedule:
 
 static bool be_reset_required(struct be_adapter *adapter)
 {
-        u32 reg;
-
-        pci_read_config_dword(adapter->pdev, PCICFG_CUST_SCRATCHPAD_CSR, &reg);
-        return reg;
+        return be_find_vfs(adapter, ENABLED) > 0 ? false : true;
 }
 
 static int __devinit be_probe(struct pci_dev *pdev,
@@ -3749,7 +3751,7 @@ static int __devinit be_probe(struct pci_dev *pdev,
                 goto disable_dev;
         pci_set_master(pdev);
 
-        netdev = alloc_etherdev_mq(sizeof(struct be_adapter), MAX_TX_QS);
+        netdev = alloc_etherdev_mqs(sizeof(*adapter), MAX_TX_QS, MAX_RX_QS);
         if (netdev == NULL) {
                 status = -ENOMEM;
                 goto rel_reg;
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 0741aded9eb0..f00a095f37b4 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -1,5 +1,4 @@
-/*
- * drivers/net/ethernet/freescale/gianfar.c
+/* drivers/net/ethernet/freescale/gianfar.c
  *
  * Gianfar Ethernet Driver
  * This driver is designed for the non-CPM ethernet controllers
@@ -114,7 +113,7 @@ static void gfar_timeout(struct net_device *dev);
 static int gfar_close(struct net_device *dev);
 struct sk_buff *gfar_new_skb(struct net_device *dev);
 static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
-                struct sk_buff *skb);
+                           struct sk_buff *skb);
 static int gfar_set_mac_address(struct net_device *dev);
 static int gfar_change_mtu(struct net_device *dev, int new_mtu);
 static irqreturn_t gfar_error(int irq, void *dev_id);
@@ -266,8 +265,8 @@ static int gfar_alloc_skb_resources(struct net_device *ndev)
                 tx_queue->tx_bd_dma_base = addr;
                 tx_queue->dev = ndev;
                 /* enet DMA only understands physical addresses */
-                addr    += sizeof(struct txbd8) *tx_queue->tx_ring_size;
-                vaddr   += sizeof(struct txbd8) *tx_queue->tx_ring_size;
+                addr  += sizeof(struct txbd8) * tx_queue->tx_ring_size;
+                vaddr += sizeof(struct txbd8) * tx_queue->tx_ring_size;
         }
 
         /* Start the rx descriptor ring where the tx ring leaves off */
@@ -276,15 +275,16 @@ static int gfar_alloc_skb_resources(struct net_device *ndev)
                 rx_queue->rx_bd_base = vaddr;
                 rx_queue->rx_bd_dma_base = addr;
                 rx_queue->dev = ndev;
-                addr    += sizeof (struct rxbd8) * rx_queue->rx_ring_size;
-                vaddr   += sizeof (struct rxbd8) * rx_queue->rx_ring_size;
+                addr  += sizeof(struct rxbd8) * rx_queue->rx_ring_size;
+                vaddr += sizeof(struct rxbd8) * rx_queue->rx_ring_size;
         }
 
         /* Setup the skbuff rings */
         for (i = 0; i < priv->num_tx_queues; i++) {
                 tx_queue = priv->tx_queue[i];
                 tx_queue->tx_skbuff = kmalloc(sizeof(*tx_queue->tx_skbuff) *
-                                  tx_queue->tx_ring_size, GFP_KERNEL);
+                                              tx_queue->tx_ring_size,
+                                              GFP_KERNEL);
                 if (!tx_queue->tx_skbuff) {
                         netif_err(priv, ifup, ndev,
                                   "Could not allocate tx_skbuff\n");
@@ -298,7 +298,8 @@ static int gfar_alloc_skb_resources(struct net_device *ndev)
         for (i = 0; i < priv->num_rx_queues; i++) {
                 rx_queue = priv->rx_queue[i];
                 rx_queue->rx_skbuff = kmalloc(sizeof(*rx_queue->rx_skbuff) *
-                                  rx_queue->rx_ring_size, GFP_KERNEL);
+                                              rx_queue->rx_ring_size,
+                                              GFP_KERNEL);
 
                 if (!rx_queue->rx_skbuff) {
                         netif_err(priv, ifup, ndev,
@@ -327,15 +328,15 @@ static void gfar_init_tx_rx_base(struct gfar_private *priv)
         int i;
 
         baddr = &regs->tbase0;
-        for(i = 0; i < priv->num_tx_queues; i++) {
+        for (i = 0; i < priv->num_tx_queues; i++) {
                 gfar_write(baddr, priv->tx_queue[i]->tx_bd_dma_base);
-                baddr   += 2;
+                baddr += 2;
         }
 
         baddr = &regs->rbase0;
-        for(i = 0; i < priv->num_rx_queues; i++) {
+        for (i = 0; i < priv->num_rx_queues; i++) {
                 gfar_write(baddr, priv->rx_queue[i]->rx_bd_dma_base);
-                baddr   += 2;
+                baddr += 2;
         }
 }
 
@@ -405,7 +406,8 @@ static void gfar_init_mac(struct net_device *ndev)
         gfar_write(&regs->attreli, attrs);
 
         /* Start with defaults, and add stashing or locking
-         * depending on the approprate variables */
+         * depending on the approprate variables
+         */
         attrs = ATTR_INIT_SETTINGS;
 
         if (priv->bd_stash_en)
@@ -426,16 +428,16 @@ static struct net_device_stats *gfar_get_stats(struct net_device *dev)
         struct gfar_private *priv = netdev_priv(dev);
         unsigned long rx_packets = 0, rx_bytes = 0, rx_dropped = 0;
         unsigned long tx_packets = 0, tx_bytes = 0;
-        int i = 0;
+        int i;
 
         for (i = 0; i < priv->num_rx_queues; i++) {
                 rx_packets += priv->rx_queue[i]->stats.rx_packets;
-                rx_bytes += priv->rx_queue[i]->stats.rx_bytes;
+                rx_bytes   += priv->rx_queue[i]->stats.rx_bytes;
                 rx_dropped += priv->rx_queue[i]->stats.rx_dropped;
         }
 
         dev->stats.rx_packets = rx_packets;
-        dev->stats.rx_bytes = rx_bytes;
+        dev->stats.rx_bytes   = rx_bytes;
         dev->stats.rx_dropped = rx_dropped;
 
         for (i = 0; i < priv->num_tx_queues; i++) {
@@ -443,7 +445,7 @@ static struct net_device_stats *gfar_get_stats(struct net_device *dev)
                 tx_packets += priv->tx_queue[i]->stats.tx_packets;
         }
 
-        dev->stats.tx_bytes = tx_bytes;
+        dev->stats.tx_bytes   = tx_bytes;
         dev->stats.tx_packets = tx_packets;
 
         return &dev->stats;
@@ -468,7 +470,7 @@ static const struct net_device_ops gfar_netdev_ops = {
 
 void lock_rx_qs(struct gfar_private *priv)
 {
-        int i = 0x0;
+        int i;
 
         for (i = 0; i < priv->num_rx_queues; i++)
                 spin_lock(&priv->rx_queue[i]->rxlock);
@@ -476,7 +478,7 @@ void lock_rx_qs(struct gfar_private *priv)
 
 void lock_tx_qs(struct gfar_private *priv)
 {
-        int i = 0x0;
+        int i;
 
         for (i = 0; i < priv->num_tx_queues; i++)
                 spin_lock(&priv->tx_queue[i]->txlock);
@@ -484,7 +486,7 @@ void lock_tx_qs(struct gfar_private *priv)
 
 void unlock_rx_qs(struct gfar_private *priv)
 {
-        int i = 0x0;
+        int i;
 
         for (i = 0; i < priv->num_rx_queues; i++)
                 spin_unlock(&priv->rx_queue[i]->rxlock);
@@ -492,7 +494,7 @@ void unlock_rx_qs(struct gfar_private *priv)
 
 void unlock_tx_qs(struct gfar_private *priv)
 {
-        int i = 0x0;
+        int i;
 
         for (i = 0; i < priv->num_tx_queues; i++)
                 spin_unlock(&priv->tx_queue[i]->txlock);
@@ -508,13 +510,13 @@ static bool gfar_is_vlan_on(struct gfar_private *priv)
 static inline int gfar_uses_fcb(struct gfar_private *priv)
 {
         return gfar_is_vlan_on(priv) ||
-                (priv->ndev->features & NETIF_F_RXCSUM) ||
-                (priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER);
+               (priv->ndev->features & NETIF_F_RXCSUM) ||
+               (priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER);
 }
 
 static void free_tx_pointers(struct gfar_private *priv)
 {
-        int i = 0;
+        int i;
 
         for (i = 0; i < priv->num_tx_queues; i++)
                 kfree(priv->tx_queue[i]);
@@ -522,7 +524,7 @@ static void free_tx_pointers(struct gfar_private *priv)
 
 static void free_rx_pointers(struct gfar_private *priv)
 {
-        int i = 0;
+        int i;
 
         for (i = 0; i < priv->num_rx_queues; i++)
                 kfree(priv->rx_queue[i]);
@@ -530,7 +532,7 @@ static void free_rx_pointers(struct gfar_private *priv)
 
 static void unmap_group_regs(struct gfar_private *priv)
 {
-        int i = 0;
+        int i;
 
         for (i = 0; i < MAXGROUPS; i++)
                 if (priv->gfargrp[i].regs)
@@ -539,7 +541,7 @@ static void unmap_group_regs(struct gfar_private *priv)
 
 static void disable_napi(struct gfar_private *priv)
 {
-        int i = 0;
+        int i;
 
         for (i = 0; i < priv->num_grps; i++)
                 napi_disable(&priv->gfargrp[i].napi);
@@ -547,14 +549,14 @@ static void disable_napi(struct gfar_private *priv)
 
 static void enable_napi(struct gfar_private *priv)
 {
-        int i = 0;
+        int i;
 
         for (i = 0; i < priv->num_grps; i++)
                 napi_enable(&priv->gfargrp[i].napi);
 }
 
 static int gfar_parse_group(struct device_node *np,
-                struct gfar_private *priv, const char *model)
+                            struct gfar_private *priv, const char *model)
 {
         u32 *queue_mask;
 
@@ -580,15 +582,13 @@ static int gfar_parse_group(struct device_node *np,
         priv->gfargrp[priv->num_grps].grp_id = priv->num_grps;
         priv->gfargrp[priv->num_grps].priv = priv;
         spin_lock_init(&priv->gfargrp[priv->num_grps].grplock);
-        if(priv->mode == MQ_MG_MODE) {
-                queue_mask = (u32 *)of_get_property(np,
-                                        "fsl,rx-bit-map", NULL);
-                priv->gfargrp[priv->num_grps].rx_bit_map =
-                        queue_mask ?  *queue_mask :(DEFAULT_MAPPING >> priv->num_grps);
-                queue_mask = (u32 *)of_get_property(np,
-                                        "fsl,tx-bit-map", NULL);
-                priv->gfargrp[priv->num_grps].tx_bit_map =
-                        queue_mask ? *queue_mask : (DEFAULT_MAPPING >> priv->num_grps);
+        if (priv->mode == MQ_MG_MODE) {
+                queue_mask = (u32 *)of_get_property(np, "fsl,rx-bit-map", NULL);
+                priv->gfargrp[priv->num_grps].rx_bit_map = queue_mask ?
+                        *queue_mask : (DEFAULT_MAPPING >> priv->num_grps);
+                queue_mask = (u32 *)of_get_property(np, "fsl,tx-bit-map", NULL);
+                priv->gfargrp[priv->num_grps].tx_bit_map = queue_mask ?
+                        *queue_mask : (DEFAULT_MAPPING >> priv->num_grps);
         } else {
                 priv->gfargrp[priv->num_grps].rx_bit_map = 0xFF;
                 priv->gfargrp[priv->num_grps].tx_bit_map = 0xFF;
@@ -652,7 +652,7 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
         priv->num_rx_queues = num_rx_qs;
         priv->num_grps = 0x0;
 
-        /* Init Rx queue filer rule set linked list*/
+        /* Init Rx queue filer rule set linked list */
         INIT_LIST_HEAD(&priv->rx_list.list);
         priv->rx_list.count = 0;
         mutex_init(&priv->rx_queue_access);
@@ -673,7 +673,7 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
         } else {
                 priv->mode = SQ_SG_MODE;
                 err = gfar_parse_group(np, priv, model);
-                if(err)
+                if (err)
                         goto err_grp_init;
         }
 
@@ -730,27 +730,27 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
                 priv->device_flags |= FSL_GIANFAR_DEV_HAS_BUF_STASHING;
 
         mac_addr = of_get_mac_address(np);
+
         if (mac_addr)
                 memcpy(dev->dev_addr, mac_addr, ETH_ALEN);
 
         if (model && !strcasecmp(model, "TSEC"))
-                priv->device_flags =
-                        FSL_GIANFAR_DEV_HAS_GIGABIT |
-                        FSL_GIANFAR_DEV_HAS_COALESCE |
-                        FSL_GIANFAR_DEV_HAS_RMON |
-                        FSL_GIANFAR_DEV_HAS_MULTI_INTR;
+                priv->device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
+                                     FSL_GIANFAR_DEV_HAS_COALESCE |
+                                     FSL_GIANFAR_DEV_HAS_RMON |
+                                     FSL_GIANFAR_DEV_HAS_MULTI_INTR;
+
         if (model && !strcasecmp(model, "eTSEC"))
-                priv->device_flags =
-                        FSL_GIANFAR_DEV_HAS_GIGABIT |
-                        FSL_GIANFAR_DEV_HAS_COALESCE |
-                        FSL_GIANFAR_DEV_HAS_RMON |
-                        FSL_GIANFAR_DEV_HAS_MULTI_INTR |
-                        FSL_GIANFAR_DEV_HAS_PADDING |
-                        FSL_GIANFAR_DEV_HAS_CSUM |
-                        FSL_GIANFAR_DEV_HAS_VLAN |
-                        FSL_GIANFAR_DEV_HAS_MAGIC_PACKET |
-                        FSL_GIANFAR_DEV_HAS_EXTENDED_HASH |
-                        FSL_GIANFAR_DEV_HAS_TIMER;
+                priv->device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
+                                     FSL_GIANFAR_DEV_HAS_COALESCE |
+                                     FSL_GIANFAR_DEV_HAS_RMON |
+                                     FSL_GIANFAR_DEV_HAS_MULTI_INTR |
+                                     FSL_GIANFAR_DEV_HAS_PADDING |
+                                     FSL_GIANFAR_DEV_HAS_CSUM |
+                                     FSL_GIANFAR_DEV_HAS_VLAN |
+                                     FSL_GIANFAR_DEV_HAS_MAGIC_PACKET |
+                                     FSL_GIANFAR_DEV_HAS_EXTENDED_HASH |
+                                     FSL_GIANFAR_DEV_HAS_TIMER;
 
         ctype = of_get_property(np, "phy-connection-type", NULL);
 
@@ -781,7 +781,7 @@ err_grp_init:
 }
 
 static int gfar_hwtstamp_ioctl(struct net_device *netdev,
-                        struct ifreq *ifr, int cmd)
+                               struct ifreq *ifr, int cmd)
 {
         struct hwtstamp_config config;
         struct gfar_private *priv = netdev_priv(netdev);
@@ -851,6 +851,7 @@ static unsigned int reverse_bitmap(unsigned int bit_map, unsigned int max_qs)
 {
         unsigned int new_bit_map = 0x0;
         int mask = 0x1 << (max_qs - 1), i;
+
         for (i = 0; i < max_qs; i++) {
                 if (bit_map & mask)
                         new_bit_map = new_bit_map + (1 << i);
@@ -936,22 +937,22 @@ static void gfar_detect_errata(struct gfar_private *priv)
 
         /* MPC8313 Rev 2.0 and higher; All MPC837x */
         if ((pvr == 0x80850010 && mod == 0x80b0 && rev >= 0x0020) ||
-                        (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
+            (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))
+            (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))
+            (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0))
                 priv->errata |= GFAR_ERRATA_A002;
 
         /* MPC8313 Rev < 2.0, MPC8548 rev 2.0 */
         if ((pvr == 0x80850010 && mod == 0x80b0 && rev < 0x0020) ||
-                        (pvr == 0x80210020 && mod == 0x8030 && rev == 0x0020))
+            (pvr == 0x80210020 && mod == 0x8030 && rev == 0x0020))
                 priv->errata |= GFAR_ERRATA_12;
 
         if (priv->errata)
@@ -960,7 +961,8 @@ static void gfar_detect_errata(struct gfar_private *priv)
 }
 
 /* Set up the ethernet device structure, private data,
- * and anything else we need before we start */
+ * and anything else we need before we start
+ */
 static int gfar_probe(struct platform_device *ofdev)
 {
         u32 tempval;
@@ -991,8 +993,9 @@ static int gfar_probe(struct platform_device *ofdev)
 
         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). */
+        /* Stop the DMA engine now, in case it was running before
+         * (The firmware could have used it, and left it running).
+         */
         gfar_halt(dev);
 
         /* Reset MAC layer */
@@ -1026,13 +1029,14 @@ static int gfar_probe(struct platform_device *ofdev)
 
         /* Register for napi ...We are registering NAPI for each grp */
         for (i = 0; i < priv->num_grps; i++)
-                netif_napi_add(dev, &priv->gfargrp[i].napi, gfar_poll, GFAR_DEV_WEIGHT);
+                netif_napi_add(dev, &priv->gfargrp[i].napi, gfar_poll,
+                               GFAR_DEV_WEIGHT);
 
         if (priv->device_flags & FSL_GIANFAR_DEV_HAS_CSUM) {
                 dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG |
-                        NETIF_F_RXCSUM;
+                                   NETIF_F_RXCSUM;
                 dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG |
-                        NETIF_F_RXCSUM | NETIF_F_HIGHDMA;
+                                 NETIF_F_RXCSUM | NETIF_F_HIGHDMA;
         }
 
         if (priv->device_flags & FSL_GIANFAR_DEV_HAS_VLAN) {
@@ -1081,7 +1085,7 @@ static int gfar_probe(struct platform_device *ofdev)
                 priv->padding = 0;
 
         if (dev->features & NETIF_F_IP_CSUM ||
-                        priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER)
+            priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER)
                 dev->needed_headroom = GMAC_FCB_LEN;
 
         /* Program the isrg regs only if number of grps > 1 */
@@ -1098,28 +1102,32 @@ static int gfar_probe(struct platform_device *ofdev)
 
         /* Need to reverse the bit maps as  bit_map's MSB is q0
          * but, for_each_set_bit parses from right to left, which
-         * basically reverses the queue numbers */
+         * basically reverses the queue numbers
+         */
         for (i = 0; i< priv->num_grps; i++) {
-                priv->gfargrp[i].tx_bit_map = reverse_bitmap(
-                                priv->gfargrp[i].tx_bit_map, MAX_TX_QS);
-                priv->gfargrp[i].rx_bit_map = reverse_bitmap(
-                                priv->gfargrp[i].rx_bit_map, MAX_RX_QS);
+                priv->gfargrp[i].tx_bit_map =
+                        reverse_bitmap(priv->gfargrp[i].tx_bit_map, MAX_TX_QS);
+                priv->gfargrp[i].rx_bit_map =
+                        reverse_bitmap(priv->gfargrp[i].rx_bit_map, MAX_RX_QS);
         }
 
         /* Calculate RSTAT, TSTAT, RQUEUE and TQUEUE values,
-         * also assign queues to groups */
+         * also assign queues to groups
+         */
         for (grp_idx = 0; grp_idx < priv->num_grps; grp_idx++) {
                 priv->gfargrp[grp_idx].num_rx_queues = 0x0;
+
                 for_each_set_bit(i, &priv->gfargrp[grp_idx].rx_bit_map,
-                                priv->num_rx_queues) {
+                                 priv->num_rx_queues) {
                         priv->gfargrp[grp_idx].num_rx_queues++;
                         priv->rx_queue[i]->grp = &priv->gfargrp[grp_idx];
                         rstat = rstat | (RSTAT_CLEAR_RHALT >> i);
                         rqueue = rqueue | ((RQUEUE_EN0 | RQUEUE_EX0) >> i);
                 }
                 priv->gfargrp[grp_idx].num_tx_queues = 0x0;
+
                 for_each_set_bit(i, &priv->gfargrp[grp_idx].tx_bit_map,
-                                priv->num_tx_queues) {
+                                 priv->num_tx_queues) {
                         priv->gfargrp[grp_idx].num_tx_queues++;
                         priv->tx_queue[i]->grp = &priv->gfargrp[grp_idx];
                         tstat = tstat | (TSTAT_CLEAR_THALT >> i);
@@ -1149,7 +1157,7 @@ static int gfar_probe(struct platform_device *ofdev)
                 priv->rx_queue[i]->rxic = DEFAULT_RXIC;
         }
 
-        /* always enable rx filer*/
+        /* always enable rx filer */
         priv->rx_filer_enable = 1;
         /* Enable most messages by default */
         priv->msg_enable = (NETIF_MSG_IFUP << 1 ) - 1;
@@ -1165,7 +1173,8 @@ static int gfar_probe(struct platform_device *ofdev)
         }
 
         device_init_wakeup(&dev->dev,
-                priv->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
+                           priv->device_flags &
+                           FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
 
         /* fill out IRQ number and name fields */
         for (i = 0; i < priv->num_grps; i++) {
@@ -1189,13 +1198,14 @@ static int gfar_probe(struct platform_device *ofdev)
         /* Print out the device info */
         netdev_info(dev, "mac: %pM\n", dev->dev_addr);
 
-        /* Even more device info helps when determining which kernel */
-        /* provided which set of benchmarks. */
+        /* Even more device info helps when determining which kernel
+         * provided which set of benchmarks.
+         */
         netdev_info(dev, "Running with NAPI enabled\n");
         for (i = 0; i < priv->num_rx_queues; i++)
                 netdev_info(dev, "RX BD ring size for Q[%d]: %d\n",
                             i, priv->rx_queue[i]->rx_ring_size);
-        for(i = 0; i < priv->num_tx_queues; i++)
+        for (i = 0; i < priv->num_tx_queues; i++)
                 netdev_info(dev, "TX BD ring size for Q[%d]: %d\n",
                             i, priv->tx_queue[i]->tx_ring_size);
 
@@ -1242,7 +1252,8 @@ static int gfar_suspend(struct device *dev)
         u32 tempval;
 
         int magic_packet = priv->wol_en &&
-                (priv->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
+                           (priv->device_flags &
+                            FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
 
         netif_device_detach(ndev);
 
@@ -1294,7 +1305,8 @@ static int gfar_resume(struct device *dev)
         unsigned long flags;
         u32 tempval;
         int magic_packet = priv->wol_en &&
-                (priv->device_flags & FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
+                           (priv->device_flags &
+                            FSL_GIANFAR_DEV_HAS_MAGIC_PACKET);
 
         if (!netif_running(ndev)) {
                 netif_device_attach(ndev);
@@ -1393,13 +1405,13 @@ static phy_interface_t gfar_get_interface(struct net_device *dev)
         }
 
         if (ecntrl & ECNTRL_REDUCED_MODE) {
-                if (ecntrl & ECNTRL_REDUCED_MII_MODE)
+                if (ecntrl & ECNTRL_REDUCED_MII_MODE) {
                         return PHY_INTERFACE_MODE_RMII;
+                }
                 else {
                         phy_interface_t interface = priv->interface;
 
-                        /*
-                         * This isn't autodetected right now, so it must
+                        /* This isn't autodetected right now, so it must
                          * be set by the device tree or platform code.
                          */
                         if (interface == PHY_INTERFACE_MODE_RGMII_ID)
@@ -1453,8 +1465,7 @@ static int init_phy(struct net_device *dev)
         return 0;
 }
 
-/*
- * Initialize TBI PHY interface for communicating with the
+/* Initialize TBI PHY interface for communicating with the
  * SERDES lynx PHY on the chip.  We communicate with this PHY
  * through the MDIO bus on each controller, treating it as a
  * "normal" PHY at the address found in the TBIPA register.  We assume
@@ -1479,8 +1490,7 @@ static void gfar_configure_serdes(struct net_device *dev)
                 return;
         }
 
-        /*
-         * If the link is already up, we must already be ok, and don't need to
+        /* If the link is already up, we must already be ok, and don't need to
          * configure and reset the TBI<->SerDes link.  Maybe U-Boot configured
          * everything for us?  Resetting it takes the link down and requires
          * several seconds for it to come back.
@@ -1492,18 +1502,19 @@ static void gfar_configure_serdes(struct net_device *dev)
         phy_write(tbiphy, MII_TBICON, TBICON_CLK_SELECT);
 
         phy_write(tbiphy, MII_ADVERTISE,
-                        ADVERTISE_1000XFULL | ADVERTISE_1000XPAUSE |
-                        ADVERTISE_1000XPSE_ASYM);
+                  ADVERTISE_1000XFULL | ADVERTISE_1000XPAUSE |
+                  ADVERTISE_1000XPSE_ASYM);
 
-        phy_write(tbiphy, MII_BMCR, BMCR_ANENABLE |
-                        BMCR_ANRESTART | BMCR_FULLDPLX | BMCR_SPEED1000);
+        phy_write(tbiphy, MII_BMCR,
+                  BMCR_ANENABLE | BMCR_ANRESTART | BMCR_FULLDPLX |
+                  BMCR_SPEED1000);
 }
 
 static void init_registers(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
         struct gfar __iomem *regs = NULL;
-        int i = 0;
+        int i;
 
         for (i = 0; i < priv->num_grps; i++) {
                 regs = priv->gfargrp[i].regs;
@@ -1554,15 +1565,13 @@ static int __gfar_is_rx_idle(struct gfar_private *priv)
 {
         u32 res;
 
-        /*
-         * Normaly TSEC should not hang on GRS commands, so we should
+        /* 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
+        /* 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.
          */
@@ -1580,7 +1589,7 @@ static void gfar_halt_nodisable(struct net_device *dev)
         struct gfar_private *priv = netdev_priv(dev);
         struct gfar __iomem *regs = NULL;
         u32 tempval;
-        int i = 0;
+        int i;
 
         for (i = 0; i < priv->num_grps; i++) {
                 regs = priv->gfargrp[i].regs;
@@ -1594,8 +1603,8 @@ static void gfar_halt_nodisable(struct net_device *dev)
         regs = priv->gfargrp[0].regs;
         /* Stop the DMA, and wait for it to stop */
         tempval = gfar_read(&regs->dmactrl);
-        if ((tempval & (DMACTRL_GRS | DMACTRL_GTS))
-            != (DMACTRL_GRS | DMACTRL_GTS)) {
+        if ((tempval & (DMACTRL_GRS | DMACTRL_GTS)) !=
+            (DMACTRL_GRS | DMACTRL_GTS)) {
                 int ret;
 
                 tempval |= (DMACTRL_GRS | DMACTRL_GTS);
@@ -1660,7 +1669,7 @@ void stop_gfar(struct net_device *dev)
         } else {
                 for (i = 0; i < priv->num_grps; i++)
                         free_irq(priv->gfargrp[i].interruptTransmit,
-                                        &priv->gfargrp[i]);
+                                 &priv->gfargrp[i]);
         }
 
         free_skb_resources(priv);
@@ -1679,13 +1688,13 @@ static void free_skb_tx_queue(struct gfar_priv_tx_q *tx_queue)
                         continue;
 
                 dma_unmap_single(&priv->ofdev->dev, txbdp->bufPtr,
-                                txbdp->length, DMA_TO_DEVICE);
+                                 txbdp->length, DMA_TO_DEVICE);
                 txbdp->lstatus = 0;
                 for (j = 0; j < skb_shinfo(tx_queue->tx_skbuff[i])->nr_frags;
-                                j++) {
+                     j++) {
                         txbdp++;
                         dma_unmap_page(&priv->ofdev->dev, txbdp->bufPtr,
-                                        txbdp->length, DMA_TO_DEVICE);
+                                       txbdp->length, DMA_TO_DEVICE);
                 }
                 txbdp++;
                 dev_kfree_skb_any(tx_queue->tx_skbuff[i]);
@@ -1705,8 +1714,8 @@ static void free_skb_rx_queue(struct gfar_priv_rx_q *rx_queue)
         for (i = 0; i < rx_queue->rx_ring_size; i++) {
                 if (rx_queue->rx_skbuff[i]) {
                         dma_unmap_single(&priv->ofdev->dev,
-                                        rxbdp->bufPtr, priv->rx_buffer_size,
-                                        DMA_FROM_DEVICE);
+                                         rxbdp->bufPtr, priv->rx_buffer_size,
+                                         DMA_FROM_DEVICE);
                         dev_kfree_skb_any(rx_queue->rx_skbuff[i]);
                         rx_queue->rx_skbuff[i] = NULL;
                 }
@@ -1718,7 +1727,8 @@ static void free_skb_rx_queue(struct gfar_priv_rx_q *rx_queue)
 }
 
 /* If there are any tx skbs or rx skbs still around, free them.
- * Then free tx_skbuff and rx_skbuff */
+ * Then free tx_skbuff and rx_skbuff
+ */
 static void free_skb_resources(struct gfar_private *priv)
 {
         struct gfar_priv_tx_q *tx_queue = NULL;
@@ -1728,24 +1738,25 @@ static void free_skb_resources(struct gfar_private *priv)
         /* Go through all the buffer descriptors and free their data buffers */
         for (i = 0; i < priv->num_tx_queues; i++) {
                 struct netdev_queue *txq;
+
                 tx_queue = priv->tx_queue[i];
                 txq = netdev_get_tx_queue(tx_queue->dev, tx_queue->qindex);
-                if(tx_queue->tx_skbuff)
+                if (tx_queue->tx_skbuff)
                         free_skb_tx_queue(tx_queue);
                 netdev_tx_reset_queue(txq);
         }
 
         for (i = 0; i < priv->num_rx_queues; i++) {
                 rx_queue = priv->rx_queue[i];
-                if(rx_queue->rx_skbuff)
+                if (rx_queue->rx_skbuff)
                         free_skb_rx_queue(rx_queue);
         }
 
         dma_free_coherent(&priv->ofdev->dev,
-                        sizeof(struct txbd8) * priv->total_tx_ring_size +
-                        sizeof(struct rxbd8) * priv->total_rx_ring_size,
-                        priv->tx_queue[0]->tx_bd_base,
-                        priv->tx_queue[0]->tx_bd_dma_base);
+                          sizeof(struct txbd8) * priv->total_tx_ring_size +
+                          sizeof(struct rxbd8) * priv->total_rx_ring_size,
+                          priv->tx_queue[0]->tx_bd_base,
+                          priv->tx_queue[0]->tx_bd_dma_base);
         skb_queue_purge(&priv->rx_recycle);
 }
 
@@ -1784,7 +1795,7 @@ void gfar_start(struct net_device *dev)
 }
 
 void gfar_configure_coalescing(struct gfar_private *priv,
-        unsigned long tx_mask, unsigned long rx_mask)
+                               unsigned long tx_mask, unsigned long rx_mask)
 {
         struct gfar __iomem *regs = priv->gfargrp[0].regs;
         u32 __iomem *baddr;
@@ -1794,11 +1805,11 @@ void gfar_configure_coalescing(struct gfar_private *priv,
          * multiple queues, there's only single reg to program
          */
         gfar_write(&regs->txic, 0);
-        if(likely(priv->tx_queue[0]->txcoalescing))
+        if (likely(priv->tx_queue[0]->txcoalescing))
                 gfar_write(&regs->txic, priv->tx_queue[0]->txic);
 
         gfar_write(&regs->rxic, 0);
-        if(unlikely(priv->rx_queue[0]->rxcoalescing))
+        if (unlikely(priv->rx_queue[0]->rxcoalescing))
                 gfar_write(&regs->rxic, priv->rx_queue[0]->rxic);
 
         if (priv->mode == MQ_MG_MODE) {
@@ -1827,12 +1838,14 @@ static int register_grp_irqs(struct gfar_priv_grp *grp)
         int err;
 
         /* If the device has multiple interrupts, register for
-         * them.  Otherwise, only register for the one */
+         * them.  Otherwise, only register for the one
+         */
         if (priv->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) {
                 /* Install our interrupt handlers for Error,
-                 * Transmit, and Receive */
-                if ((err = request_irq(grp->interruptError, gfar_error, 0,
-                                grp->int_name_er,grp)) < 0) {
+                 * Transmit, and Receive
+                 */
+                if ((err = request_irq(grp->interruptError, gfar_error,
+                                       0, grp->int_name_er, grp)) < 0) {
                         netif_err(priv, intr, dev, "Can't get IRQ %d\n",
                                   grp->interruptError);
 
@@ -1840,21 +1853,21 @@ static int register_grp_irqs(struct gfar_priv_grp *grp)
                 }
 
                 if ((err = request_irq(grp->interruptTransmit, gfar_transmit,
-                                0, grp->int_name_tx, grp)) < 0) {
+                                       0, grp->int_name_tx, grp)) < 0) {
                         netif_err(priv, intr, dev, "Can't get IRQ %d\n",
                                   grp->interruptTransmit);
                         goto tx_irq_fail;
                 }
 
-                if ((err = request_irq(grp->interruptReceive, gfar_receive, 0,
-                                grp->int_name_rx, grp)) < 0) {
+                if ((err = request_irq(grp->interruptReceive, gfar_receive,
+                                       0, grp->int_name_rx, grp)) < 0) {
                         netif_err(priv, intr, dev, "Can't get IRQ %d\n",
                                   grp->interruptReceive);
                         goto rx_irq_fail;
                 }
         } else {
-                if ((err = request_irq(grp->interruptTransmit, gfar_interrupt, 0,
-                                grp->int_name_tx, grp)) < 0) {
+                if ((err = request_irq(grp->interruptTransmit, gfar_interrupt,
+                                       0, grp->int_name_tx, grp)) < 0) {
                         netif_err(priv, intr, dev, "Can't get IRQ %d\n",
                                   grp->interruptTransmit);
                         goto err_irq_fail;
@@ -1914,8 +1927,9 @@ irq_fail:
         return err;
 }
 
-/* Called when something needs to use the ethernet device */
-/* Returns 0 for success. */
+/* Called when something needs to use the ethernet device
+ * Returns 0 for success.
+ */
 static int gfar_enet_open(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
@@ -1960,18 +1974,17 @@ static inline struct txfcb *gfar_add_fcb(struct sk_buff *skb)
 }
 
 static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb,
-                int fcb_length)
+                                    int fcb_length)
 {
-        u8 flags = 0;
-
         /* If we're here, it's a IP packet with a TCP or UDP
          * payload.  We set it to checksum, using a pseudo-header
          * we provide
          */
-        flags = TXFCB_DEFAULT;
+        u8 flags = TXFCB_DEFAULT;
 
-        /* Tell the controller what the protocol is */
-        /* And provide the already calculated phcs */
+        /* Tell the controller what the protocol is
+         * And provide the already calculated phcs
+         */
         if (ip_hdr(skb)->protocol == IPPROTO_UDP) {
                 flags |= TXFCB_UDP;
                 fcb->phcs = udp_hdr(skb)->check;
@@ -1981,7 +1994,8 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb,
         /* l3os is the distance between the start of the
          * frame (skb->data) and the start of the IP hdr.
          * l4os is the distance between the start of the
-         * l3 hdr and the l4 hdr */
+         * l3 hdr and the l4 hdr
+         */
         fcb->l3os = (u16)(skb_network_offset(skb) - fcb_length);
         fcb->l4os = skb_network_header_len(skb);
 
@@ -1995,7 +2009,7 @@ void inline gfar_tx_vlan(struct sk_buff *skb, struct txfcb *fcb)
 }
 
 static inline struct txbd8 *skip_txbd(struct txbd8 *bdp, int stride,
-                               struct txbd8 *base, int ring_size)
+                                      struct txbd8 *base, int ring_size)
 {
         struct txbd8 *new_bd = bdp + stride;
 
@@ -2003,13 +2017,14 @@ static inline struct txbd8 *skip_txbd(struct txbd8 *bdp, int stride,
 }
 
 static inline struct txbd8 *next_txbd(struct txbd8 *bdp, struct txbd8 *base,
-                int ring_size)
+                                      int ring_size)
 {
         return skip_txbd(bdp, 1, base, ring_size);
 }
 
-/* This is called by the kernel when a frame is ready for transmission. */
-/* It is pointed to by the dev->hard_start_xmit function pointer */
+/* This is called by the kernel when a frame is ready for transmission.
+ * It is pointed to by the dev->hard_start_xmit function pointer
+ */
 static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
@@ -2024,13 +2039,12 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         unsigned long flags;
         unsigned int nr_frags, nr_txbds, length, fcb_length = GMAC_FCB_LEN;
 
-        /*
-         * TOE=1 frames larger than 2500 bytes may see excess delays
+        /* 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)) {
+                     skb->ip_summed == CHECKSUM_PARTIAL &&
+                     skb->len > 2500)) {
                 int ret;
 
                 ret = skb_checksum_help(skb);
@@ -2046,16 +2060,16 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         /* check if time stamp should be generated */
         if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP &&
-                        priv->hwts_tx_en)) {
+                     priv->hwts_tx_en)) {
                 do_tstamp = 1;
                 fcb_length = GMAC_FCB_LEN + GMAC_TXPAL_LEN;
         }
 
         /* make space for additional header when fcb is needed */
         if (((skb->ip_summed == CHECKSUM_PARTIAL) ||
-                        vlan_tx_tag_present(skb) ||
-                        unlikely(do_tstamp)) &&
-                        (skb_headroom(skb) < fcb_length)) {
+             vlan_tx_tag_present(skb) ||
+             unlikely(do_tstamp)) &&
+            (skb_headroom(skb) < fcb_length)) {
                 struct sk_buff *skb_new;
 
                 skb_new = skb_realloc_headroom(skb, fcb_length);
@@ -2099,12 +2113,12 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* Time stamp insertion requires one additional TxBD */
         if (unlikely(do_tstamp))
                 txbdp_tstamp = txbdp = next_txbd(txbdp, base,
-                                tx_queue->tx_ring_size);
+                                                 tx_queue->tx_ring_size);
 
         if (nr_frags == 0) {
                 if (unlikely(do_tstamp))
                         txbdp_tstamp->lstatus |= BD_LFLAG(TXBD_LAST |
-                                        TXBD_INTERRUPT);
+                                                          TXBD_INTERRUPT);
                 else
                         lstatus |= BD_LFLAG(TXBD_LAST | TXBD_INTERRUPT);
         } else {
@@ -2116,7 +2130,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         length = skb_shinfo(skb)->frags[i].size;
 
                         lstatus = txbdp->lstatus | length |
-                                BD_LFLAG(TXBD_READY);
+                                  BD_LFLAG(TXBD_READY);
 
                         /* Handle the last BD specially */
                         if (i == nr_frags - 1)
@@ -2146,8 +2160,8 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (CHECKSUM_PARTIAL == skb->ip_summed) {
                 fcb = gfar_add_fcb(skb);
                 /* as specified by errata */
-                if (unlikely(gfar_has_errata(priv, GFAR_ERRATA_12)
-                             && ((unsigned long)fcb % 0x20) > 0x18)) {
+                if (unlikely(gfar_has_errata(priv, GFAR_ERRATA_12) &&
+                             ((unsigned long)fcb % 0x20) > 0x18)) {
                         __skb_pull(skb, GMAC_FCB_LEN);
                         skb_checksum_help(skb);
                 } else {
@@ -2175,10 +2189,9 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         txbdp_start->bufPtr = dma_map_single(&priv->ofdev->dev, skb->data,
-                        skb_headlen(skb), DMA_TO_DEVICE);
+                                             skb_headlen(skb), DMA_TO_DEVICE);
 
-        /*
-         * If time stamping is requested one additional TxBD must be set up. The
+        /* If time stamping is requested one additional TxBD must be set up. The
          * first TxBD points to the FCB and must have a data length of
          * GMAC_FCB_LEN. The second TxBD points to the actual frame data with
          * the full frame length.
@@ -2186,7 +2199,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (unlikely(do_tstamp)) {
                 txbdp_tstamp->bufPtr = txbdp_start->bufPtr + fcb_length;
                 txbdp_tstamp->lstatus |= BD_LFLAG(TXBD_READY) |
-                                (skb_headlen(skb) - fcb_length);
+                                         (skb_headlen(skb) - fcb_length);
                 lstatus |= BD_LFLAG(TXBD_CRC | TXBD_READY) | GMAC_FCB_LEN;
         } else {
                 lstatus |= BD_LFLAG(TXBD_CRC | TXBD_READY) | skb_headlen(skb);
@@ -2194,8 +2207,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         netdev_tx_sent_queue(txq, skb->len);
 
-        /*
-         * We can work in parallel with gfar_clean_tx_ring(), except
+        /* We can work in parallel with gfar_clean_tx_ring(), except
          * when modifying num_txbdfree. Note that we didn't grab the lock
          * when we were reading the num_txbdfree and checking for available
          * space, that's because outside of this function it can only grow,
@@ -2208,8 +2220,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
          */
         spin_lock_irqsave(&tx_queue->txlock, flags);
 
-        /*
-         * The powerpc-specific eieio() is used, as wmb() has too strong
+        /* The powerpc-specific eieio() is used, as wmb() has too strong
          * semantics (it requires synchronization between cacheable and
          * uncacheable mappings, which eieio doesn't provide and which we
          * don't need), thus requiring a more expensive sync instruction.  At
@@ -2225,9 +2236,10 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         tx_queue->tx_skbuff[tx_queue->skb_curtx] = skb;
 
         /* Update the current skb pointer to the next entry we will use
-         * (wrapping if necessary) */
+         * (wrapping if necessary)
+         */
         tx_queue->skb_curtx = (tx_queue->skb_curtx + 1) &
-                TX_RING_MOD_MASK(tx_queue->tx_ring_size);
+                              TX_RING_MOD_MASK(tx_queue->tx_ring_size);
 
         tx_queue->cur_tx = next_txbd(txbdp, base, tx_queue->tx_ring_size);
 
@@ -2235,7 +2247,8 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         tx_queue->num_txbdfree -= (nr_txbds);
 
         /* If the next BD still needs to be cleaned up, then the bds
-           are full.  We need to tell the kernel to stop sending us stuff. */
+         * are full.  We need to tell the kernel to stop sending us stuff.
+         */
         if (!tx_queue->num_txbdfree) {
                 netif_tx_stop_queue(txq);
 
@@ -2360,12 +2373,12 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
 
         frame_size += priv->padding;
 
-        tempsize =
-            (frame_size & ~(INCREMENTAL_BUFFER_SIZE - 1)) +
-            INCREMENTAL_BUFFER_SIZE;
+        tempsize = (frame_size & ~(INCREMENTAL_BUFFER_SIZE - 1)) +
+                   INCREMENTAL_BUFFER_SIZE;
 
         /* Only stop and start the controller if it isn't already
-         * stopped, and we changed something */
+         * stopped, and we changed something
+         */
         if ((oldsize != tempsize) && (dev->flags & IFF_UP))
                 stop_gfar(dev);
 
@@ -2378,11 +2391,12 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
 
         /* If the mtu is larger than the max size for standard
          * ethernet frames (ie, a jumbo frame), then set maccfg2
-         * to allow huge frames, and to check the length */
+         * to allow huge frames, and to check the length
+         */
         tempval = gfar_read(&regs->maccfg2);
 
         if (priv->rx_buffer_size > DEFAULT_RX_BUFFER_SIZE ||
-                        gfar_has_errata(priv, GFAR_ERRATA_74))
+            gfar_has_errata(priv, GFAR_ERRATA_74))
                 tempval |= (MACCFG2_HUGEFRAME | MACCFG2_LENGTHCHECK);
         else
                 tempval &= ~(MACCFG2_HUGEFRAME | MACCFG2_LENGTHCHECK);
@@ -2403,7 +2417,7 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu)
 static void gfar_reset_task(struct work_struct *work)
 {
         struct gfar_private *priv = container_of(work, struct gfar_private,
-                        reset_task);
+                                                 reset_task);
         struct net_device *dev = priv->ndev;
 
         if (dev->flags & IFF_UP) {
@@ -2430,7 +2444,7 @@ static void gfar_align_skb(struct sk_buff *skb)
          * as many bytes as needed to align the data properly
          */
         skb_reserve(skb, RXBUF_ALIGNMENT -
-                (((unsigned long) skb->data) & (RXBUF_ALIGNMENT - 1)));
+                    (((unsigned long) skb->data) & (RXBUF_ALIGNMENT - 1)));
 }
 
 /* Interrupt Handler for Transmit complete */
@@ -2464,8 +2478,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
 
                 frags = skb_shinfo(skb)->nr_frags;
 
-                /*
-                 * When time stamping, one additional TxBD must be freed.
+                /* When time stamping, one additional TxBD must be freed.
                  * Also, we need to dma_unmap_single() the TxPAL.
                  */
                 if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS))
@@ -2479,7 +2492,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
 
                 /* Only clean completed frames */
                 if ((lstatus & BD_LFLAG(TXBD_READY)) &&
-                                (lstatus & BD_LENGTH_MASK))
+                    (lstatus & BD_LENGTH_MASK))
                         break;
 
                 if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS)) {
@@ -2489,11 +2502,12 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
                         buflen = bdp->length;
 
                 dma_unmap_single(&priv->ofdev->dev, bdp->bufPtr,
-                                buflen, DMA_TO_DEVICE);
+                                 buflen, DMA_TO_DEVICE);
 
                 if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS)) {
                         struct skb_shared_hwtstamps shhwtstamps;
                         u64 *ns = (u64*) (((u32)skb->data + 0x10) & ~0x7);
+
                         memset(&shhwtstamps, 0, sizeof(shhwtstamps));
                         shhwtstamps.hwtstamp = ns_to_ktime(*ns);
                         skb_pull(skb, GMAC_FCB_LEN + GMAC_TXPAL_LEN);
@@ -2506,23 +2520,20 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
                 bdp = next_txbd(bdp, base, tx_ring_size);
 
                 for (i = 0; i < frags; i++) {
-                        dma_unmap_page(&priv->ofdev->dev,
-                                        bdp->bufPtr,
-                                        bdp->length,
-                                        DMA_TO_DEVICE);
+                        dma_unmap_page(&priv->ofdev->dev, bdp->bufPtr,
+                                       bdp->length, DMA_TO_DEVICE);
                         bdp->lstatus &= BD_LFLAG(TXBD_WRAP);
                         bdp = next_txbd(bdp, base, tx_ring_size);
                 }
 
                 bytes_sent += skb->len;
 
-                /*
-                 * If there's room in the queue (limit it to rx_buffer_size)
+                /* If there's room in the queue (limit it to rx_buffer_size)
                  * we add this skb back into the pool, if it's the right size
                  */
                 if (skb_queue_len(&priv->rx_recycle) < rx_queue->rx_ring_size &&
-                                skb_recycle_check(skb, priv->rx_buffer_size +
-                                        RXBUF_ALIGNMENT)) {
+                    skb_recycle_check(skb, priv->rx_buffer_size +
+                                      RXBUF_ALIGNMENT)) {
                         gfar_align_skb(skb);
                         skb_queue_head(&priv->rx_recycle, skb);
                 } else
@@ -2531,7 +2542,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
                 tx_queue->tx_skbuff[skb_dirtytx] = NULL;
 
                 skb_dirtytx = (skb_dirtytx + 1) &
-                        TX_RING_MOD_MASK(tx_ring_size);
+                              TX_RING_MOD_MASK(tx_ring_size);
 
                 howmany++;
                 spin_lock_irqsave(&tx_queue->txlock, flags);
@@ -2561,8 +2572,7 @@ static void gfar_schedule_cleanup(struct gfar_priv_grp *gfargrp)
                 gfar_write(&gfargrp->regs->imask, IMASK_RTX_DISABLED);
                 __napi_schedule(&gfargrp->napi);
         } else {
-                /*
-                 * Clear IEVENT, so interrupts aren't called again
+                /* Clear IEVENT, so interrupts aren't called again
                  * because of the packets that have already arrived.
                  */
                 gfar_write(&gfargrp->regs->ievent, IEVENT_RTX_MASK);
@@ -2579,7 +2589,7 @@ static irqreturn_t gfar_transmit(int irq, void *grp_id)
 }
 
 static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
-                struct sk_buff *skb)
+                           struct sk_buff *skb)
 {
         struct net_device *dev = rx_queue->dev;
         struct gfar_private *priv = netdev_priv(dev);
@@ -2590,7 +2600,7 @@ static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp,
         gfar_init_rxbdp(rx_queue, bdp, buf);
 }
 
-static struct sk_buff * gfar_alloc_skb(struct net_device *dev)
+static struct sk_buff *gfar_alloc_skb(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
         struct sk_buff *skb = NULL;
@@ -2604,7 +2614,7 @@ static struct sk_buff * gfar_alloc_skb(struct net_device *dev)
         return skb;
 }
 
-struct sk_buff * gfar_new_skb(struct net_device *dev)
+struct sk_buff *gfar_new_skb(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
         struct sk_buff *skb = NULL;
@@ -2622,8 +2632,7 @@ static inline void count_errors(unsigned short status, struct net_device *dev)
         struct net_device_stats *stats = &dev->stats;
         struct gfar_extra_stats *estats = &priv->extra_stats;
 
-        /* If the packet was truncated, none of the other errors
-         * matter */
+        /* If the packet was truncated, none of the other errors matter */
         if (status & RXBD_TRUNCATED) {
                 stats->rx_length_errors++;
 
@@ -2664,7 +2673,8 @@ static inline void gfar_rx_checksum(struct sk_buff *skb, struct rxfcb *fcb)
 {
         /* If valid headers were found, and valid sums
          * were verified, then we tell the kernel that no
-         * checksumming is necessary.  Otherwise, it is */
+         * checksumming is necessary.  Otherwise, it is [FIXME]
+         */
         if ((fcb->flags & RXFCB_CSUM_MASK) == (RXFCB_CIP | RXFCB_CTU))
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
         else
@@ -2672,8 +2682,7 @@ static inline void gfar_rx_checksum(struct sk_buff *skb, struct rxfcb *fcb)
 }
 
 
-/* gfar_process_frame() -- handle one incoming packet if skb
- * isn't NULL.  */
+/* gfar_process_frame() -- handle one incoming packet if skb isn't NULL. */
 static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
                               int amount_pull, struct napi_struct *napi)
 {
@@ -2685,8 +2694,9 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
         /* fcb is at the beginning if exists */
         fcb = (struct rxfcb *)skb->data;
 
-        /* Remove the FCB from the skb */
-        /* Remove the padded bytes, if there are any */
+        /* Remove the FCB from the skb
+         * Remove the padded bytes, if there are any
+         */
         if (amount_pull) {
                 skb_record_rx_queue(skb, fcb->rq);
                 skb_pull(skb, amount_pull);
@@ -2696,6 +2706,7 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
         if (priv->hwts_rx_en) {
                 struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
                 u64 *ns = (u64 *) skb->data;
+
                 memset(shhwtstamps, 0, sizeof(*shhwtstamps));
                 shhwtstamps->hwtstamp = ns_to_ktime(*ns);
         }
@@ -2709,8 +2720,7 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
         /* Tell the skb what kind of packet this is */
         skb->protocol = eth_type_trans(skb, dev);
 
-        /*
-         * There's need to check for NETIF_F_HW_VLAN_RX here.
+        /* There's need to check for NETIF_F_HW_VLAN_RX here.
          * Even if vlan rx accel is disabled, on some chips
          * RXFCB_VLN is pseudo randomly set.
          */
@@ -2728,8 +2738,8 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
 }
 
 /* gfar_clean_rx_ring() -- Processes each frame in the rx ring
- *   until the budget/quota has been reached. Returns the number
- *   of frames handled
+ * until the budget/quota has been reached. Returns the number
+ * of frames handled
  */
 int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
 {
@@ -2749,6 +2759,7 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
 
         while (!((bdp->status & RXBD_EMPTY) || (--rx_work_limit < 0))) {
                 struct sk_buff *newskb;
+
                 rmb();
 
                 /* Add another skb for the future */
@@ -2757,15 +2768,15 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
                 skb = rx_queue->rx_skbuff[rx_queue->skb_currx];
 
                 dma_unmap_single(&priv->ofdev->dev, bdp->bufPtr,
-                                priv->rx_buffer_size, DMA_FROM_DEVICE);
+                                 priv->rx_buffer_size, DMA_FROM_DEVICE);
 
                 if (unlikely(!(bdp->status & RXBD_ERR) &&
-                                bdp->length > priv->rx_buffer_size))
+                             bdp->length > priv->rx_buffer_size))
                         bdp->status = RXBD_LARGE;
 
                 /* We drop the frame if we failed to allocate a new buffer */
                 if (unlikely(!newskb || !(bdp->status & RXBD_LAST) ||
-                                 bdp->status & RXBD_ERR)) {
+                             bdp->status & RXBD_ERR)) {
                         count_errors(bdp->status, dev);
 
                         if (unlikely(!newskb))
@@ -2784,7 +2795,7 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
                                 rx_queue->stats.rx_bytes += pkt_len;
                                 skb_record_rx_queue(skb, rx_queue->qindex);
                                 gfar_process_frame(dev, skb, amount_pull,
-                                                &rx_queue->grp->napi);
+                                                   &rx_queue->grp->napi);
 
                         } else {
                                 netif_warn(priv, rx_err, dev, "Missing skb!\n");
@@ -2803,9 +2814,8 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
                 bdp = next_bd(bdp, base, rx_queue->rx_ring_size);
 
                 /* update to point at the next skb */
-                rx_queue->skb_currx =
-                    (rx_queue->skb_currx + 1) &
-                    RX_RING_MOD_MASK(rx_queue->rx_ring_size);
+                rx_queue->skb_currx = (rx_queue->skb_currx + 1) &
+                                      RX_RING_MOD_MASK(rx_queue->rx_ring_size);
         }
 
         /* Update the current rxbd pointer to be the next one */
@@ -2816,8 +2826,8 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
 
 static int gfar_poll(struct napi_struct *napi, int budget)
 {
-        struct gfar_priv_grp *gfargrp = container_of(napi,
-                        struct gfar_priv_grp, napi);
+        struct gfar_priv_grp *gfargrp =
+                container_of(napi, struct gfar_priv_grp, napi);
         struct gfar_private *priv = gfargrp->priv;
         struct gfar __iomem *regs = gfargrp->regs;
         struct gfar_priv_tx_q *tx_queue = NULL;
@@ -2831,11 +2841,11 @@ static int gfar_poll(struct napi_struct *napi, int budget)
         budget_per_queue = budget/num_queues;
 
         /* Clear IEVENT, so interrupts aren't called again
-         * because of the packets that have already arrived */
+         * because of the packets that have already arrived
+         */
         gfar_write(&regs->ievent, IEVENT_RTX_MASK);
 
         while (num_queues && left_over_budget) {
-
                 budget_per_queue = left_over_budget/num_queues;
                 left_over_budget = 0;
 
@@ -2846,12 +2856,13 @@ static int gfar_poll(struct napi_struct *napi, int budget)
                         tx_queue = priv->tx_queue[rx_queue->qindex];
 
                         tx_cleaned += gfar_clean_tx_ring(tx_queue);
-                        rx_cleaned_per_queue = gfar_clean_rx_ring(rx_queue,
-                                                        budget_per_queue);
+                        rx_cleaned_per_queue =
+                                gfar_clean_rx_ring(rx_queue, budget_per_queue);
                         rx_cleaned += rx_cleaned_per_queue;
-                        if(rx_cleaned_per_queue < budget_per_queue) {
+                        if (rx_cleaned_per_queue < budget_per_queue) {
                                 left_over_budget = left_over_budget +
-                                        (budget_per_queue - rx_cleaned_per_queue);
+                                        (budget_per_queue -
+                                         rx_cleaned_per_queue);
                                 set_bit(i, &serviced_queues);
                                 num_queues--;
                         }
@@ -2869,25 +2880,25 @@ static int gfar_poll(struct napi_struct *napi, int budget)
 
                 gfar_write(&regs->imask, IMASK_DEFAULT);
 
-                /* If we are coalescing interrupts, update the timer */
-                /* Otherwise, clear it */
-                gfar_configure_coalescing(priv,
-                                gfargrp->rx_bit_map, gfargrp->tx_bit_map);
+                /* If we are coalescing interrupts, update the timer
+                 * Otherwise, clear it
+                 */
+                gfar_configure_coalescing(priv, gfargrp->rx_bit_map,
+                                          gfargrp->tx_bit_map);
         }
 
         return rx_cleaned;
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * Polling 'interrupt' - used by things like netconsole to send skbs
+/* Polling 'interrupt' - used by things like netconsole to send skbs
  * without having to re-enable interrupts. It's not called while
  * the interrupt routine is executing.
  */
 static void gfar_netpoll(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
-        int i = 0;
+        int i;
 
         /* If the device has multiple interrupts, run tx/rx */
         if (priv->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) {
@@ -2896,7 +2907,7 @@ static void gfar_netpoll(struct net_device *dev)
                         disable_irq(priv->gfargrp[i].interruptReceive);
                         disable_irq(priv->gfargrp[i].interruptError);
                         gfar_interrupt(priv->gfargrp[i].interruptTransmit,
-                                                &priv->gfargrp[i]);
+                                       &priv->gfargrp[i]);
                         enable_irq(priv->gfargrp[i].interruptError);
                         enable_irq(priv->gfargrp[i].interruptReceive);
                         enable_irq(priv->gfargrp[i].interruptTransmit);
@@ -2905,7 +2916,7 @@ static void gfar_netpoll(struct net_device *dev)
                 for (i = 0; i < priv->num_grps; i++) {
                         disable_irq(priv->gfargrp[i].interruptTransmit);
                         gfar_interrupt(priv->gfargrp[i].interruptTransmit,
-                                                &priv->gfargrp[i]);
+                                       &priv->gfargrp[i]);
                         enable_irq(priv->gfargrp[i].interruptTransmit);
                 }
         }
@@ -2957,7 +2968,8 @@ static void adjust_link(struct net_device *dev)
                 u32 ecntrl = gfar_read(&regs->ecntrl);
 
                 /* Now we make sure that we can be in full duplex mode.
-                 * If not, we operate in half-duplex mode. */
+                 * If not, we operate in half-duplex mode.
+                 */
                 if (phydev->duplex != priv->oldduplex) {
                         new_state = 1;
                         if (!(phydev->duplex))
@@ -2983,7 +2995,8 @@ static void adjust_link(struct net_device *dev)
                                     ((tempval & ~(MACCFG2_IF)) | MACCFG2_MII);
 
                                 /* Reduced mode distinguishes
-                                 * between 10 and 100 */
+                                 * between 10 and 100
+                                 */
                                 if (phydev->speed == SPEED_100)
                                         ecntrl |= ECNTRL_R100;
                                 else
@@ -3022,7 +3035,8 @@ static void adjust_link(struct net_device *dev)
 /* Update the hash table based on the current list of multicast
  * addresses we subscribe to.  Also, change the promiscuity of
  * the device based on the flags (this function is called
- * whenever dev->flags is changed */
+ * whenever dev->flags is changed
+ */
 static void gfar_set_multi(struct net_device *dev)
 {
         struct netdev_hw_addr *ha;
@@ -3084,7 +3098,8 @@ static void gfar_set_multi(struct net_device *dev)
 
                 /* If we have extended hash tables, we need to
                  * clear the exact match registers to prepare for
-                 * setting them */
+                 * setting them
+                 */
                 if (priv->extended_hash) {
                         em_num = GFAR_EM_NUM + 1;
                         gfar_clear_exact_match(dev);
@@ -3110,13 +3125,14 @@ static void gfar_set_multi(struct net_device *dev)
 
 
 /* Clears each of the exact match registers to zero, so they
- * don't interfere with normal reception */
+ * don't interfere with normal reception
+ */
 static void gfar_clear_exact_match(struct net_device *dev)
 {
         int idx;
         static const u8 zero_arr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
 
-        for(idx = 1;idx < GFAR_EM_NUM + 1;idx++)
+        for (idx = 1; idx < GFAR_EM_NUM + 1; idx++)
                 gfar_set_mac_for_addr(dev, idx, zero_arr);
 }
 
@@ -3132,7 +3148,8 @@ static void gfar_clear_exact_match(struct net_device *dev)
  * hash index which gaddr register to use, and the 5 other bits
  * indicate which bit (assuming an IBM numbering scheme, which
  * for PowerPC (tm) is usually the case) in the register holds
- * the entry. */
+ * the entry.
+ */
 static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr)
 {
         u32 tempval;
@@ -3164,8 +3181,9 @@ static void gfar_set_mac_for_addr(struct net_device *dev, int num,
 
         macptr += num*2;
 
-        /* Now copy it into the mac registers backwards, cuz */
-        /* little endian is silly */
+        /* Now copy it into the mac registers backwards, cuz
+         * little endian is silly
+         */
         for (idx = 0; idx < ETH_ALEN; idx++)
                 tmpbuf[ETH_ALEN - 1 - idx] = addr[idx];
 
@@ -3197,7 +3215,8 @@ static irqreturn_t gfar_error(int irq, void *grp_id)
 
         /* Hmm... */
         if (netif_msg_rx_err(priv) || netif_msg_tx_err(priv))
-                netdev_dbg(dev, "error interrupt (ievent=0x%08x imask=0x%08x)\n",
+                netdev_dbg(dev,
+                           "error interrupt (ievent=0x%08x imask=0x%08x)\n",
                            events, gfar_read(&regs->imask));
 
         /* Update the error counters */
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
index 8a025570d97e..8971921cc1c8 100644
--- a/drivers/net/ethernet/freescale/gianfar_ethtool.c
+++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c
@@ -46,18 +46,24 @@
 #include "gianfar.h"
 
 extern void gfar_start(struct net_device *dev);
-extern int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit);
+extern int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue,
+                              int rx_work_limit);
 
 #define GFAR_MAX_COAL_USECS 0xffff
 #define GFAR_MAX_COAL_FRAMES 0xff
 static void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy,
-                     u64 * buf);
+                            u64 *buf);
 static void gfar_gstrings(struct net_device *dev, u32 stringset, u8 * buf);
-static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals);
-static int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals);
-static void gfar_gringparam(struct net_device *dev, struct ethtool_ringparam *rvals);
-static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rvals);
-static void gfar_gdrvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo);
+static int gfar_gcoalesce(struct net_device *dev,
+                          struct ethtool_coalesce *cvals);
+static int gfar_scoalesce(struct net_device *dev,
+                          struct ethtool_coalesce *cvals);
+static void gfar_gringparam(struct net_device *dev,
+                            struct ethtool_ringparam *rvals);
+static int gfar_sringparam(struct net_device *dev,
+                           struct ethtool_ringparam *rvals);
+static void gfar_gdrvinfo(struct net_device *dev,
+                          struct ethtool_drvinfo *drvinfo);
 
 static const char stat_gstrings[][ETH_GSTRING_LEN] = {
         "rx-dropped-by-kernel",
@@ -130,14 +136,15 @@ static void gfar_gstrings(struct net_device *dev, u32 stringset, u8 * buf)
                 memcpy(buf, stat_gstrings, GFAR_STATS_LEN * ETH_GSTRING_LEN);
         else
                 memcpy(buf, stat_gstrings,
-                                GFAR_EXTRA_STATS_LEN * ETH_GSTRING_LEN);
+                       GFAR_EXTRA_STATS_LEN * ETH_GSTRING_LEN);
 }
 
 /* Fill in an array of 64-bit statistics from various sources.
  * This array will be appended to the end of the ethtool_stats
  * structure, and returned to user space
  */
-static void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy, u64 * buf)
+static void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy,
+                            u64 *buf)
 {
         int i;
         struct gfar_private *priv = netdev_priv(dev);
@@ -174,8 +181,8 @@ static int gfar_sset_count(struct net_device *dev, int sset)
 }
 
 /* Fills in the drvinfo structure with some basic info */
-static void gfar_gdrvinfo(struct net_device *dev, struct
-              ethtool_drvinfo *drvinfo)
+static void gfar_gdrvinfo(struct net_device *dev,
+                          struct ethtool_drvinfo *drvinfo)
 {
         strncpy(drvinfo->driver, DRV_NAME, GFAR_INFOSTR_LEN);
         strncpy(drvinfo->version, gfar_driver_version, GFAR_INFOSTR_LEN);
@@ -226,7 +233,8 @@ static int gfar_reglen(struct net_device *dev)
 }
 
 /* Return a dump of the GFAR register space */
-static void gfar_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *regbuf)
+static void gfar_get_regs(struct net_device *dev, struct ethtool_regs *regs,
+                          void *regbuf)
 {
         int i;
         struct gfar_private *priv = netdev_priv(dev);
@@ -239,7 +247,8 @@ static void gfar_get_regs(struct net_device *dev, struct ethtool_regs *regs, voi
 
 /* Convert microseconds to ethernet clock ticks, which changes
  * depending on what speed the controller is running at */
-static unsigned int gfar_usecs2ticks(struct gfar_private *priv, unsigned int usecs)
+static unsigned int gfar_usecs2ticks(struct gfar_private *priv,
+                                     unsigned int usecs)
 {
         unsigned int count;
 
@@ -263,7 +272,8 @@ static unsigned int gfar_usecs2ticks(struct gfar_private *priv, unsigned int use
 }
 
 /* Convert ethernet clock ticks to microseconds */
-static unsigned int gfar_ticks2usecs(struct gfar_private *priv, unsigned int ticks)
+static unsigned int gfar_ticks2usecs(struct gfar_private *priv,
+                                     unsigned int ticks)
 {
         unsigned int count;
 
@@ -288,7 +298,8 @@ static unsigned int gfar_ticks2usecs(struct gfar_private *priv, unsigned int tic
 
 /* Get the coalescing parameters, and put them in the cvals
  * structure.  */
-static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals)
+static int gfar_gcoalesce(struct net_device *dev,
+                          struct ethtool_coalesce *cvals)
 {
         struct gfar_private *priv = netdev_priv(dev);
         struct gfar_priv_rx_q *rx_queue = NULL;
@@ -353,7 +364,8 @@ static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals
  * Both cvals->*_usecs and cvals->*_frames have to be > 0
  * in order for coalescing to be active
  */
-static int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals)
+static int gfar_scoalesce(struct net_device *dev,
+                          struct ethtool_coalesce *cvals)
 {
         struct gfar_private *priv = netdev_priv(dev);
         int i = 0;
@@ -364,7 +376,8 @@ static int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals
         /* Set up rx coalescing */
         /* As of now, we will enable/disable coalescing for all
          * queues together in case of eTSEC2, this will be modified
-         * along with the ethtool interface */
+         * along with the ethtool interface
+         */
         if ((cvals->rx_coalesce_usecs == 0) ||
             (cvals->rx_max_coalesced_frames == 0)) {
                 for (i = 0; i < priv->num_rx_queues; i++)
@@ -433,7 +446,8 @@ static int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals
 /* Fills in rvals with the current ring parameters.  Currently,
  * rx, rx_mini, and rx_jumbo rings are the same size, as mini and
  * jumbo are ignored by the driver */
-static void gfar_gringparam(struct net_device *dev, struct ethtool_ringparam *rvals)
+static void gfar_gringparam(struct net_device *dev,
+                            struct ethtool_ringparam *rvals)
 {
         struct gfar_private *priv = netdev_priv(dev);
         struct gfar_priv_tx_q *tx_queue = NULL;
@@ -459,8 +473,10 @@ static void gfar_gringparam(struct net_device *dev, struct ethtool_ringparam *rv
 /* Change the current ring parameters, stopping the controller if
  * necessary so that we don't mess things up while we're in
  * motion.  We wait for the ring to be clean before reallocating
- * the rings. */
-static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rvals)
+ * the rings.
+ */
+static int gfar_sringparam(struct net_device *dev,
+                           struct ethtool_ringparam *rvals)
 {
         struct gfar_private *priv = netdev_priv(dev);
         int err = 0, i = 0;
@@ -486,7 +502,8 @@ static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rva
                 unsigned long flags;
 
                 /* Halt TX and RX, and process the frames which
-                 * have already been received */
+                 * have already been received
+                 */
                 local_irq_save(flags);
                 lock_tx_qs(priv);
                 lock_rx_qs(priv);
@@ -499,7 +516,7 @@ static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rva
 
                 for (i = 0; i < priv->num_rx_queues; i++)
                         gfar_clean_rx_ring(priv->rx_queue[i],
-                                        priv->rx_queue[i]->rx_ring_size);
+                                           priv->rx_queue[i]->rx_ring_size);
 
                 /* Now we take down the rings to rebuild them */
                 stop_gfar(dev);
@@ -509,7 +526,8 @@ static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rva
         for (i = 0; i < priv->num_rx_queues; i++) {
                 priv->rx_queue[i]->rx_ring_size = rvals->rx_pending;
                 priv->tx_queue[i]->tx_ring_size = rvals->tx_pending;
-                priv->tx_queue[i]->num_txbdfree = priv->tx_queue[i]->tx_ring_size;
+                priv->tx_queue[i]->num_txbdfree =
+                        priv->tx_queue[i]->tx_ring_size;
         }
 
         /* Rebuild the rings with the new size */
@@ -535,7 +553,8 @@ int gfar_set_features(struct net_device *dev, netdev_features_t features)
 
         if (dev->flags & IFF_UP) {
                 /* Halt TX and RX, and process the frames which
-                 * have already been received */
+                 * have already been received
+                 */
                 local_irq_save(flags);
                 lock_tx_qs(priv);
                 lock_rx_qs(priv);
@@ -548,7 +567,7 @@ int gfar_set_features(struct net_device *dev, netdev_features_t features)
 
                 for (i = 0; i < priv->num_rx_queues; i++)
                         gfar_clean_rx_ring(priv->rx_queue[i],
-                                        priv->rx_queue[i]->rx_ring_size);
+                                           priv->rx_queue[i]->rx_ring_size);
 
                 /* Now we take down the rings to rebuild them */
                 stop_gfar(dev);
@@ -564,12 +583,14 @@ int gfar_set_features(struct net_device *dev, netdev_features_t features)
 static uint32_t gfar_get_msglevel(struct net_device *dev)
 {
         struct gfar_private *priv = netdev_priv(dev);
+
         return priv->msg_enable;
 }
 
 static void gfar_set_msglevel(struct net_device *dev, uint32_t data)
 {
         struct gfar_private *priv = netdev_priv(dev);
+
         priv->msg_enable = data;
 }
 
@@ -614,14 +635,14 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
 
         if (ethflow & RXH_L2DA) {
                 fcr = RQFCR_PID_DAH |RQFCR_CMP_NOMATCH |
-                        RQFCR_HASH | RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_HASH | RQFCR_AND | RQFCR_HASHTBL_0;
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
                 priv->cur_filer_idx = priv->cur_filer_idx - 1;
 
                 fcr = RQFCR_PID_DAL | RQFCR_AND | RQFCR_CMP_NOMATCH |
-                                RQFCR_HASH | RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_HASH | RQFCR_AND | RQFCR_HASHTBL_0;
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
@@ -630,7 +651,7 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
 
         if (ethflow & RXH_VLAN) {
                 fcr = RQFCR_PID_VID | RQFCR_CMP_NOMATCH | RQFCR_HASH |
-                                RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_AND | RQFCR_HASHTBL_0;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
@@ -639,7 +660,7 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
 
         if (ethflow & RXH_IP_SRC) {
                 fcr = RQFCR_PID_SIA | RQFCR_CMP_NOMATCH | RQFCR_HASH |
-                        RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_AND | RQFCR_HASHTBL_0;
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
@@ -648,7 +669,7 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
 
         if (ethflow & (RXH_IP_DST)) {
                 fcr = RQFCR_PID_DIA | RQFCR_CMP_NOMATCH | RQFCR_HASH |
-                        RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_AND | RQFCR_HASHTBL_0;
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
@@ -657,7 +678,7 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
 
         if (ethflow & RXH_L3_PROTO) {
                 fcr = RQFCR_PID_L4P | RQFCR_CMP_NOMATCH | RQFCR_HASH |
-                        RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_AND | RQFCR_HASHTBL_0;
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
@@ -666,7 +687,7 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
 
         if (ethflow & RXH_L4_B_0_1) {
                 fcr = RQFCR_PID_SPT | RQFCR_CMP_NOMATCH | RQFCR_HASH |
-                        RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_AND | RQFCR_HASHTBL_0;
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
@@ -675,7 +696,7 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
 
         if (ethflow & RXH_L4_B_2_3) {
                 fcr = RQFCR_PID_DPT | RQFCR_CMP_NOMATCH | RQFCR_HASH |
-                        RQFCR_AND | RQFCR_HASHTBL_0;
+                      RQFCR_AND | RQFCR_HASHTBL_0;
                 priv->ftp_rqfpr[priv->cur_filer_idx] = fpr;
                 priv->ftp_rqfcr[priv->cur_filer_idx] = fcr;
                 gfar_write_filer(priv, priv->cur_filer_idx, fcr, fpr);
@@ -683,7 +704,8 @@ static void ethflow_to_filer_rules (struct gfar_private *priv, u64 ethflow)
         }
 }
 
-static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u64 class)
+static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow,
+                                       u64 class)
 {
         unsigned int last_rule_idx = priv->cur_filer_idx;
         unsigned int cmp_rqfpr;
@@ -694,9 +716,9 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u
         int ret = 1;
 
         local_rqfpr = kmalloc(sizeof(unsigned int) * (MAX_FILER_IDX + 1),
-                GFP_KERNEL);
+                              GFP_KERNEL);
         local_rqfcr = kmalloc(sizeof(unsigned int) * (MAX_FILER_IDX + 1),
-                GFP_KERNEL);
+                              GFP_KERNEL);
         if (!local_rqfpr || !local_rqfcr) {
                 pr_err("Out of memory\n");
                 ret = 0;
@@ -726,9 +748,9 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u
                 local_rqfpr[j] = priv->ftp_rqfpr[i];
                 local_rqfcr[j] = priv->ftp_rqfcr[i];
                 j--;
-                if ((priv->ftp_rqfcr[i] == (RQFCR_PID_PARSE |
-                        RQFCR_CLE |RQFCR_AND)) &&
-                        (priv->ftp_rqfpr[i] == cmp_rqfpr))
+                if ((priv->ftp_rqfcr[i] ==
+                     (RQFCR_PID_PARSE | RQFCR_CLE | RQFCR_AND)) &&
+                    (priv->ftp_rqfpr[i] == cmp_rqfpr))
                         break;
         }
 
@@ -743,12 +765,12 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u
          */
         for (l = i+1; l < MAX_FILER_IDX; l++) {
                 if ((priv->ftp_rqfcr[l] & RQFCR_CLE) &&
-                        !(priv->ftp_rqfcr[l] & RQFCR_AND)) {
+                    !(priv->ftp_rqfcr[l] & RQFCR_AND)) {
                         priv->ftp_rqfcr[l] = RQFCR_CLE | RQFCR_CMP_EXACT |
-                                RQFCR_HASHTBL_0 | RQFCR_PID_MASK;
+                                             RQFCR_HASHTBL_0 | RQFCR_PID_MASK;
                         priv->ftp_rqfpr[l] = FPR_FILER_MASK;
                         gfar_write_filer(priv, l, priv->ftp_rqfcr[l],
-                                priv->ftp_rqfpr[l]);
+                                         priv->ftp_rqfpr[l]);
                         break;
                 }
 
@@ -773,7 +795,7 @@ static int gfar_ethflow_to_filer_table(struct gfar_private *priv, u64 ethflow, u
                 priv->ftp_rqfpr[priv->cur_filer_idx] = local_rqfpr[k];
                 priv->ftp_rqfcr[priv->cur_filer_idx] = local_rqfcr[k];
                 gfar_write_filer(priv, priv->cur_filer_idx,
-                                local_rqfcr[k], local_rqfpr[k]);
+                                 local_rqfcr[k], local_rqfpr[k]);
                 if (!priv->cur_filer_idx)
                         break;
                 priv->cur_filer_idx = priv->cur_filer_idx - 1;
@@ -785,7 +807,8 @@ err:
         return ret;
 }
 
-static int gfar_set_hash_opts(struct gfar_private *priv, struct ethtool_rxnfc *cmd)
+static int gfar_set_hash_opts(struct gfar_private *priv,
+                              struct ethtool_rxnfc *cmd)
 {
         /* write the filer rules here */
         if (!gfar_ethflow_to_filer_table(priv, cmd->data, cmd->flow_type))
@@ -810,10 +833,10 @@ static int gfar_check_filer_hardware(struct gfar_private *priv)
                 i &= RCTRL_PRSDEP_MASK | RCTRL_PRSFM;
                 if (i == (RCTRL_PRSDEP_MASK | RCTRL_PRSFM)) {
                         netdev_info(priv->ndev,
-                                        "Receive Queue Filtering enabled\n");
+                                    "Receive Queue Filtering enabled\n");
                 } else {
                         netdev_warn(priv->ndev,
-                                        "Receive Queue Filtering disabled\n");
+                                    "Receive Queue Filtering disabled\n");
                         return -EOPNOTSUPP;
                 }
         }
@@ -823,16 +846,17 @@ static int gfar_check_filer_hardware(struct gfar_private *priv)
                 i &= RCTRL_PRSDEP_MASK;
                 if (i == RCTRL_PRSDEP_MASK) {
                         netdev_info(priv->ndev,
-                                        "Receive Queue Filtering enabled\n");
+                                    "Receive Queue Filtering enabled\n");
                 } else {
                         netdev_warn(priv->ndev,
-                                        "Receive Queue Filtering disabled\n");
+                                    "Receive Queue Filtering disabled\n");
                         return -EOPNOTSUPP;
                 }
         }
 
         /* Sets the properties for arbitrary filer rule
-         * to the first 4 Layer 4 Bytes */
+         * to the first 4 Layer 4 Bytes
+         */
         regs->rbifx = 0xC0C1C2C3;
         return 0;
 }
@@ -870,14 +894,14 @@ static void gfar_set_mask(u32 mask, struct filer_table *tab)
 static void gfar_set_parse_bits(u32 value, u32 mask, struct filer_table *tab)
 {
         gfar_set_mask(mask, tab);
-        tab->fe[tab->index].ctrl = RQFCR_CMP_EXACT | RQFCR_PID_PARSE
-                        | RQFCR_AND;
+        tab->fe[tab->index].ctrl = RQFCR_CMP_EXACT | RQFCR_PID_PARSE |
+                                   RQFCR_AND;
         tab->fe[tab->index].prop = value;
         tab->index++;
 }
 
 static void gfar_set_general_attribute(u32 value, u32 mask, u32 flag,
-                struct filer_table *tab)
+                                       struct filer_table *tab)
 {
         gfar_set_mask(mask, tab);
         tab->fe[tab->index].ctrl = RQFCR_CMP_EXACT | RQFCR_AND | flag;
@@ -885,8 +909,7 @@ static void gfar_set_general_attribute(u32 value, u32 mask, u32 flag,
         tab->index++;
 }
 
-/*
- * For setting a tuple of value and mask of type flag
+/* For setting a tuple of value and mask of type flag
  * Example:
  * IP-Src = 10.0.0.0/255.0.0.0
  * value: 0x0A000000 mask: FF000000 flag: RQFPR_IPV4
@@ -901,7 +924,7 @@ static void gfar_set_general_attribute(u32 value, u32 mask, u32 flag,
  * Further the all masks are one-padded for better hardware efficiency.
  */
 static void gfar_set_attribute(u32 value, u32 mask, u32 flag,
-                struct filer_table *tab)
+                               struct filer_table *tab)
 {
         switch (flag) {
                 /* 3bit */
@@ -959,7 +982,8 @@ static void gfar_set_attribute(u32 value, u32 mask, u32 flag,
 
 /* Translates value and mask for UDP, TCP or SCTP */
 static void gfar_set_basic_ip(struct ethtool_tcpip4_spec *value,
-                struct ethtool_tcpip4_spec *mask, struct filer_table *tab)
+                              struct ethtool_tcpip4_spec *mask,
+                              struct filer_table *tab)
 {
         gfar_set_attribute(value->ip4src, mask->ip4src, RQFCR_PID_SIA, tab);
         gfar_set_attribute(value->ip4dst, mask->ip4dst, RQFCR_PID_DIA, tab);
@@ -970,97 +994,92 @@ static void gfar_set_basic_ip(struct ethtool_tcpip4_spec *value,
 
 /* Translates value and mask for RAW-IP4 */
 static void gfar_set_user_ip(struct ethtool_usrip4_spec *value,
-                struct ethtool_usrip4_spec *mask, struct filer_table *tab)
+                             struct ethtool_usrip4_spec *mask,
+                             struct filer_table *tab)
 {
         gfar_set_attribute(value->ip4src, mask->ip4src, RQFCR_PID_SIA, tab);
         gfar_set_attribute(value->ip4dst, mask->ip4dst, RQFCR_PID_DIA, tab);
         gfar_set_attribute(value->tos, mask->tos, RQFCR_PID_TOS, tab);
         gfar_set_attribute(value->proto, mask->proto, RQFCR_PID_L4P, tab);
         gfar_set_attribute(value->l4_4_bytes, mask->l4_4_bytes, RQFCR_PID_ARB,
-                        tab);
+                           tab);
 
 }
 
 /* Translates value and mask for ETHER spec */
 static void gfar_set_ether(struct ethhdr *value, struct ethhdr *mask,
-                struct filer_table *tab)
+                           struct filer_table *tab)
 {
         u32 upper_temp_mask = 0;
         u32 lower_temp_mask = 0;
+
         /* Source address */
         if (!is_broadcast_ether_addr(mask->h_source)) {
-
                 if (is_zero_ether_addr(mask->h_source)) {
                         upper_temp_mask = 0xFFFFFFFF;
                         lower_temp_mask = 0xFFFFFFFF;
                 } else {
-                        upper_temp_mask = mask->h_source[0] << 16
-                                        | mask->h_source[1] << 8
-                                        | mask->h_source[2];
-                        lower_temp_mask = mask->h_source[3] << 16
-                                        | mask->h_source[4] << 8
-                                        | mask->h_source[5];
+                        upper_temp_mask = mask->h_source[0] << 16 |
+                                          mask->h_source[1] << 8  |
+                                          mask->h_source[2];
+                        lower_temp_mask = mask->h_source[3] << 16 |
+                                          mask->h_source[4] << 8  |
+                                          mask->h_source[5];
                 }
                 /* Upper 24bit */
-                gfar_set_attribute(
-                                value->h_source[0] << 16 | value->h_source[1]
-                                                << 8 | value->h_source[2],
-                                upper_temp_mask, RQFCR_PID_SAH, tab);
+                gfar_set_attribute(value->h_source[0] << 16 |
+                                   value->h_source[1] << 8  |
+                                   value->h_source[2],
+                                   upper_temp_mask, RQFCR_PID_SAH, tab);
                 /* And the same for the lower part */
-                gfar_set_attribute(
-                                value->h_source[3] << 16 | value->h_source[4]
-                                                << 8 | value->h_source[5],
-                                lower_temp_mask, RQFCR_PID_SAL, tab);
+                gfar_set_attribute(value->h_source[3] << 16 |
+                                   value->h_source[4] << 8  |
+                                   value->h_source[5],
+                                   lower_temp_mask, RQFCR_PID_SAL, tab);
         }
         /* Destination address */
         if (!is_broadcast_ether_addr(mask->h_dest)) {
-
                 /* Special for destination is limited broadcast */
-                if ((is_broadcast_ether_addr(value->h_dest)
-                                && is_zero_ether_addr(mask->h_dest))) {
+                if ((is_broadcast_ether_addr(value->h_dest) &&
+                    is_zero_ether_addr(mask->h_dest))) {
                         gfar_set_parse_bits(RQFPR_EBC, RQFPR_EBC, tab);
                 } else {
-
                         if (is_zero_ether_addr(mask->h_dest)) {
                                 upper_temp_mask = 0xFFFFFFFF;
                                 lower_temp_mask = 0xFFFFFFFF;
                         } else {
-                                upper_temp_mask = mask->h_dest[0] << 16
-                                                | mask->h_dest[1] << 8
-                                                | mask->h_dest[2];
-                                lower_temp_mask = mask->h_dest[3] << 16
-                                                | mask->h_dest[4] << 8
-                                                | mask->h_dest[5];
+                                upper_temp_mask = mask->h_dest[0] << 16 |
+                                                  mask->h_dest[1] << 8  |
+                                                  mask->h_dest[2];
+                                lower_temp_mask = mask->h_dest[3] << 16 |
+                                                  mask->h_dest[4] << 8  |
+                                                  mask->h_dest[5];
                         }
 
                         /* Upper 24bit */
-                        gfar_set_attribute(
-                                        value->h_dest[0] << 16
-                                                        | value->h_dest[1] << 8
-                                                        | value->h_dest[2],
-                                        upper_temp_mask, RQFCR_PID_DAH, tab);
+                        gfar_set_attribute(value->h_dest[0] << 16 |
+                                           value->h_dest[1] << 8  |
+                                           value->h_dest[2],
+                                           upper_temp_mask, RQFCR_PID_DAH, tab);
                         /* And the same for the lower part */
-                        gfar_set_attribute(
-                                        value->h_dest[3] << 16
-                                                        | value->h_dest[4] << 8
-                                                        | value->h_dest[5],
-                                        lower_temp_mask, RQFCR_PID_DAL, tab);
+                        gfar_set_attribute(value->h_dest[3] << 16 |
+                                           value->h_dest[4] << 8  |
+                                           value->h_dest[5],
+                                           lower_temp_mask, RQFCR_PID_DAL, tab);
                 }
         }
 
         gfar_set_attribute(value->h_proto, mask->h_proto, RQFCR_PID_ETY, tab);
-
 }
 
 /* Convert a rule to binary filter format of gianfar */
 static int gfar_convert_to_filer(struct ethtool_rx_flow_spec *rule,
-                struct filer_table *tab)
+                                 struct filer_table *tab)
 {
         u32 vlan = 0, vlan_mask = 0;
         u32 id = 0, id_mask = 0;
         u32 cfi = 0, cfi_mask = 0;
         u32 prio = 0, prio_mask = 0;
-
         u32 old_index = tab->index;
 
         /* Check if vlan is wanted */
@@ -1076,13 +1095,16 @@ static int gfar_convert_to_filer(struct ethtool_rx_flow_spec *rule,
                 id_mask = rule->m_ext.vlan_tci & VLAN_VID_MASK;
                 cfi = rule->h_ext.vlan_tci & VLAN_CFI_MASK;
                 cfi_mask = rule->m_ext.vlan_tci & VLAN_CFI_MASK;
-                prio = (rule->h_ext.vlan_tci & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;
-                prio_mask = (rule->m_ext.vlan_tci & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;
+                prio = (rule->h_ext.vlan_tci & VLAN_PRIO_MASK) >>
+                       VLAN_PRIO_SHIFT;
+                prio_mask = (rule->m_ext.vlan_tci & VLAN_PRIO_MASK) >>
+                            VLAN_PRIO_SHIFT;
 
                 if (cfi == VLAN_TAG_PRESENT && cfi_mask == VLAN_TAG_PRESENT) {
                         vlan |= RQFPR_CFI;
                         vlan_mask |= RQFPR_CFI;
-                } else if (cfi != VLAN_TAG_PRESENT && cfi_mask == VLAN_TAG_PRESENT) {
+                } else if (cfi != VLAN_TAG_PRESENT &&
+                           cfi_mask == VLAN_TAG_PRESENT) {
                         vlan_mask |= RQFPR_CFI;
                 }
         }
@@ -1090,34 +1112,36 @@ static int gfar_convert_to_filer(struct ethtool_rx_flow_spec *rule,
         switch (rule->flow_type & ~FLOW_EXT) {
         case TCP_V4_FLOW:
                 gfar_set_parse_bits(RQFPR_IPV4 | RQFPR_TCP | vlan,
-                                RQFPR_IPV4 | RQFPR_TCP | vlan_mask, tab);
+                                    RQFPR_IPV4 | RQFPR_TCP | vlan_mask, tab);
                 gfar_set_basic_ip(&rule->h_u.tcp_ip4_spec,
-                                &rule->m_u.tcp_ip4_spec, tab);
+                                  &rule->m_u.tcp_ip4_spec, tab);
                 break;
         case UDP_V4_FLOW:
                 gfar_set_parse_bits(RQFPR_IPV4 | RQFPR_UDP | vlan,
-                                RQFPR_IPV4 | RQFPR_UDP | vlan_mask, tab);
+                                    RQFPR_IPV4 | RQFPR_UDP | vlan_mask, tab);
                 gfar_set_basic_ip(&rule->h_u.udp_ip4_spec,
-                                &rule->m_u.udp_ip4_spec, tab);
+                                  &rule->m_u.udp_ip4_spec, tab);
                 break;
         case SCTP_V4_FLOW:
                 gfar_set_parse_bits(RQFPR_IPV4 | vlan, RQFPR_IPV4 | vlan_mask,
-                                tab);
+                                    tab);
                 gfar_set_attribute(132, 0, RQFCR_PID_L4P, tab);
-                gfar_set_basic_ip((struct ethtool_tcpip4_spec *) &rule->h_u,
-                                (struct ethtool_tcpip4_spec *) &rule->m_u, tab);
+                gfar_set_basic_ip((struct ethtool_tcpip4_spec *)&rule->h_u,
+                                  (struct ethtool_tcpip4_spec *)&rule->m_u,
+                                  tab);
                 break;
         case IP_USER_FLOW:
                 gfar_set_parse_bits(RQFPR_IPV4 | vlan, RQFPR_IPV4 | vlan_mask,
-                                tab);
+                                    tab);
                 gfar_set_user_ip((struct ethtool_usrip4_spec *) &rule->h_u,
-                                (struct ethtool_usrip4_spec *) &rule->m_u, tab);
+                                 (struct ethtool_usrip4_spec *) &rule->m_u,
+                                 tab);
                 break;
         case ETHER_FLOW:
                 if (vlan)
                         gfar_set_parse_bits(vlan, vlan_mask, tab);
                 gfar_set_ether((struct ethhdr *) &rule->h_u,
-                                (struct ethhdr *) &rule->m_u, tab);
+                               (struct ethhdr *) &rule->m_u, tab);
                 break;
         default:
                 return -1;
@@ -1152,7 +1176,9 @@ static int gfar_convert_to_filer(struct ethtool_rx_flow_spec *rule,
                 tab->fe[tab->index - 1].ctrl |= RQFCR_CLE;
         }
 
-        /* In rare cases the cache can be full while there is free space in hw */
+        /* In rare cases the cache can be full while there is
+         * free space in hw
+         */
         if (tab->index > MAX_FILER_CACHE_IDX - 1)
                 return -EBUSY;
 
@@ -1161,7 +1187,7 @@ static int gfar_convert_to_filer(struct ethtool_rx_flow_spec *rule,
 
 /* Copy size filer entries */
 static void gfar_copy_filer_entries(struct gfar_filer_entry dst[0],
-                struct gfar_filer_entry src[0], s32 size)
+                                    struct gfar_filer_entry src[0], s32 size)
 {
         while (size > 0) {
                 size--;
@@ -1171,10 +1197,12 @@ static void gfar_copy_filer_entries(struct gfar_filer_entry dst[0],
 }
 
 /* Delete the contents of the filer-table between start and end
- * and collapse them */
+ * and collapse them
+ */
 static int gfar_trim_filer_entries(u32 begin, u32 end, struct filer_table *tab)
 {
         int length;
+
         if (end > MAX_FILER_CACHE_IDX || end < begin)
                 return -EINVAL;
 
@@ -1200,14 +1228,14 @@ static int gfar_trim_filer_entries(u32 begin, u32 end, struct filer_table *tab)
 
 /* Make space on the wanted location */
 static int gfar_expand_filer_entries(u32 begin, u32 length,
-                struct filer_table *tab)
+                                     struct filer_table *tab)
 {
-        if (length == 0 || length + tab->index > MAX_FILER_CACHE_IDX || begin
-                        > MAX_FILER_CACHE_IDX)
+        if (length == 0 || length + tab->index > MAX_FILER_CACHE_IDX ||
+            begin > MAX_FILER_CACHE_IDX)
                 return -EINVAL;
 
         gfar_copy_filer_entries(&(tab->fe[begin + length]), &(tab->fe[begin]),
-                        tab->index - length + 1);
+                                tab->index - length + 1);
 
         tab->index += length;
         return 0;
@@ -1215,9 +1243,10 @@ static int gfar_expand_filer_entries(u32 begin, u32 length,
 
 static int gfar_get_next_cluster_start(int start, struct filer_table *tab)
 {
-        for (; (start < tab->index) && (start < MAX_FILER_CACHE_IDX - 1); start++) {
-                if ((tab->fe[start].ctrl & (RQFCR_AND | RQFCR_CLE))
-                                == (RQFCR_AND | RQFCR_CLE))
+        for (; (start < tab->index) && (start < MAX_FILER_CACHE_IDX - 1);
+             start++) {
+                if ((tab->fe[start].ctrl & (RQFCR_AND | RQFCR_CLE)) ==
+                    (RQFCR_AND | RQFCR_CLE))
                         return start;
         }
         return -1;
@@ -1225,16 +1254,16 @@ static int gfar_get_next_cluster_start(int start, struct filer_table *tab)
 
 static int gfar_get_next_cluster_end(int start, struct filer_table *tab)
 {
-        for (; (start < tab->index) && (start < MAX_FILER_CACHE_IDX - 1); start++) {
-                if ((tab->fe[start].ctrl & (RQFCR_AND | RQFCR_CLE))
-                                == (RQFCR_CLE))
+        for (; (start < tab->index) && (start < MAX_FILER_CACHE_IDX - 1);
+             start++) {
+                if ((tab->fe[start].ctrl & (RQFCR_AND | RQFCR_CLE)) ==
+                    (RQFCR_CLE))
                         return start;
         }
         return -1;
 }
 
-/*
- * Uses hardwares clustering option to reduce
+/* Uses hardwares clustering option to reduce
  * the number of filer table entries
  */
 static void gfar_cluster_filer(struct filer_table *tab)
@@ -1244,8 +1273,7 @@ static void gfar_cluster_filer(struct filer_table *tab)
         while ((i = gfar_get_next_cluster_start(++i, tab)) != -1) {
                 j = i;
                 while ((j = gfar_get_next_cluster_start(++j, tab)) != -1) {
-                        /*
-                         * The cluster entries self and the previous one
+                        /* The cluster entries self and the previous one
                          * (a mask) must be identical!
                          */
                         if (tab->fe[i].ctrl != tab->fe[j].ctrl)
@@ -1260,21 +1288,21 @@ static void gfar_cluster_filer(struct filer_table *tab)
                         jend = gfar_get_next_cluster_end(j, tab);
                         if (jend == -1 || iend == -1)
                                 break;
-                        /*
-                         * First we make some free space, where our cluster
+
+                        /* First we make some free space, where our cluster
                          * element should be. Then we copy it there and finally
                          * delete in from its old location.
                          */
-
-                        if (gfar_expand_filer_entries(iend, (jend - j), tab)
-                                        == -EINVAL)
+                        if (gfar_expand_filer_entries(iend, (jend - j), tab) ==
+                            -EINVAL)
                                 break;
 
                         gfar_copy_filer_entries(&(tab->fe[iend + 1]),
-                                        &(tab->fe[jend + 1]), jend - j);
+                                                &(tab->fe[jend + 1]), jend - j);
 
                         if (gfar_trim_filer_entries(jend - 1,
-                                        jend + (jend - j), tab) == -EINVAL)
+                                                    jend + (jend - j),
+                                                    tab) == -EINVAL)
                                 return;
 
                         /* Mask out cluster bit */
@@ -1285,8 +1313,9 @@ static void gfar_cluster_filer(struct filer_table *tab)
 
 /* Swaps the masked bits of a1<>a2 and b1<>b2 */
 static void gfar_swap_bits(struct gfar_filer_entry *a1,
-                struct gfar_filer_entry *a2, struct gfar_filer_entry *b1,
-                struct gfar_filer_entry *b2, u32 mask)
+                           struct gfar_filer_entry *a2,
+                           struct gfar_filer_entry *b1,
+                           struct gfar_filer_entry *b2, u32 mask)
 {
         u32 temp[4];
         temp[0] = a1->ctrl & mask;
@@ -1305,13 +1334,12 @@ static void gfar_swap_bits(struct gfar_filer_entry *a1,
         b2->ctrl |= temp[2];
 }
 
-/*
- * Generate a list consisting of masks values with their start and
+/* Generate a list consisting of masks values with their start and
  * end of validity and block as indicator for parts belonging
  * together (glued by ANDs) in mask_table
  */
 static u32 gfar_generate_mask_table(struct gfar_mask_entry *mask_table,
-                struct filer_table *tab)
+                                    struct filer_table *tab)
 {
         u32 i, and_index = 0, block_index = 1;
 
@@ -1327,13 +1355,13 @@ static u32 gfar_generate_mask_table(struct gfar_mask_entry *mask_table,
                         and_index++;
                 }
                 /* cluster starts and ends will be separated because they should
-                 * hold their position */
+                 * hold their position
+                 */
                 if (tab->fe[i].ctrl & RQFCR_CLE)
                         block_index++;
                 /* A not set AND indicates the end of a depended block */
                 if (!(tab->fe[i].ctrl & RQFCR_AND))
                         block_index++;
-
         }
 
         mask_table[and_index - 1].end = i - 1;
@@ -1341,14 +1369,13 @@ static u32 gfar_generate_mask_table(struct gfar_mask_entry *mask_table,
         return and_index;
 }
 
-/*
- * Sorts the entries of mask_table by the values of the masks.
+/* Sorts the entries of mask_table by the values of the masks.
  * Important: The 0xFF80 flags of the first and last entry of a
  * block must hold their position (which queue, CLusterEnable, ReJEct,
  * AND)
  */
 static void gfar_sort_mask_table(struct gfar_mask_entry *mask_table,
-                struct filer_table *temp_table, u32 and_index)
+                                 struct filer_table *temp_table, u32 and_index)
 {
         /* Pointer to compare function (_asc or _desc) */
         int (*gfar_comp)(const void *, const void *);
@@ -1359,16 +1386,16 @@ static void gfar_sort_mask_table(struct gfar_mask_entry *mask_table,
         gfar_comp = &gfar_comp_desc;
 
         for (i = 0; i < and_index; i++) {
-
                 if (prev != mask_table[i].block) {
                         old_first = mask_table[start].start + 1;
                         old_last = mask_table[i - 1].end;
                         sort(mask_table + start, size,
-                                        sizeof(struct gfar_mask_entry),
-                                        gfar_comp, &gfar_swap);
+                             sizeof(struct gfar_mask_entry),
+                             gfar_comp, &gfar_swap);
 
                         /* Toggle order for every block. This makes the
-                         * thing more efficient! */
+                         * thing more efficient!
+                         */
                         if (gfar_comp == gfar_comp_desc)
                                 gfar_comp = &gfar_comp_asc;
                         else
@@ -1378,12 +1405,11 @@ static void gfar_sort_mask_table(struct gfar_mask_entry *mask_table,
                         new_last = mask_table[i - 1].end;
 
                         gfar_swap_bits(&temp_table->fe[new_first],
-                                        &temp_table->fe[old_first],
-                                        &temp_table->fe[new_last],
-                                        &temp_table->fe[old_last],
-                                        RQFCR_QUEUE | RQFCR_CLE |
-                                                RQFCR_RJE | RQFCR_AND
-                                        );
+                                       &temp_table->fe[old_first],
+                                       &temp_table->fe[new_last],
+                                       &temp_table->fe[old_last],
+                                       RQFCR_QUEUE | RQFCR_CLE |
+                                       RQFCR_RJE | RQFCR_AND);
 
                         start = i;
                         size = 0;
@@ -1391,11 +1417,9 @@ static void gfar_sort_mask_table(struct gfar_mask_entry *mask_table,
                 size++;
                 prev = mask_table[i].block;
         }
-
 }
 
-/*
- * Reduces the number of masks needed in the filer table to save entries
+/* Reduces the number of masks needed in the filer table to save entries
  * This is done by sorting the masks of a depended block. A depended block is
  * identified by gluing ANDs or CLE. The sorting order toggles after every
  * block. Of course entries in scope of a mask must change their location with
@@ -1410,13 +1434,14 @@ static int gfar_optimize_filer_masks(struct filer_table *tab)
         s32 ret = 0;
 
         /* We need a copy of the filer table because
-         * we want to change its order */
+         * we want to change its order
+         */
         temp_table = kmemdup(tab, sizeof(*temp_table), GFP_KERNEL);
         if (temp_table == NULL)
                 return -ENOMEM;
 
         mask_table = kcalloc(MAX_FILER_CACHE_IDX / 2 + 1,
-                        sizeof(struct gfar_mask_entry), GFP_KERNEL);
+                             sizeof(struct gfar_mask_entry), GFP_KERNEL);
 
         if (mask_table == NULL) {
                 ret = -ENOMEM;
@@ -1428,7 +1453,8 @@ static int gfar_optimize_filer_masks(struct filer_table *tab)
         gfar_sort_mask_table(mask_table, temp_table, and_index);
 
         /* Now we can copy the data from our duplicated filer table to
-         * the real one in the order the mask table says */
+         * the real one in the order the mask table says
+         */
         for (i = 0; i < and_index; i++) {
                 size = mask_table[i].end - mask_table[i].start + 1;
                 gfar_copy_filer_entries(&(tab->fe[j]),
@@ -1437,7 +1463,8 @@ static int gfar_optimize_filer_masks(struct filer_table *tab)
         }
 
         /* And finally we just have to check for duplicated masks and drop the
-         * second ones */
+         * second ones
+         */
         for (i = 0; i < tab->index && i < MAX_FILER_CACHE_IDX; i++) {
                 if (tab->fe[i].ctrl == 0x80) {
                         previous_mask = i++;
@@ -1448,7 +1475,8 @@ static int gfar_optimize_filer_masks(struct filer_table *tab)
                 if (tab->fe[i].ctrl == 0x80) {
                         if (tab->fe[i].prop == tab->fe[previous_mask].prop) {
                                 /* Two identical ones found!
-                                 * So drop the second one! */
+                                 * So drop the second one!
+                                 */
                                 gfar_trim_filer_entries(i, i, tab);
                         } else
                                 /* Not identical! */
@@ -1463,7 +1491,7 @@ end:	kfree(temp_table);
 
 /* Write the bit-pattern from software's buffer to hardware registers */
 static int gfar_write_filer_table(struct gfar_private *priv,
-                struct filer_table *tab)
+                                  struct filer_table *tab)
 {
         u32 i = 0;
         if (tab->index > MAX_FILER_IDX - 1)
@@ -1473,13 +1501,15 @@ static int gfar_write_filer_table(struct gfar_private *priv,
         lock_rx_qs(priv);
 
         /* Fill regular entries */
-        for (; i < MAX_FILER_IDX - 1 && (tab->fe[i].ctrl | tab->fe[i].ctrl); i++)
+        for (; i < MAX_FILER_IDX - 1 && (tab->fe[i].ctrl | tab->fe[i].ctrl);
+             i++)
                 gfar_write_filer(priv, i, tab->fe[i].ctrl, tab->fe[i].prop);
         /* Fill the rest with fall-troughs */
         for (; i < MAX_FILER_IDX - 1; i++)
                 gfar_write_filer(priv, i, 0x60, 0xFFFFFFFF);
         /* Last entry must be default accept
-         * because that's what people expect */
+         * because that's what people expect
+         */
         gfar_write_filer(priv, i, 0x20, 0x0);
 
         unlock_rx_qs(priv);
@@ -1488,21 +1518,21 @@ static int gfar_write_filer_table(struct gfar_private *priv,
 }
 
 static int gfar_check_capability(struct ethtool_rx_flow_spec *flow,
-                struct gfar_private *priv)
+                                 struct gfar_private *priv)
 {
 
         if (flow->flow_type & FLOW_EXT) {
                 if (~flow->m_ext.data[0] || ~flow->m_ext.data[1])
                         netdev_warn(priv->ndev,
-                                        "User-specific data not supported!\n");
+                                    "User-specific data not supported!\n");
                 if (~flow->m_ext.vlan_etype)
                         netdev_warn(priv->ndev,
-                                        "VLAN-etype not supported!\n");
+                                    "VLAN-etype not supported!\n");
         }
         if (flow->flow_type == IP_USER_FLOW)
                 if (flow->h_u.usr_ip4_spec.ip_ver != ETH_RX_NFC_IP4)
                         netdev_warn(priv->ndev,
-                                        "IP-Version differing from IPv4 not supported!\n");
+                                    "IP-Version differing from IPv4 not supported!\n");
 
         return 0;
 }
@@ -1520,15 +1550,18 @@ static int gfar_process_filer_changes(struct gfar_private *priv)
                 return -ENOMEM;
 
         /* Now convert the existing filer data from flow_spec into
-         * filer tables binary format */
+         * filer tables binary format
+         */
         list_for_each_entry(j, &priv->rx_list.list, list) {
                 ret = gfar_convert_to_filer(&j->fs, tab);
                 if (ret == -EBUSY) {
-                        netdev_err(priv->ndev, "Rule not added: No free space!\n");
+                        netdev_err(priv->ndev,
+                                   "Rule not added: No free space!\n");
                         goto end;
                 }
                 if (ret == -1) {
-                        netdev_err(priv->ndev, "Rule not added: Unsupported Flow-type!\n");
+                        netdev_err(priv->ndev,
+                                   "Rule not added: Unsupported Flow-type!\n");
                         goto end;
                 }
         }
@@ -1540,9 +1573,9 @@ static int gfar_process_filer_changes(struct gfar_private *priv)
         gfar_optimize_filer_masks(tab);
 
         pr_debug("\n\tSummary:\n"
-                "\tData on hardware: %d\n"
-                "\tCompression rate: %d%%\n",
-                tab->index, 100 - (100 * tab->index) / i);
+                 "\tData on hardware: %d\n"
+                 "\tCompression rate: %d%%\n",
+                 tab->index, 100 - (100 * tab->index) / i);
 
         /* Write everything to hardware */
         ret = gfar_write_filer_table(priv, tab);
@@ -1551,7 +1584,8 @@ static int gfar_process_filer_changes(struct gfar_private *priv)
                 goto end;
         }
 
-end:    kfree(tab);
+end:
+        kfree(tab);
         return ret;
 }
 
@@ -1569,7 +1603,7 @@ static void gfar_invert_masks(struct ethtool_rx_flow_spec *flow)
 }
 
 static int gfar_add_cls(struct gfar_private *priv,
-                struct ethtool_rx_flow_spec *flow)
+                        struct ethtool_rx_flow_spec *flow)
 {
         struct ethtool_flow_spec_container *temp, *comp;
         int ret = 0;
@@ -1591,7 +1625,6 @@ static int gfar_add_cls(struct gfar_private *priv,
                 list_add(&temp->list, &priv->rx_list.list);
                 goto process;
         } else {
-
                 list_for_each_entry(comp, &priv->rx_list.list, list) {
                         if (comp->fs.location > flow->location) {
                                 list_add_tail(&temp->list, &comp->list);
@@ -1599,8 +1632,8 @@ static int gfar_add_cls(struct gfar_private *priv,
                         }
                         if (comp->fs.location == flow->location) {
                                 netdev_err(priv->ndev,
-                                                "Rule not added: ID %d not free!\n",
-                                        flow->location);
+                                           "Rule not added: ID %d not free!\n",
+                                           flow->location);
                                 ret = -EBUSY;
                                 goto clean_mem;
                         }
@@ -1642,7 +1675,6 @@ static int gfar_del_cls(struct gfar_private *priv, u32 loc)
         }
 
         return ret;
-
 }
 
 static int gfar_get_cls(struct gfar_private *priv, struct ethtool_rxnfc *cmd)
@@ -1663,7 +1695,7 @@ static int gfar_get_cls(struct gfar_private *priv, struct ethtool_rxnfc *cmd)
 }
 
 static int gfar_get_cls_all(struct gfar_private *priv,
-                struct ethtool_rxnfc *cmd, u32 *rule_locs)
+                            struct ethtool_rxnfc *cmd, u32 *rule_locs)
 {
         struct ethtool_flow_spec_container *comp;
         u32 i = 0;
@@ -1714,7 +1746,7 @@ static int gfar_set_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
 }
 
 static int gfar_get_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
-                u32 *rule_locs)
+                        u32 *rule_locs)
 {
         struct gfar_private *priv = netdev_priv(dev);
         int ret = 0;
@@ -1748,23 +1780,19 @@ static int gfar_get_ts_info(struct net_device *dev,
         struct gfar_private *priv = netdev_priv(dev);
 
         if (!(priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER)) {
-                info->so_timestamping =
-                        SOF_TIMESTAMPING_RX_SOFTWARE |
-                        SOF_TIMESTAMPING_SOFTWARE;
+                info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
+                                        SOF_TIMESTAMPING_SOFTWARE;
                 info->phc_index = -1;
                 return 0;
         }
-        info->so_timestamping =
-                SOF_TIMESTAMPING_TX_HARDWARE |
-                SOF_TIMESTAMPING_RX_HARDWARE |
-                SOF_TIMESTAMPING_RAW_HARDWARE;
+        info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |
+                                SOF_TIMESTAMPING_RX_HARDWARE |
+                                SOF_TIMESTAMPING_RAW_HARDWARE;
         info->phc_index = gfar_phc_index;
-        info->tx_types =
-                (1 << HWTSTAMP_TX_OFF) |
-                (1 << HWTSTAMP_TX_ON);
-        info->rx_filters =
-                (1 << HWTSTAMP_FILTER_NONE) |
-                (1 << HWTSTAMP_FILTER_ALL);
+        info->tx_types = (1 << HWTSTAMP_TX_OFF) |
+                         (1 << HWTSTAMP_TX_ON);
+        info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |
+                           (1 << HWTSTAMP_FILTER_ALL);
         return 0;
 }
 
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 9ac14f804851..21c6574c5f15 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -185,7 +185,7 @@ static void mem_disp(u8 *addr, int size)
         for (; (u32) i < (u32) addr + size4Aling; i += 4)
                 printk("%08x ", *((u32 *) (i)));
         for (; (u32) i < (u32) addr + size; i++)
-                printk("%02x", *((u8 *) (i)));
+                printk("%02x", *((i)));
         if (notAlign == 1)
                 printk("\r\n");
 }
diff --git a/drivers/net/ethernet/hp/hp100.c b/drivers/net/ethernet/hp/hp100.c
index d496673f0908..3f4391bede81 100644
--- a/drivers/net/ethernet/hp/hp100.c
+++ b/drivers/net/ethernet/hp/hp100.c
@@ -1217,7 +1217,7 @@ static int hp100_init_rxpdl(struct net_device *dev,
 
         ringptr->pdl = pdlptr + 1;
         ringptr->pdl_paddr = virt_to_whatever(dev, pdlptr + 1);
-        ringptr->skb = (void *) NULL;
+        ringptr->skb = NULL;
 
         /*
          * Write address and length of first PDL Fragment (which is used for
@@ -1243,7 +1243,7 @@ static int hp100_init_txpdl(struct net_device *dev,
 
         ringptr->pdl = pdlptr;  /* +1; */
         ringptr->pdl_paddr = virt_to_whatever(dev, pdlptr);     /* +1 */
-        ringptr->skb = (void *) NULL;
+        ringptr->skb = NULL;
 
         return roundup(MAX_TX_FRAG * 2 + 2, 4);
 }
@@ -1628,7 +1628,7 @@ static void hp100_clean_txring(struct net_device *dev)
                 /* Conversion to new PCI API : NOP */
                 pci_unmap_single(lp->pci_dev, (dma_addr_t) lp->txrhead->pdl[1], lp->txrhead->pdl[2], PCI_DMA_TODEVICE);
                 dev_kfree_skb_any(lp->txrhead->skb);
-                lp->txrhead->skb = (void *) NULL;
+                lp->txrhead->skb = NULL;
                 lp->txrhead = lp->txrhead->next;
                 lp->txrcommit--;
         }
diff --git a/drivers/net/ethernet/i825xx/lp486e.c b/drivers/net/ethernet/i825xx/lp486e.c
index 6c2952c8ea15..3735bfa53600 100644
--- a/drivers/net/ethernet/i825xx/lp486e.c
+++ b/drivers/net/ethernet/i825xx/lp486e.c
@@ -629,10 +629,10 @@ init_i596(struct net_device *dev) {
 
         memcpy ((void *)lp->eth_addr, dev->dev_addr, 6);
         lp->set_add.command = CmdIASetup;
-        i596_add_cmd(dev, (struct i596_cmd *)&lp->set_add);
+        i596_add_cmd(dev, &lp->set_add);
 
         lp->tdr.command = CmdTDR;
-        i596_add_cmd(dev, (struct i596_cmd *)&lp->tdr);
+        i596_add_cmd(dev, &lp->tdr);
 
         if (lp->scb.command && i596_timeout(dev, "i82596 init", 200))
                 return 1;
@@ -737,7 +737,7 @@ i596_cleanup_cmd(struct net_device *dev) {
 
         lp = netdev_priv(dev);
         while (lp->cmd_head) {
-                cmd = (struct i596_cmd *)lp->cmd_head;
+                cmd = lp->cmd_head;
 
                 lp->cmd_head = pa_to_va(lp->cmd_head->pa_next);
                 lp->cmd_backlog--;
@@ -1281,7 +1281,7 @@ static void set_multicast_list(struct net_device *dev) {
                         lp->i596_config[8] |= 0x01;
                 }
 
-                i596_add_cmd(dev, (struct i596_cmd *) &lp->set_conf);
+                i596_add_cmd(dev, &lp->set_conf);
         }
 }
 
diff --git a/drivers/net/ethernet/i825xx/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c
index cae17f4bc93e..353f57f675d0 100644
--- a/drivers/net/ethernet/i825xx/sun3_82586.c
+++ b/drivers/net/ethernet/i825xx/sun3_82586.c
@@ -571,7 +571,7 @@ static int init586(struct net_device *dev)
         }
 #endif
 
-        ptr = alloc_rfa(dev,(void *)ptr); /* init receive-frame-area */
+        ptr = alloc_rfa(dev,ptr); /* init receive-frame-area */
 
         /*
          * alloc xmit-buffs / init xmit_cmds
@@ -584,7 +584,7 @@ static int init586(struct net_device *dev)
                 ptr = (char *) ptr + XMIT_BUFF_SIZE;
                 p->xmit_buffs[i] = (struct tbd_struct *)ptr; /* TBD */
                 ptr = (char *) ptr + sizeof(struct tbd_struct);
-                if((void *)ptr > (void *)dev->mem_end)
+                if(ptr > (void *)dev->mem_end)
                 {
                         printk("%s: not enough shared-mem for your configuration!\n",dev->name);
                         return 1;
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index f0f06b2bc28b..770ee557924c 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -1896,7 +1896,7 @@ static int rxq_init(struct mv643xx_eth_private *mp, int index)
                 goto out_free;
         }
 
-        rx_desc = (struct rx_desc *)rxq->rx_desc_area;
+        rx_desc = rxq->rx_desc_area;
         for (i = 0; i < rxq->rx_ring_size; i++) {
                 int nexti;
 
@@ -2001,7 +2001,7 @@ static int txq_init(struct mv643xx_eth_private *mp, int index)
 
         txq->tx_desc_area_size = size;
 
-        tx_desc = (struct tx_desc *)txq->tx_desc_area;
+        tx_desc = txq->tx_desc_area;
         for (i = 0; i < txq->tx_ring_size; i++) {
                 struct tx_desc *txd = tx_desc + i;
                 int nexti;
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 1db023b075a1..59489722e898 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1032,7 +1032,7 @@ static int rxq_init(struct net_device *dev)
         }
         memset((void *)pep->p_rx_desc_area, 0, size);
         /* initialize the next_desc_ptr links in the Rx descriptors ring */
-        p_rx_desc = (struct rx_desc *)pep->p_rx_desc_area;
+        p_rx_desc = pep->p_rx_desc_area;
         for (i = 0; i < rx_desc_num; i++) {
                 p_rx_desc[i].next_desc_ptr = pep->rx_desc_dma +
                     ((i + 1) % rx_desc_num) * sizeof(struct rx_desc);
@@ -1095,7 +1095,7 @@ static int txq_init(struct net_device *dev)
         }
         memset((void *)pep->p_tx_desc_area, 0, pep->tx_desc_area_size);
         /* Initialize the next_desc_ptr links in the Tx descriptors ring */
-        p_tx_desc = (struct tx_desc *)pep->p_tx_desc_area;
+        p_tx_desc = pep->p_tx_desc_area;
         for (i = 0; i < tx_desc_num; i++) {
                 p_tx_desc[i].next_desc_ptr = pep->tx_desc_dma +
                     ((i + 1) % tx_desc_num) * sizeof(struct tx_desc);
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index b45d0e7f6ab0..766b8c5a235e 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -779,7 +779,7 @@ static int qp_res_start_move_to(struct mlx4_dev *dev, int slave, int qpn,
                         r->com.to_state = state;
                         r->com.state = RES_QP_BUSY;
                         if (qp)
-                                *qp = (struct res_qp *)r;
+                                *qp = r;
                 }
         }
 
@@ -832,7 +832,7 @@ static int mr_res_start_move_to(struct mlx4_dev *dev, int slave, int index,
                         r->com.to_state = state;
                         r->com.state = RES_MPT_BUSY;
                         if (mpt)
-                                *mpt = (struct res_mpt *)r;
+                                *mpt = r;
                 }
         }
 
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
index 5ffde23ac8fb..875dd5e264eb 100644
--- a/drivers/net/ethernet/micrel/ks8851_mll.c
+++ b/drivers/net/ethernet/micrel/ks8851_mll.c
@@ -35,7 +35,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <asm/io.h>
+#include <linux/ks8851_mll.h>
 
 #define DRV_NAME        "ks8851_mll"
 
@@ -1515,6 +1515,7 @@ static int __devinit ks8851_probe(struct platform_device *pdev)
         struct net_device *netdev;
         struct ks_net *ks;
         u16 id, data;
+        struct ks8851_mll_platform_data *pdata;
 
         io_d = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         io_c = platform_get_resource(pdev, IORESOURCE_MEM, 1);
@@ -1596,17 +1597,27 @@ static int __devinit ks8851_probe(struct platform_device *pdev)
         ks_disable_qmu(ks);
         ks_setup(ks);
         ks_setup_int(ks);
-        memcpy(netdev->dev_addr, ks->mac_addr, 6);
 
         data = ks_rdreg16(ks, KS_OBCR);
         ks_wrreg16(ks, KS_OBCR, data | OBCR_ODS_16MA);
 
-        /**
-         * If you want to use the default MAC addr,
-         * comment out the 2 functions below.
-         */
+        /* overwriting the default MAC address */
+        pdata = pdev->dev.platform_data;
+        if (!pdata) {
+                netdev_err(netdev, "No platform data\n");
+                err = -ENODEV;
+                goto err_pdata;
+        }
+        memcpy(ks->mac_addr, pdata->mac_addr, 6);
+        if (!is_valid_ether_addr(ks->mac_addr)) {
+                /* Use random MAC address if none passed */
+                random_ether_addr(ks->mac_addr);
+                netdev_info(netdev, "Using random mac address\n");
+        }
+        netdev_info(netdev, "Mac address is: %pM\n", ks->mac_addr);
+
+        memcpy(netdev->dev_addr, ks->mac_addr, 6);
 
-        random_ether_addr(netdev->dev_addr);
         ks_set_mac(ks, netdev->dev_addr);
 
         id = ks_rdreg16(ks, KS_CIDER);
@@ -1615,6 +1626,8 @@ static int __devinit ks8851_probe(struct platform_device *pdev)
                     (id >> 8) & 0xff, (id >> 4) & 0xf, (id >> 1) & 0x7);
         return 0;
 
+err_pdata:
+        unregister_netdev(netdev);
 err_register:
 err_get_irq:
         iounmap(ks->hw_addr_cmd);
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index bb367582c1e8..e7cd587d8ae7 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -6946,9 +6946,9 @@ static  int rxd_owner_bit_reset(struct s2io_nic *sp)
                                 if (sp->rxd_mode == RXD_MODE_3B)
                                         ba = &ring->ba[j][k];
                                 if (set_rxd_buffer_pointer(sp, rxdp, ba, &skb,
-                                                           (u64 *)&temp0_64,
-                                                           (u64 *)&temp1_64,
-                                                           (u64 *)&temp2_64,
+                                                           &temp0_64,
+                                                           &temp1_64,
+                                                           &temp2_64,
                                                            size) == -ENOMEM) {
                                         return 0;
                                 }
@@ -7149,7 +7149,7 @@ static int s2io_card_up(struct s2io_nic *sp)
         int i, ret = 0;
         struct config_param *config;
         struct mac_info *mac_control;
-        struct net_device *dev = (struct net_device *)sp->dev;
+        struct net_device *dev = sp->dev;
         u16 interruptible;
 
         /* Initialize the H/W I/O registers */
@@ -7325,7 +7325,7 @@ static void s2io_tx_watchdog(struct net_device *dev)
 static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
 {
         struct s2io_nic *sp = ring_data->nic;
-        struct net_device *dev = (struct net_device *)ring_data->dev;
+        struct net_device *dev = ring_data->dev;
         struct sk_buff *skb = (struct sk_buff *)
                 ((unsigned long)rxdp->Host_Control);
         int ring_no = ring_data->ring_no;
@@ -7508,7 +7508,7 @@ aggregate:
 
 static void s2io_link(struct s2io_nic *sp, int link)
 {
-        struct net_device *dev = (struct net_device *)sp->dev;
+        struct net_device *dev = sp->dev;
         struct swStat *swstats = &sp->mac_control.stats_info->sw_stat;
 
         if (link != sp->last_link_state) {
@@ -8280,7 +8280,7 @@ static int check_L2_lro_capable(u8 *buffer, struct iphdr **ip,
                 return -1;
         }
 
-        *ip = (struct iphdr *)((u8 *)buffer + ip_off);
+        *ip = (struct iphdr *)(buffer + ip_off);
         ip_len = (u8)((*ip)->ihl);
         ip_len <<= 2;
         *tcp = (struct tcphdr *)((unsigned long)*ip + ip_len);
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
index 98e2c10ae08b..32d06824fe3e 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
@@ -2346,7 +2346,7 @@ void __vxge_hw_blockpool_blocks_add(struct __vxge_hw_blockpool *blockpool)
 
         for (i = 0; i < nreq; i++)
                 vxge_os_dma_malloc_async(
-                        ((struct __vxge_hw_device *)blockpool->hldev)->pdev,
+                        (blockpool->hldev)->pdev,
                         blockpool->hldev, VXGE_HW_BLOCK_SIZE);
 }
 
@@ -2428,13 +2428,13 @@ __vxge_hw_blockpool_blocks_remove(struct __vxge_hw_blockpool *blockpool)
                         break;
 
                 pci_unmap_single(
-                        ((struct __vxge_hw_device *)blockpool->hldev)->pdev,
+                        (blockpool->hldev)->pdev,
                         ((struct __vxge_hw_blockpool_entry *)p)->dma_addr,
                         ((struct __vxge_hw_blockpool_entry *)p)->length,
                         PCI_DMA_BIDIRECTIONAL);
 
                 vxge_os_dma_free(
-                        ((struct __vxge_hw_device *)blockpool->hldev)->pdev,
+                        (blockpool->hldev)->pdev,
                         ((struct __vxge_hw_blockpool_entry *)p)->memblock,
                         &((struct __vxge_hw_blockpool_entry *)p)->acc_handle);
 
@@ -4059,7 +4059,7 @@ __vxge_hw_vpath_sw_reset(struct __vxge_hw_device *hldev, u32 vp_id)
         enum vxge_hw_status status = VXGE_HW_OK;
         struct __vxge_hw_virtualpath *vpath;
 
-        vpath = (struct __vxge_hw_virtualpath *)&hldev->virtual_paths[vp_id];
+        vpath = &hldev->virtual_paths[vp_id];
 
         if (vpath->ringh) {
                 status = __vxge_hw_ring_reset(vpath->ringh);
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
index 5046a64f0fe8..9e0c1eed5dc5 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
@@ -1922,7 +1922,7 @@ realloc:
                 /* misaligned, free current one and try allocating
                  * size + VXGE_CACHE_LINE_SIZE memory
                  */
-                kfree((void *) vaddr);
+                kfree(vaddr);
                 size += VXGE_CACHE_LINE_SIZE;
                 realloc_flag = 1;
                 goto realloc;
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 51387c31914b..2578eb1f025d 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -1134,7 +1134,7 @@ static void vxge_set_multicast(struct net_device *dev)
                 "%s:%d", __func__, __LINE__);
 
         vdev = netdev_priv(dev);
-        hldev = (struct __vxge_hw_device  *)vdev->devh;
+        hldev = vdev->devh;
 
         if (unlikely(!is_vxge_card_up(vdev)))
                 return;
@@ -3989,16 +3989,16 @@ static void __devinit vxge_print_parm(struct vxgedev *vdev, u64 vpath_mask)
                         continue;
                 vxge_debug_ll_config(VXGE_TRACE,
                         "%s: MTU size - %d", vdev->ndev->name,
-                        ((struct __vxge_hw_device  *)(vdev->devh))->
+                        ((vdev->devh))->
                                 config.vp_config[i].mtu);
                 vxge_debug_init(VXGE_TRACE,
                         "%s: VLAN tag stripping %s", vdev->ndev->name,
-                        ((struct __vxge_hw_device  *)(vdev->devh))->
+                        ((vdev->devh))->
                                 config.vp_config[i].rpa_strip_vlan_tag
                         ? "Enabled" : "Disabled");
                 vxge_debug_ll_config(VXGE_TRACE,
                         "%s: Max frags : %d", vdev->ndev->name,
-                        ((struct __vxge_hw_device  *)(vdev->devh))->
+                        ((vdev->devh))->
                                 config.vp_config[i].fifo.max_frags);
                 break;
         }
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
index 5954fa264da1..99749bd07d72 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
@@ -533,8 +533,7 @@ __vxge_hw_device_handle_error(struct __vxge_hw_device *hldev, u32 vp_id,
 
         /* notify driver */
         if (hldev->uld_callbacks->crit_err)
-                hldev->uld_callbacks->crit_err(
-                        (struct __vxge_hw_device *)hldev,
+                hldev->uld_callbacks->crit_err(hldev,
                         type, vp_id);
 out:
 
@@ -1322,7 +1321,7 @@ enum vxge_hw_status vxge_hw_ring_rxd_next_completed(
         /* check whether it is not the end */
         if (!own || *t_code == VXGE_HW_RING_T_CODE_FRM_DROP) {
 
-                vxge_assert(((struct vxge_hw_ring_rxd_1 *)rxdp)->host_control !=
+                vxge_assert((rxdp)->host_control !=
                                 0);
 
                 ++ring->cmpl_cnt;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
index 8680a5dae4a2..eaa1db9fec32 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
@@ -36,8 +36,8 @@
 
 #define _QLCNIC_LINUX_MAJOR 5
 #define _QLCNIC_LINUX_MINOR 0
-#define _QLCNIC_LINUX_SUBVERSION 28
-#define QLCNIC_LINUX_VERSIONID  "5.0.28"
+#define _QLCNIC_LINUX_SUBVERSION 29
+#define QLCNIC_LINUX_VERSIONID  "5.0.29"
 #define QLCNIC_DRV_IDC_VER  0x01
 #define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\
                  (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
@@ -258,6 +258,8 @@ struct rcv_desc {
         (((sts_data) >> 52) & 0x1)
 #define qlcnic_get_lro_sts_seq_number(sts_data)         \
         ((sts_data) & 0x0FFFFFFFF)
+#define qlcnic_get_lro_sts_mss(sts_data1)               \
+        ((sts_data1 >> 32) & 0x0FFFF)
 
 
 struct status_desc {
@@ -610,7 +612,11 @@ struct qlcnic_recv_context {
 #define QLCNIC_CDRP_CMD_GET_MAC_STATS           0x00000037
 
 #define QLCNIC_RCODE_SUCCESS            0
+#define QLCNIC_RCODE_INVALID_ARGS       6
 #define QLCNIC_RCODE_NOT_SUPPORTED      9
+#define QLCNIC_RCODE_NOT_PERMITTED      10
+#define QLCNIC_RCODE_NOT_IMPL           15
+#define QLCNIC_RCODE_INVALID            16
 #define QLCNIC_RCODE_TIMEOUT            17
 #define QLCNIC_DESTROY_CTX_RESET        0
 
@@ -623,6 +629,7 @@ struct qlcnic_recv_context {
 #define QLCNIC_CAP0_JUMBO_CONTIGUOUS    (1 << 7)
 #define QLCNIC_CAP0_LRO_CONTIGUOUS      (1 << 8)
 #define QLCNIC_CAP0_VALIDOFF            (1 << 11)
+#define QLCNIC_CAP0_LRO_MSS             (1 << 21)
 
 /*
  * Context state
@@ -829,6 +836,9 @@ struct qlcnic_mac_list_s {
 #define QLCNIC_FW_CAPABILITY_FVLANTX            BIT_9
 #define QLCNIC_FW_CAPABILITY_HW_LRO             BIT_10
 #define QLCNIC_FW_CAPABILITY_MULTI_LOOPBACK     BIT_27
+#define QLCNIC_FW_CAPABILITY_MORE_CAPS          BIT_31
+
+#define QLCNIC_FW_CAPABILITY_2_LRO_MAX_TCP_SEG  BIT_2
 
 /* module types */
 #define LINKEVENT_MODULE_NOT_PRESENT                    1
@@ -918,6 +928,7 @@ struct qlcnic_ipaddr {
 #define QLCNIC_NEED_FLR                 0x1000
 #define QLCNIC_FW_RESET_OWNER           0x2000
 #define QLCNIC_FW_HANG                  0x4000
+#define QLCNIC_FW_LRO_MSS_CAP           0x8000
 #define QLCNIC_IS_MSI_FAMILY(adapter) \
         ((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED))
 
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index 8db85244e8ad..b8ead696141e 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
@@ -53,12 +53,39 @@ qlcnic_issue_cmd(struct qlcnic_adapter *adapter, struct qlcnic_cmd_args *cmd)
         rsp = qlcnic_poll_rsp(adapter);
 
         if (rsp == QLCNIC_CDRP_RSP_TIMEOUT) {
-                dev_err(&pdev->dev, "card response timeout.\n");
+                dev_err(&pdev->dev, "CDRP response timeout.\n");
                 cmd->rsp.cmd = QLCNIC_RCODE_TIMEOUT;
         } else if (rsp == QLCNIC_CDRP_RSP_FAIL) {
                 cmd->rsp.cmd = QLCRD32(adapter, QLCNIC_ARG1_CRB_OFFSET);
-                dev_err(&pdev->dev, "failed card response code:0x%x\n",
+                switch (cmd->rsp.cmd) {
+                case QLCNIC_RCODE_INVALID_ARGS:
+                        dev_err(&pdev->dev, "CDRP invalid args: 0x%x.\n",
                                 cmd->rsp.cmd);
+                        break;
+                case QLCNIC_RCODE_NOT_SUPPORTED:
+                case QLCNIC_RCODE_NOT_IMPL:
+                        dev_err(&pdev->dev,
+                                "CDRP command not supported: 0x%x.\n",
+                                cmd->rsp.cmd);
+                        break;
+                case QLCNIC_RCODE_NOT_PERMITTED:
+                        dev_err(&pdev->dev,
+                                "CDRP requested action not permitted: 0x%x.\n",
+                                cmd->rsp.cmd);
+                        break;
+                case QLCNIC_RCODE_INVALID:
+                        dev_err(&pdev->dev,
+                                "CDRP invalid or unknown cmd received: 0x%x.\n",
+                                cmd->rsp.cmd);
+                        break;
+                case QLCNIC_RCODE_TIMEOUT:
+                        dev_err(&pdev->dev, "CDRP command timeout: 0x%x.\n",
+                                cmd->rsp.cmd);
+                        break;
+                default:
+                        dev_err(&pdev->dev, "CDRP command failed: 0x%x.\n",
+                                cmd->rsp.cmd);
+                }
         } else if (rsp == QLCNIC_CDRP_RSP_OK) {
                 cmd->rsp.cmd = QLCNIC_RCODE_SUCCESS;
                 if (cmd->rsp.arg2)
@@ -237,6 +264,9 @@ qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
                                                 | QLCNIC_CAP0_VALIDOFF);
         cap |= (QLCNIC_CAP0_JUMBO_CONTIGUOUS | QLCNIC_CAP0_LRO_CONTIGUOUS);
 
+        if (adapter->flags & QLCNIC_FW_LRO_MSS_CAP)
+                cap |= QLCNIC_CAP0_LRO_MSS;
+
         prq->valid_field_offset = offsetof(struct qlcnic_hostrq_rx_ctx,
                                                          msix_handler);
         prq->txrx_sds_binding = nsds_rings - 1;
@@ -954,9 +984,6 @@ int qlcnic_get_mac_stats(struct qlcnic_adapter *adapter,
                 mac_stats->mac_rx_jabber = le64_to_cpu(stats->mac_rx_jabber);
                 mac_stats->mac_rx_dropped = le64_to_cpu(stats->mac_rx_dropped);
                 mac_stats->mac_rx_crc_error = le64_to_cpu(stats->mac_rx_crc_error);
-        } else {
-                dev_info(&adapter->pdev->dev,
-                        "%s: Get mac stats failed =%d.\n", __func__, err);
         }
 
         dma_free_coherent(&adapter->pdev->dev, stats_size, stats_addr,
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
index 6ced3195aad3..28a6b28192e3 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h
@@ -588,6 +588,7 @@ enum {
 #define CRB_DRIVER_VERSION              (QLCNIC_REG(0x2a0))
 
 #define CRB_FW_CAPABILITIES_1           (QLCNIC_CAM_RAM(0x128))
+#define CRB_FW_CAPABILITIES_2           (QLCNIC_CAM_RAM(0x12c))
 #define CRB_MAC_BLOCK_START             (QLCNIC_CAM_RAM(0x1c0))
 
 /*
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
index 799fd40ed03a..8620b696aca8 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
@@ -1653,6 +1653,9 @@ qlcnic_process_lro(struct qlcnic_adapter *adapter,
 
         length = skb->len;
 
+        if (adapter->flags & QLCNIC_FW_LRO_MSS_CAP)
+                skb_shinfo(skb)->gso_size = qlcnic_get_lro_sts_mss(sts_data1);
+
         if (vid != 0xffff)
                 __vlan_hwaccel_put_tag(skb, vid);
         netif_receive_skb(skb);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 46e77a2c5121..33c3e46e59c4 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -1136,6 +1136,8 @@ static int
 __qlcnic_up(struct qlcnic_adapter *adapter, struct net_device *netdev)
 {
         int ring;
+        u32 capab2;
+
         struct qlcnic_host_rds_ring *rds_ring;
 
         if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
@@ -1146,6 +1148,12 @@ __qlcnic_up(struct qlcnic_adapter *adapter, struct net_device *netdev)
         if (qlcnic_set_eswitch_port_config(adapter))
                 return -EIO;
 
+        if (adapter->capabilities & QLCNIC_FW_CAPABILITY_MORE_CAPS) {
+                capab2 = QLCRD32(adapter, CRB_FW_CAPABILITIES_2);
+                if (capab2 & QLCNIC_FW_CAPABILITY_2_LRO_MAX_TCP_SEG)
+                        adapter->flags |= QLCNIC_FW_LRO_MSS_CAP;
+        }
+
         if (qlcnic_fw_create_ctx(adapter))
                 return -EIO;
 
@@ -1215,6 +1223,7 @@ __qlcnic_down(struct qlcnic_adapter *adapter, struct net_device *netdev)
         qlcnic_napi_disable(adapter);
 
         qlcnic_fw_destroy_ctx(adapter);
+        adapter->flags &= ~QLCNIC_FW_LRO_MSS_CAP;
 
         qlcnic_reset_rx_buffers_list(adapter);
         qlcnic_release_tx_buffers(adapter);
@@ -2024,6 +2033,7 @@ qlcnic_tx_pkt(struct qlcnic_adapter *adapter,
                 vh = (struct vlan_ethhdr *)skb->data;
                 flags = FLAGS_VLAN_TAGGED;
                 vlan_tci = vh->h_vlan_TCI;
+                protocol = ntohs(vh->h_vlan_encapsulated_proto);
         } else if (vlan_tx_tag_present(skb)) {
                 flags = FLAGS_VLAN_OOB;
                 vlan_tci = vlan_tx_tag_get(skb);
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index ac149d99f78f..b5ba3084c7fc 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -583,7 +583,7 @@ static inline void ioc3_rx(struct net_device *dev)
         unsigned long *rxr;
         u32 w0, err;
 
-        rxr = (unsigned long *) ip->rxr;                /* Ring base */
+        rxr = ip->rxr;          /* Ring base */
         rx_entry = ip->rx_ci;                           /* RX consume index */
         n_entry = ip->rx_pi;
 
@@ -903,7 +903,7 @@ static void ioc3_alloc_rings(struct net_device *dev)
         if (ip->rxr == NULL) {
                 /* Allocate and initialize rx ring.  4kb = 512 entries  */
                 ip->rxr = (unsigned long *) get_zeroed_page(GFP_ATOMIC);
-                rxr = (unsigned long *) ip->rxr;
+                rxr = ip->rxr;
                 if (!rxr)
                         printk("ioc3_alloc_rings(): get_zeroed_page() failed!\n");
 
diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
index fd33b21f6c96..1fcd914ec39b 100644
--- a/drivers/net/ethernet/smsc/smsc9420.c
+++ b/drivers/net/ethernet/smsc/smsc9420.c
@@ -1640,8 +1640,7 @@ smsc9420_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto out_free_io_4;
 
         /* descriptors are aligned due to the nature of pci_alloc_consistent */
-        pd->tx_ring = (struct smsc9420_dma_desc *)
-            (pd->rx_ring + RX_RING_SIZE);
+        pd->tx_ring = (pd->rx_ring + RX_RING_SIZE);
         pd->tx_dma_addr = pd->rx_dma_addr +
             sizeof(struct smsc9420_dma_desc) * RX_RING_SIZE;
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 51b3b68528ee..590e95b4cbfa 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -677,7 +677,7 @@ static void stmmac_tx(struct stmmac_priv *priv)
 
                 priv->hw->desc->release_tx_desc(p);
 
-                entry = (++priv->dirty_tx) % txsize;
+                priv->dirty_tx++;
         }
         if (unlikely(netif_queue_stopped(priv->dev) &&
                      stmmac_tx_avail(priv) > STMMAC_TX_THRESH(priv))) {
@@ -1308,7 +1308,6 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
                 display_ring(priv->dma_rx, rxsize);
         }
 #endif
-        count = 0;
         while (!priv->hw->desc->get_rx_owner(p)) {
                 int status;
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 680d2b8dfe27..20eb5026c49c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -190,7 +190,7 @@ static int stmmac_pltfr_remove(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, NULL);
 
-        iounmap((void *)priv->ioaddr);
+        iounmap((void __force __iomem *)priv->ioaddr);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(res->start, resource_size(res));
 
diff --git a/drivers/net/ethernet/sun/sunqe.c b/drivers/net/ethernet/sun/sunqe.c
index 7d4a040d84a2..aeded7ff1c8f 100644
--- a/drivers/net/ethernet/sun/sunqe.c
+++ b/drivers/net/ethernet/sun/sunqe.c
@@ -441,7 +441,7 @@ static void qe_rx(struct sunqe *qep)
                         } else {
                                 skb_reserve(skb, 2);
                                 skb_put(skb, len);
-                                skb_copy_to_linear_data(skb, (unsigned char *) this_qbuf,
+                                skb_copy_to_linear_data(skb, this_qbuf,
                                                  len);
                                 skb->protocol = eth_type_trans(skb, qep->dev);
                                 netif_rx(skb);
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index ea3e0a21ba74..a46c19859683 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -486,7 +486,7 @@ static void __devinit velocity_get_options(struct velocity_opt *opts, int index,
         velocity_set_bool_opt(&opts->flags, IP_byte_align[index], IP_ALIG_DEF, VELOCITY_FLAGS_IP_ALIGN, "IP_byte_align", devname);
         velocity_set_bool_opt(&opts->flags, ValPktLen[index], VAL_PKT_LEN_DEF, VELOCITY_FLAGS_VAL_PKT_LEN, "ValPktLen", devname);
         velocity_set_int_opt((int *) &opts->spd_dpx, speed_duplex[index], MED_LNK_MIN, MED_LNK_MAX, MED_LNK_DEF, "Media link mode", devname);
-        velocity_set_int_opt((int *) &opts->wol_opts, wol_opts[index], WOL_OPT_MIN, WOL_OPT_MAX, WOL_OPT_DEF, "Wake On Lan options", devname);
+        velocity_set_int_opt(&opts->wol_opts, wol_opts[index], WOL_OPT_MIN, WOL_OPT_MAX, WOL_OPT_DEF, "Wake On Lan options", devname);
         opts->numrx = (opts->numrx & ~3);
 }
 
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
index 4ad80f771099..6695a1dadf4e 100644
--- a/drivers/net/fddi/defxx.c
+++ b/drivers/net/fddi/defxx.c
@@ -2962,7 +2962,7 @@ static int dfx_rcv_init(DFX_board_t *bp, int get_buffers)
                         bp->descr_block_virt->rcv_data[i+j].long_0 = (u32) (PI_RCV_DESCR_M_SOP |
                                 ((PI_RCV_DATA_K_SIZE_MAX / PI_ALIGN_K_RCV_DATA_BUFF) << PI_RCV_DESCR_V_SEG_LEN));
                         bp->descr_block_virt->rcv_data[i+j].long_1 = (u32) (bp->rcv_block_phys + (i * PI_RCV_DATA_K_SIZE_MAX));
-                        bp->p_rcv_buff_va[i+j] = (char *) (bp->rcv_block_virt + (i * PI_RCV_DATA_K_SIZE_MAX));
+                        bp->p_rcv_buff_va[i+j] = (bp->rcv_block_virt + (i * PI_RCV_DATA_K_SIZE_MAX));
                         }
 #endif
         }
@@ -3030,7 +3030,7 @@ static void dfx_rcv_queue_process(
 #ifdef DYNAMIC_BUFFERS
                 p_buff = (char *) (((struct sk_buff *)bp->p_rcv_buff_va[entry])->data);
 #else
-                p_buff = (char *) bp->p_rcv_buff_va[entry];
+                p_buff = bp->p_rcv_buff_va[entry];
 #endif
                 memcpy(&descr, p_buff + RCV_BUFF_K_DESCR, sizeof(u32));
 
diff --git a/drivers/net/fddi/skfp/pmf.c b/drivers/net/fddi/skfp/pmf.c
index 9ac4665d7411..24d8566cfd8b 100644
--- a/drivers/net/fddi/skfp/pmf.c
+++ b/drivers/net/fddi/skfp/pmf.c
@@ -1242,7 +1242,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,
                         if (len < 8)
                                 goto len_error ;
                         if (set)
-                                memcpy((char *) to,(char *) from+2,6) ;
+                                memcpy(to,from+2,6) ;
                         to += 8 ;
                         from += 8 ;
                         len -= 8 ;
@@ -1251,7 +1251,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,
                         if (len < 4)
                                 goto len_error ;
                         if (set)
-                                memcpy((char *) to,(char *) from,4) ;
+                                memcpy(to,from,4) ;
                         to += 4 ;
                         from += 4 ;
                         len -= 4 ;
@@ -1260,7 +1260,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,
                         if (len < 8)
                                 goto len_error ;
                         if (set)
-                                memcpy((char *) to,(char *) from,8) ;
+                                memcpy(to,from,8) ;
                         to += 8 ;
                         from += 8 ;
                         len -= 8 ;
@@ -1269,7 +1269,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,
                         if (len < 32)
                                 goto len_error ;
                         if (set)
-                                memcpy((char *) to,(char *) from,32) ;
+                                memcpy(to,from,32) ;
                         to += 32 ;
                         from += 32 ;
                         len -= 32 ;
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index aed1a6105b24..2c0894a92abd 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -485,7 +485,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
 
                         return;
                 default:
-                        count = kiss_esc(p, (unsigned char *)ax->xbuff, len);
+                        count = kiss_esc(p, ax->xbuff, len);
                 }
         } else {
                 unsigned short crc;
@@ -497,7 +497,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
                 case CRC_MODE_SMACK:
                         *p |= 0x80;
                         crc = swab16(crc16(0, p, len));
-                        count = kiss_esc_crc(p, (unsigned char *)ax->xbuff, crc, len+2);
+                        count = kiss_esc_crc(p, ax->xbuff, crc, len+2);
                         break;
                 case CRC_MODE_FLEX_TEST:
                         ax->crcmode = CRC_MODE_NONE;
@@ -506,11 +506,11 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
                 case CRC_MODE_FLEX:
                         *p |= 0x20;
                         crc = calc_crc_flex(p, len);
-                        count = kiss_esc_crc(p, (unsigned char *)ax->xbuff, crc, len+2);
+                        count = kiss_esc_crc(p, ax->xbuff, crc, len+2);
                         break;
 
                 default:
-                        count = kiss_esc(p, (unsigned char *)ax->xbuff, len);
+                        count = kiss_esc(p, ax->xbuff, len);
                 }
         }
         spin_unlock_bh(&ax->buflock);
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 0c569831db5a..6cee2917eb02 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -614,7 +614,7 @@ retry_send_cmplt:
 static void netvsc_receive_completion(void *context)
 {
         struct hv_netvsc_packet *packet = context;
-        struct hv_device *device = (struct hv_device *)packet->device;
+        struct hv_device *device = packet->device;
         struct netvsc_device *net_device;
         u64 transaction_id = 0;
         bool fsend_receive_comp = false;
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index dcc80d652b78..84872043b5c6 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -1017,7 +1017,7 @@ static void ali_ircc_fir_change_speed(struct ali_ircc_cb *priv, __u32 baud)
 {
                 
         int iobase; 
-        struct ali_ircc_cb *self = (struct ali_ircc_cb *) priv;
+        struct ali_ircc_cb *self = priv;
         struct net_device *dev;
 
         IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __func__ );
@@ -1052,7 +1052,7 @@ static void ali_ircc_fir_change_speed(struct ali_ircc_cb *priv, __u32 baud)
  */
 static void ali_ircc_sir_change_speed(struct ali_ircc_cb *priv, __u32 speed)
 {
-        struct ali_ircc_cb *self = (struct ali_ircc_cb *) priv;
+        struct ali_ircc_cb *self = priv;
         unsigned long flags;
         int iobase; 
         int fcr;    /* FIFO control reg */
@@ -1121,7 +1121,7 @@ static void ali_ircc_sir_change_speed(struct ali_ircc_cb *priv, __u32 speed)
 static void ali_ircc_change_dongle_speed(struct ali_ircc_cb *priv, int speed)
 {
         
-        struct ali_ircc_cb *self = (struct ali_ircc_cb *) priv;
+        struct ali_ircc_cb *self = priv;
         int iobase,dongle_id;
         int tmp = 0;
                         
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c
index fc503aa5288e..e09417df8f39 100644
--- a/drivers/net/irda/au1k_ir.c
+++ b/drivers/net/irda/au1k_ir.c
@@ -794,7 +794,7 @@ static int __devinit au1k_irda_net_init(struct net_device *dev)
 
         /* allocate the data buffers */
         aup->db[0].vaddr =
-                (void *)dma_alloc(MAX_BUF_SIZE * 2 * NUM_IR_DESC, &temp);
+                dma_alloc(MAX_BUF_SIZE * 2 * NUM_IR_DESC, &temp);
         if (!aup->db[0].vaddr)
                 goto out3;
 
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 2ee56de7b0ca..0737bd4d1669 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -847,13 +847,12 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
                                const struct iovec *iv, unsigned long len,
                                int noblock)
 {
-        DECLARE_WAITQUEUE(wait, current);
+        DEFINE_WAIT(wait);
         struct sk_buff *skb;
         ssize_t ret = 0;
 
-        add_wait_queue(sk_sleep(&q->sk), &wait);
         while (len) {
-                current->state = TASK_INTERRUPTIBLE;
+                prepare_to_wait(sk_sleep(&q->sk), &wait, TASK_INTERRUPTIBLE);
 
                 /* Read frames from the queue */
                 skb = skb_dequeue(&q->sk.sk_receive_queue);
@@ -875,8 +874,7 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
                 break;
         }
 
-        current->state = TASK_RUNNING;
-        remove_wait_queue(sk_sleep(&q->sk), &wait);
+        finish_wait(sk_sleep(&q->sk), &wait);
         return ret;
 }
 
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index 940b29022d0c..b0da0226661f 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -17,6 +17,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/ethtool.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
@@ -453,16 +456,16 @@ static void enable_status_frames(struct phy_device *phydev, bool on)
         ext_write(0, phydev, PAGE6, PSF_CFG1, ver);
 
         if (!phydev->attached_dev) {
-                pr_warning("dp83640: expected to find an attached netdevice\n");
+                pr_warn("expected to find an attached netdevice\n");
                 return;
         }
 
         if (on) {
                 if (dev_mc_add(phydev->attached_dev, status_frame_dst))
-                        pr_warning("dp83640: failed to add mc address\n");
+                        pr_warn("failed to add mc address\n");
         } else {
                 if (dev_mc_del(phydev->attached_dev, status_frame_dst))
-                        pr_warning("dp83640: failed to delete mc address\n");
+                        pr_warn("failed to delete mc address\n");
         }
 }
 
@@ -582,9 +585,9 @@ static void recalibrate(struct dp83640_clock *clock)
          * read out and correct offsets
          */
         val = ext_read(master, PAGE4, PTP_STS);
-        pr_info("master PTP_STS  0x%04hx", val);
+        pr_info("master PTP_STS  0x%04hx\n", val);
         val = ext_read(master, PAGE4, PTP_ESTS);
-        pr_info("master PTP_ESTS 0x%04hx", val);
+        pr_info("master PTP_ESTS 0x%04hx\n", val);
         event_ts.ns_lo  = ext_read(master, PAGE4, PTP_EDATA);
         event_ts.ns_hi  = ext_read(master, PAGE4, PTP_EDATA);
         event_ts.sec_lo = ext_read(master, PAGE4, PTP_EDATA);
@@ -594,9 +597,9 @@ static void recalibrate(struct dp83640_clock *clock)
         list_for_each(this, &clock->phylist) {
                 tmp = list_entry(this, struct dp83640_private, list);
                 val = ext_read(tmp->phydev, PAGE4, PTP_STS);
-                pr_info("slave  PTP_STS  0x%04hx", val);
+                pr_info("slave  PTP_STS  0x%04hx\n", val);
                 val = ext_read(tmp->phydev, PAGE4, PTP_ESTS);
-                pr_info("slave  PTP_ESTS 0x%04hx", val);
+                pr_info("slave  PTP_ESTS 0x%04hx\n", val);
                 event_ts.ns_lo  = ext_read(tmp->phydev, PAGE4, PTP_EDATA);
                 event_ts.ns_hi  = ext_read(tmp->phydev, PAGE4, PTP_EDATA);
                 event_ts.sec_lo = ext_read(tmp->phydev, PAGE4, PTP_EDATA);
@@ -686,7 +689,7 @@ static void decode_rxts(struct dp83640_private *dp83640,
         prune_rx_ts(dp83640);
 
         if (list_empty(&dp83640->rxpool)) {
-                pr_debug("dp83640: rx timestamp pool is empty\n");
+                pr_debug("rx timestamp pool is empty\n");
                 goto out;
         }
         rxts = list_first_entry(&dp83640->rxpool, struct rxts, list);
@@ -709,7 +712,7 @@ static void decode_txts(struct dp83640_private *dp83640,
         skb = skb_dequeue(&dp83640->tx_queue);
 
         if (!skb) {
-                pr_debug("dp83640: have timestamp but tx_queue empty\n");
+                pr_debug("have timestamp but tx_queue empty\n");
                 return;
         }
         ns = phy2txts(phy_txts);
@@ -847,7 +850,7 @@ static void dp83640_free_clocks(void)
         list_for_each_safe(this, next, &phyter_clocks) {
                 clock = list_entry(this, struct dp83640_clock, list);
                 if (!list_empty(&clock->phylist)) {
-                        pr_warning("phy list non-empty while unloading");
+                        pr_warn("phy list non-empty while unloading\n");
                         BUG();
                 }
                 list_del(&clock->list);
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 633680d0828e..ba55adfc7aae 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -70,7 +70,7 @@ static int fixed_phy_update_regs(struct fixed_phy *fp)
                         lpa |= LPA_10FULL;
                         break;
                 default:
-                        printk(KERN_WARNING "fixed phy: unknown speed\n");
+                        pr_warn("fixed phy: unknown speed\n");
                         return -EINVAL;
                 }
         } else {
@@ -90,7 +90,7 @@ static int fixed_phy_update_regs(struct fixed_phy *fp)
                         lpa |= LPA_10HALF;
                         break;
                 default:
-                        printk(KERN_WARNING "fixed phy: unknown speed\n");
+                        pr_warn("fixed phy: unknown speed\n");
                         return -EINVAL;
                 }
         }
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 5061608f408c..31470b0d0c32 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -13,6 +13,9 @@
  * option) any later version.
  *
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>
@@ -148,7 +151,7 @@ int mdiobus_register(struct mii_bus *bus)
 
         err = device_register(&bus->dev);
         if (err) {
-                printk(KERN_ERR "mii_bus %s failed to register\n", bus->id);
+                pr_err("mii_bus %s failed to register\n", bus->id);
                 return -EINVAL;
         }
 
diff --git a/drivers/net/phy/national.c b/drivers/net/phy/national.c
index 04bb8fcc0cb5..9a5f234d95b0 100644
--- a/drivers/net/phy/national.c
+++ b/drivers/net/phy/national.c
@@ -15,6 +15,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mii.h>
@@ -22,6 +24,8 @@
 #include <linux/phy.h>
 #include <linux/netdevice.h>
 
+#define DEBUG
+
 /* DP83865 phy identifier values */
 #define DP83865_PHY_ID  0x20005c7a
 
@@ -112,8 +116,8 @@ static void ns_10_base_t_hdx_loopack(struct phy_device *phydev, int disable)
                 ns_exp_write(phydev, 0x1c0,
                              ns_exp_read(phydev, 0x1c0) & 0xfffe);
 
-        printk(KERN_DEBUG "DP83865 PHY: 10BASE-T HDX loopback %s\n",
-               (ns_exp_read(phydev, 0x1c0) & 0x0001) ? "off" : "on");
+        pr_debug("10BASE-T HDX loopback %s\n",
+                 (ns_exp_read(phydev, 0x1c0) & 0x0001) ? "off" : "on");
 }
 
 static int ns_config_init(struct phy_device *phydev)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 3cbda0851f83..2e1c23731ded 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -15,6 +15,9 @@
  * option) any later version.
  *
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>
@@ -44,18 +47,16 @@
  */
 void phy_print_status(struct phy_device *phydev)
 {
-        pr_info("PHY: %s - Link is %s", dev_name(&phydev->dev),
-                        phydev->link ? "Up" : "Down");
         if (phydev->link)
-                printk(KERN_CONT " - %d/%s", phydev->speed,
-                                DUPLEX_FULL == phydev->duplex ?
-                                "Full" : "Half");
-
-        printk(KERN_CONT "\n");
+                pr_info("%s - Link is Up - %d/%s\n",
+                        dev_name(&phydev->dev),
+                        phydev->speed,
+                        DUPLEX_FULL == phydev->duplex ? "Full" : "Half");
+        else
+                pr_info("%s - Link is Down\n", dev_name(&phydev->dev));
 }
 EXPORT_SYMBOL(phy_print_status);
 
-
 /**
  * phy_clear_interrupt - Ack the phy device's interrupt
  * @phydev: the phy_device struct
@@ -482,9 +483,8 @@ static void phy_force_reduction(struct phy_device *phydev)
         phydev->speed = settings[idx].speed;
         phydev->duplex = settings[idx].duplex;
 
-        pr_info("Trying %d/%s\n", phydev->speed,
-                        DUPLEX_FULL == phydev->duplex ?
-                        "FULL" : "HALF");
+        pr_info("Trying %d/%s\n",
+                phydev->speed, DUPLEX_FULL == phydev->duplex ? "FULL" : "HALF");
 }
 
 
@@ -598,9 +598,8 @@ int phy_start_interrupts(struct phy_device *phydev)
                                 IRQF_SHARED,
                                 "phy_interrupt",
                                 phydev) < 0) {
-                printk(KERN_WARNING "%s: Can't get IRQ %d (PHY)\n",
-                                phydev->bus->name,
-                                phydev->irq);
+                pr_warn("%s: Can't get IRQ %d (PHY)\n",
+                        phydev->bus->name, phydev->irq);
                 phydev->irq = PHY_POLL;
                 return 0;
         }
@@ -838,10 +837,10 @@ void phy_state_machine(struct work_struct *work)
 
                                 phydev->autoneg = AUTONEG_DISABLE;
 
-                                pr_info("Trying %d/%s\n", phydev->speed,
-                                                DUPLEX_FULL ==
-                                                phydev->duplex ?
-                                                "FULL" : "HALF");
+                                pr_info("Trying %d/%s\n",
+                                        phydev->speed,
+                                        DUPLEX_FULL == phydev->duplex ?
+                                        "FULL" : "HALF");
                         }
                         break;
                 case PHY_NOLINK:
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index de86a5582224..18ab0daf4490 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -14,6 +14,9 @@
  * option) any later version.
  *
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>
@@ -975,8 +978,8 @@ int phy_driver_register(struct phy_driver *new_driver)
         retval = driver_register(&new_driver->driver);
 
         if (retval) {
-                printk(KERN_ERR "%s: Error %d in registering driver\n",
-                                new_driver->name, retval);
+                pr_err("%s: Error %d in registering driver\n",
+                       new_driver->name, retval);
 
                 return retval;
         }
diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c
index 4eb98bc52a0a..1c3abce78b6a 100644
--- a/drivers/net/phy/spi_ks8995.c
+++ b/drivers/net/phy/spi_ks8995.c
@@ -11,6 +11,8 @@
  * by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -356,7 +358,7 @@ static struct spi_driver ks8995_driver = {
 
 static int __init ks8995_init(void)
 {
-        printk(KERN_INFO DRV_DESC " version " DRV_VERSION"\n");
+        pr_info(DRV_DESC " version " DRV_VERSION "\n");
 
         return spi_register_driver(&ks8995_driver);
 }
diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index d4c9db3da22a..a34d6bf5e43b 100644
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -390,10 +390,10 @@ static void sl_encaps(struct slip *sl, unsigned char *icp, int len)
 #endif
 #ifdef CONFIG_SLIP_MODE_SLIP6
         if (sl->mode & SL_MODE_SLIP6)
-                count = slip_esc6(p, (unsigned char *) sl->xbuff, len);
+                count = slip_esc6(p, sl->xbuff, len);
         else
 #endif
-                count = slip_esc(p, (unsigned char *) sl->xbuff, len);
+                count = slip_esc(p, sl->xbuff, len);
 
         /* Order of next two lines is *very* important.
          * When we are sending a little amount of data,
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index d848d4dd5754..187c144c5e5b 100644
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -394,7 +394,7 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
         SET_NETDEV_DEV(dev, &intf->dev);
 
         pnd->dev = dev;
-        pnd->usb = usb_get_dev(usbdev);
+        pnd->usb = usbdev;
         pnd->intf = intf;
         pnd->data_intf = data_intf;
         spin_lock_init(&pnd->tx_lock);
@@ -440,7 +440,6 @@ out:
 static void usbpn_disconnect(struct usb_interface *intf)
 {
         struct usbpn_dev *pnd = usb_get_intfdata(intf);
-        struct usb_device *usb = pnd->usb;
 
         if (pnd->disconnected)
                 return;
@@ -449,7 +448,6 @@ static void usbpn_disconnect(struct usb_interface *intf)
         usb_driver_release_interface(&usbpn_driver,
                         (pnd->intf == intf) ? pnd->data_intf : pnd->intf);
         unregister_netdev(pnd->dev);
-        usb_put_dev(usb);
 }
 
 static struct usb_driver usbpn_driver = {
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 7023220456c5..a0b5807b30d4 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1329,8 +1329,6 @@ static int pegasus_probe(struct usb_interface *intf,
         }
         pegasus_count++;
 
-        usb_get_dev(dev);
-
         net = alloc_etherdev(sizeof(struct pegasus));
         if (!net)
                 goto out;
@@ -1407,7 +1405,6 @@ out2:
 out1:
         free_netdev(net);
 out:
-        usb_put_dev(dev);
         pegasus_dec_workqueue();
         return res;
 }
@@ -1425,7 +1422,6 @@ static void pegasus_disconnect(struct usb_interface *intf)
         pegasus->flags |= PEGASUS_UNPLUG;
         cancel_delayed_work(&pegasus->carrier_check);
         unregister_netdev(pegasus->net);
-        usb_put_dev(interface_to_usbdev(intf));
         unlink_all_urbs(pegasus);
         free_all_urbs(pegasus);
         free_skb_pool(pegasus);
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 9f58330f1312..ac2e4936b421 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -180,7 +180,40 @@ int usbnet_get_ethernet_addr(struct usbnet *dev, int iMACAddress)
 }
 EXPORT_SYMBOL_GPL(usbnet_get_ethernet_addr);
 
-static void intr_complete (struct urb *urb);
+static void intr_complete (struct urb *urb)
+{
+        struct usbnet   *dev = urb->context;
+        int             status = urb->status;
+
+        switch (status) {
+        /* success */
+        case 0:
+                dev->driver_info->status(dev, urb);
+                break;
+
+        /* software-driven interface shutdown */
+        case -ENOENT:           /* urb killed */
+        case -ESHUTDOWN:        /* hardware gone */
+                netif_dbg(dev, ifdown, dev->net,
+                          "intr shutdown, code %d\n", status);
+                return;
+
+        /* NOTE:  not throttling like RX/TX, since this endpoint
+         * already polls infrequently
+         */
+        default:
+                netdev_dbg(dev->net, "intr status %d\n", status);
+                break;
+        }
+
+        if (!netif_running (dev->net))
+                return;
+
+        status = usb_submit_urb (urb, GFP_ATOMIC);
+        if (status != 0)
+                netif_err(dev, timer, dev->net,
+                          "intr resubmit --> %d\n", status);
+}
 
 static int init_status (struct usbnet *dev, struct usb_interface *intf)
 {
@@ -519,42 +552,6 @@ block:
         netif_dbg(dev, rx_err, dev->net, "no read resubmitted\n");
 }
 
-static void intr_complete (struct urb *urb)
-{
-        struct usbnet   *dev = urb->context;
-        int             status = urb->status;
-
-        switch (status) {
-        /* success */
-        case 0:
-                dev->driver_info->status(dev, urb);
-                break;
-
-        /* software-driven interface shutdown */
-        case -ENOENT:           /* urb killed */
-        case -ESHUTDOWN:        /* hardware gone */
-                netif_dbg(dev, ifdown, dev->net,
-                          "intr shutdown, code %d\n", status);
-                return;
-
-        /* NOTE:  not throttling like RX/TX, since this endpoint
-         * already polls infrequently
-         */
-        default:
-                netdev_dbg(dev->net, "intr status %d\n", status);
-                break;
-        }
-
-        if (!netif_running (dev->net))
-                return;
-
-        memset(urb->transfer_buffer, 0, urb->transfer_buffer_length);
-        status = usb_submit_urb (urb, GFP_ATOMIC);
-        if (status != 0)
-                netif_err(dev, timer, dev->net,
-                          "intr resubmit --> %d\n", status);
-}
-
 /*-------------------------------------------------------------------------*/
 void usbnet_pause_rx(struct usbnet *dev)
 {
@@ -1307,7 +1304,6 @@ void usbnet_disconnect (struct usb_interface *intf)
         usb_free_urb(dev->interrupt);
 
         free_netdev(net);
-        usb_put_dev (xdev);
 }
 EXPORT_SYMBOL_GPL(usbnet_disconnect);
 
@@ -1363,8 +1359,6 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
         xdev = interface_to_usbdev (udev);
         interface = udev->cur_altsetting;
 
-        usb_get_dev (xdev);
-
         status = -ENOMEM;
 
         // set up our own records
@@ -1493,7 +1487,6 @@ out3:
 out1:
         free_netdev(net);
 out:
-        usb_put_dev(xdev);
         return status;
 }
 EXPORT_SYMBOL_GPL(usbnet_probe);
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 3f04ba0a5454..93e0cfb739b8 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1037,7 +1037,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
 #endif
         dev_dbg(&adapter->netdev->dev,
                 "txd[%u]: SOP 0x%Lx 0x%x 0x%x\n",
-                (u32)((union Vmxnet3_GenericDesc *)ctx.sop_txd -
+                (u32)(ctx.sop_txd -
                 tq->tx_ring.base), le64_to_cpu(gdesc->txd.addr),
                 le32_to_cpu(gdesc->dword[2]), le32_to_cpu(gdesc->dword[3]));
 
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index d7a65e141d1a..44db8b75a531 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -231,7 +231,7 @@ static void x25_asy_encaps(struct x25_asy *sl, unsigned char *icp, int len)
         }
 
         p = icp;
-        count = x25_asy_esc(p, (unsigned char *) sl->xbuff, len);
+        count = x25_asy_esc(p, sl->xbuff, len);
 
         /* Order of next two lines is *very* important.
          * When we are sending a little amount of data,
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index 7cbd7d231e11..d09e44970e63 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -1268,7 +1268,7 @@ int i2400m_fw_check(struct i2400m *i2400m, const void *bcf, size_t bcf_size)
                 size_t leftover, offset, header_len, size;
 
                 leftover = top - itr;
-                offset = itr - (const void *) bcf;
+                offset = itr - bcf;
                 if (leftover <= sizeof(*bcf_hdr)) {
                         dev_err(dev, "firmware %s: %zu B left at @%zx, "
                                 "not enough for BCF header\n",
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 0ac09a2bd144..97afcec24759 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1738,8 +1738,7 @@ static int adm8211_alloc_rings(struct ieee80211_hw *dev)
                 return -ENOMEM;
         }
 
-        priv->tx_ring = (struct adm8211_desc *)(priv->rx_ring +
-                                                priv->rx_ring_size);
+        priv->tx_ring = priv->rx_ring + priv->rx_ring_size;
         priv->tx_ring_dma = priv->rx_ring_dma +
                             sizeof(struct adm8211_desc) * priv->rx_ring_size;
 
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 520a4b2eb9cc..252c2c2d76c1 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -1997,7 +1997,7 @@ static int mpi_send_packet (struct net_device *dev)
  *                         ------------------------------------------------
  */
 
-        memcpy((char *)ai->txfids[0].virtual_host_addr,
+        memcpy(ai->txfids[0].virtual_host_addr,
                 (char *)&wifictlhdr8023, sizeof(wifictlhdr8023));
 
         payloadLen = (__le16 *)(ai->txfids[0].virtual_host_addr +
@@ -4212,7 +4212,7 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid,
                         airo_print_err(ai->dev->name, "%s: len=%d", __func__, len);
                         rc = -1;
                 } else {
-                        memcpy((char *)ai->config_desc.virtual_host_addr,
+                        memcpy(ai->config_desc.virtual_host_addr,
                                 pBuf, len);
 
                         rc = issuecommand(ai, &cmd, &rsp);
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index b869a358ce43..f27e9732951d 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -2585,35 +2585,6 @@ static int ath6kl_set_ies(struct ath6kl_vif *vif,
         return 0;
 }
 
-static int ath6kl_set_channel(struct wiphy *wiphy, struct net_device *dev,
-                              struct ieee80211_channel *chan,
-                              enum nl80211_channel_type channel_type)
-{
-        struct ath6kl_vif *vif;
-
-        /*
-         * 'dev' could be NULL if a channel change is required for the hardware
-         * device itself, instead of a particular VIF.
-         *
-         * FIXME: To be handled properly when monitor mode is supported.
-         */
-        if (!dev)
-                return -EBUSY;
-
-        vif = netdev_priv(dev);
-
-        if (!ath6kl_cfg80211_ready(vif))
-                return -EIO;
-
-        ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: center_freq=%u hw_value=%u\n",
-                   __func__, chan->center_freq, chan->hw_value);
-        vif->next_chan = chan->center_freq;
-        vif->next_ch_type = channel_type;
-        vif->next_ch_band = chan->band;
-
-        return 0;
-}
-
 static int ath6kl_get_rsn_capab(struct cfg80211_beacon_data *beacon,
                                 u8 *rsn_capab)
 {
@@ -2791,7 +2762,7 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,
         p.ssid_len = vif->ssid_len;
         memcpy(p.ssid, vif->ssid, vif->ssid_len);
         p.dot11_auth_mode = vif->dot11_auth_mode;
-        p.ch = cpu_to_le16(vif->next_chan);
+        p.ch = cpu_to_le16(info->channel->center_freq);
 
         /* Enable uAPSD support by default */
         res = ath6kl_wmi_ap_set_apsd(ar->wmi, vif->fw_vif_idx, true);
@@ -2815,8 +2786,8 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,
                         return res;
         }
 
-        if (ath6kl_set_htcap(vif, vif->next_ch_band,
-                             vif->next_ch_type != NL80211_CHAN_NO_HT))
+        if (ath6kl_set_htcap(vif, info->channel->band,
+                             info->channel_type != NL80211_CHAN_NO_HT))
                 return -EIO;
 
         /*
@@ -3271,7 +3242,6 @@ static struct cfg80211_ops ath6kl_cfg80211_ops = {
         .suspend = __ath6kl_cfg80211_suspend,
         .resume = __ath6kl_cfg80211_resume,
 #endif
-        .set_channel = ath6kl_set_channel,
         .start_ap = ath6kl_start_ap,
         .change_beacon = ath6kl_change_beacon,
         .stop_ap = ath6kl_stop_ap,
diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h
index 4d9c6f142698..8443b2a4133e 100644
--- a/drivers/net/wireless/ath/ath6kl/core.h
+++ b/drivers/net/wireless/ath/ath6kl/core.h
@@ -553,9 +553,6 @@ struct ath6kl_vif {
         u32 last_cancel_roc_id;
         u32 send_action_id;
         bool probe_req_report;
-        u16 next_chan;
-        enum nl80211_channel_type next_ch_type;
-        enum ieee80211_band next_ch_band;
         u16 assoc_bss_beacon_int;
         u16 listen_intvl_t;
         u16 bmiss_time_t;
diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index e5524470529c..b836f2795114 100644
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -598,7 +598,6 @@ static int ath6kl_commit_ch_switch(struct ath6kl_vif *vif, u16 channel)
 
         struct ath6kl *ar = vif->ar;
 
-        vif->next_chan = channel;
         vif->profile.ch = cpu_to_le16(channel);
 
         switch (vif->nw_type) {
diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile
index 3f0b84723789..9c41232b0cd0 100644
--- a/drivers/net/wireless/ath/ath9k/Makefile
+++ b/drivers/net/wireless/ath/ath9k/Makefile
@@ -3,7 +3,9 @@ ath9k-y +=	beacon.o \
                 init.o \
                 main.o \
                 recv.o \
-                xmit.o
+                xmit.o \
+                link.o \
+                antenna.o
 
 ath9k-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += mci.o
 ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o
diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 5e47ca6d16a8..4a4e8a2b9d2c 100644
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -126,7 +126,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
         sc->irq = irq;
 
         /* Will be cleared in ath9k_start() */
-        sc->sc_flags |= SC_OP_INVALID;
+        set_bit(SC_OP_INVALID, &sc->sc_flags);
 
         ret = request_irq(irq, ath_isr, IRQF_SHARED, "ath9k", sc);
         if (ret) {
diff --git a/drivers/net/wireless/ath/ath9k/antenna.c b/drivers/net/wireless/ath/ath9k/antenna.c
new file mode 100644
index 000000000000..bbcfeb3b2a60
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/antenna.c
@@ -0,0 +1,776 @@
+/*
+ * Copyright (c) 2012 Qualcomm Atheros, 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 "ath9k.h"
+
+static inline bool ath_is_alt_ant_ratio_better(int alt_ratio, int maxdelta,
+                                               int mindelta, int main_rssi_avg,
+                                               int alt_rssi_avg, int pkt_count)
+{
+        return (((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
+                 (alt_rssi_avg > main_rssi_avg + maxdelta)) ||
+                (alt_rssi_avg > main_rssi_avg + mindelta)) && (pkt_count > 50);
+}
+
+static inline bool ath_ant_div_comb_alt_check(u8 div_group, int alt_ratio,
+                                              int curr_main_set, int curr_alt_set,
+                                              int alt_rssi_avg, int main_rssi_avg)
+{
+        bool result = false;
+        switch (div_group) {
+        case 0:
+                if (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO)
+                        result = true;
+                break;
+        case 1:
+        case 2:
+                if ((((curr_main_set == ATH_ANT_DIV_COMB_LNA2) &&
+                      (curr_alt_set == ATH_ANT_DIV_COMB_LNA1) &&
+                      (alt_rssi_avg >= (main_rssi_avg - 5))) ||
+                     ((curr_main_set == ATH_ANT_DIV_COMB_LNA1) &&
+                      (curr_alt_set == ATH_ANT_DIV_COMB_LNA2) &&
+                      (alt_rssi_avg >= (main_rssi_avg - 2)))) &&
+                    (alt_rssi_avg >= 4))
+                        result = true;
+                else
+                        result = false;
+                break;
+        }
+
+        return result;
+}
+
+static void ath_lnaconf_alt_good_scan(struct ath_ant_comb *antcomb,
+                                      struct ath_hw_antcomb_conf ant_conf,
+                                      int main_rssi_avg)
+{
+        antcomb->quick_scan_cnt = 0;
+
+        if (ant_conf.main_lna_conf == ATH_ANT_DIV_COMB_LNA2)
+                antcomb->rssi_lna2 = main_rssi_avg;
+        else if (ant_conf.main_lna_conf == ATH_ANT_DIV_COMB_LNA1)
+                antcomb->rssi_lna1 = main_rssi_avg;
+
+        switch ((ant_conf.main_lna_conf << 4) | ant_conf.alt_lna_conf) {
+        case 0x10: /* LNA2 A-B */
+                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                antcomb->first_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1;
+                break;
+        case 0x20: /* LNA1 A-B */
+                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                antcomb->first_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA2;
+                break;
+        case 0x21: /* LNA1 LNA2 */
+                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA2;
+                antcomb->first_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                antcomb->second_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                break;
+        case 0x12: /* LNA2 LNA1 */
+                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1;
+                antcomb->first_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                antcomb->second_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                break;
+        case 0x13: /* LNA2 A+B */
+                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                antcomb->first_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1;
+                break;
+        case 0x23: /* LNA1 A+B */
+                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                antcomb->first_quick_scan_conf =
+                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA2;
+                break;
+        default:
+                break;
+        }
+}
+
+static void ath_select_ant_div_from_quick_scan(struct ath_ant_comb *antcomb,
+                                       struct ath_hw_antcomb_conf *div_ant_conf,
+                                       int main_rssi_avg, int alt_rssi_avg,
+                                       int alt_ratio)
+{
+        /* alt_good */
+        switch (antcomb->quick_scan_cnt) {
+        case 0:
+                /* set alt to main, and alt to first conf */
+                div_ant_conf->main_lna_conf = antcomb->main_conf;
+                div_ant_conf->alt_lna_conf = antcomb->first_quick_scan_conf;
+                break;
+        case 1:
+                /* set alt to main, and alt to first conf */
+                div_ant_conf->main_lna_conf = antcomb->main_conf;
+                div_ant_conf->alt_lna_conf = antcomb->second_quick_scan_conf;
+                antcomb->rssi_first = main_rssi_avg;
+                antcomb->rssi_second = alt_rssi_avg;
+
+                if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) {
+                        /* main is LNA1 */
+                        if (ath_is_alt_ant_ratio_better(alt_ratio,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_HI,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
+                                                main_rssi_avg, alt_rssi_avg,
+                                                antcomb->total_pkt_count))
+                                antcomb->first_ratio = true;
+                        else
+                                antcomb->first_ratio = false;
+                } else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2) {
+                        if (ath_is_alt_ant_ratio_better(alt_ratio,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_MID,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
+                                                main_rssi_avg, alt_rssi_avg,
+                                                antcomb->total_pkt_count))
+                                antcomb->first_ratio = true;
+                        else
+                                antcomb->first_ratio = false;
+                } else {
+                        if ((((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
+                              (alt_rssi_avg > main_rssi_avg +
+                               ATH_ANT_DIV_COMB_LNA1_DELTA_HI)) ||
+                             (alt_rssi_avg > main_rssi_avg)) &&
+                            (antcomb->total_pkt_count > 50))
+                                antcomb->first_ratio = true;
+                        else
+                                antcomb->first_ratio = false;
+                }
+                break;
+        case 2:
+                antcomb->alt_good = false;
+                antcomb->scan_not_start = false;
+                antcomb->scan = false;
+                antcomb->rssi_first = main_rssi_avg;
+                antcomb->rssi_third = alt_rssi_avg;
+
+                if (antcomb->second_quick_scan_conf == ATH_ANT_DIV_COMB_LNA1)
+                        antcomb->rssi_lna1 = alt_rssi_avg;
+                else if (antcomb->second_quick_scan_conf ==
+                         ATH_ANT_DIV_COMB_LNA2)
+                        antcomb->rssi_lna2 = alt_rssi_avg;
+                else if (antcomb->second_quick_scan_conf ==
+                         ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2) {
+                        if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2)
+                                antcomb->rssi_lna2 = main_rssi_avg;
+                        else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1)
+                                antcomb->rssi_lna1 = main_rssi_avg;
+                }
+
+                if (antcomb->rssi_lna2 > antcomb->rssi_lna1 +
+                    ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA)
+                        div_ant_conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA2;
+                else
+                        div_ant_conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1;
+
+                if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) {
+                        if (ath_is_alt_ant_ratio_better(alt_ratio,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_HI,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
+                                                main_rssi_avg, alt_rssi_avg,
+                                                antcomb->total_pkt_count))
+                                antcomb->second_ratio = true;
+                        else
+                                antcomb->second_ratio = false;
+                } else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2) {
+                        if (ath_is_alt_ant_ratio_better(alt_ratio,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_MID,
+                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
+                                                main_rssi_avg, alt_rssi_avg,
+                                                antcomb->total_pkt_count))
+                                antcomb->second_ratio = true;
+                        else
+                                antcomb->second_ratio = false;
+                } else {
+                        if ((((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
+                              (alt_rssi_avg > main_rssi_avg +
+                               ATH_ANT_DIV_COMB_LNA1_DELTA_HI)) ||
+                             (alt_rssi_avg > main_rssi_avg)) &&
+                            (antcomb->total_pkt_count > 50))
+                                antcomb->second_ratio = true;
+                        else
+                                antcomb->second_ratio = false;
+                }
+
+                /* set alt to the conf with maximun ratio */
+                if (antcomb->first_ratio && antcomb->second_ratio) {
+                        if (antcomb->rssi_second > antcomb->rssi_third) {
+                                /* first alt*/
+                                if ((antcomb->first_quick_scan_conf ==
+                                    ATH_ANT_DIV_COMB_LNA1) ||
+                                    (antcomb->first_quick_scan_conf ==
+                                    ATH_ANT_DIV_COMB_LNA2))
+                                        /* Set alt LNA1 or LNA2*/
+                                        if (div_ant_conf->main_lna_conf ==
+                                            ATH_ANT_DIV_COMB_LNA2)
+                                                div_ant_conf->alt_lna_conf =
+                                                        ATH_ANT_DIV_COMB_LNA1;
+                                        else
+                                                div_ant_conf->alt_lna_conf =
+                                                        ATH_ANT_DIV_COMB_LNA2;
+                                else
+                                        /* Set alt to A+B or A-B */
+                                        div_ant_conf->alt_lna_conf =
+                                                antcomb->first_quick_scan_conf;
+                        } else if ((antcomb->second_quick_scan_conf ==
+                                   ATH_ANT_DIV_COMB_LNA1) ||
+                                   (antcomb->second_quick_scan_conf ==
+                                   ATH_ANT_DIV_COMB_LNA2)) {
+                                /* Set alt LNA1 or LNA2 */
+                                if (div_ant_conf->main_lna_conf ==
+                                    ATH_ANT_DIV_COMB_LNA2)
+                                        div_ant_conf->alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                else
+                                        div_ant_conf->alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                        } else {
+                                /* Set alt to A+B or A-B */
+                                div_ant_conf->alt_lna_conf =
+                                        antcomb->second_quick_scan_conf;
+                        }
+                } else if (antcomb->first_ratio) {
+                        /* first alt */
+                        if ((antcomb->first_quick_scan_conf ==
+                            ATH_ANT_DIV_COMB_LNA1) ||
+                            (antcomb->first_quick_scan_conf ==
+                            ATH_ANT_DIV_COMB_LNA2))
+                                        /* Set alt LNA1 or LNA2 */
+                                if (div_ant_conf->main_lna_conf ==
+                                    ATH_ANT_DIV_COMB_LNA2)
+                                        div_ant_conf->alt_lna_conf =
+                                                        ATH_ANT_DIV_COMB_LNA1;
+                                else
+                                        div_ant_conf->alt_lna_conf =
+                                                        ATH_ANT_DIV_COMB_LNA2;
+                        else
+                                /* Set alt to A+B or A-B */
+                                div_ant_conf->alt_lna_conf =
+                                                antcomb->first_quick_scan_conf;
+                } else if (antcomb->second_ratio) {
+                                /* second alt */
+                        if ((antcomb->second_quick_scan_conf ==
+                            ATH_ANT_DIV_COMB_LNA1) ||
+                            (antcomb->second_quick_scan_conf ==
+                            ATH_ANT_DIV_COMB_LNA2))
+                                /* Set alt LNA1 or LNA2 */
+                                if (div_ant_conf->main_lna_conf ==
+                                    ATH_ANT_DIV_COMB_LNA2)
+                                        div_ant_conf->alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                else
+                                        div_ant_conf->alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                        else
+                                /* Set alt to A+B or A-B */
+                                div_ant_conf->alt_lna_conf =
+                                                antcomb->second_quick_scan_conf;
+                } else {
+                        /* main is largest */
+                        if ((antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) ||
+                            (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2))
+                                /* Set alt LNA1 or LNA2 */
+                                if (div_ant_conf->main_lna_conf ==
+                                    ATH_ANT_DIV_COMB_LNA2)
+                                        div_ant_conf->alt_lna_conf =
+                                                        ATH_ANT_DIV_COMB_LNA1;
+                                else
+                                        div_ant_conf->alt_lna_conf =
+                                                        ATH_ANT_DIV_COMB_LNA2;
+                        else
+                                /* Set alt to A+B or A-B */
+                                div_ant_conf->alt_lna_conf = antcomb->main_conf;
+                }
+                break;
+        default:
+                break;
+        }
+}
+
+static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
+                                          struct ath_ant_comb *antcomb,
+                                          int alt_ratio)
+{
+        if (ant_conf->div_group == 0) {
+                /* Adjust the fast_div_bias based on main and alt lna conf */
+                switch ((ant_conf->main_lna_conf << 4) |
+                                ant_conf->alt_lna_conf) {
+                case 0x01: /* A-B LNA2 */
+                        ant_conf->fast_div_bias = 0x3b;
+                        break;
+                case 0x02: /* A-B LNA1 */
+                        ant_conf->fast_div_bias = 0x3d;
+                        break;
+                case 0x03: /* A-B A+B */
+                        ant_conf->fast_div_bias = 0x1;
+                        break;
+                case 0x10: /* LNA2 A-B */
+                        ant_conf->fast_div_bias = 0x7;
+                        break;
+                case 0x12: /* LNA2 LNA1 */
+                        ant_conf->fast_div_bias = 0x2;
+                        break;
+                case 0x13: /* LNA2 A+B */
+                        ant_conf->fast_div_bias = 0x7;
+                        break;
+                case 0x20: /* LNA1 A-B */
+                        ant_conf->fast_div_bias = 0x6;
+                        break;
+                case 0x21: /* LNA1 LNA2 */
+                        ant_conf->fast_div_bias = 0x0;
+                        break;
+                case 0x23: /* LNA1 A+B */
+                        ant_conf->fast_div_bias = 0x6;
+                        break;
+                case 0x30: /* A+B A-B */
+                        ant_conf->fast_div_bias = 0x1;
+                        break;
+                case 0x31: /* A+B LNA2 */
+                        ant_conf->fast_div_bias = 0x3b;
+                        break;
+                case 0x32: /* A+B LNA1 */
+                        ant_conf->fast_div_bias = 0x3d;
+                        break;
+                default:
+                        break;
+                }
+        } else if (ant_conf->div_group == 1) {
+                /* Adjust the fast_div_bias based on main and alt_lna_conf */
+                switch ((ant_conf->main_lna_conf << 4) |
+                        ant_conf->alt_lna_conf) {
+                case 0x01: /* A-B LNA2 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x02: /* A-B LNA1 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x03: /* A-B A+B */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x10: /* LNA2 A-B */
+                        if (!(antcomb->scan) &&
+                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x3f;
+                        else
+                                ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x12: /* LNA2 LNA1 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x13: /* LNA2 A+B */
+                        if (!(antcomb->scan) &&
+                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x3f;
+                        else
+                                ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x20: /* LNA1 A-B */
+                        if (!(antcomb->scan) &&
+                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x3f;
+                        else
+                                ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x21: /* LNA1 LNA2 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x23: /* LNA1 A+B */
+                        if (!(antcomb->scan) &&
+                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x3f;
+                        else
+                                ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x30: /* A+B A-B */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x31: /* A+B LNA2 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x32: /* A+B LNA1 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                default:
+                        break;
+                }
+        } else if (ant_conf->div_group == 2) {
+                /* Adjust the fast_div_bias based on main and alt_lna_conf */
+                switch ((ant_conf->main_lna_conf << 4) |
+                                ant_conf->alt_lna_conf) {
+                case 0x01: /* A-B LNA2 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x02: /* A-B LNA1 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x03: /* A-B A+B */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x10: /* LNA2 A-B */
+                        if (!(antcomb->scan) &&
+                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x1;
+                        else
+                                ant_conf->fast_div_bias = 0x2;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x12: /* LNA2 LNA1 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x13: /* LNA2 A+B */
+                        if (!(antcomb->scan) &&
+                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x1;
+                        else
+                                ant_conf->fast_div_bias = 0x2;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x20: /* LNA1 A-B */
+                        if (!(antcomb->scan) &&
+                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x1;
+                        else
+                                ant_conf->fast_div_bias = 0x2;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x21: /* LNA1 LNA2 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x23: /* LNA1 A+B */
+                        if (!(antcomb->scan) &&
+                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
+                                ant_conf->fast_div_bias = 0x1;
+                        else
+                                ant_conf->fast_div_bias = 0x2;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x30: /* A+B A-B */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x31: /* A+B LNA2 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                case 0x32: /* A+B LNA1 */
+                        ant_conf->fast_div_bias = 0x1;
+                        ant_conf->main_gaintb = 0;
+                        ant_conf->alt_gaintb = 0;
+                        break;
+                default:
+                        break;
+                }
+        }
+}
+
+void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs)
+{
+        struct ath_hw_antcomb_conf div_ant_conf;
+        struct ath_ant_comb *antcomb = &sc->ant_comb;
+        int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set;
+        int curr_main_set;
+        int main_rssi = rs->rs_rssi_ctl0;
+        int alt_rssi = rs->rs_rssi_ctl1;
+        int rx_ant_conf,  main_ant_conf;
+        bool short_scan = false;
+
+        rx_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_CURRENT_SHIFT) &
+                       ATH_ANT_RX_MASK;
+        main_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_MAIN_SHIFT) &
+                         ATH_ANT_RX_MASK;
+
+        /* Record packet only when both main_rssi and  alt_rssi is positive */
+        if (main_rssi > 0 && alt_rssi > 0) {
+                antcomb->total_pkt_count++;
+                antcomb->main_total_rssi += main_rssi;
+                antcomb->alt_total_rssi  += alt_rssi;
+                if (main_ant_conf == rx_ant_conf)
+                        antcomb->main_recv_cnt++;
+                else
+                        antcomb->alt_recv_cnt++;
+        }
+
+        /* Short scan check */
+        if (antcomb->scan && antcomb->alt_good) {
+                if (time_after(jiffies, antcomb->scan_start_time +
+                    msecs_to_jiffies(ATH_ANT_DIV_COMB_SHORT_SCAN_INTR)))
+                        short_scan = true;
+                else
+                        if (antcomb->total_pkt_count ==
+                            ATH_ANT_DIV_COMB_SHORT_SCAN_PKTCOUNT) {
+                                alt_ratio = ((antcomb->alt_recv_cnt * 100) /
+                                            antcomb->total_pkt_count);
+                                if (alt_ratio < ATH_ANT_DIV_COMB_ALT_ANT_RATIO)
+                                        short_scan = true;
+                        }
+        }
+
+        if (((antcomb->total_pkt_count < ATH_ANT_DIV_COMB_MAX_PKTCOUNT) ||
+            rs->rs_moreaggr) && !short_scan)
+                return;
+
+        if (antcomb->total_pkt_count) {
+                alt_ratio = ((antcomb->alt_recv_cnt * 100) /
+                             antcomb->total_pkt_count);
+                main_rssi_avg = (antcomb->main_total_rssi /
+                                 antcomb->total_pkt_count);
+                alt_rssi_avg = (antcomb->alt_total_rssi /
+                                 antcomb->total_pkt_count);
+        }
+
+
+        ath9k_hw_antdiv_comb_conf_get(sc->sc_ah, &div_ant_conf);
+        curr_alt_set = div_ant_conf.alt_lna_conf;
+        curr_main_set = div_ant_conf.main_lna_conf;
+
+        antcomb->count++;
+
+        if (antcomb->count == ATH_ANT_DIV_COMB_MAX_COUNT) {
+                if (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO) {
+                        ath_lnaconf_alt_good_scan(antcomb, div_ant_conf,
+                                                  main_rssi_avg);
+                        antcomb->alt_good = true;
+                } else {
+                        antcomb->alt_good = false;
+                }
+
+                antcomb->count = 0;
+                antcomb->scan = true;
+                antcomb->scan_not_start = true;
+        }
+
+        if (!antcomb->scan) {
+                if (ath_ant_div_comb_alt_check(div_ant_conf.div_group,
+                                        alt_ratio, curr_main_set, curr_alt_set,
+                                        alt_rssi_avg, main_rssi_avg)) {
+                        if (curr_alt_set == ATH_ANT_DIV_COMB_LNA2) {
+                                /* Switch main and alt LNA */
+                                div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                                div_ant_conf.alt_lna_conf  =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                        } else if (curr_alt_set == ATH_ANT_DIV_COMB_LNA1) {
+                                div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                div_ant_conf.alt_lna_conf  =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                        }
+
+                        goto div_comb_done;
+                } else if ((curr_alt_set != ATH_ANT_DIV_COMB_LNA1) &&
+                           (curr_alt_set != ATH_ANT_DIV_COMB_LNA2)) {
+                        /* Set alt to another LNA */
+                        if (curr_main_set == ATH_ANT_DIV_COMB_LNA2)
+                                div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                        else if (curr_main_set == ATH_ANT_DIV_COMB_LNA1)
+                                div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+
+                        goto div_comb_done;
+                }
+
+                if ((alt_rssi_avg < (main_rssi_avg +
+                                     div_ant_conf.lna1_lna2_delta)))
+                        goto div_comb_done;
+        }
+
+        if (!antcomb->scan_not_start) {
+                switch (curr_alt_set) {
+                case ATH_ANT_DIV_COMB_LNA2:
+                        antcomb->rssi_lna2 = alt_rssi_avg;
+                        antcomb->rssi_lna1 = main_rssi_avg;
+                        antcomb->scan = true;
+                        /* set to A+B */
+                        div_ant_conf.main_lna_conf =
+                                ATH_ANT_DIV_COMB_LNA1;
+                        div_ant_conf.alt_lna_conf  =
+                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                        break;
+                case ATH_ANT_DIV_COMB_LNA1:
+                        antcomb->rssi_lna1 = alt_rssi_avg;
+                        antcomb->rssi_lna2 = main_rssi_avg;
+                        antcomb->scan = true;
+                        /* set to A+B */
+                        div_ant_conf.main_lna_conf = ATH_ANT_DIV_COMB_LNA2;
+                        div_ant_conf.alt_lna_conf  =
+                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                        break;
+                case ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2:
+                        antcomb->rssi_add = alt_rssi_avg;
+                        antcomb->scan = true;
+                        /* set to A-B */
+                        div_ant_conf.alt_lna_conf =
+                                ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                        break;
+                case ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2:
+                        antcomb->rssi_sub = alt_rssi_avg;
+                        antcomb->scan = false;
+                        if (antcomb->rssi_lna2 >
+                            (antcomb->rssi_lna1 +
+                            ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA)) {
+                                /* use LNA2 as main LNA */
+                                if ((antcomb->rssi_add > antcomb->rssi_lna1) &&
+                                    (antcomb->rssi_add > antcomb->rssi_sub)) {
+                                        /* set to A+B */
+                                        div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                                        div_ant_conf.alt_lna_conf  =
+                                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                                } else if (antcomb->rssi_sub >
+                                           antcomb->rssi_lna1) {
+                                        /* set to A-B */
+                                        div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                                        div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                                } else {
+                                        /* set to LNA1 */
+                                        div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                                        div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                }
+                        } else {
+                                /* use LNA1 as main LNA */
+                                if ((antcomb->rssi_add > antcomb->rssi_lna2) &&
+                                    (antcomb->rssi_add > antcomb->rssi_sub)) {
+                                        /* set to A+B */
+                                        div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                        div_ant_conf.alt_lna_conf  =
+                                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
+                                } else if (antcomb->rssi_sub >
+                                           antcomb->rssi_lna1) {
+                                        /* set to A-B */
+                                        div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                        div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
+                                } else {
+                                        /* set to LNA2 */
+                                        div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                        div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                                }
+                        }
+                        break;
+                default:
+                        break;
+                }
+        } else {
+                if (!antcomb->alt_good) {
+                        antcomb->scan_not_start = false;
+                        /* Set alt to another LNA */
+                        if (curr_main_set == ATH_ANT_DIV_COMB_LNA2) {
+                                div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                                div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                        } else if (curr_main_set == ATH_ANT_DIV_COMB_LNA1) {
+                                div_ant_conf.main_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA1;
+                                div_ant_conf.alt_lna_conf =
+                                                ATH_ANT_DIV_COMB_LNA2;
+                        }
+                        goto div_comb_done;
+                }
+        }
+
+        ath_select_ant_div_from_quick_scan(antcomb, &div_ant_conf,
+                                           main_rssi_avg, alt_rssi_avg,
+                                           alt_ratio);
+
+        antcomb->quick_scan_cnt++;
+
+div_comb_done:
+        ath_ant_div_conf_fast_divbias(&div_ant_conf, antcomb, alt_ratio);
+        ath9k_hw_antdiv_comb_conf_set(sc->sc_ah, &div_ant_conf);
+
+        antcomb->scan_start_time = jiffies;
+        antcomb->total_pkt_count = 0;
+        antcomb->main_total_rssi = 0;
+        antcomb->alt_total_rssi = 0;
+        antcomb->main_recv_cnt = 0;
+        antcomb->alt_recv_cnt = 0;
+}
+
+void ath_ant_comb_update(struct ath_softc *sc)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_hw_antcomb_conf div_ant_conf;
+        u8 lna_conf;
+
+        ath9k_hw_antdiv_comb_conf_get(ah, &div_ant_conf);
+
+        if (sc->ant_rx == 1)
+                lna_conf = ATH_ANT_DIV_COMB_LNA1;
+        else
+                lna_conf = ATH_ANT_DIV_COMB_LNA2;
+
+        div_ant_conf.main_lna_conf = lna_conf;
+        div_ant_conf.alt_lna_conf = lna_conf;
+
+        ath9k_hw_antdiv_comb_conf_set(ah, &div_ant_conf);
+}
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 9fdd70fcaf5b..d7deb8c9f299 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -653,7 +653,6 @@ static void ar9003_hw_detect_outlier(int *mp_coeff, int nmeasurement,
 }
 
 static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah,
-                                                 u8 num_chains,
                                                  struct coeff *coeff,
                                                  bool is_reusable)
 {
@@ -677,7 +676,9 @@ static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah,
         }
 
         /* Load the average of 2 passes */
-        for (i = 0; i < num_chains; i++) {
+        for (i = 0; i < AR9300_MAX_CHAINS; i++) {
+                if (!(ah->txchainmask & (1 << i)))
+                        continue;
                 nmeasurement = REG_READ_FIELD(ah,
                                 AR_PHY_TX_IQCAL_STATUS_B0,
                                 AR_PHY_CALIBRATED_GAINS_0);
@@ -767,16 +768,13 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)
         };
         struct coeff coeff;
         s32 iq_res[6];
-        u8 num_chains = 0;
         int i, im, j;
         int nmeasurement;
 
         for (i = 0; i < AR9300_MAX_CHAINS; i++) {
-                if (ah->txchainmask & (1 << i))
-                        num_chains++;
-        }
+                if (!(ah->txchainmask & (1 << i)))
+                        continue;
 
-        for (i = 0; i < num_chains; i++) {
                 nmeasurement = REG_READ_FIELD(ah,
                                 AR_PHY_TX_IQCAL_STATUS_B0,
                                 AR_PHY_CALIBRATED_GAINS_0);
@@ -839,8 +837,7 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah, bool is_reusable)
                                 coeff.phs_coeff[i][im] -= 128;
                 }
         }
-        ar9003_hw_tx_iqcal_load_avg_2_passes(ah, num_chains,
-                                             &coeff, is_reusable);
+        ar9003_hw_tx_iqcal_load_avg_2_passes(ah, &coeff, is_reusable);
 
         return;
 
@@ -901,7 +898,6 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
         bool is_reusable = true, status = true;
         bool run_rtt_cal = false, run_agc_cal;
         bool rtt = !!(ah->caps.hw_caps & ATH9K_HW_CAP_RTT);
-        bool mci = !!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI);
         u32 agc_ctrl = 0, agc_supp_cals = AR_PHY_AGC_CONTROL_OFFSET_CAL |
                                           AR_PHY_AGC_CONTROL_FLTR_CAL   |
                                           AR_PHY_AGC_CONTROL_PKDET_CAL;
@@ -970,7 +966,7 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
         } else if (caldata && !caldata->done_txiqcal_once)
                 run_agc_cal = true;
 
-        if (mci && IS_CHAN_2GHZ(chan) && run_agc_cal)
+        if (ath9k_hw_mci_is_enabled(ah) && IS_CHAN_2GHZ(chan) && run_agc_cal)
                 ar9003_mci_init_cal_req(ah, &is_reusable);
 
         if (!(IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan))) {
@@ -993,7 +989,7 @@ skip_tx_iqcal:
                                        0, AH_WAIT_TIMEOUT);
         }
 
-        if (mci && IS_CHAN_2GHZ(chan) && run_agc_cal)
+        if (ath9k_hw_mci_is_enabled(ah) && IS_CHAN_2GHZ(chan) && run_agc_cal)
                 ar9003_mci_init_cal_done(ah);
 
         if (rtt && !run_rtt_cal) {
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index dfb0441f406c..b1e59236d245 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -3178,7 +3178,7 @@ static int ar9300_compress_decision(struct ath_hw *ah,
                                 mdata_size, length);
                         return -1;
                 }
-                memcpy(mptr, (u8 *) (word + COMP_HDR_LEN), length);
+                memcpy(mptr, word + COMP_HDR_LEN, length);
                 ath_dbg(common, EEPROM,
                         "restored eeprom %d: uncompressed, length %d\n",
                         it, length);
@@ -3199,7 +3199,7 @@ static int ar9300_compress_decision(struct ath_hw *ah,
                         "restore eeprom %d: block, reference %d, length %d\n",
                         it, reference, length);
                 ar9300_uncompress_block(ah, mptr, mdata_size,
-                                        (u8 *) (word + COMP_HDR_LEN), length);
+                                        (word + COMP_HDR_LEN), length);
                 break;
         default:
                 ath_dbg(common, EEPROM, "unknown compression code %d\n", code);
@@ -3412,11 +3412,11 @@ static u32 ath9k_hw_ar9003_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
         if (!dump_base_hdr) {
                 len += snprintf(buf + len, size - len,
                                 "%20s :\n", "2GHz modal Header");
-                len += ar9003_dump_modal_eeprom(buf, len, size,
+                len = ar9003_dump_modal_eeprom(buf, len, size,
                                                 &eep->modalHeader2G);
                 len += snprintf(buf + len, size - len,
                                 "%20s :\n", "5GHz modal Header");
-                len += ar9003_dump_modal_eeprom(buf, len, size,
+                len = ar9003_dump_modal_eeprom(buf, len, size,
                                                 &eep->modalHeader5G);
                 goto out;
         }
@@ -3613,6 +3613,7 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)
                 value = ar9003_switch_com_spdt_get(ah, is2ghz);
                 REG_RMW_FIELD(ah, AR_PHY_GLB_CONTROL,
                                 AR_SWITCH_TABLE_COM_SPDT_ALL, value);
+                REG_SET_BIT(ah, AR_PHY_GLB_CONTROL, AR_BTCOEX_CTRL_SPDT_ENABLE);
         }
 
         value = ar9003_hw_ant_ctrl_common_2_get(ah, is2ghz);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.c b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
index ffbb180f91e1..b1ced2a76da3 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mci.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
@@ -35,31 +35,30 @@ static int ar9003_mci_wait_for_interrupt(struct ath_hw *ah, u32 address,
         struct ath_common *common = ath9k_hw_common(ah);
 
         while (time_out) {
-                if (REG_READ(ah, address) & bit_position) {
-                        REG_WRITE(ah, address, bit_position);
-
-                        if (address == AR_MCI_INTERRUPT_RX_MSG_RAW) {
-                                if (bit_position &
-                                    AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE)
-                                        ar9003_mci_reset_req_wakeup(ah);
-
-                                if (bit_position &
-                                    (AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING |
-                                     AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING))
-                                        REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,
-                                        AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE);
-
-                                REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,
-                                          AR_MCI_INTERRUPT_RX_MSG);
-                        }
-                        break;
-                }
+                if (!(REG_READ(ah, address) & bit_position)) {
+                        udelay(10);
+                        time_out -= 10;
 
-                udelay(10);
-                time_out -= 10;
+                        if (time_out < 0)
+                                break;
+                        else
+                                continue;
+                }
+                REG_WRITE(ah, address, bit_position);
 
-                if (time_out < 0)
+                if (address != AR_MCI_INTERRUPT_RX_MSG_RAW)
                         break;
+
+                if (bit_position & AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE)
+                        ar9003_mci_reset_req_wakeup(ah);
+
+                if (bit_position & (AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING |
+                                    AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING))
+                        REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,
+                                  AR_MCI_INTERRUPT_REMOTE_SLEEP_UPDATE);
+
+                REG_WRITE(ah, AR_MCI_INTERRUPT_RAW, AR_MCI_INTERRUPT_RX_MSG);
+                break;
         }
 
         if (time_out <= 0) {
@@ -127,14 +126,13 @@ static void ar9003_mci_send_coex_version_query(struct ath_hw *ah,
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
         u32 payload[4] = {0, 0, 0, 0};
 
-        if (!mci->bt_version_known &&
-            (mci->bt_state != MCI_BT_SLEEP)) {
-                MCI_GPM_SET_TYPE_OPCODE(payload,
-                                        MCI_GPM_COEX_AGENT,
-                                        MCI_GPM_COEX_VERSION_QUERY);
-                ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,
-                                        wait_done, true);
-        }
+        if (mci->bt_version_known ||
+            (mci->bt_state == MCI_BT_SLEEP))
+                return;
+
+        MCI_GPM_SET_TYPE_OPCODE(payload, MCI_GPM_COEX_AGENT,
+                                MCI_GPM_COEX_VERSION_QUERY);
+        ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16, wait_done, true);
 }
 
 static void ar9003_mci_send_coex_version_response(struct ath_hw *ah,
@@ -158,15 +156,14 @@ static void ar9003_mci_send_coex_wlan_channels(struct ath_hw *ah,
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
         u32 *payload = &mci->wlan_channels[0];
 
-        if ((mci->wlan_channels_update == true) &&
-            (mci->bt_state != MCI_BT_SLEEP)) {
-                MCI_GPM_SET_TYPE_OPCODE(payload,
-                                        MCI_GPM_COEX_AGENT,
-                                        MCI_GPM_COEX_WLAN_CHANNELS);
-                ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,
-                                        wait_done, true);
-                MCI_GPM_SET_TYPE_OPCODE(payload, 0xff, 0xff);
-        }
+        if (!mci->wlan_channels_update ||
+            (mci->bt_state == MCI_BT_SLEEP))
+                return;
+
+        MCI_GPM_SET_TYPE_OPCODE(payload, MCI_GPM_COEX_AGENT,
+                                MCI_GPM_COEX_WLAN_CHANNELS);
+        ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16, wait_done, true);
+        MCI_GPM_SET_TYPE_OPCODE(payload, 0xff, 0xff);
 }
 
 static void ar9003_mci_send_coex_bt_status_query(struct ath_hw *ah,
@@ -174,29 +171,30 @@ static void ar9003_mci_send_coex_bt_status_query(struct ath_hw *ah,
 {
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
         u32 payload[4] = {0, 0, 0, 0};
-        bool query_btinfo = !!(query_type & (MCI_GPM_COEX_QUERY_BT_ALL_INFO |
-                                             MCI_GPM_COEX_QUERY_BT_TOPOLOGY));
-
-        if (mci->bt_state != MCI_BT_SLEEP) {
+        bool query_btinfo;
 
-                MCI_GPM_SET_TYPE_OPCODE(payload, MCI_GPM_COEX_AGENT,
-                                        MCI_GPM_COEX_STATUS_QUERY);
+        if (mci->bt_state == MCI_BT_SLEEP)
+                return;
 
-                *(((u8 *)payload) + MCI_GPM_COEX_B_BT_BITMAP) = query_type;
+        query_btinfo = !!(query_type & (MCI_GPM_COEX_QUERY_BT_ALL_INFO |
+                                        MCI_GPM_COEX_QUERY_BT_TOPOLOGY));
+        MCI_GPM_SET_TYPE_OPCODE(payload, MCI_GPM_COEX_AGENT,
+                                MCI_GPM_COEX_STATUS_QUERY);
 
-                /*
-                 * If bt_status_query message is  not sent successfully,
-                 * then need_flush_btinfo should be set again.
-                 */
-                if (!ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,
-                                             wait_done, true)) {
-                        if (query_btinfo)
-                                mci->need_flush_btinfo = true;
-                }
+        *(((u8 *)payload) + MCI_GPM_COEX_B_BT_BITMAP) = query_type;
 
+        /*
+         * If bt_status_query message is  not sent successfully,
+         * then need_flush_btinfo should be set again.
+         */
+        if (!ar9003_mci_send_message(ah, MCI_GPM, 0, payload, 16,
+                                wait_done, true)) {
                 if (query_btinfo)
-                        mci->query_bt = false;
+                        mci->need_flush_btinfo = true;
         }
+
+        if (query_btinfo)
+                mci->query_bt = false;
 }
 
 static void ar9003_mci_send_coex_halt_bt_gpm(struct ath_hw *ah, bool halt,
@@ -241,73 +239,73 @@ static void ar9003_mci_prep_interface(struct ath_hw *ah)
         ar9003_mci_remote_reset(ah, true);
         ar9003_mci_send_req_wake(ah, true);
 
-        if (ar9003_mci_wait_for_interrupt(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
-                                  AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING, 500)) {
+        if (!ar9003_mci_wait_for_interrupt(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                                  AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING, 500))
+                goto clear_redunt;
 
-                mci->bt_state = MCI_BT_AWAKE;
+        mci->bt_state = MCI_BT_AWAKE;
 
-                /*
-                 * we don't need to send more remote_reset at this moment.
-                 * If BT receive first remote_reset, then BT HW will
-                 * be cleaned up and will be able to receive req_wake
-                 * and BT HW will respond sys_waking.
-                 * In this case, WLAN will receive BT's HW sys_waking.
-                 * Otherwise, if BT SW missed initial remote_reset,
-                 * that remote_reset will still clean up BT MCI RX,
-                 * and the req_wake will wake BT up,
-                 * and BT SW will respond this req_wake with a remote_reset and
-                 * sys_waking. In this case, WLAN will receive BT's SW
-                 * sys_waking. In either case, BT's RX is cleaned up. So we
-                 * don't need to reply BT's remote_reset now, if any.
-                 * Similarly, if in any case, WLAN can receive BT's sys_waking,
-                 * that means WLAN's RX is also fine.
-                 */
-                ar9003_mci_send_sys_waking(ah, true);
-                udelay(10);
+        /*
+         * we don't need to send more remote_reset at this moment.
+         * If BT receive first remote_reset, then BT HW will
+         * be cleaned up and will be able to receive req_wake
+         * and BT HW will respond sys_waking.
+         * In this case, WLAN will receive BT's HW sys_waking.
+         * Otherwise, if BT SW missed initial remote_reset,
+         * that remote_reset will still clean up BT MCI RX,
+         * and the req_wake will wake BT up,
+         * and BT SW will respond this req_wake with a remote_reset and
+         * sys_waking. In this case, WLAN will receive BT's SW
+         * sys_waking. In either case, BT's RX is cleaned up. So we
+         * don't need to reply BT's remote_reset now, if any.
+         * Similarly, if in any case, WLAN can receive BT's sys_waking,
+         * that means WLAN's RX is also fine.
+         */
+        ar9003_mci_send_sys_waking(ah, true);
+        udelay(10);
 
-                /*
-                 * Set BT priority interrupt value to be 0xff to
-                 * avoid having too many BT PRIORITY interrupts.
-                 */
-                REG_WRITE(ah, AR_MCI_BT_PRI0, 0xFFFFFFFF);
-                REG_WRITE(ah, AR_MCI_BT_PRI1, 0xFFFFFFFF);
-                REG_WRITE(ah, AR_MCI_BT_PRI2, 0xFFFFFFFF);
-                REG_WRITE(ah, AR_MCI_BT_PRI3, 0xFFFFFFFF);
-                REG_WRITE(ah, AR_MCI_BT_PRI, 0X000000FF);
+        /*
+         * Set BT priority interrupt value to be 0xff to
+         * avoid having too many BT PRIORITY interrupts.
+         */
+        REG_WRITE(ah, AR_MCI_BT_PRI0, 0xFFFFFFFF);
+        REG_WRITE(ah, AR_MCI_BT_PRI1, 0xFFFFFFFF);
+        REG_WRITE(ah, AR_MCI_BT_PRI2, 0xFFFFFFFF);
+        REG_WRITE(ah, AR_MCI_BT_PRI3, 0xFFFFFFFF);
+        REG_WRITE(ah, AR_MCI_BT_PRI, 0X000000FF);
 
-                /*
-                 * A contention reset will be received after send out
-                 * sys_waking. Also BT priority interrupt bits will be set.
-                 * Clear those bits before the next step.
-                 */
+        /*
+         * A contention reset will be received after send out
+         * sys_waking. Also BT priority interrupt bits will be set.
+         * Clear those bits before the next step.
+         */
 
-                REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
-                          AR_MCI_INTERRUPT_RX_MSG_CONT_RST);
-                REG_WRITE(ah, AR_MCI_INTERRUPT_RAW,
-                          AR_MCI_INTERRUPT_BT_PRI);
+        REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                  AR_MCI_INTERRUPT_RX_MSG_CONT_RST);
+        REG_WRITE(ah, AR_MCI_INTERRUPT_RAW, AR_MCI_INTERRUPT_BT_PRI);
 
-                if (mci->is_2g) {
-                        ar9003_mci_send_lna_transfer(ah, true);
-                        udelay(5);
-                }
+        if (mci->is_2g) {
+                ar9003_mci_send_lna_transfer(ah, true);
+                udelay(5);
+        }
 
-                if ((mci->is_2g && !mci->update_2g5g)) {
-                        if (ar9003_mci_wait_for_interrupt(ah,
-                                          AR_MCI_INTERRUPT_RX_MSG_RAW,
-                                          AR_MCI_INTERRUPT_RX_MSG_LNA_INFO,
-                                          mci_timeout))
-                                ath_dbg(common, MCI,
-                                        "MCI WLAN has control over the LNA & BT obeys it\n");
-                        else
-                                ath_dbg(common, MCI,
-                                        "MCI BT didn't respond to LNA_TRANS\n");
-                }
+        if ((mci->is_2g && !mci->update_2g5g)) {
+                if (ar9003_mci_wait_for_interrupt(ah,
+                                        AR_MCI_INTERRUPT_RX_MSG_RAW,
+                                        AR_MCI_INTERRUPT_RX_MSG_LNA_INFO,
+                                        mci_timeout))
+                        ath_dbg(common, MCI,
+                                "MCI WLAN has control over the LNA & BT obeys it\n");
+                else
+                        ath_dbg(common, MCI,
+                                "MCI BT didn't respond to LNA_TRANS\n");
         }
 
+clear_redunt:
         /* Clear the extra redundant SYS_WAKING from BT */
         if ((mci->bt_state == MCI_BT_AWAKE) &&
-                (REG_READ_FIELD(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
-                                AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING)) &&
+            (REG_READ_FIELD(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                            AR_MCI_INTERRUPT_RX_MSG_SYS_WAKING)) &&
             (REG_READ_FIELD(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
                             AR_MCI_INTERRUPT_RX_MSG_SYS_SLEEPING) == 0)) {
                 REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
@@ -330,7 +328,6 @@ void ar9003_mci_set_full_sleep(struct ath_hw *ah)
         }
 
         mci->ready = false;
-        REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
 }
 
 static void ar9003_mci_disable_interrupt(struct ath_hw *ah)
@@ -615,9 +612,9 @@ static u32 ar9003_mci_wait_for_gpm(struct ath_hw *ah, u8 gpm_type,
                                 }
                                 break;
                         }
-                } else if ((recv_type == gpm_type) && (recv_opcode == gpm_opcode)) {
+                } else if ((recv_type == gpm_type) &&
+                           (recv_opcode == gpm_opcode))
                         break;
-                }
 
                 /*
                  * check if it's cal_grant
@@ -731,38 +728,38 @@ int ar9003_mci_end_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         if (!IS_CHAN_2GHZ(chan) || (mci_hw->bt_state != MCI_BT_SLEEP))
                 goto exit;
 
-        if (ar9003_mci_check_int(ah, AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET) ||
-            ar9003_mci_check_int(ah, AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE)) {
+        if (!ar9003_mci_check_int(ah, AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET) &&
+            !ar9003_mci_check_int(ah, AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE))
+                goto exit;
 
-                /*
-                 * BT is sleeping. Check if BT wakes up during
-                 * WLAN calibration. If BT wakes up during
-                 * WLAN calibration, need to go through all
-                 * message exchanges again and recal.
-                 */
-                REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
-                          AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET |
-                          AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE);
+        /*
+         * BT is sleeping. Check if BT wakes up during
+         * WLAN calibration. If BT wakes up during
+         * WLAN calibration, need to go through all
+         * message exchanges again and recal.
+         */
+        REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_RAW,
+                  (AR_MCI_INTERRUPT_RX_MSG_REMOTE_RESET |
+                   AR_MCI_INTERRUPT_RX_MSG_REQ_WAKE));
 
-                ar9003_mci_remote_reset(ah, true);
-                ar9003_mci_send_sys_waking(ah, true);
-                udelay(1);
+        ar9003_mci_remote_reset(ah, true);
+        ar9003_mci_send_sys_waking(ah, true);
+        udelay(1);
 
-                if (IS_CHAN_2GHZ(chan))
-                        ar9003_mci_send_lna_transfer(ah, true);
+        if (IS_CHAN_2GHZ(chan))
+                ar9003_mci_send_lna_transfer(ah, true);
 
-                mci_hw->bt_state = MCI_BT_AWAKE;
+        mci_hw->bt_state = MCI_BT_AWAKE;
 
-                if (caldata) {
-                        caldata->done_txiqcal_once = false;
-                        caldata->done_txclcal_once = false;
-                        caldata->rtt_done = false;
-                }
+        if (caldata) {
+                caldata->done_txiqcal_once = false;
+                caldata->done_txclcal_once = false;
+                caldata->rtt_done = false;
+        }
 
-                if (!ath9k_hw_init_cal(ah, chan))
-                        return -EIO;
+        if (!ath9k_hw_init_cal(ah, chan))
+                return -EIO;
 
-        }
 exit:
         ar9003_mci_enable_interrupt(ah);
         return 0;
@@ -798,29 +795,27 @@ static void ar9003_mci_osla_setup(struct ath_hw *ah, bool enable)
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
         u32 thresh;
 
-        if (enable) {
-                REG_RMW_FIELD(ah, AR_MCI_SCHD_TABLE_2,
-                              AR_MCI_SCHD_TABLE_2_HW_BASED, 1);
-                REG_RMW_FIELD(ah, AR_MCI_SCHD_TABLE_2,
-                              AR_MCI_SCHD_TABLE_2_MEM_BASED, 1);
-
-                if (!(mci->config & ATH_MCI_CONFIG_DISABLE_AGGR_THRESH)) {
-                        thresh = MS(mci->config, ATH_MCI_CONFIG_AGGR_THRESH);
-                        REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
-                                      AR_BTCOEX_CTRL_AGGR_THRESH, thresh);
-                        REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
-                                      AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN, 1);
-                } else {
-                        REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
-                                      AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN, 0);
-                }
-
-                REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
-                              AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN, 1);
-        } else {
+        if (!enable) {
                 REG_CLR_BIT(ah, AR_BTCOEX_CTRL,
                             AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
+                return;
         }
+        REG_RMW_FIELD(ah, AR_MCI_SCHD_TABLE_2, AR_MCI_SCHD_TABLE_2_HW_BASED, 1);
+        REG_RMW_FIELD(ah, AR_MCI_SCHD_TABLE_2,
+                      AR_MCI_SCHD_TABLE_2_MEM_BASED, 1);
+
+        if (!(mci->config & ATH_MCI_CONFIG_DISABLE_AGGR_THRESH)) {
+                thresh = MS(mci->config, ATH_MCI_CONFIG_AGGR_THRESH);
+                REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
+                              AR_BTCOEX_CTRL_AGGR_THRESH, thresh);
+                REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
+                              AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN, 1);
+        } else
+                REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
+                              AR_BTCOEX_CTRL_TIME_TO_NEXT_BT_THRESH_EN, 0);
+
+        REG_RMW_FIELD(ah, AR_BTCOEX_CTRL,
+                      AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN, 1);
 }
 
 void ar9003_mci_reset(struct ath_hw *ah, bool en_int, bool is_2g,
@@ -943,26 +938,27 @@ static void ar9003_mci_send_2g5g_status(struct ath_hw *ah, bool wait_done)
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
         u32 new_flags, to_set, to_clear;
 
-        if (mci->update_2g5g && (mci->bt_state != MCI_BT_SLEEP)) {
-                if (mci->is_2g) {
-                        new_flags = MCI_2G_FLAGS;
-                        to_clear = MCI_2G_FLAGS_CLEAR_MASK;
-                        to_set = MCI_2G_FLAGS_SET_MASK;
-                } else {
-                        new_flags = MCI_5G_FLAGS;
-                        to_clear = MCI_5G_FLAGS_CLEAR_MASK;
-                        to_set = MCI_5G_FLAGS_SET_MASK;
-                }
+        if (!mci->update_2g5g || (mci->bt_state == MCI_BT_SLEEP))
+                return;
+
+        if (mci->is_2g) {
+                new_flags = MCI_2G_FLAGS;
+                to_clear = MCI_2G_FLAGS_CLEAR_MASK;
+                to_set = MCI_2G_FLAGS_SET_MASK;
+        } else {
+                new_flags = MCI_5G_FLAGS;
+                to_clear = MCI_5G_FLAGS_CLEAR_MASK;
+                to_set = MCI_5G_FLAGS_SET_MASK;
+        }
 
-                if (to_clear)
-                        ar9003_mci_send_coex_bt_flags(ah, wait_done,
+        if (to_clear)
+                ar9003_mci_send_coex_bt_flags(ah, wait_done,
                                               MCI_GPM_COEX_BT_FLAGS_CLEAR,
                                               to_clear);
-                if (to_set)
-                        ar9003_mci_send_coex_bt_flags(ah, wait_done,
+        if (to_set)
+                ar9003_mci_send_coex_bt_flags(ah, wait_done,
                                               MCI_GPM_COEX_BT_FLAGS_SET,
                                               to_set);
-        }
 }
 
 static void ar9003_mci_queue_unsent_gpm(struct ath_hw *ah, u8 header,
@@ -1018,34 +1014,34 @@ void ar9003_mci_2g5g_switch(struct ath_hw *ah, bool wait_done)
 {
         struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
 
-        if (mci->update_2g5g) {
-                if (mci->is_2g) {
-                        ar9003_mci_send_2g5g_status(ah, true);
-                        ar9003_mci_send_lna_transfer(ah, true);
-                        udelay(5);
+        if (!mci->update_2g5g)
+                return;
 
-                        REG_CLR_BIT(ah, AR_MCI_TX_CTRL,
-                                    AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
-                        REG_CLR_BIT(ah, AR_PHY_GLB_CONTROL,
-                                    AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
+        if (mci->is_2g) {
+                ar9003_mci_send_2g5g_status(ah, true);
+                ar9003_mci_send_lna_transfer(ah, true);
+                udelay(5);
 
-                        if (!(mci->config & ATH_MCI_CONFIG_DISABLE_OSLA)) {
-                                REG_SET_BIT(ah, AR_BTCOEX_CTRL,
-                                            AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
-                        }
-                } else {
-                        ar9003_mci_send_lna_take(ah, true);
-                        udelay(5);
-
-                        REG_SET_BIT(ah, AR_MCI_TX_CTRL,
-                                    AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
-                        REG_SET_BIT(ah, AR_PHY_GLB_CONTROL,
-                                    AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
-                        REG_CLR_BIT(ah, AR_BTCOEX_CTRL,
+                REG_CLR_BIT(ah, AR_MCI_TX_CTRL,
+                            AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
+                REG_CLR_BIT(ah, AR_PHY_GLB_CONTROL,
+                            AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
+
+                if (!(mci->config & ATH_MCI_CONFIG_DISABLE_OSLA))
+                        REG_SET_BIT(ah, AR_BTCOEX_CTRL,
                                     AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
+        } else {
+                ar9003_mci_send_lna_take(ah, true);
+                udelay(5);
 
-                        ar9003_mci_send_2g5g_status(ah, true);
-                }
+                REG_SET_BIT(ah, AR_MCI_TX_CTRL,
+                            AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
+                REG_SET_BIT(ah, AR_PHY_GLB_CONTROL,
+                            AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
+                REG_CLR_BIT(ah, AR_BTCOEX_CTRL,
+                            AR_BTCOEX_CTRL_ONE_STEP_LOOK_AHEAD_EN);
+
+                ar9003_mci_send_2g5g_status(ah, true);
         }
 }
 
@@ -1132,7 +1128,7 @@ void ar9003_mci_init_cal_req(struct ath_hw *ah, bool *is_reusable)
         if (ar9003_mci_wait_for_gpm(ah, MCI_GPM_BT_CAL_GRANT, 0, 50000)) {
                 ath_dbg(common, MCI, "MCI BT_CAL_GRANT received\n");
         } else {
-                is_reusable = false;
+                *is_reusable = false;
                 ath_dbg(common, MCI, "MCI BT_CAL_GRANT not received\n");
         }
 }
@@ -1259,12 +1255,12 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data)
                         }
                         if (p_data)
                                 *p_data = more_gpm;
-                        }
+                }
 
-                        if (value != MCI_GPM_INVALID)
-                                value <<= 4;
+                if (value != MCI_GPM_INVALID)
+                        value <<= 4;
 
-                        break;
+                break;
         case MCI_STATE_LAST_SCHD_MSG_OFFSET:
                 value = MS(REG_READ(ah, AR_MCI_RX_STATUS),
                                     AR_MCI_RX_LAST_SCHD_MSG_INDEX);
@@ -1359,24 +1355,22 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data)
                 ar9003_mci_send_coex_bt_status_query(ah, true, query_type);
                 break;
         case MCI_STATE_NEED_FLUSH_BT_INFO:
-                        /*
-                         * btcoex_hw.mci.unhalt_bt_gpm means whether it's
-                         * needed to send UNHALT message. It's set whenever
-                         * there's a request to send HALT message.
-                         * mci_halted_bt_gpm means whether HALT message is sent
-                         * out successfully.
-                         *
-                         * Checking (mci_unhalt_bt_gpm == false) instead of
-                         * checking (ah->mci_halted_bt_gpm == false) will make
-                         * sure currently is in UNHALT-ed mode and BT can
-                         * respond to status query.
-                         */
-                        value = (!mci->unhalt_bt_gpm &&
-                                 mci->need_flush_btinfo) ? 1 : 0;
-                        if (p_data)
-                                mci->need_flush_btinfo =
-                                        (*p_data != 0) ? true : false;
-                        break;
+                /*
+                 * btcoex_hw.mci.unhalt_bt_gpm means whether it's
+                 * needed to send UNHALT message. It's set whenever
+                 * there's a request to send HALT message.
+                 * mci_halted_bt_gpm means whether HALT message is sent
+                 * out successfully.
+                 *
+                 * Checking (mci_unhalt_bt_gpm == false) instead of
+                 * checking (ah->mci_halted_bt_gpm == false) will make
+                 * sure currently is in UNHALT-ed mode and BT can
+                 * respond to status query.
+                 */
+                value = (!mci->unhalt_bt_gpm && mci->need_flush_btinfo) ? 1 : 0;
+                if (p_data)
+                        mci->need_flush_btinfo = (*p_data != 0) ? true : false;
+                break;
         case MCI_STATE_RECOVER_RX:
                 ar9003_mci_prep_interface(ah);
                 mci->query_bt = true;
@@ -1387,9 +1381,6 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data)
         case MCI_STATE_NEED_FTP_STOMP:
                 value = !(mci->config & ATH_MCI_CONFIG_DISABLE_FTP_STOMP);
                 break;
-        case MCI_STATE_NEED_TUNING:
-                value = !(mci->config & ATH_MCI_CONFIG_DISABLE_TUNING);
-                break;
         default:
                 break;
         }
@@ -1397,3 +1388,19 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type, u32 *p_data)
         return value;
 }
 EXPORT_SYMBOL(ar9003_mci_state);
+
+void ar9003_mci_bt_gain_ctrl(struct ath_hw *ah)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
+
+        ath_dbg(common, MCI, "Give LNA and SPDT control to BT\n");
+
+        REG_SET_BIT(ah, AR_PHY_GLB_CONTROL, AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
+        mci->is_2g = false;
+        mci->update_2g5g = true;
+        ar9003_mci_send_2g5g_status(ah, true);
+
+        /* Force another 2g5g update at next scanning */
+        mci->update_2g5g = true;
+}
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.h b/drivers/net/wireless/ath/ath9k/ar9003_mci.h
index 4842f6c06b8c..10282e2bcdc9 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mci.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.h
@@ -212,7 +212,6 @@ enum mci_state_type {
         MCI_STATE_SET_CONCUR_TX_PRI,
         MCI_STATE_RECOVER_RX,
         MCI_STATE_NEED_FTP_STOMP,
-        MCI_STATE_NEED_TUNING,
         MCI_STATE_DEBUG,
         MCI_STATE_MAX
 };
@@ -266,6 +265,7 @@ void ar9003_mci_setup(struct ath_hw *ah, u32 gpm_addr, void *gpm_buf,
 void ar9003_mci_cleanup(struct ath_hw *ah);
 void ar9003_mci_get_interrupt(struct ath_hw *ah, u32 *raw_intr,
                               u32 *rx_msg_intr);
+void ar9003_mci_bt_gain_ctrl(struct ath_hw *ah);
 
 /*
  * These functions are used by ath9k_hw.
@@ -273,10 +273,6 @@ void ar9003_mci_get_interrupt(struct ath_hw *ah, u32 *raw_intr,
 
 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
 
-static inline bool ar9003_mci_is_ready(struct ath_hw *ah)
-{
-        return ah->btcoex_hw.mci.ready;
-}
 void ar9003_mci_stop_bt(struct ath_hw *ah, bool save_fullsleep);
 void ar9003_mci_init_cal_req(struct ath_hw *ah, bool *is_reusable);
 void ar9003_mci_init_cal_done(struct ath_hw *ah);
@@ -292,10 +288,6 @@ void ar9003_mci_get_isr(struct ath_hw *ah, enum ath9k_int *masked);
 
 #else
 
-static inline bool ar9003_mci_is_ready(struct ath_hw *ah)
-{
-        return false;
-}
 static inline void ar9003_mci_stop_bt(struct ath_hw *ah, bool save_fullsleep)
 {
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 11abb972be1f..d6baf69cdc14 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -676,6 +676,10 @@ static int ar9003_hw_process_ini(struct ath_hw *ah,
         if (chan->channel == 2484)
                 ar9003_hw_prog_ini(ah, &ah->ini_japan2484, 1);
 
+        if (AR_SREV_9462(ah))
+                REG_WRITE(ah, AR_GLB_SWREG_DISCONT_MODE,
+                          AR_GLB_SWREG_DISCONT_EN_BT_WLAN);
+
         ah->modes_index = modesIndex;
         ar9003_hw_override_ini(ah);
         ar9003_hw_set_channel_regs(ah, chan);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
index 7268a48a92a1..ed662c3bae5b 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
@@ -820,18 +820,26 @@
 #define AR_PHY_CHAN_INFO_MEMORY_CAPTURE_MASK         0x0001
 #define AR_PHY_RX_DELAY_DELAY   0x00003FFF
 #define AR_PHY_CCK_TX_CTRL_JAPAN    0x00000010
-#define AR_PHY_SPECTRAL_SCAN_ENABLE         0x00000001
-#define AR_PHY_SPECTRAL_SCAN_ENABLE_S       0
-#define AR_PHY_SPECTRAL_SCAN_ACTIVE         0x00000002
-#define AR_PHY_SPECTRAL_SCAN_ACTIVE_S       1
-#define AR_PHY_SPECTRAL_SCAN_FFT_PERIOD     0x000000F0
-#define AR_PHY_SPECTRAL_SCAN_FFT_PERIOD_S   4
-#define AR_PHY_SPECTRAL_SCAN_PERIOD         0x0000FF00
-#define AR_PHY_SPECTRAL_SCAN_PERIOD_S       8
-#define AR_PHY_SPECTRAL_SCAN_COUNT          0x00FF0000
-#define AR_PHY_SPECTRAL_SCAN_COUNT_S        16
-#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT   0x01000000
-#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_S 24
+
+#define AR_PHY_SPECTRAL_SCAN_ENABLE           0x00000001
+#define AR_PHY_SPECTRAL_SCAN_ENABLE_S         0
+#define AR_PHY_SPECTRAL_SCAN_ACTIVE           0x00000002
+#define AR_PHY_SPECTRAL_SCAN_ACTIVE_S         1
+#define AR_PHY_SPECTRAL_SCAN_FFT_PERIOD       0x000000F0
+#define AR_PHY_SPECTRAL_SCAN_FFT_PERIOD_S     4
+#define AR_PHY_SPECTRAL_SCAN_PERIOD           0x0000FF00
+#define AR_PHY_SPECTRAL_SCAN_PERIOD_S         8
+#define AR_PHY_SPECTRAL_SCAN_COUNT            0x0FFF0000
+#define AR_PHY_SPECTRAL_SCAN_COUNT_S          16
+#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT     0x10000000
+#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_S   28
+#define AR_PHY_SPECTRAL_SCAN_PRIORITY         0x20000000
+#define AR_PHY_SPECTRAL_SCAN_PRIORITY_S       29
+#define AR_PHY_SPECTRAL_SCAN_USE_ERR5         0x40000000
+#define AR_PHY_SPECTRAL_SCAN_USE_ERR5_S       30
+#define AR_PHY_SPECTRAL_SCAN_COMPRESSED_RPT   0x80000000
+#define AR_PHY_SPECTRAL_SCAN_COMPRESSED_RPT_S 31
+
 #define AR_PHY_CHANNEL_STATUS_RX_CLEAR      0x00000004
 #define AR_PHY_RTT_CTRL_ENA_RADIO_RETENTION     0x00000001
 #define AR_PHY_RTT_CTRL_ENA_RADIO_RETENTION_S   0
diff --git a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
index 1d6658e139b5..4a93e1534c1d 100644
--- a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
@@ -958,7 +958,7 @@ static const u32 ar9462_2p0_radio_core[][2] = {
         {0x0001604c, 0x2699e04f},
         {0x00016050, 0x6db6db6c},
         {0x00016058, 0x6c200000},
-        {0x00016080, 0x00040000},
+        {0x00016080, 0x000c0000},
         {0x00016084, 0x9a68048c},
         {0x00016088, 0x54214514},
         {0x0001608c, 0x1203040b},
@@ -981,7 +981,7 @@ static const u32 ar9462_2p0_radio_core[][2] = {
         {0x00016144, 0x02084080},
         {0x00016148, 0x000080c0},
         {0x00016280, 0x050a0001},
-        {0x00016284, 0x3d841400},
+        {0x00016284, 0x3d841418},
         {0x00016288, 0x00000000},
         {0x0001628c, 0xe3000000},
         {0x00016290, 0xa1005080},
@@ -1007,6 +1007,7 @@ static const u32 ar9462_2p0_radio_core[][2] = {
 
 static const u32 ar9462_2p0_soc_preamble[][2] = {
         /* Addr      allmodes  */
+        {0x000040a4 ,0x00a0c1c9},
         {0x00007020, 0x00000000},
         {0x00007034, 0x00000002},
         {0x00007038, 0x000004c2},
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index a277cf6f339d..02fc1c1e5eeb 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -307,6 +307,7 @@ struct ath_rx {
         u8 defant;
         u8 rxotherant;
         u32 *rxlink;
+        u32 num_pkts;
         unsigned int rxfilter;
         spinlock_t rxbuflock;
         struct list_head rxbuf;
@@ -325,6 +326,9 @@ int ath_rx_init(struct ath_softc *sc, int nbufs);
 void ath_rx_cleanup(struct ath_softc *sc);
 int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp);
 struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype);
+void ath_txq_lock(struct ath_softc *sc, struct ath_txq *txq);
+void ath_txq_unlock(struct ath_softc *sc, struct ath_txq *txq);
+void ath_txq_unlock_complete(struct ath_softc *sc, struct ath_txq *txq);
 void ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq);
 bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx);
 void ath_draintxq(struct ath_softc *sc,
@@ -414,9 +418,9 @@ int ath_beaconq_config(struct ath_softc *sc);
 void ath_set_beacon(struct ath_softc *sc);
 void ath9k_set_beaconing_status(struct ath_softc *sc, bool status);
 
-/*******/
-/* ANI */
-/*******/
+/*******************/
+/* Link Monitoring */
+/*******************/
 
 #define ATH_STA_SHORT_CALINTERVAL 1000    /* 1 second */
 #define ATH_AP_SHORT_CALINTERVAL  100     /* 100 ms */
@@ -427,7 +431,9 @@ void ath9k_set_beaconing_status(struct ath_softc *sc, bool status);
 #define ATH_RESTART_CALINTERVAL   1200000 /* 20 minutes */
 
 #define ATH_PAPRD_TIMEOUT       100 /* msecs */
+#define ATH_PLL_WORK_INTERVAL   100
 
+void ath_tx_complete_poll_work(struct work_struct *work);
 void ath_reset_work(struct work_struct *work);
 void ath_hw_check(struct work_struct *work);
 void ath_hw_pll_work(struct work_struct *work);
@@ -436,22 +442,31 @@ void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon);
 void ath_paprd_calibrate(struct work_struct *work);
 void ath_ani_calibrate(unsigned long data);
 void ath_start_ani(struct ath_common *common);
+int ath_update_survey_stats(struct ath_softc *sc);
+void ath_update_survey_nf(struct ath_softc *sc, int channel);
 
 /**********/
 /* BTCOEX */
 /**********/
 
+enum bt_op_flags {
+        BT_OP_PRIORITY_DETECTED,
+        BT_OP_SCAN,
+};
+
 struct ath_btcoex {
         bool hw_timer_enabled;
         spinlock_t btcoex_lock;
         struct timer_list period_timer; /* Timer for BT period */
         u32 bt_priority_cnt;
         unsigned long bt_priority_time;
+        unsigned long op_flags;
         int bt_stomp_type; /* Types of BT stomping */
         u32 btcoex_no_stomp; /* in usec */
         u32 btcoex_period; /* in usec */
         u32 btscan_no_stomp; /* in usec */
         u32 duty_cycle;
+        u32 bt_wait_time;
         struct ath_gen_timer *no_stomp_timer; /* Timer for no BT stomping */
         struct ath_mci_profile mci;
 };
@@ -513,8 +528,10 @@ static inline void ath_deinit_leds(struct ath_softc *sc)
 }
 #endif
 
-
+/*******************************/
 /* Antenna diversity/combining */
+/*******************************/
+
 #define ATH_ANT_RX_CURRENT_SHIFT 4
 #define ATH_ANT_RX_MAIN_SHIFT 2
 #define ATH_ANT_RX_MASK 0x3
@@ -567,6 +584,9 @@ struct ath_ant_comb {
         unsigned long scan_start_time;
 };
 
+void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs);
+void ath_ant_comb_update(struct ath_softc *sc);
+
 /********************/
 /* Main driver core */
 /********************/
@@ -584,15 +604,15 @@ struct ath_ant_comb {
 #define ATH_TXPOWER_MAX         100     /* .5 dBm units */
 #define ATH_RATE_DUMMY_MARKER   0
 
-#define SC_OP_INVALID                BIT(0)
-#define SC_OP_BEACONS                BIT(1)
-#define SC_OP_OFFCHANNEL             BIT(2)
-#define SC_OP_RXFLUSH                BIT(3)
-#define SC_OP_TSF_RESET              BIT(4)
-#define SC_OP_BT_PRIORITY_DETECTED   BIT(5)
-#define SC_OP_BT_SCAN                BIT(6)
-#define SC_OP_ANI_RUN                BIT(7)
-#define SC_OP_PRIM_STA_VIF           BIT(8)
+enum sc_op_flags {
+        SC_OP_INVALID,
+        SC_OP_BEACONS,
+        SC_OP_RXFLUSH,
+        SC_OP_TSF_RESET,
+        SC_OP_ANI_RUN,
+        SC_OP_PRIM_STA_VIF,
+        SC_OP_HW_RESET,
+};
 
 /* Powersave flags */
 #define PS_WAIT_FOR_BEACON        BIT(0)
@@ -638,9 +658,9 @@ struct ath_softc {
         struct completion paprd_complete;
 
         unsigned int hw_busy_count;
+        unsigned long sc_flags;
 
         u32 intrstatus;
-        u32 sc_flags; /* SC_OP_* */
         u16 ps_flags; /* PS_* */
         u16 curtxpow;
         bool ps_enabled;
@@ -736,5 +756,4 @@ void ath9k_calculate_iter_data(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif,
                                struct ath9k_vif_iter_data *iter_data);
 
-
 #endif /* ATH9K_H */
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 11bc55e3d697..40775da8941e 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -48,7 +48,10 @@ int ath_beaconq_config(struct ath_softc *sc)
                 txq = sc->tx.txq_map[WME_AC_BE];
                 ath9k_hw_get_txq_props(ah, txq->axq_qnum, &qi_be);
                 qi.tqi_aifs = qi_be.tqi_aifs;
-                qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
+                if (ah->slottime == ATH9K_SLOT_TIME_20)
+                        qi.tqi_cwmin = 2*qi_be.tqi_cwmin;
+                else
+                        qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
                 qi.tqi_cwmax = qi_be.tqi_cwmax;
         }
 
@@ -387,7 +390,7 @@ void ath_beacon_tasklet(unsigned long data)
                 } else if (sc->beacon.bmisscnt >= BSTUCK_THRESH) {
                         ath_dbg(common, BSTUCK, "beacon is officially stuck\n");
                         sc->beacon.bmisscnt = 0;
-                        sc->sc_flags |= SC_OP_TSF_RESET;
+                        set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
                         ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
                 }
 
@@ -477,16 +480,16 @@ static void ath9k_beacon_init(struct ath_softc *sc,
                               u32 next_beacon,
                               u32 beacon_period)
 {
-        if (sc->sc_flags & SC_OP_TSF_RESET) {
+        if (test_bit(SC_OP_TSF_RESET, &sc->sc_flags)) {
                 ath9k_ps_wakeup(sc);
                 ath9k_hw_reset_tsf(sc->sc_ah);
         }
 
         ath9k_hw_beaconinit(sc->sc_ah, next_beacon, beacon_period);
 
-        if (sc->sc_flags & SC_OP_TSF_RESET) {
+        if (test_bit(SC_OP_TSF_RESET, &sc->sc_flags)) {
                 ath9k_ps_restore(sc);
-                sc->sc_flags &= ~SC_OP_TSF_RESET;
+                clear_bit(SC_OP_TSF_RESET, &sc->sc_flags);
         }
 }
 
@@ -516,7 +519,7 @@ static void ath_beacon_config_ap(struct ath_softc *sc,
         /* Set the computed AP beacon timers */
 
         ath9k_hw_disable_interrupts(ah);
-        sc->sc_flags |= SC_OP_TSF_RESET;
+        set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
         ath9k_beacon_init(sc, nexttbtt, intval);
         sc->beacon.bmisscnt = 0;
         ath9k_hw_set_interrupts(ah);
@@ -659,7 +662,7 @@ static void ath_beacon_config_adhoc(struct ath_softc *sc,
         u32 tsf, intval, nexttbtt;
 
         ath9k_reset_beacon_status(sc);
-        if (!(sc->sc_flags & SC_OP_BEACONS))
+        if (!test_bit(SC_OP_BEACONS, &sc->sc_flags))
                 ath9k_hw_settsf64(ah, sc->beacon.bc_tstamp);
 
         intval = TU_TO_USEC(conf->beacon_interval);
@@ -724,7 +727,7 @@ static bool ath9k_allow_beacon_config(struct ath_softc *sc,
          */
         if ((sc->sc_ah->opmode == NL80211_IFTYPE_STATION) &&
             (vif->type == NL80211_IFTYPE_STATION) &&
-            (sc->sc_flags & SC_OP_BEACONS) &&
+            test_bit(SC_OP_BEACONS, &sc->sc_flags) &&
             !avp->primary_sta_vif) {
                 ath_dbg(common, CONFIG,
                         "Beacon already configured for a station interface\n");
@@ -810,7 +813,7 @@ void ath_set_beacon(struct ath_softc *sc)
                 return;
         }
 
-        sc->sc_flags |= SC_OP_BEACONS;
+        set_bit(SC_OP_BEACONS, &sc->sc_flags);
 }
 
 void ath9k_set_beaconing_status(struct ath_softc *sc, bool status)
@@ -818,7 +821,7 @@ void ath9k_set_beaconing_status(struct ath_softc *sc, bool status)
         struct ath_hw *ah = sc->sc_ah;
 
         if (!ath_has_valid_bslot(sc)) {
-                sc->sc_flags &= ~SC_OP_BEACONS;
+                clear_bit(SC_OP_BEACONS, &sc->sc_flags);
                 return;
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.c b/drivers/net/wireless/ath/ath9k/btcoex.c
index 1ca6da80d4ad..acd437384fe4 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.c
+++ b/drivers/net/wireless/ath/ath9k/btcoex.c
@@ -336,10 +336,16 @@ static void ar9003_btcoex_bt_stomp(struct ath_hw *ah,
                          enum ath_stomp_type stomp_type)
 {
         struct ath_btcoex_hw *btcoex = &ah->btcoex_hw;
-        const u32 *weight = AR_SREV_9462(ah) ? ar9003_wlan_weights[stomp_type] :
-                                               ar9462_wlan_weights[stomp_type];
+        const u32 *weight = ar9003_wlan_weights[stomp_type];
         int i;
 
+        if (AR_SREV_9462(ah)) {
+                if ((stomp_type == ATH_BTCOEX_STOMP_LOW) &&
+                    btcoex->mci.stomp_ftp)
+                        stomp_type = ATH_BTCOEX_STOMP_LOW_FTP;
+                weight = ar9462_wlan_weights[stomp_type];
+        }
+
         for (i = 0; i < AR9300_NUM_WLAN_WEIGHTS; i++) {
                 btcoex->bt_weight[i] = AR9300_BT_WGHT;
                 btcoex->wlan_weight[i] = weight[i];
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.h b/drivers/net/wireless/ath/ath9k/btcoex.h
index 3a1e1cfabd5e..20092f98658f 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.h
+++ b/drivers/net/wireless/ath/ath9k/btcoex.h
@@ -36,6 +36,9 @@
 #define ATH_BT_CNT_THRESHOLD           3
 #define ATH_BT_CNT_SCAN_THRESHOLD      15
 
+#define ATH_BTCOEX_RX_WAIT_TIME       100
+#define ATH_BTCOEX_STOMP_FTP_THRESH   5
+
 #define AR9300_NUM_BT_WEIGHTS   4
 #define AR9300_NUM_WLAN_WEIGHTS 4
 /* Defines the BT AR_BT_COEX_WGHT used */
@@ -80,6 +83,7 @@ struct ath9k_hw_mci {
         u8 bt_ver_major;
         u8 bt_ver_minor;
         u8 bt_state;
+        u8 stomp_ftp;
 };
 
 struct ath_btcoex_hw {
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index fde700c4e490..2831258d9507 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -205,10 +205,10 @@ static ssize_t write_file_disable_ani(struct file *file,
         common->disable_ani = !!disable_ani;
 
         if (disable_ani) {
-                sc->sc_flags &= ~SC_OP_ANI_RUN;
+                clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                 del_timer_sync(&common->ani.timer);
         } else {
-                sc->sc_flags |= SC_OP_ANI_RUN;
+                set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                 ath_start_ani(common);
         }
 
@@ -374,6 +374,8 @@ void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status)
                 sc->debug.stats.istats.dtim++;
         if (status & ATH9K_INT_TSFOOR)
                 sc->debug.stats.istats.tsfoor++;
+        if (status & ATH9K_INT_MCI)
+                sc->debug.stats.istats.mci++;
 }
 
 static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
@@ -418,6 +420,7 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
         PR_IS("DTIMSYNC", dtimsync);
         PR_IS("DTIM", dtim);
         PR_IS("TSFOOR", tsfoor);
+        PR_IS("MCI", mci);
         PR_IS("TOTAL", total);
 
         len += snprintf(buf + len, mxlen - len,
@@ -1318,7 +1321,7 @@ static int open_file_bb_mac_samps(struct inode *inode, struct file *file)
         u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
         u8 nread;
 
-        if (sc->sc_flags & SC_OP_INVALID)
+        if (test_bit(SC_OP_INVALID, &sc->sc_flags))
                 return -EAGAIN;
 
         buf = vmalloc(size);
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h
index c34da09d9103..d0f851cea43a 100644
--- a/drivers/net/wireless/ath/ath9k/debug.h
+++ b/drivers/net/wireless/ath/ath9k/debug.h
@@ -86,6 +86,7 @@ struct ath_interrupt_stats {
         u32 dtim;
         u32 bb_watchdog;
         u32 tsfoor;
+        u32 mci;
 
         /* Sync-cause stats */
         u32 sync_cause_all;
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
index 4322ac80c203..7d075105a85d 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
@@ -135,7 +135,7 @@ static u32 ath9k_hw_4k_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
         if (!dump_base_hdr) {
                 len += snprintf(buf + len, size - len,
                                 "%20s :\n", "2GHz modal Header");
-                len += ath9k_dump_4k_modal_eeprom(buf, len, size,
+                len = ath9k_dump_4k_modal_eeprom(buf, len, size,
                                                   &eep->modalHeader);
                 goto out;
         }
@@ -188,8 +188,7 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah)
 {
 #define EEPROM_4K_SIZE (sizeof(struct ar5416_eeprom_4k) / sizeof(u16))
         struct ath_common *common = ath9k_hw_common(ah);
-        struct ar5416_eeprom_4k *eep =
-                (struct ar5416_eeprom_4k *) &ah->eeprom.map4k;
+        struct ar5416_eeprom_4k *eep = &ah->eeprom.map4k;
         u16 *eepdata, temp, magic, magic2;
         u32 sum = 0, el;
         bool need_swap = false;
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
index aa614767adff..cd742fb944c2 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
@@ -132,7 +132,7 @@ static u32 ath9k_hw_ar9287_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
         if (!dump_base_hdr) {
                 len += snprintf(buf + len, size - len,
                                 "%20s :\n", "2GHz modal Header");
-                len += ar9287_dump_modal_eeprom(buf, len, size,
+                len = ar9287_dump_modal_eeprom(buf, len, size,
                                                 &eep->modalHeader);
                 goto out;
         }
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index b5fba8b18b8b..a8ac30a00720 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -211,11 +211,11 @@ static u32 ath9k_hw_def_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
         if (!dump_base_hdr) {
                 len += snprintf(buf + len, size - len,
                                 "%20s :\n", "2GHz modal Header");
-                len += ath9k_def_dump_modal_eeprom(buf, len, size,
+                len = ath9k_def_dump_modal_eeprom(buf, len, size,
                                                    &eep->modalHeader[0]);
                 len += snprintf(buf + len, size - len,
                                 "%20s :\n", "5GHz modal Header");
-                len += ath9k_def_dump_modal_eeprom(buf, len, size,
+                len = ath9k_def_dump_modal_eeprom(buf, len, size,
                                                    &eep->modalHeader[1]);
                 goto out;
         }
@@ -264,8 +264,7 @@ static u32 ath9k_hw_def_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
 
 static int ath9k_hw_def_check_eeprom(struct ath_hw *ah)
 {
-        struct ar5416_eeprom_def *eep =
-                (struct ar5416_eeprom_def *) &ah->eeprom.def;
+        struct ar5416_eeprom_def *eep = &ah->eeprom.def;
         struct ath_common *common = ath9k_hw_common(ah);
         u16 *eepdata, temp, magic, magic2;
         u32 sum = 0, el;
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index 281a9af0f1b6..af6d27350291 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -132,17 +132,18 @@ static void ath_detect_bt_priority(struct ath_softc *sc)
 
         if (time_after(jiffies, btcoex->bt_priority_time +
                         msecs_to_jiffies(ATH_BT_PRIORITY_TIME_THRESHOLD))) {
-                sc->sc_flags &= ~(SC_OP_BT_PRIORITY_DETECTED | SC_OP_BT_SCAN);
+                clear_bit(BT_OP_PRIORITY_DETECTED, &btcoex->op_flags);
+                clear_bit(BT_OP_SCAN, &btcoex->op_flags);
                 /* Detect if colocated bt started scanning */
                 if (btcoex->bt_priority_cnt >= ATH_BT_CNT_SCAN_THRESHOLD) {
                         ath_dbg(ath9k_hw_common(sc->sc_ah), BTCOEX,
                                 "BT scan detected\n");
-                        sc->sc_flags |= (SC_OP_BT_SCAN |
-                                         SC_OP_BT_PRIORITY_DETECTED);
+                        set_bit(BT_OP_PRIORITY_DETECTED, &btcoex->op_flags);
+                        set_bit(BT_OP_SCAN, &btcoex->op_flags);
                 } else if (btcoex->bt_priority_cnt >= ATH_BT_CNT_THRESHOLD) {
                         ath_dbg(ath9k_hw_common(sc->sc_ah), BTCOEX,
                                 "BT priority traffic detected\n");
-                        sc->sc_flags |= SC_OP_BT_PRIORITY_DETECTED;
+                        set_bit(BT_OP_PRIORITY_DETECTED, &btcoex->op_flags);
                 }
 
                 btcoex->bt_priority_cnt = 0;
@@ -190,13 +191,26 @@ static void ath_btcoex_period_timer(unsigned long data)
         struct ath_softc *sc = (struct ath_softc *) data;
         struct ath_hw *ah = sc->sc_ah;
         struct ath_btcoex *btcoex = &sc->btcoex;
+        struct ath_mci_profile *mci = &btcoex->mci;
         u32 timer_period;
         bool is_btscan;
 
         ath9k_ps_wakeup(sc);
         if (!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI))
                 ath_detect_bt_priority(sc);
-        is_btscan = sc->sc_flags & SC_OP_BT_SCAN;
+        is_btscan = test_bit(BT_OP_SCAN, &btcoex->op_flags);
+
+        btcoex->bt_wait_time += btcoex->btcoex_period;
+        if (btcoex->bt_wait_time > ATH_BTCOEX_RX_WAIT_TIME) {
+                if (ar9003_mci_state(ah, MCI_STATE_NEED_FTP_STOMP, NULL) &&
+                    (mci->num_pan || mci->num_other_acl))
+                        ah->btcoex_hw.mci.stomp_ftp =
+                                (sc->rx.num_pkts < ATH_BTCOEX_STOMP_FTP_THRESH);
+                else
+                        ah->btcoex_hw.mci.stomp_ftp = false;
+                btcoex->bt_wait_time = 0;
+                sc->rx.num_pkts = 0;
+        }
 
         spin_lock_bh(&btcoex->btcoex_lock);
 
@@ -219,8 +233,7 @@ static void ath_btcoex_period_timer(unsigned long data)
 
         ath9k_ps_restore(sc);
         timer_period = btcoex->btcoex_period / 1000;
-        mod_timer(&btcoex->period_timer, jiffies +
-                                  msecs_to_jiffies(timer_period));
+        mod_timer(&btcoex->period_timer, jiffies + msecs_to_jiffies(timer_period));
 }
 
 /*
@@ -233,14 +246,14 @@ static void ath_btcoex_no_stomp_timer(void *arg)
         struct ath_hw *ah = sc->sc_ah;
         struct ath_btcoex *btcoex = &sc->btcoex;
         struct ath_common *common = ath9k_hw_common(ah);
-        bool is_btscan = sc->sc_flags & SC_OP_BT_SCAN;
 
         ath_dbg(common, BTCOEX, "no stomp timer running\n");
 
         ath9k_ps_wakeup(sc);
         spin_lock_bh(&btcoex->btcoex_lock);
 
-        if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW || is_btscan)
+        if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW ||
+            test_bit(BT_OP_SCAN, &btcoex->op_flags))
                 ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE);
          else if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_ALL)
                 ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_LOW);
@@ -292,7 +305,7 @@ void ath9k_btcoex_timer_resume(struct ath_softc *sc)
 
         btcoex->bt_priority_cnt = 0;
         btcoex->bt_priority_time = jiffies;
-        sc->sc_flags &= ~(SC_OP_BT_PRIORITY_DETECTED | SC_OP_BT_SCAN);
+        btcoex->op_flags &= ~(BT_OP_PRIORITY_DETECTED | BT_OP_SCAN);
 
         mod_timer(&btcoex->period_timer, jiffies);
 }
@@ -316,12 +329,13 @@ void ath9k_btcoex_timer_pause(struct ath_softc *sc)
 
 u16 ath9k_btcoex_aggr_limit(struct ath_softc *sc, u32 max_4ms_framelen)
 {
+        struct ath_btcoex *btcoex = &sc->btcoex;
         struct ath_mci_profile *mci = &sc->btcoex.mci;
         u16 aggr_limit = 0;
 
         if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_MCI) && mci->aggr_limit)
                 aggr_limit = (max_4ms_framelen * mci->aggr_limit) >> 4;
-        else if (sc->sc_flags & SC_OP_BT_PRIORITY_DETECTED)
+        else if (test_bit(BT_OP_PRIORITY_DETECTED, &btcoex->op_flags))
                 aggr_limit = min((max_4ms_framelen * 3) / 8,
                                  (u32)ATH_AMPDU_LIMIT_MAX);
 
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 7db1890448f2..45e670087e1c 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -390,14 +390,6 @@ static void ath9k_hw_disablepcie(struct ath_hw *ah)
         REG_WRITE(ah, AR_PCIE_SERDES2, 0x00000000);
 }
 
-static void ath9k_hw_aspm_init(struct ath_hw *ah)
-{
-        struct ath_common *common = ath9k_hw_common(ah);
-
-        if (common->bus_ops->aspm_init)
-                common->bus_ops->aspm_init(common);
-}
-
 /* This should work for all families including legacy */
 static bool ath9k_hw_chip_test(struct ath_hw *ah)
 {
@@ -693,9 +685,6 @@ static int __ath9k_hw_init(struct ath_hw *ah)
         if (r)
                 return r;
 
-        if (ah->is_pciexpress)
-                ath9k_hw_aspm_init(ah);
-
         r = ath9k_hw_init_macaddr(ah);
         if (r) {
                 ath_err(common, "Failed to initialize MAC address\n");
@@ -1443,9 +1432,6 @@ static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type)
                 break;
         }
 
-        if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
-                REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
-
         return ret;
 }
 
@@ -1721,7 +1707,7 @@ static int ath9k_hw_do_fastcc(struct ath_hw *ah, struct ath9k_channel *chan)
         ath9k_hw_loadnf(ah, ah->curchan);
         ath9k_hw_start_nfcal(ah, true);
 
-        if ((ah->caps.hw_caps & ATH9K_HW_CAP_MCI) && ar9003_mci_is_ready(ah))
+        if (ath9k_hw_mci_is_enabled(ah))
                 ar9003_mci_2g5g_switch(ah, true);
 
         if (AR_SREV_9271(ah))
@@ -1742,10 +1728,9 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         u64 tsf = 0;
         int i, r;
         bool start_mci_reset = false;
-        bool mci = !!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI);
         bool save_fullsleep = ah->chip_fullsleep;
 
-        if (mci) {
+        if (ath9k_hw_mci_is_enabled(ah)) {
                 start_mci_reset = ar9003_mci_start_reset(ah, chan);
                 if (start_mci_reset)
                         return 0;
@@ -1774,7 +1759,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                         return r;
         }
 
-        if (mci)
+        if (ath9k_hw_mci_is_enabled(ah))
                 ar9003_mci_stop_bt(ah, save_fullsleep);
 
         saveDefAntenna = REG_READ(ah, AR_DEF_ANTENNA);
@@ -1832,7 +1817,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         if (r)
                 return r;
 
-        if (mci)
+        if (ath9k_hw_mci_is_enabled(ah))
                 ar9003_mci_reset(ah, false, IS_CHAN_2GHZ(chan), save_fullsleep);
 
         /*
@@ -1951,7 +1936,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         ath9k_hw_loadnf(ah, chan);
         ath9k_hw_start_nfcal(ah, true);
 
-        if (mci && ar9003_mci_end_reset(ah, chan, caldata))
+        if (ath9k_hw_mci_is_enabled(ah) && ar9003_mci_end_reset(ah, chan, caldata))
                 return -EIO;
 
         ENABLE_REGWRITE_BUFFER(ah);
@@ -1996,7 +1981,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         if (ath9k_hw_btcoex_is_enabled(ah))
                 ath9k_hw_btcoex_enable(ah);
 
-        if (mci)
+        if (ath9k_hw_mci_is_enabled(ah))
                 ar9003_mci_check_bt(ah);
 
         if (AR_SREV_9300_20_OR_LATER(ah)) {
@@ -2019,39 +2004,35 @@ EXPORT_SYMBOL(ath9k_hw_reset);
  * Notify Power Mgt is disabled in self-generated frames.
  * If requested, force chip to sleep.
  */
-static void ath9k_set_power_sleep(struct ath_hw *ah, int setChip)
+static void ath9k_set_power_sleep(struct ath_hw *ah)
 {
         REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);
-        if (setChip) {
-                if (AR_SREV_9462(ah)) {
-                        REG_WRITE(ah, AR_TIMER_MODE,
-                                  REG_READ(ah, AR_TIMER_MODE) & 0xFFFFFF00);
-                        REG_WRITE(ah, AR_NDP2_TIMER_MODE, REG_READ(ah,
-                                  AR_NDP2_TIMER_MODE) & 0xFFFFFF00);
-                        REG_WRITE(ah, AR_SLP32_INC,
-                                  REG_READ(ah, AR_SLP32_INC) & 0xFFF00000);
-                        /* xxx Required for WLAN only case ? */
-                        REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_EN, 0);
-                        udelay(100);
-                }
 
-                /*
-                 * Clear the RTC force wake bit to allow the
-                 * mac to go to sleep.
-                 */
-                REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN);
+        if (AR_SREV_9462(ah)) {
+                REG_CLR_BIT(ah, AR_TIMER_MODE, 0xff);
+                REG_CLR_BIT(ah, AR_NDP2_TIMER_MODE, 0xff);
+                REG_CLR_BIT(ah, AR_SLP32_INC, 0xfffff);
+                /* xxx Required for WLAN only case ? */
+                REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_EN, 0);
+                udelay(100);
+        }
 
-                if (AR_SREV_9462(ah))
-                        udelay(100);
+        /*
+         * Clear the RTC force wake bit to allow the
+         * mac to go to sleep.
+         */
+        REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN);
+
+        if (ath9k_hw_mci_is_enabled(ah))
+                udelay(100);
 
-                if (!AR_SREV_9100(ah) && !AR_SREV_9300_20_OR_LATER(ah))
-                        REG_WRITE(ah, AR_RC, AR_RC_AHB | AR_RC_HOSTIF);
+        if (!AR_SREV_9100(ah) && !AR_SREV_9300_20_OR_LATER(ah))
+                REG_WRITE(ah, AR_RC, AR_RC_AHB | AR_RC_HOSTIF);
 
-                /* Shutdown chip. Active low */
-                if (!AR_SREV_5416(ah) && !AR_SREV_9271(ah)) {
-                        REG_CLR_BIT(ah, AR_RTC_RESET, AR_RTC_RESET_EN);
-                        udelay(2);
-                }
+        /* Shutdown chip. Active low */
+        if (!AR_SREV_5416(ah) && !AR_SREV_9271(ah)) {
+                REG_CLR_BIT(ah, AR_RTC_RESET, AR_RTC_RESET_EN);
+                udelay(2);
         }
 
         /* Clear Bit 14 of AR_WA after putting chip into Full Sleep mode. */
@@ -2064,44 +2045,38 @@ static void ath9k_set_power_sleep(struct ath_hw *ah, int setChip)
  * frames. If request, set power mode of chip to
  * auto/normal.  Duration in units of 128us (1/8 TU).
  */
-static void ath9k_set_power_network_sleep(struct ath_hw *ah, int setChip)
+static void ath9k_set_power_network_sleep(struct ath_hw *ah)
 {
-        u32 val;
+        struct ath9k_hw_capabilities *pCap = &ah->caps;
 
         REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);
-        if (setChip) {
-                struct ath9k_hw_capabilities *pCap = &ah->caps;
 
-                if (!(pCap->hw_caps & ATH9K_HW_CAP_AUTOSLEEP)) {
-                        /* Set WakeOnInterrupt bit; clear ForceWake bit */
-                        REG_WRITE(ah, AR_RTC_FORCE_WAKE,
-                                  AR_RTC_FORCE_WAKE_ON_INT);
-                } else {
+        if (!(pCap->hw_caps & ATH9K_HW_CAP_AUTOSLEEP)) {
+                /* Set WakeOnInterrupt bit; clear ForceWake bit */
+                REG_WRITE(ah, AR_RTC_FORCE_WAKE,
+                          AR_RTC_FORCE_WAKE_ON_INT);
+        } else {
 
-                        /* When chip goes into network sleep, it could be waken
-                         * up by MCI_INT interrupt caused by BT's HW messages
-                         * (LNA_xxx, CONT_xxx) which chould be in a very fast
-                         * rate (~100us). This will cause chip to leave and
-                         * re-enter network sleep mode frequently, which in
-                         * consequence will have WLAN MCI HW to generate lots of
-                         * SYS_WAKING and SYS_SLEEPING messages which will make
-                         * BT CPU to busy to process.
-                         */
-                        if (AR_SREV_9462(ah)) {
-                                val = REG_READ(ah, AR_MCI_INTERRUPT_RX_MSG_EN) &
-                                        ~AR_MCI_INTERRUPT_RX_HW_MSG_MASK;
-                                REG_WRITE(ah, AR_MCI_INTERRUPT_RX_MSG_EN, val);
-                        }
-                        /*
-                         * Clear the RTC force wake bit to allow the
-                         * mac to go to sleep.
-                         */
-                        REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE,
-                                    AR_RTC_FORCE_WAKE_EN);
-
-                        if (AR_SREV_9462(ah))
-                                udelay(30);
-                }
+                /* When chip goes into network sleep, it could be waken
+                 * up by MCI_INT interrupt caused by BT's HW messages
+                 * (LNA_xxx, CONT_xxx) which chould be in a very fast
+                 * rate (~100us). This will cause chip to leave and
+                 * re-enter network sleep mode frequently, which in
+                 * consequence will have WLAN MCI HW to generate lots of
+                 * SYS_WAKING and SYS_SLEEPING messages which will make
+                 * BT CPU to busy to process.
+                 */
+                if (ath9k_hw_mci_is_enabled(ah))
+                        REG_CLR_BIT(ah, AR_MCI_INTERRUPT_RX_MSG_EN,
+                                    AR_MCI_INTERRUPT_RX_HW_MSG_MASK);
+                /*
+                 * Clear the RTC force wake bit to allow the
+                 * mac to go to sleep.
+                 */
+                REG_CLR_BIT(ah, AR_RTC_FORCE_WAKE, AR_RTC_FORCE_WAKE_EN);
+
+                if (ath9k_hw_mci_is_enabled(ah))
+                        udelay(30);
         }
 
         /* Clear Bit 14 of AR_WA after putting chip into Net Sleep mode. */
@@ -2109,7 +2084,7 @@ static void ath9k_set_power_network_sleep(struct ath_hw *ah, int setChip)
                 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)
+static bool ath9k_hw_set_power_awake(struct ath_hw *ah)
 {
         u32 val;
         int i;
@@ -2120,37 +2095,35 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip)
                 udelay(10);
         }
 
-        if (setChip) {
-                if ((REG_READ(ah, AR_RTC_STATUS) &
-                     AR_RTC_STATUS_M) == AR_RTC_STATUS_SHUTDOWN) {
-                        if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) {
-                                return false;
-                        }
-                        if (!AR_SREV_9300_20_OR_LATER(ah))
-                                ath9k_hw_init_pll(ah, NULL);
+        if ((REG_READ(ah, AR_RTC_STATUS) &
+             AR_RTC_STATUS_M) == AR_RTC_STATUS_SHUTDOWN) {
+                if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) {
+                        return false;
                 }
-                if (AR_SREV_9100(ah))
-                        REG_SET_BIT(ah, AR_RTC_RESET,
-                                    AR_RTC_RESET_EN);
+                if (!AR_SREV_9300_20_OR_LATER(ah))
+                        ath9k_hw_init_pll(ah, NULL);
+        }
+        if (AR_SREV_9100(ah))
+                REG_SET_BIT(ah, AR_RTC_RESET,
+                            AR_RTC_RESET_EN);
 
+        REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
+                    AR_RTC_FORCE_WAKE_EN);
+        udelay(50);
+
+        for (i = POWER_UP_TIME / 50; i > 0; i--) {
+                val = REG_READ(ah, AR_RTC_STATUS) & AR_RTC_STATUS_M;
+                if (val == AR_RTC_STATUS_ON)
+                        break;
+                udelay(50);
                 REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
                             AR_RTC_FORCE_WAKE_EN);
-                udelay(50);
-
-                for (i = POWER_UP_TIME / 50; i > 0; i--) {
-                        val = REG_READ(ah, AR_RTC_STATUS) & AR_RTC_STATUS_M;
-                        if (val == AR_RTC_STATUS_ON)
-                                break;
-                        udelay(50);
-                        REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
-                                    AR_RTC_FORCE_WAKE_EN);
-                }
-                if (i == 0) {
-                        ath_err(ath9k_hw_common(ah),
-                                "Failed to wakeup in %uus\n",
-                                POWER_UP_TIME / 20);
-                        return false;
-                }
+        }
+        if (i == 0) {
+                ath_err(ath9k_hw_common(ah),
+                        "Failed to wakeup in %uus\n",
+                        POWER_UP_TIME / 20);
+                return false;
         }
 
         REG_CLR_BIT(ah, AR_STA_ID1, AR_STA_ID1_PWR_SAV);
@@ -2161,7 +2134,7 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip)
 bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)
 {
         struct ath_common *common = ath9k_hw_common(ah);
-        int status = true, setChip = true;
+        int status = true;
         static const char *modes[] = {
                 "AWAKE",
                 "FULL-SLEEP",
@@ -2177,25 +2150,17 @@ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)
 
         switch (mode) {
         case ATH9K_PM_AWAKE:
-                status = ath9k_hw_set_power_awake(ah, setChip);
-
-                if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
-                        REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
-
+                status = ath9k_hw_set_power_awake(ah);
                 break;
         case ATH9K_PM_FULL_SLEEP:
-                if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
+                if (ath9k_hw_mci_is_enabled(ah))
                         ar9003_mci_set_full_sleep(ah);
 
-                ath9k_set_power_sleep(ah, setChip);
+                ath9k_set_power_sleep(ah);
                 ah->chip_fullsleep = true;
                 break;
         case ATH9K_PM_NETWORK_SLEEP:
-
-                if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
-                        REG_WRITE(ah, AR_RTC_KEEP_AWAKE, 0x2);
-
-                ath9k_set_power_network_sleep(ah, setChip);
+                ath9k_set_power_network_sleep(ah);
                 break;
         default:
                 ath_err(common, "Unknown power mode %u\n", mode);
@@ -2765,6 +2730,9 @@ EXPORT_SYMBOL(ath9k_hw_setrxfilter);
 
 bool ath9k_hw_phy_disable(struct ath_hw *ah)
 {
+        if (ath9k_hw_mci_is_enabled(ah))
+                ar9003_mci_bt_gain_ctrl(ah);
+
         if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_WARM))
                 return false;
 
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index b620c557c2a6..03d590924c64 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -824,7 +824,6 @@ struct ath_hw {
         struct ar5416IniArray ini_japan2484;
         struct ar5416IniArray iniModes_9271_ANI_reg;
         struct ar5416IniArray ini_radio_post_sys2ant;
-        struct ar5416IniArray ini_BTCOEX_MAX_TXPWR;
 
         struct ar5416IniArray iniMac[ATH_INI_NUM_SPLIT];
         struct ar5416IniArray iniBB[ATH_INI_NUM_SPLIT];
@@ -1037,6 +1036,11 @@ static inline bool ath9k_hw_btcoex_is_enabled(struct ath_hw *ah)
 {
         return ah->btcoex_hw.enabled;
 }
+static inline bool ath9k_hw_mci_is_enabled(struct ath_hw *ah)
+{
+        return ah->btcoex_hw.enabled && (ah->caps.hw_caps & ATH9K_HW_CAP_MCI);
+
+}
 void ath9k_hw_btcoex_enable(struct ath_hw *ah);
 static inline enum ath_btcoex_scheme
 ath9k_hw_get_btcoex_scheme(struct ath_hw *ah)
@@ -1048,6 +1052,10 @@ static inline bool ath9k_hw_btcoex_is_enabled(struct ath_hw *ah)
 {
         return false;
 }
+static inline bool ath9k_hw_mci_is_enabled(struct ath_hw *ah)
+{
+        return false;
+}
 static inline void ath9k_hw_btcoex_enable(struct ath_hw *ah)
 {
 }
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index dee9e092449a..9dfce1a69c73 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -489,6 +489,7 @@ static void ath9k_init_misc(struct ath_softc *sc)
 
         setup_timer(&common->ani.timer, ath_ani_calibrate, (unsigned long)sc);
 
+        sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
         sc->config.txpowlimit = ATH_TXPOWER_MAX;
         memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN);
         sc->beacon.slottime = ATH9K_SLOT_TIME_9;
@@ -560,6 +561,12 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
         tasklet_init(&sc->bcon_tasklet, ath_beacon_tasklet,
                      (unsigned long)sc);
 
+        INIT_WORK(&sc->hw_reset_work, ath_reset_work);
+        INIT_WORK(&sc->hw_check_work, ath_hw_check);
+        INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
+        INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);
+        setup_timer(&sc->rx_poll_timer, ath_rx_poll, (unsigned long)sc);
+
         /*
          * Cache line size is used to size and align various
          * structures used to communicate with the hardware.
@@ -590,6 +597,9 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
         ath9k_cmn_init_crypto(sc->sc_ah);
         ath9k_init_misc(sc);
 
+        if (common->bus_ops->aspm_init)
+                common->bus_ops->aspm_init(common);
+
         return 0;
 
 err_btcoex:
@@ -782,11 +792,6 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,
                 ARRAY_SIZE(ath9k_tpt_blink));
 #endif
 
-        INIT_WORK(&sc->hw_reset_work, ath_reset_work);
-        INIT_WORK(&sc->hw_check_work, ath_hw_check);
-        INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
-        INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);
-
         /* Register with mac80211 */
         error = ieee80211_register_hw(hw);
         if (error)
@@ -805,9 +810,6 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,
                         goto error_world;
         }
 
-        setup_timer(&sc->rx_poll_timer, ath_rx_poll, (unsigned long)sc);
-        sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
-
         ath_init_leds(sc);
         ath_start_rfkill_poll(sc);
 
diff --git a/drivers/net/wireless/ath/ath9k/link.c b/drivers/net/wireless/ath/ath9k/link.c
new file mode 100644
index 000000000000..0cc4c70f7f0c
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/link.c
@@ -0,0 +1,502 @@
+/*
+ * Copyright (c) 2012 Qualcomm Atheros, 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 "ath9k.h"
+
+/*
+ * TX polling - checks if the TX engine is stuck somewhere
+ * and issues a chip reset if so.
+ */
+void ath_tx_complete_poll_work(struct work_struct *work)
+{
+        struct ath_softc *sc = container_of(work, struct ath_softc,
+                                            tx_complete_work.work);
+        struct ath_txq *txq;
+        int i;
+        bool needreset = false;
+#ifdef CONFIG_ATH9K_DEBUGFS
+        sc->tx_complete_poll_work_seen++;
+#endif
+
+        for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)
+                if (ATH_TXQ_SETUP(sc, i)) {
+                        txq = &sc->tx.txq[i];
+                        ath_txq_lock(sc, txq);
+                        if (txq->axq_depth) {
+                                if (txq->axq_tx_inprogress) {
+                                        needreset = true;
+                                        ath_txq_unlock(sc, txq);
+                                        break;
+                                } else {
+                                        txq->axq_tx_inprogress = true;
+                                }
+                        }
+                        ath_txq_unlock_complete(sc, txq);
+                }
+
+        if (needreset) {
+                ath_dbg(ath9k_hw_common(sc->sc_ah), RESET,
+                        "tx hung, resetting the chip\n");
+                RESET_STAT_INC(sc, RESET_TYPE_TX_HANG);
+                ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+                return;
+        }
+
+        ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,
+                                     msecs_to_jiffies(ATH_TX_COMPLETE_POLL_INT));
+}
+
+/*
+ * Checks if the BB/MAC is hung.
+ */
+void ath_hw_check(struct work_struct *work)
+{
+        struct ath_softc *sc = container_of(work, struct ath_softc, hw_check_work);
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        unsigned long flags;
+        int busy;
+        u8 is_alive, nbeacon = 1;
+
+        ath9k_ps_wakeup(sc);
+        is_alive = ath9k_hw_check_alive(sc->sc_ah);
+
+        if (is_alive && !AR_SREV_9300(sc->sc_ah))
+                goto out;
+        else if (!is_alive && AR_SREV_9300(sc->sc_ah)) {
+                ath_dbg(common, RESET,
+                        "DCU stuck is detected. Schedule chip reset\n");
+                RESET_STAT_INC(sc, RESET_TYPE_MAC_HANG);
+                goto sched_reset;
+        }
+
+        spin_lock_irqsave(&common->cc_lock, flags);
+        busy = ath_update_survey_stats(sc);
+        spin_unlock_irqrestore(&common->cc_lock, flags);
+
+        ath_dbg(common, RESET, "Possible baseband hang, busy=%d (try %d)\n",
+                busy, sc->hw_busy_count + 1);
+        if (busy >= 99) {
+                if (++sc->hw_busy_count >= 3) {
+                        RESET_STAT_INC(sc, RESET_TYPE_BB_HANG);
+                        goto sched_reset;
+                }
+        } else if (busy >= 0) {
+                sc->hw_busy_count = 0;
+                nbeacon = 3;
+        }
+
+        ath_start_rx_poll(sc, nbeacon);
+        goto out;
+
+sched_reset:
+        ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+out:
+        ath9k_ps_restore(sc);
+}
+
+/*
+ * PLL-WAR for AR9485/AR9340
+ */
+static bool ath_hw_pll_rx_hang_check(struct ath_softc *sc, u32 pll_sqsum)
+{
+        static int count;
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+
+        if (pll_sqsum >= 0x40000) {
+                count++;
+                if (count == 3) {
+                        ath_dbg(common, RESET, "PLL WAR, resetting the chip\n");
+                        RESET_STAT_INC(sc, RESET_TYPE_PLL_HANG);
+                        ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+                        count = 0;
+                        return true;
+                }
+        } else {
+                count = 0;
+        }
+
+        return false;
+}
+
+void ath_hw_pll_work(struct work_struct *work)
+{
+        u32 pll_sqsum;
+        struct ath_softc *sc = container_of(work, struct ath_softc,
+                                            hw_pll_work.work);
+
+        ath9k_ps_wakeup(sc);
+        pll_sqsum = ar9003_get_pll_sqsum_dvc(sc->sc_ah);
+        ath9k_ps_restore(sc);
+        if (ath_hw_pll_rx_hang_check(sc, pll_sqsum))
+                return;
+
+        ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,
+                                     msecs_to_jiffies(ATH_PLL_WORK_INTERVAL));
+}
+
+/*
+ * RX Polling - monitors baseband hangs.
+ */
+void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon)
+{
+        if (!AR_SREV_9300(sc->sc_ah))
+                return;
+
+        if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags))
+                return;
+
+        mod_timer(&sc->rx_poll_timer, jiffies + msecs_to_jiffies
+                  (nbeacon * sc->cur_beacon_conf.beacon_interval));
+}
+
+void ath_rx_poll(unsigned long data)
+{
+        struct ath_softc *sc = (struct ath_softc *)data;
+
+        ieee80211_queue_work(sc->hw, &sc->hw_check_work);
+}
+
+/*
+ * PA Pre-distortion.
+ */
+static void ath_paprd_activate(struct ath_softc *sc)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath9k_hw_cal_data *caldata = ah->caldata;
+        int chain;
+
+        if (!caldata || !caldata->paprd_done)
+                return;
+
+        ath9k_ps_wakeup(sc);
+        ar9003_paprd_enable(ah, false);
+        for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
+                if (!(ah->txchainmask & BIT(chain)))
+                        continue;
+
+                ar9003_paprd_populate_single_table(ah, caldata, chain);
+        }
+
+        ar9003_paprd_enable(ah, true);
+        ath9k_ps_restore(sc);
+}
+
+static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int chain)
+{
+        struct ieee80211_hw *hw = sc->hw;
+        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath_tx_control txctl;
+        int time_left;
+
+        memset(&txctl, 0, sizeof(txctl));
+        txctl.txq = sc->tx.txq_map[WME_AC_BE];
+
+        memset(tx_info, 0, sizeof(*tx_info));
+        tx_info->band = hw->conf.channel->band;
+        tx_info->flags |= IEEE80211_TX_CTL_NO_ACK;
+        tx_info->control.rates[0].idx = 0;
+        tx_info->control.rates[0].count = 1;
+        tx_info->control.rates[0].flags = IEEE80211_TX_RC_MCS;
+        tx_info->control.rates[1].idx = -1;
+
+        init_completion(&sc->paprd_complete);
+        txctl.paprd = BIT(chain);
+
+        if (ath_tx_start(hw, skb, &txctl) != 0) {
+                ath_dbg(common, CALIBRATE, "PAPRD TX failed\n");
+                dev_kfree_skb_any(skb);
+                return false;
+        }
+
+        time_left = wait_for_completion_timeout(&sc->paprd_complete,
+                        msecs_to_jiffies(ATH_PAPRD_TIMEOUT));
+
+        if (!time_left)
+                ath_dbg(common, CALIBRATE,
+                        "Timeout waiting for paprd training on TX chain %d\n",
+                        chain);
+
+        return !!time_left;
+}
+
+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 ath9k_hw_cal_data *caldata = ah->caldata;
+        struct ath_common *common = ath9k_hw_common(ah);
+        int ftype;
+        int chain_ok = 0;
+        int chain;
+        int len = 1800;
+
+        if (!caldata)
+                return;
+
+        ath9k_ps_wakeup(sc);
+
+        if (ar9003_paprd_init_table(ah) < 0)
+                goto fail_paprd;
+
+        skb = alloc_skb(len, GFP_KERNEL);
+        if (!skb)
+                goto fail_paprd;
+
+        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);
+
+        for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
+                if (!(ah->txchainmask & BIT(chain)))
+                        continue;
+
+                chain_ok = 0;
+
+                ath_dbg(common, CALIBRATE,
+                        "Sending PAPRD frame for thermal measurement on chain %d\n",
+                        chain);
+                if (!ath_paprd_send_frame(sc, skb, chain))
+                        goto fail_paprd;
+
+                ar9003_paprd_setup_gain_table(ah, chain);
+
+                ath_dbg(common, CALIBRATE,
+                        "Sending PAPRD training frame on chain %d\n", chain);
+                if (!ath_paprd_send_frame(sc, skb, chain))
+                        goto fail_paprd;
+
+                if (!ar9003_paprd_is_done(ah)) {
+                        ath_dbg(common, CALIBRATE,
+                                "PAPRD not yet done on chain %d\n", chain);
+                        break;
+                }
+
+                if (ar9003_paprd_create_curve(ah, caldata, chain)) {
+                        ath_dbg(common, CALIBRATE,
+                                "PAPRD create curve failed on chain %d\n",
+                                chain);
+                        break;
+                }
+
+                chain_ok = 1;
+        }
+        kfree_skb(skb);
+
+        if (chain_ok) {
+                caldata->paprd_done = true;
+                ath_paprd_activate(sc);
+        }
+
+fail_paprd:
+        ath9k_ps_restore(sc);
+}
+
+/*
+ *  ANI performs periodic noise floor calibration
+ *  that is used to adjust and optimize the chip performance.  This
+ *  takes environmental changes (location, temperature) into account.
+ *  When the task is complete, it reschedules itself depending on the
+ *  appropriate interval that was calculated.
+ */
+void ath_ani_calibrate(unsigned long data)
+{
+        struct ath_softc *sc = (struct ath_softc *)data;
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
+        bool longcal = false;
+        bool shortcal = false;
+        bool aniflag = false;
+        unsigned int timestamp = jiffies_to_msecs(jiffies);
+        u32 cal_interval, short_cal_interval, long_cal_interval;
+        unsigned long flags;
+
+        if (ah->caldata && ah->caldata->nfcal_interference)
+                long_cal_interval = ATH_LONG_CALINTERVAL_INT;
+        else
+                long_cal_interval = ATH_LONG_CALINTERVAL;
+
+        short_cal_interval = (ah->opmode == NL80211_IFTYPE_AP) ?
+                ATH_AP_SHORT_CALINTERVAL : ATH_STA_SHORT_CALINTERVAL;
+
+        /* Only calibrate if awake */
+        if (sc->sc_ah->power_mode != ATH9K_PM_AWAKE)
+                goto set_timer;
+
+        ath9k_ps_wakeup(sc);
+
+        /* Long calibration runs independently of short calibration. */
+        if ((timestamp - common->ani.longcal_timer) >= long_cal_interval) {
+                longcal = true;
+                common->ani.longcal_timer = timestamp;
+        }
+
+        /* Short calibration applies only while caldone is false */
+        if (!common->ani.caldone) {
+                if ((timestamp - common->ani.shortcal_timer) >= short_cal_interval) {
+                        shortcal = true;
+                        common->ani.shortcal_timer = timestamp;
+                        common->ani.resetcal_timer = timestamp;
+                }
+        } else {
+                if ((timestamp - common->ani.resetcal_timer) >=
+                    ATH_RESTART_CALINTERVAL) {
+                        common->ani.caldone = ath9k_hw_reset_calvalid(ah);
+                        if (common->ani.caldone)
+                                common->ani.resetcal_timer = timestamp;
+                }
+        }
+
+        /* Verify whether we must check ANI */
+        if (sc->sc_ah->config.enable_ani
+            && (timestamp - common->ani.checkani_timer) >=
+            ah->config.ani_poll_interval) {
+                aniflag = true;
+                common->ani.checkani_timer = timestamp;
+        }
+
+        /* Call ANI routine if necessary */
+        if (aniflag) {
+                spin_lock_irqsave(&common->cc_lock, flags);
+                ath9k_hw_ani_monitor(ah, ah->curchan);
+                ath_update_survey_stats(sc);
+                spin_unlock_irqrestore(&common->cc_lock, flags);
+        }
+
+        /* Perform calibration if necessary */
+        if (longcal || shortcal) {
+                common->ani.caldone =
+                        ath9k_hw_calibrate(ah, ah->curchan,
+                                           ah->rxchainmask, longcal);
+        }
+
+        ath_dbg(common, ANI,
+                "Calibration @%lu finished: %s %s %s, caldone: %s\n",
+                jiffies,
+                longcal ? "long" : "", shortcal ? "short" : "",
+                aniflag ? "ani" : "", common->ani.caldone ? "true" : "false");
+
+        ath9k_ps_restore(sc);
+
+set_timer:
+        /*
+        * Set timer interval based on previous results.
+        * The interval must be the shortest necessary to satisfy ANI,
+        * short calibration and long calibration.
+        */
+        ath9k_debug_samp_bb_mac(sc);
+        cal_interval = ATH_LONG_CALINTERVAL;
+        if (sc->sc_ah->config.enable_ani)
+                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) && ah->caldata) {
+                if (!ah->caldata->paprd_done)
+                        ieee80211_queue_work(sc->hw, &sc->paprd_work);
+                else if (!ah->paprd_table_write_done)
+                        ath_paprd_activate(sc);
+        }
+}
+
+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;
+
+        if (!test_bit(SC_OP_ANI_RUN, &sc->sc_flags))
+                return;
+
+        if (sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
+                return;
+
+        common->ani.longcal_timer = timestamp;
+        common->ani.shortcal_timer = timestamp;
+        common->ani.checkani_timer = timestamp;
+
+        mod_timer(&common->ani.timer,
+                  jiffies + msecs_to_jiffies((u32)ah->config.ani_poll_interval));
+}
+
+void ath_update_survey_nf(struct ath_softc *sc, int channel)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath9k_channel *chan = &ah->channels[channel];
+        struct survey_info *survey = &sc->survey[channel];
+
+        if (chan->noisefloor) {
+                survey->filled |= SURVEY_INFO_NOISE_DBM;
+                survey->noise = ath9k_hw_getchan_noise(ah, chan);
+        }
+}
+
+/*
+ * Updates the survey statistics and returns the busy time since last
+ * update in %, if the measurement duration was long enough for the
+ * result to be useful, -1 otherwise.
+ */
+int ath_update_survey_stats(struct ath_softc *sc)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
+        int pos = ah->curchan - &ah->channels[0];
+        struct survey_info *survey = &sc->survey[pos];
+        struct ath_cycle_counters *cc = &common->cc_survey;
+        unsigned int div = common->clockrate * 1000;
+        int ret = 0;
+
+        if (!ah->curchan)
+                return -1;
+
+        if (ah->power_mode == ATH9K_PM_AWAKE)
+                ath_hw_cycle_counters_update(common);
+
+        if (cc->cycles > 0) {
+                survey->filled |= SURVEY_INFO_CHANNEL_TIME |
+                        SURVEY_INFO_CHANNEL_TIME_BUSY |
+                        SURVEY_INFO_CHANNEL_TIME_RX |
+                        SURVEY_INFO_CHANNEL_TIME_TX;
+                survey->channel_time += cc->cycles / div;
+                survey->channel_time_busy += cc->rx_busy / div;
+                survey->channel_time_rx += cc->rx_frame / div;
+                survey->channel_time_tx += cc->tx_frame / div;
+        }
+
+        if (cc->cycles < div)
+                return -1;
+
+        if (cc->cycles > 0)
+                ret = cc->rx_busy * 100 / cc->cycles;
+
+        memset(cc, 0, sizeof(*cc));
+
+        ath_update_survey_nf(sc, pos);
+
+        return ret;
+}
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 4de4473776ac..c0f478b0a9a2 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -101,6 +101,7 @@ void ath9k_ps_wakeup(struct ath_softc *sc)
                 spin_lock(&common->cc_lock);
                 ath_hw_cycle_counters_update(common);
                 memset(&common->cc_survey, 0, sizeof(common->cc_survey));
+                memset(&common->cc_ani, 0, sizeof(common->cc_ani));
                 spin_unlock(&common->cc_lock);
         }
 
@@ -143,84 +144,6 @@ void ath9k_ps_restore(struct ath_softc *sc)
         spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
 }
 
-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;
-
-        if (!(sc->sc_flags & SC_OP_ANI_RUN))
-                return;
-
-        if (sc->sc_flags & SC_OP_OFFCHANNEL)
-                return;
-
-        common->ani.longcal_timer = timestamp;
-        common->ani.shortcal_timer = timestamp;
-        common->ani.checkani_timer = timestamp;
-
-        mod_timer(&common->ani.timer,
-                  jiffies +
-                        msecs_to_jiffies((u32)ah->config.ani_poll_interval));
-}
-
-static void ath_update_survey_nf(struct ath_softc *sc, int channel)
-{
-        struct ath_hw *ah = sc->sc_ah;
-        struct ath9k_channel *chan = &ah->channels[channel];
-        struct survey_info *survey = &sc->survey[channel];
-
-        if (chan->noisefloor) {
-                survey->filled |= SURVEY_INFO_NOISE_DBM;
-                survey->noise = ath9k_hw_getchan_noise(ah, chan);
-        }
-}
-
-/*
- * Updates the survey statistics and returns the busy time since last
- * update in %, if the measurement duration was long enough for the
- * result to be useful, -1 otherwise.
- */
-static int ath_update_survey_stats(struct ath_softc *sc)
-{
-        struct ath_hw *ah = sc->sc_ah;
-        struct ath_common *common = ath9k_hw_common(ah);
-        int pos = ah->curchan - &ah->channels[0];
-        struct survey_info *survey = &sc->survey[pos];
-        struct ath_cycle_counters *cc = &common->cc_survey;
-        unsigned int div = common->clockrate * 1000;
-        int ret = 0;
-
-        if (!ah->curchan)
-                return -1;
-
-        if (ah->power_mode == ATH9K_PM_AWAKE)
-                ath_hw_cycle_counters_update(common);
-
-        if (cc->cycles > 0) {
-                survey->filled |= SURVEY_INFO_CHANNEL_TIME |
-                        SURVEY_INFO_CHANNEL_TIME_BUSY |
-                        SURVEY_INFO_CHANNEL_TIME_RX |
-                        SURVEY_INFO_CHANNEL_TIME_TX;
-                survey->channel_time += cc->cycles / div;
-                survey->channel_time_busy += cc->rx_busy / div;
-                survey->channel_time_rx += cc->rx_frame / div;
-                survey->channel_time_tx += cc->tx_frame / div;
-        }
-
-        if (cc->cycles < div)
-                return -1;
-
-        if (cc->cycles > 0)
-                ret = cc->rx_busy * 100 / cc->cycles;
-
-        memset(cc, 0, sizeof(*cc));
-
-        ath_update_survey_nf(sc, pos);
-
-        return ret;
-}
-
 static void __ath_cancel_work(struct ath_softc *sc)
 {
         cancel_work_sync(&sc->paprd_work);
@@ -235,6 +158,22 @@ static void ath_cancel_work(struct ath_softc *sc)
         cancel_work_sync(&sc->hw_reset_work);
 }
 
+static void ath_restart_work(struct ath_softc *sc)
+{
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+
+        ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
+
+        if (AR_SREV_9485(sc->sc_ah) || AR_SREV_9340(sc->sc_ah))
+                ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,
+                                     msecs_to_jiffies(ATH_PLL_WORK_INTERVAL));
+
+        ath_start_rx_poll(sc, 3);
+
+        if (!common->disable_ani)
+                ath_start_ani(common);
+}
+
 static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
 {
         struct ath_hw *ah = sc->sc_ah;
@@ -271,6 +210,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
 {
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
+        unsigned long flags;
 
         if (ath_startrecv(sc) != 0) {
                 ath_err(common, "Unable to restart recv logic\n");
@@ -279,36 +219,30 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
 
         ath9k_cmn_update_txpow(ah, sc->curtxpow,
                                sc->config.txpowlimit, &sc->curtxpow);
+
+        clear_bit(SC_OP_HW_RESET, &sc->sc_flags);
         ath9k_hw_set_interrupts(ah);
         ath9k_hw_enable_interrupts(ah);
 
-        if (!(sc->sc_flags & (SC_OP_OFFCHANNEL)) && start) {
-                if (sc->sc_flags & SC_OP_BEACONS)
-                        ath_set_beacon(sc);
+        if (!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL) && start) {
+                if (!test_bit(SC_OP_BEACONS, &sc->sc_flags))
+                        goto work;
 
-                ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
-                ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work, HZ/2);
-                ath_start_rx_poll(sc, 3);
-                if (!common->disable_ani)
-                        ath_start_ani(common);
-        }
-
-        if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3) {
-                struct ath_hw_antcomb_conf div_ant_conf;
-                u8 lna_conf;
-
-                ath9k_hw_antdiv_comb_conf_get(ah, &div_ant_conf);
-
-                if (sc->ant_rx == 1)
-                        lna_conf = ATH_ANT_DIV_COMB_LNA1;
-                else
-                        lna_conf = ATH_ANT_DIV_COMB_LNA2;
-                div_ant_conf.main_lna_conf = lna_conf;
-                div_ant_conf.alt_lna_conf = lna_conf;
+                ath_set_beacon(sc);
 
-                ath9k_hw_antdiv_comb_conf_set(ah, &div_ant_conf);
+                if (ah->opmode == NL80211_IFTYPE_STATION &&
+                    test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
+                        spin_lock_irqsave(&sc->sc_pm_lock, flags);
+                        sc->ps_flags |= PS_BEACON_SYNC | PS_WAIT_FOR_BEACON;
+                        spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
+                }
+        work:
+                ath_restart_work(sc);
         }
 
+        if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3)
+                ath_ant_comb_update(sc);
+
         ieee80211_wake_queues(sc->hw);
 
         return true;
@@ -328,7 +262,7 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
 
         spin_lock_bh(&sc->sc_pcu_lock);
 
-        if (!(sc->sc_flags & SC_OP_OFFCHANNEL)) {
+        if (!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
                 fastcc = false;
                 caldata = &sc->caldata;
         }
@@ -371,7 +305,7 @@ static int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw,
 {
         int r;
 
-        if (sc->sc_flags & SC_OP_INVALID)
+        if (test_bit(SC_OP_INVALID, &sc->sc_flags))
                 return -EIO;
 
         r = ath_reset_internal(sc, hchan, false);
@@ -379,258 +313,6 @@ static 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;
-        struct ath9k_hw_cal_data *caldata = ah->caldata;
-        int chain;
-
-        if (!caldata || !caldata->paprd_done)
-                return;
-
-        ath9k_ps_wakeup(sc);
-        ar9003_paprd_enable(ah, false);
-        for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
-                if (!(ah->txchainmask & BIT(chain)))
-                        continue;
-
-                ar9003_paprd_populate_single_table(ah, caldata, chain);
-        }
-
-        ar9003_paprd_enable(ah, true);
-        ath9k_ps_restore(sc);
-}
-
-static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int chain)
-{
-        struct ieee80211_hw *hw = sc->hw;
-        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
-        struct ath_hw *ah = sc->sc_ah;
-        struct ath_common *common = ath9k_hw_common(ah);
-        struct ath_tx_control txctl;
-        int time_left;
-
-        memset(&txctl, 0, sizeof(txctl));
-        txctl.txq = sc->tx.txq_map[WME_AC_BE];
-
-        memset(tx_info, 0, sizeof(*tx_info));
-        tx_info->band = hw->conf.channel->band;
-        tx_info->flags |= IEEE80211_TX_CTL_NO_ACK;
-        tx_info->control.rates[0].idx = 0;
-        tx_info->control.rates[0].count = 1;
-        tx_info->control.rates[0].flags = IEEE80211_TX_RC_MCS;
-        tx_info->control.rates[1].idx = -1;
-
-        init_completion(&sc->paprd_complete);
-        txctl.paprd = BIT(chain);
-
-        if (ath_tx_start(hw, skb, &txctl) != 0) {
-                ath_dbg(common, CALIBRATE, "PAPRD TX failed\n");
-                dev_kfree_skb_any(skb);
-                return false;
-        }
-
-        time_left = wait_for_completion_timeout(&sc->paprd_complete,
-                        msecs_to_jiffies(ATH_PAPRD_TIMEOUT));
-
-        if (!time_left)
-                ath_dbg(common, CALIBRATE,
-                        "Timeout waiting for paprd training on TX chain %d\n",
-                        chain);
-
-        return !!time_left;
-}
-
-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 ath9k_hw_cal_data *caldata = ah->caldata;
-        struct ath_common *common = ath9k_hw_common(ah);
-        int ftype;
-        int chain_ok = 0;
-        int chain;
-        int len = 1800;
-
-        if (!caldata)
-                return;
-
-        ath9k_ps_wakeup(sc);
-
-        if (ar9003_paprd_init_table(ah) < 0)
-                goto fail_paprd;
-
-        skb = alloc_skb(len, GFP_KERNEL);
-        if (!skb)
-                goto fail_paprd;
-
-        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);
-
-        for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
-                if (!(ah->txchainmask & BIT(chain)))
-                        continue;
-
-                chain_ok = 0;
-
-                ath_dbg(common, CALIBRATE,
-                        "Sending PAPRD frame for thermal measurement on chain %d\n",
-                        chain);
-                if (!ath_paprd_send_frame(sc, skb, chain))
-                        goto fail_paprd;
-
-                ar9003_paprd_setup_gain_table(ah, chain);
-
-                ath_dbg(common, CALIBRATE,
-                        "Sending PAPRD training frame on chain %d\n", chain);
-                if (!ath_paprd_send_frame(sc, skb, chain))
-                        goto fail_paprd;
-
-                if (!ar9003_paprd_is_done(ah)) {
-                        ath_dbg(common, CALIBRATE,
-                                "PAPRD not yet done on chain %d\n", chain);
-                        break;
-                }
-
-                if (ar9003_paprd_create_curve(ah, caldata, chain)) {
-                        ath_dbg(common, CALIBRATE,
-                                "PAPRD create curve failed on chain %d\n",
-                                                                   chain);
-                        break;
-                }
-
-                chain_ok = 1;
-        }
-        kfree_skb(skb);
-
-        if (chain_ok) {
-                caldata->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
- *  takes environmental changes (location, temperature) into account.
- *  When the task is complete, it reschedules itself depending on the
- *  appropriate interval that was calculated.
- */
-void ath_ani_calibrate(unsigned long data)
-{
-        struct ath_softc *sc = (struct ath_softc *)data;
-        struct ath_hw *ah = sc->sc_ah;
-        struct ath_common *common = ath9k_hw_common(ah);
-        bool longcal = false;
-        bool shortcal = false;
-        bool aniflag = false;
-        unsigned int timestamp = jiffies_to_msecs(jiffies);
-        u32 cal_interval, short_cal_interval, long_cal_interval;
-        unsigned long flags;
-
-        if (ah->caldata && ah->caldata->nfcal_interference)
-                long_cal_interval = ATH_LONG_CALINTERVAL_INT;
-        else
-                long_cal_interval = ATH_LONG_CALINTERVAL;
-
-        short_cal_interval = (ah->opmode == NL80211_IFTYPE_AP) ?
-                ATH_AP_SHORT_CALINTERVAL : ATH_STA_SHORT_CALINTERVAL;
-
-        /* Only calibrate if awake */
-        if (sc->sc_ah->power_mode != ATH9K_PM_AWAKE)
-                goto set_timer;
-
-        ath9k_ps_wakeup(sc);
-
-        /* Long calibration runs independently of short calibration. */
-        if ((timestamp - common->ani.longcal_timer) >= long_cal_interval) {
-                longcal = true;
-                common->ani.longcal_timer = timestamp;
-        }
-
-        /* Short calibration applies only while caldone is false */
-        if (!common->ani.caldone) {
-                if ((timestamp - common->ani.shortcal_timer) >= short_cal_interval) {
-                        shortcal = true;
-                        common->ani.shortcal_timer = timestamp;
-                        common->ani.resetcal_timer = timestamp;
-                }
-        } else {
-                if ((timestamp - common->ani.resetcal_timer) >=
-                    ATH_RESTART_CALINTERVAL) {
-                        common->ani.caldone = ath9k_hw_reset_calvalid(ah);
-                        if (common->ani.caldone)
-                                common->ani.resetcal_timer = timestamp;
-                }
-        }
-
-        /* Verify whether we must check ANI */
-        if (sc->sc_ah->config.enable_ani
-            && (timestamp - common->ani.checkani_timer) >=
-            ah->config.ani_poll_interval) {
-                aniflag = true;
-                common->ani.checkani_timer = timestamp;
-        }
-
-        /* Call ANI routine if necessary */
-        if (aniflag) {
-                spin_lock_irqsave(&common->cc_lock, flags);
-                ath9k_hw_ani_monitor(ah, ah->curchan);
-                ath_update_survey_stats(sc);
-                spin_unlock_irqrestore(&common->cc_lock, flags);
-        }
-
-        /* Perform calibration if necessary */
-        if (longcal || shortcal) {
-                common->ani.caldone =
-                        ath9k_hw_calibrate(ah, ah->curchan,
-                                                ah->rxchainmask, longcal);
-        }
-
-        ath_dbg(common, ANI,
-                "Calibration @%lu finished: %s %s %s, caldone: %s\n",
-                jiffies,
-                longcal ? "long" : "", shortcal ? "short" : "",
-                aniflag ? "ani" : "", common->ani.caldone ? "true" : "false");
-
-        ath9k_ps_restore(sc);
-
-set_timer:
-        /*
-        * Set timer interval based on previous results.
-        * The interval must be the shortest necessary to satisfy ANI,
-        * short calibration and long calibration.
-        */
-        ath9k_debug_samp_bb_mac(sc);
-        cal_interval = ATH_LONG_CALINTERVAL;
-        if (sc->sc_ah->config.enable_ani)
-                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) && ah->caldata) {
-                if (!ah->caldata->paprd_done)
-                        ieee80211_queue_work(sc->hw, &sc->paprd_work);
-                else if (!ah->paprd_table_write_done)
-                        ath_paprd_activate(sc);
-        }
-}
-
 static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta,
                             struct ieee80211_vif *vif)
 {
@@ -668,13 +350,12 @@ static void ath_node_detach(struct ath_softc *sc, struct ieee80211_sta *sta)
                 ath_tx_node_cleanup(sc, an);
 }
 
-
 void ath9k_tasklet(unsigned long data)
 {
         struct ath_softc *sc = (struct ath_softc *)data;
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
-
+        unsigned long flags;
         u32 status = sc->intrstatus;
         u32 rxmask;
 
@@ -693,10 +374,12 @@ void ath9k_tasklet(unsigned long data)
 
                 RESET_STAT_INC(sc, type);
 #endif
+                set_bit(SC_OP_HW_RESET, &sc->sc_flags);
                 ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
                 goto out;
         }
 
+        spin_lock_irqsave(&sc->sc_pm_lock, flags);
         if ((status & ATH9K_INT_TSFOOR) && sc->ps_enabled) {
                 /*
                  * TSF sync does not look correct; remain awake to sync with
@@ -705,6 +388,7 @@ void ath9k_tasklet(unsigned long data)
                 ath_dbg(common, PS, "TSFOOR - Sync with next Beacon\n");
                 sc->ps_flags |= PS_WAIT_FOR_BEACON | PS_BEACON_SYNC;
         }
+        spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
 
         if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
                 rxmask = (ATH9K_INT_RXHP | ATH9K_INT_RXLP | ATH9K_INT_RXEOL |
@@ -766,15 +450,17 @@ irqreturn_t ath_isr(int irq, void *dev)
          * touch anything. Note this can happen early
          * on if the IRQ is shared.
          */
-        if (sc->sc_flags & SC_OP_INVALID)
+        if (test_bit(SC_OP_INVALID, &sc->sc_flags))
                 return IRQ_NONE;
 
-
         /* shared irq, not for us */
 
         if (!ath9k_hw_intrpend(ah))
                 return IRQ_NONE;
 
+        if(test_bit(SC_OP_HW_RESET, &sc->sc_flags))
+                return IRQ_HANDLED;
+
         /*
          * Figure out the reason(s) for the interrupt.  Note
          * that the hal returns a pseudo-ISR that may include
@@ -852,8 +538,10 @@ irqreturn_t ath_isr(int irq, void *dev)
                         /* Clear RxAbort bit so that we can
                          * receive frames */
                         ath9k_setpower(sc, ATH9K_PM_AWAKE);
+                        spin_lock(&sc->sc_pm_lock);
                         ath9k_hw_setrxabort(sc->sc_ah, 0);
                         sc->ps_flags |= PS_WAIT_FOR_BEACON;
+                        spin_unlock(&sc->sc_pm_lock);
                 }
 
 chip_reset:
@@ -902,87 +590,6 @@ void ath_reset_work(struct work_struct *work)
         ath_reset(sc, true);
 }
 
-void ath_hw_check(struct work_struct *work)
-{
-        struct ath_softc *sc = container_of(work, struct ath_softc, hw_check_work);
-        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-        unsigned long flags;
-        int busy;
-        u8 is_alive, nbeacon = 1;
-
-        ath9k_ps_wakeup(sc);
-        is_alive = ath9k_hw_check_alive(sc->sc_ah);
-
-        if (is_alive && !AR_SREV_9300(sc->sc_ah))
-                goto out;
-        else if (!is_alive && AR_SREV_9300(sc->sc_ah)) {
-                ath_dbg(common, RESET,
-                        "DCU stuck is detected. Schedule chip reset\n");
-                RESET_STAT_INC(sc, RESET_TYPE_MAC_HANG);
-                goto sched_reset;
-        }
-
-        spin_lock_irqsave(&common->cc_lock, flags);
-        busy = ath_update_survey_stats(sc);
-        spin_unlock_irqrestore(&common->cc_lock, flags);
-
-        ath_dbg(common, RESET, "Possible baseband hang, busy=%d (try %d)\n",
-                busy, sc->hw_busy_count + 1);
-        if (busy >= 99) {
-                if (++sc->hw_busy_count >= 3) {
-                        RESET_STAT_INC(sc, RESET_TYPE_BB_HANG);
-                        goto sched_reset;
-                }
-        } else if (busy >= 0) {
-                sc->hw_busy_count = 0;
-                nbeacon = 3;
-        }
-
-        ath_start_rx_poll(sc, nbeacon);
-        goto out;
-
-sched_reset:
-        ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-out:
-        ath9k_ps_restore(sc);
-}
-
-static void ath_hw_pll_rx_hang_check(struct ath_softc *sc, u32 pll_sqsum)
-{
-        static int count;
-        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-
-        if (pll_sqsum >= 0x40000) {
-                count++;
-                if (count == 3) {
-                        /* Rx is hung for more than 500ms. Reset it */
-                        ath_dbg(common, RESET, "Possible RX hang, resetting\n");
-                        RESET_STAT_INC(sc, RESET_TYPE_PLL_HANG);
-                        ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-                        count = 0;
-                }
-        } else
-                count = 0;
-}
-
-void ath_hw_pll_work(struct work_struct *work)
-{
-        struct ath_softc *sc = container_of(work, struct ath_softc,
-                                            hw_pll_work.work);
-        u32 pll_sqsum;
-
-        if (AR_SREV_9485(sc->sc_ah)) {
-
-                ath9k_ps_wakeup(sc);
-                pll_sqsum = ar9003_get_pll_sqsum_dvc(sc->sc_ah);
-                ath9k_ps_restore(sc);
-
-                ath_hw_pll_rx_hang_check(sc, pll_sqsum);
-
-                ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work, HZ/5);
-        }
-}
-
 /**********************/
 /* mac80211 callbacks */
 /**********************/
@@ -1045,10 +652,9 @@ static int ath9k_start(struct ieee80211_hw *hw)
         if (ah->caps.hw_caps & ATH9K_HW_CAP_HT)
                 ah->imask |= ATH9K_INT_CST;
 
-        if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
-                ah->imask |= ATH9K_INT_MCI;
+        ath_mci_enable(sc);
 
-        sc->sc_flags &= ~SC_OP_INVALID;
+        clear_bit(SC_OP_INVALID, &sc->sc_flags);
         sc->sc_ah->is_monitoring = false;
 
         if (!ath_complete_reset(sc, false)) {
@@ -1090,6 +696,7 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_tx_control txctl;
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        unsigned long flags;
 
         if (sc->ps_enabled) {
                 /*
@@ -1112,6 +719,7 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                  * completed and if needed, also for RX of buffered frames.
                  */
                 ath9k_ps_wakeup(sc);
+                spin_lock_irqsave(&sc->sc_pm_lock, flags);
                 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)) {
@@ -1127,6 +735,7 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                  * the ps_flags bit is cleared. We are just dropping
                  * the ps_usecount here.
                  */
+                spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
                 ath9k_ps_restore(sc);
         }
 
@@ -1167,7 +776,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
         ath_cancel_work(sc);
         del_timer_sync(&sc->rx_poll_timer);
 
-        if (sc->sc_flags & SC_OP_INVALID) {
+        if (test_bit(SC_OP_INVALID, &sc->sc_flags)) {
                 ath_dbg(common, ANY, "Device not present\n");
                 mutex_unlock(&sc->mutex);
                 return;
@@ -1224,7 +833,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
 
         ath9k_ps_restore(sc);
 
-        sc->sc_flags |= SC_OP_INVALID;
+        set_bit(SC_OP_INVALID, &sc->sc_flags);
         sc->ps_idle = prev_idle;
 
         mutex_unlock(&sc->mutex);
@@ -1328,11 +937,11 @@ static void ath9k_calculate_summary_state(struct ieee80211_hw *hw,
         /* Set op-mode & TSF */
         if (iter_data.naps > 0) {
                 ath9k_hw_set_tsfadjust(ah, 1);
-                sc->sc_flags |= SC_OP_TSF_RESET;
+                set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
                 ah->opmode = NL80211_IFTYPE_AP;
         } else {
                 ath9k_hw_set_tsfadjust(ah, 0);
-                sc->sc_flags &= ~SC_OP_TSF_RESET;
+                clear_bit(SC_OP_TSF_RESET, &sc->sc_flags);
 
                 if (iter_data.nmeshes)
                         ah->opmode = NL80211_IFTYPE_MESH_POINT;
@@ -1363,12 +972,12 @@ static void ath9k_calculate_summary_state(struct ieee80211_hw *hw,
                 sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
 
                 if (!common->disable_ani) {
-                        sc->sc_flags |= SC_OP_ANI_RUN;
+                        set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                         ath_start_ani(common);
                 }
 
         } else {
-                sc->sc_flags &= ~SC_OP_ANI_RUN;
+                clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                 del_timer_sync(&common->ani.timer);
         }
 }
@@ -1389,25 +998,6 @@ static void ath9k_do_vif_add_setup(struct ieee80211_hw *hw,
         }
 }
 
-void ath_start_rx_poll(struct ath_softc *sc, u8 nbeacon)
-{
-        if (!AR_SREV_9300(sc->sc_ah))
-                return;
-
-        if (!(sc->sc_flags & SC_OP_PRIM_STA_VIF))
-                return;
-
-        mod_timer(&sc->rx_poll_timer, jiffies + msecs_to_jiffies
-                        (nbeacon * sc->cur_beacon_conf.beacon_interval));
-}
-
-void ath_rx_poll(unsigned long data)
-{
-        struct ath_softc *sc = (struct ath_softc *)data;
-
-        ieee80211_queue_work(sc->hw, &sc->hw_check_work);
-}
-
 static int ath9k_add_interface(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif)
 {
@@ -1627,11 +1217,6 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                 if (ah->curchan)
                         old_pos = ah->curchan - &ah->channels[0];
 
-                if (hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)
-                        sc->sc_flags |= SC_OP_OFFCHANNEL;
-                else
-                        sc->sc_flags &= ~SC_OP_OFFCHANNEL;
-
                 ath_dbg(common, CONFIG, "Set channel: %d MHz type: %d\n",
                         curchan->center_freq, conf->channel_type);
 
@@ -1911,16 +1496,16 @@ static void ath9k_bss_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
         struct ath_vif *avp = (void *)vif->drv_priv;
-
+        unsigned long flags;
         /*
          * Skip iteration if primary station vif's bss info
          * was not changed
          */
-        if (sc->sc_flags & SC_OP_PRIM_STA_VIF)
+        if (test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags))
                 return;
 
         if (bss_conf->assoc) {
-                sc->sc_flags |= SC_OP_PRIM_STA_VIF;
+                set_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags);
                 avp->primary_sta_vif = true;
                 memcpy(common->curbssid, bss_conf->bssid, ETH_ALEN);
                 common->curaid = bss_conf->aid;
@@ -1933,7 +1518,10 @@ static void ath9k_bss_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
                  * on the receipt of the first Beacon frame (i.e.,
                  * after time sync with the AP).
                  */
+                spin_lock_irqsave(&sc->sc_pm_lock, flags);
                 sc->ps_flags |= PS_BEACON_SYNC | PS_WAIT_FOR_BEACON;
+                spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
+
                 /* Reset rssi stats */
                 sc->last_rssi = ATH_RSSI_DUMMY_MARKER;
                 sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
@@ -1941,7 +1529,7 @@ static void ath9k_bss_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
                 ath_start_rx_poll(sc, 3);
 
                 if (!common->disable_ani) {
-                        sc->sc_flags |= SC_OP_ANI_RUN;
+                        set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                         ath_start_ani(common);
                 }
 
@@ -1961,7 +1549,8 @@ static void ath9k_config_bss(struct ath_softc *sc, struct ieee80211_vif *vif)
         if (avp->primary_sta_vif && !bss_conf->assoc) {
                 ath_dbg(common, CONFIG, "Bss Info DISASSOC %d, bssid %pM\n",
                         common->curaid, common->curbssid);
-                sc->sc_flags &= ~(SC_OP_PRIM_STA_VIF | SC_OP_BEACONS);
+                clear_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags);
+                clear_bit(SC_OP_BEACONS, &sc->sc_flags);
                 avp->primary_sta_vif = false;
                 memset(common->curbssid, 0, ETH_ALEN);
                 common->curaid = 0;
@@ -1974,10 +1563,9 @@ static void ath9k_config_bss(struct ath_softc *sc, struct ieee80211_vif *vif)
          * None of station vifs are associated.
          * Clear bssid & aid
          */
-        if (!(sc->sc_flags & SC_OP_PRIM_STA_VIF)) {
+        if (!test_bit(SC_OP_PRIM_STA_VIF, &sc->sc_flags)) {
                 ath9k_hw_write_associd(sc->sc_ah);
-                /* Stop ANI */
-                sc->sc_flags &= ~SC_OP_ANI_RUN;
+                clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                 del_timer_sync(&common->ani.timer);
                 del_timer_sync(&sc->rx_poll_timer);
                 memset(&sc->caldata, 0, sizeof(sc->caldata));
@@ -2015,12 +1603,12 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
                         sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;
 
                         if (!common->disable_ani) {
-                                sc->sc_flags |= SC_OP_ANI_RUN;
+                                set_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                                 ath_start_ani(common);
                         }
 
                 } else {
-                        sc->sc_flags &= ~SC_OP_ANI_RUN;
+                        clear_bit(SC_OP_ANI_RUN, &sc->sc_flags);
                         del_timer_sync(&common->ani.timer);
                         del_timer_sync(&sc->rx_poll_timer);
                 }
@@ -2032,7 +1620,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
          */
         if ((changed & BSS_CHANGED_BEACON_INT) &&
             (vif->type == NL80211_IFTYPE_AP))
-                sc->sc_flags |= SC_OP_TSF_RESET;
+                set_bit(SC_OP_TSF_RESET, &sc->sc_flags);
 
         /* Configure beaconing (AP, IBSS, MESH) */
         if (ath9k_uses_beacons(vif->type) &&
@@ -2224,7 +1812,7 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop)
                 return;
         }
 
-        if (sc->sc_flags & SC_OP_INVALID) {
+        if (test_bit(SC_OP_INVALID, &sc->sc_flags)) {
                 ath_dbg(common, ANY, "Device not present\n");
                 mutex_unlock(&sc->mutex);
                 return;
@@ -2389,6 +1977,134 @@ static int ath9k_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)
         return 0;
 }
 
+#ifdef CONFIG_ATH9K_DEBUGFS
+
+/* Ethtool support for get-stats */
+
+#define AMKSTR(nm) #nm "_BE", #nm "_BK", #nm "_VI", #nm "_VO"
+static const char ath9k_gstrings_stats[][ETH_GSTRING_LEN] = {
+        "tx_pkts_nic",
+        "tx_bytes_nic",
+        "rx_pkts_nic",
+        "rx_bytes_nic",
+        AMKSTR(d_tx_pkts),
+        AMKSTR(d_tx_bytes),
+        AMKSTR(d_tx_mpdus_queued),
+        AMKSTR(d_tx_mpdus_completed),
+        AMKSTR(d_tx_mpdu_xretries),
+        AMKSTR(d_tx_aggregates),
+        AMKSTR(d_tx_ampdus_queued_hw),
+        AMKSTR(d_tx_ampdus_queued_sw),
+        AMKSTR(d_tx_ampdus_completed),
+        AMKSTR(d_tx_ampdu_retries),
+        AMKSTR(d_tx_ampdu_xretries),
+        AMKSTR(d_tx_fifo_underrun),
+        AMKSTR(d_tx_op_exceeded),
+        AMKSTR(d_tx_timer_expiry),
+        AMKSTR(d_tx_desc_cfg_err),
+        AMKSTR(d_tx_data_underrun),
+        AMKSTR(d_tx_delim_underrun),
+
+        "d_rx_decrypt_crc_err",
+        "d_rx_phy_err",
+        "d_rx_mic_err",
+        "d_rx_pre_delim_crc_err",
+        "d_rx_post_delim_crc_err",
+        "d_rx_decrypt_busy_err",
+
+        "d_rx_phyerr_radar",
+        "d_rx_phyerr_ofdm_timing",
+        "d_rx_phyerr_cck_timing",
+
+};
+#define ATH9K_SSTATS_LEN ARRAY_SIZE(ath9k_gstrings_stats)
+
+static void ath9k_get_et_strings(struct ieee80211_hw *hw,
+                                 struct ieee80211_vif *vif,
+                                 u32 sset, u8 *data)
+{
+        if (sset == ETH_SS_STATS)
+                memcpy(data, *ath9k_gstrings_stats,
+                       sizeof(ath9k_gstrings_stats));
+}
+
+static int ath9k_get_et_sset_count(struct ieee80211_hw *hw,
+                                   struct ieee80211_vif *vif, int sset)
+{
+        if (sset == ETH_SS_STATS)
+                return ATH9K_SSTATS_LEN;
+        return 0;
+}
+
+#define PR_QNUM(_n) (sc->tx.txq_map[_n]->axq_qnum)
+#define AWDATA(elem)                                                    \
+        do {                                                            \
+                data[i++] = sc->debug.stats.txstats[PR_QNUM(WME_AC_BE)].elem; \
+                data[i++] = sc->debug.stats.txstats[PR_QNUM(WME_AC_BK)].elem; \
+                data[i++] = sc->debug.stats.txstats[PR_QNUM(WME_AC_VI)].elem; \
+                data[i++] = sc->debug.stats.txstats[PR_QNUM(WME_AC_VO)].elem; \
+        } while (0)
+
+#define AWDATA_RX(elem)                                         \
+        do {                                                    \
+                data[i++] = sc->debug.stats.rxstats.elem;       \
+        } while (0)
+
+static void ath9k_get_et_stats(struct ieee80211_hw *hw,
+                               struct ieee80211_vif *vif,
+                               struct ethtool_stats *stats, u64 *data)
+{
+        struct ath_softc *sc = hw->priv;
+        int i = 0;
+
+        data[i++] = (sc->debug.stats.txstats[PR_QNUM(WME_AC_BE)].tx_pkts_all +
+                     sc->debug.stats.txstats[PR_QNUM(WME_AC_BK)].tx_pkts_all +
+                     sc->debug.stats.txstats[PR_QNUM(WME_AC_VI)].tx_pkts_all +
+                     sc->debug.stats.txstats[PR_QNUM(WME_AC_VO)].tx_pkts_all);
+        data[i++] = (sc->debug.stats.txstats[PR_QNUM(WME_AC_BE)].tx_bytes_all +
+                     sc->debug.stats.txstats[PR_QNUM(WME_AC_BK)].tx_bytes_all +
+                     sc->debug.stats.txstats[PR_QNUM(WME_AC_VI)].tx_bytes_all +
+                     sc->debug.stats.txstats[PR_QNUM(WME_AC_VO)].tx_bytes_all);
+        AWDATA_RX(rx_pkts_all);
+        AWDATA_RX(rx_bytes_all);
+
+        AWDATA(tx_pkts_all);
+        AWDATA(tx_bytes_all);
+        AWDATA(queued);
+        AWDATA(completed);
+        AWDATA(xretries);
+        AWDATA(a_aggr);
+        AWDATA(a_queued_hw);
+        AWDATA(a_queued_sw);
+        AWDATA(a_completed);
+        AWDATA(a_retries);
+        AWDATA(a_xretries);
+        AWDATA(fifo_underrun);
+        AWDATA(xtxop);
+        AWDATA(timer_exp);
+        AWDATA(desc_cfg_err);
+        AWDATA(data_underrun);
+        AWDATA(delim_underrun);
+
+        AWDATA_RX(decrypt_crc_err);
+        AWDATA_RX(phy_err);
+        AWDATA_RX(mic_err);
+        AWDATA_RX(pre_delim_crc_err);
+        AWDATA_RX(post_delim_crc_err);
+        AWDATA_RX(decrypt_busy_err);
+
+        AWDATA_RX(phy_err_stats[ATH9K_PHYERR_RADAR]);
+        AWDATA_RX(phy_err_stats[ATH9K_PHYERR_OFDM_TIMING]);
+        AWDATA_RX(phy_err_stats[ATH9K_PHYERR_CCK_TIMING]);
+
+        WARN_ON(i != ATH9K_SSTATS_LEN);
+}
+
+/* End of ethtool get-stats functions */
+
+#endif
+
+
 struct ieee80211_ops ath9k_ops = {
         .tx                 = ath9k_tx,
         .start              = ath9k_start,
@@ -2417,4 +2133,10 @@ struct ieee80211_ops ath9k_ops = {
         .get_stats          = ath9k_get_stats,
         .set_antenna        = ath9k_set_antenna,
         .get_antenna        = ath9k_get_antenna,
+
+#ifdef CONFIG_ATH9K_DEBUGFS
+        .get_et_sset_count  = ath9k_get_et_sset_count,
+        .get_et_stats  = ath9k_get_et_stats,
+        .get_et_strings  = ath9k_get_et_strings,
+#endif
 };
diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c
index 29fe52d69973..49137f477b05 100644
--- a/drivers/net/wireless/ath/ath9k/mci.c
+++ b/drivers/net/wireless/ath/ath9k/mci.c
@@ -116,42 +116,58 @@ static void ath_mci_update_scheme(struct ath_softc *sc)
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_btcoex *btcoex = &sc->btcoex;
         struct ath_mci_profile *mci = &btcoex->mci;
+        struct ath9k_hw_mci *mci_hw = &sc->sc_ah->btcoex_hw.mci;
         struct ath_mci_profile_info *info;
         u32 num_profile = NUM_PROF(mci);
 
+        if (mci_hw->config & ATH_MCI_CONFIG_DISABLE_TUNING)
+                goto skip_tuning;
+
         if (num_profile == 1) {
                 info = list_first_entry(&mci->info,
                                         struct ath_mci_profile_info,
                                         list);
-                if (mci->num_sco && info->T == 12) {
-                        mci->aggr_limit = 8;
+                if (mci->num_sco) {
+                        if (info->T == 12)
+                                mci->aggr_limit = 8;
+                        else if (info->T == 6) {
+                                mci->aggr_limit = 6;
+                                btcoex->duty_cycle = 30;
+                        }
                         ath_dbg(common, MCI,
-                                "Single SCO, aggregation limit 2 ms\n");
-                } else if ((info->type == MCI_GPM_COEX_PROFILE_BNEP) &&
-                           !info->master) {
-                        btcoex->btcoex_period = 60;
+                                "Single SCO, aggregation limit %d 1/4 ms\n",
+                                mci->aggr_limit);
+                } else if (mci->num_pan || mci->num_other_acl) {
+                        /*
+                         * For single PAN/FTP profile, allocate 35% for BT
+                         * to improve WLAN throughput.
+                         */
+                        btcoex->duty_cycle = 35;
+                        btcoex->btcoex_period = 53;
                         ath_dbg(common, MCI,
-                                "Single slave PAN/FTP, bt period 60 ms\n");
-                } else if ((info->type == MCI_GPM_COEX_PROFILE_HID) &&
-                         (info->T > 0 && info->T < 50) &&
-                         (info->A > 1 || info->W > 1)) {
+                                "Single PAN/FTP bt period %d ms dutycycle %d\n",
+                                btcoex->duty_cycle, btcoex->btcoex_period);
+                } else if (mci->num_hid) {
                         btcoex->duty_cycle = 30;
-                        mci->aggr_limit = 8;
+                        mci->aggr_limit = 6;
                         ath_dbg(common, MCI,
                                 "Multiple attempt/timeout single HID "
-                                "aggregation limit 2 ms dutycycle 30%%\n");
+                                "aggregation limit 1.5 ms dutycycle 30%%\n");
                 }
-        } else if ((num_profile == 2) && (mci->num_hid == 2)) {
-                btcoex->duty_cycle = 30;
-                mci->aggr_limit = 8;
-                ath_dbg(common, MCI,
-                        "Two HIDs aggregation limit 2 ms dutycycle 30%%\n");
-        } else if (num_profile > 3) {
+        } else if (num_profile == 2) {
+                if (mci->num_hid == 2)
+                        btcoex->duty_cycle = 30;
                 mci->aggr_limit = 6;
                 ath_dbg(common, MCI,
-                        "Three or more profiles aggregation limit 1.5 ms\n");
+                        "Two BT profiles aggr limit 1.5 ms dutycycle %d%%\n",
+                        btcoex->duty_cycle);
+        } else if (num_profile >= 3) {
+                mci->aggr_limit = 4;
+                ath_dbg(common, MCI,
+                        "Three or more profiles aggregation limit 1 ms\n");
         }
 
+skip_tuning:
         if (IS_CHAN_2GHZ(sc->sc_ah->curchan)) {
                 if (IS_CHAN_HT(sc->sc_ah->curchan))
                         ath_mci_adjust_aggr_limit(btcoex);
@@ -538,3 +554,14 @@ void ath_mci_intr(struct ath_softc *sc)
                 mci_int &= ~(AR_MCI_INTERRUPT_RX_INVALID_HDR |
                              AR_MCI_INTERRUPT_CONT_INFO_TIMEOUT);
 }
+
+void ath_mci_enable(struct ath_softc *sc)
+{
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+
+        if (!common->btcoex_enabled)
+                return;
+
+        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_MCI)
+                sc->sc_ah->imask |= ATH9K_INT_MCI;
+}
diff --git a/drivers/net/wireless/ath/ath9k/mci.h b/drivers/net/wireless/ath/ath9k/mci.h
index c841444f53c2..fc14eea034eb 100644
--- a/drivers/net/wireless/ath/ath9k/mci.h
+++ b/drivers/net/wireless/ath/ath9k/mci.h
@@ -130,4 +130,13 @@ void ath_mci_flush_profile(struct ath_mci_profile *mci);
 int ath_mci_setup(struct ath_softc *sc);
 void ath_mci_cleanup(struct ath_softc *sc);
 void ath_mci_intr(struct ath_softc *sc);
-#endif
+
+#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
+void ath_mci_enable(struct ath_softc *sc);
+#else
+static inline void ath_mci_enable(struct ath_softc *sc)
+{
+}
+#endif /* CONFIG_ATH9K_BTCOEX_SUPPORT */
+
+#endif /* MCI_H*/
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index a856b51255f4..aa0e83ac51f4 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -115,6 +115,9 @@ static void ath_pci_aspm_init(struct ath_common *common)
         int pos;
         u8 aspm;
 
+        if (!ah->is_pciexpress)
+                return;
+
         pos = pci_pcie_cap(pdev);
         if (!pos)
                 return;
@@ -138,6 +141,7 @@ static void ath_pci_aspm_init(struct ath_common *common)
                 aspm &= ~(PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1);
                 pci_write_config_byte(parent, pos + PCI_EXP_LNKCTL, aspm);
 
+                ath_info(common, "Disabling ASPM since BTCOEX is enabled\n");
                 return;
         }
 
@@ -147,6 +151,7 @@ static void ath_pci_aspm_init(struct ath_common *common)
                 ah->aspm_enabled = true;
                 /* Initialize PCIe PM and SERDES registers. */
                 ath9k_hw_configpcipowersave(ah, false);
+                ath_info(common, "ASPM enabled: 0x%x\n", aspm);
         }
 }
 
@@ -246,7 +251,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         sc->mem = mem;
 
         /* Will be cleared in ath9k_start() */
-        sc->sc_flags |= SC_OP_INVALID;
+        set_bit(SC_OP_INVALID, &sc->sc_flags);
 
         ret = request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath9k", sc);
         if (ret) {
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index e1fcc68124dc..fbdcc80437fe 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -20,43 +20,6 @@
 
 #define SKB_CB_ATHBUF(__skb)    (*((struct ath_buf **)__skb->cb))
 
-static inline bool ath_is_alt_ant_ratio_better(int alt_ratio, int maxdelta,
-                                               int mindelta, int main_rssi_avg,
-                                               int alt_rssi_avg, int pkt_count)
-{
-        return (((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
-                (alt_rssi_avg > main_rssi_avg + maxdelta)) ||
-                (alt_rssi_avg > main_rssi_avg + mindelta)) && (pkt_count > 50);
-}
-
-static inline bool ath_ant_div_comb_alt_check(u8 div_group, int alt_ratio,
-                                        int curr_main_set, int curr_alt_set,
-                                        int alt_rssi_avg, int main_rssi_avg)
-{
-        bool result = false;
-        switch (div_group) {
-        case 0:
-                if (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO)
-                        result = true;
-                break;
-        case 1:
-        case 2:
-                if ((((curr_main_set == ATH_ANT_DIV_COMB_LNA2) &&
-                        (curr_alt_set == ATH_ANT_DIV_COMB_LNA1) &&
-                                (alt_rssi_avg >= (main_rssi_avg - 5))) ||
-                        ((curr_main_set == ATH_ANT_DIV_COMB_LNA1) &&
-                        (curr_alt_set == ATH_ANT_DIV_COMB_LNA2) &&
-                                (alt_rssi_avg >= (main_rssi_avg - 2)))) &&
-                                                        (alt_rssi_avg >= 4))
-                        result = true;
-                else
-                        result = false;
-                break;
-        }
-
-        return result;
-}
-
 static inline bool ath9k_check_auto_sleep(struct ath_softc *sc)
 {
         return sc->ps_enabled &&
@@ -303,7 +266,7 @@ static void ath_edma_start_recv(struct ath_softc *sc)
 
         ath_opmode_init(sc);
 
-        ath9k_hw_startpcureceive(sc->sc_ah, (sc->sc_flags & SC_OP_OFFCHANNEL));
+        ath9k_hw_startpcureceive(sc->sc_ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL));
 
         spin_unlock_bh(&sc->rx.rxbuflock);
 }
@@ -322,8 +285,8 @@ int ath_rx_init(struct ath_softc *sc, int nbufs)
         int error = 0;
 
         spin_lock_init(&sc->sc_pcu_lock);
-        sc->sc_flags &= ~SC_OP_RXFLUSH;
         spin_lock_init(&sc->rx.rxbuflock);
+        clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
 
         common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 +
                              sc->sc_ah->caps.rx_status_len;
@@ -500,7 +463,7 @@ int ath_startrecv(struct ath_softc *sc)
 
 start_recv:
         ath_opmode_init(sc);
-        ath9k_hw_startpcureceive(ah, (sc->sc_flags & SC_OP_OFFCHANNEL));
+        ath9k_hw_startpcureceive(ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL));
 
         spin_unlock_bh(&sc->rx.rxbuflock);
 
@@ -535,11 +498,11 @@ bool ath_stoprecv(struct ath_softc *sc)
 
 void ath_flushrecv(struct ath_softc *sc)
 {
-        sc->sc_flags |= SC_OP_RXFLUSH;
+        set_bit(SC_OP_RXFLUSH, &sc->sc_flags);
         if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
                 ath_rx_tasklet(sc, 1, true);
         ath_rx_tasklet(sc, 1, false);
-        sc->sc_flags &= ~SC_OP_RXFLUSH;
+        clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
 }
 
 static bool ath_beacon_dtim_pending_cab(struct sk_buff *skb)
@@ -624,13 +587,13 @@ static void ath_rx_ps(struct ath_softc *sc, struct sk_buff *skb, bool mybeacon)
 
         /* Process Beacon and CAB receive in PS state */
         if (((sc->ps_flags & PS_WAIT_FOR_BEACON) || ath9k_check_auto_sleep(sc))
-            && mybeacon)
+            && mybeacon) {
                 ath_rx_ps_beacon(sc, skb);
-        else if ((sc->ps_flags & PS_WAIT_FOR_CAB) &&
-                 (ieee80211_is_data(hdr->frame_control) ||
-                  ieee80211_is_action(hdr->frame_control)) &&
-                 is_multicast_ether_addr(hdr->addr1) &&
-                 !ieee80211_has_moredata(hdr->frame_control)) {
+        } else if ((sc->ps_flags & PS_WAIT_FOR_CAB) &&
+                   (ieee80211_is_data(hdr->frame_control) ||
+                    ieee80211_is_action(hdr->frame_control)) &&
+                   is_multicast_ether_addr(hdr->addr1) &&
+                   !ieee80211_has_moredata(hdr->frame_control)) {
                 /*
                  * No more broadcast/multicast frames to be received at this
                  * point.
@@ -1067,709 +1030,6 @@ static void ath9k_rx_skb_postprocess(struct ath_common *common,
                 rxs->flag &= ~RX_FLAG_DECRYPTED;
 }
 
-static void ath_lnaconf_alt_good_scan(struct ath_ant_comb *antcomb,
-                                      struct ath_hw_antcomb_conf ant_conf,
-                                      int main_rssi_avg)
-{
-        antcomb->quick_scan_cnt = 0;
-
-        if (ant_conf.main_lna_conf == ATH_ANT_DIV_COMB_LNA2)
-                antcomb->rssi_lna2 = main_rssi_avg;
-        else if (ant_conf.main_lna_conf == ATH_ANT_DIV_COMB_LNA1)
-                antcomb->rssi_lna1 = main_rssi_avg;
-
-        switch ((ant_conf.main_lna_conf << 4) | ant_conf.alt_lna_conf) {
-        case 0x10: /* LNA2 A-B */
-                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                antcomb->first_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1;
-                break;
-        case 0x20: /* LNA1 A-B */
-                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                antcomb->first_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA2;
-                break;
-        case 0x21: /* LNA1 LNA2 */
-                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA2;
-                antcomb->first_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                antcomb->second_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                break;
-        case 0x12: /* LNA2 LNA1 */
-                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1;
-                antcomb->first_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                antcomb->second_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                break;
-        case 0x13: /* LNA2 A+B */
-                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                antcomb->first_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1;
-                break;
-        case 0x23: /* LNA1 A+B */
-                antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                antcomb->first_quick_scan_conf =
-                        ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA2;
-                break;
-        default:
-                break;
-        }
-}
-
-static void ath_select_ant_div_from_quick_scan(struct ath_ant_comb *antcomb,
-                                struct ath_hw_antcomb_conf *div_ant_conf,
-                                int main_rssi_avg, int alt_rssi_avg,
-                                int alt_ratio)
-{
-        /* alt_good */
-        switch (antcomb->quick_scan_cnt) {
-        case 0:
-                /* set alt to main, and alt to first conf */
-                div_ant_conf->main_lna_conf = antcomb->main_conf;
-                div_ant_conf->alt_lna_conf = antcomb->first_quick_scan_conf;
-                break;
-        case 1:
-                /* set alt to main, and alt to first conf */
-                div_ant_conf->main_lna_conf = antcomb->main_conf;
-                div_ant_conf->alt_lna_conf = antcomb->second_quick_scan_conf;
-                antcomb->rssi_first = main_rssi_avg;
-                antcomb->rssi_second = alt_rssi_avg;
-
-                if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) {
-                        /* main is LNA1 */
-                        if (ath_is_alt_ant_ratio_better(alt_ratio,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_HI,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
-                                                main_rssi_avg, alt_rssi_avg,
-                                                antcomb->total_pkt_count))
-                                antcomb->first_ratio = true;
-                        else
-                                antcomb->first_ratio = false;
-                } else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2) {
-                        if (ath_is_alt_ant_ratio_better(alt_ratio,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_MID,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
-                                                main_rssi_avg, alt_rssi_avg,
-                                                antcomb->total_pkt_count))
-                                antcomb->first_ratio = true;
-                        else
-                                antcomb->first_ratio = false;
-                } else {
-                        if ((((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
-                            (alt_rssi_avg > main_rssi_avg +
-                            ATH_ANT_DIV_COMB_LNA1_DELTA_HI)) ||
-                            (alt_rssi_avg > main_rssi_avg)) &&
-                            (antcomb->total_pkt_count > 50))
-                                antcomb->first_ratio = true;
-                        else
-                                antcomb->first_ratio = false;
-                }
-                break;
-        case 2:
-                antcomb->alt_good = false;
-                antcomb->scan_not_start = false;
-                antcomb->scan = false;
-                antcomb->rssi_first = main_rssi_avg;
-                antcomb->rssi_third = alt_rssi_avg;
-
-                if (antcomb->second_quick_scan_conf == ATH_ANT_DIV_COMB_LNA1)
-                        antcomb->rssi_lna1 = alt_rssi_avg;
-                else if (antcomb->second_quick_scan_conf ==
-                         ATH_ANT_DIV_COMB_LNA2)
-                        antcomb->rssi_lna2 = alt_rssi_avg;
-                else if (antcomb->second_quick_scan_conf ==
-                         ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2) {
-                        if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2)
-                                antcomb->rssi_lna2 = main_rssi_avg;
-                        else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1)
-                                antcomb->rssi_lna1 = main_rssi_avg;
-                }
-
-                if (antcomb->rssi_lna2 > antcomb->rssi_lna1 +
-                    ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA)
-                        div_ant_conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-                else
-                        div_ant_conf->main_lna_conf = ATH_ANT_DIV_COMB_LNA1;
-
-                if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) {
-                        if (ath_is_alt_ant_ratio_better(alt_ratio,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_HI,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
-                                                main_rssi_avg, alt_rssi_avg,
-                                                antcomb->total_pkt_count))
-                                antcomb->second_ratio = true;
-                        else
-                                antcomb->second_ratio = false;
-                } else if (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2) {
-                        if (ath_is_alt_ant_ratio_better(alt_ratio,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_MID,
-                                                ATH_ANT_DIV_COMB_LNA1_DELTA_LOW,
-                                                main_rssi_avg, alt_rssi_avg,
-                                                antcomb->total_pkt_count))
-                                antcomb->second_ratio = true;
-                        else
-                                antcomb->second_ratio = false;
-                } else {
-                        if ((((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&
-                            (alt_rssi_avg > main_rssi_avg +
-                            ATH_ANT_DIV_COMB_LNA1_DELTA_HI)) ||
-                            (alt_rssi_avg > main_rssi_avg)) &&
-                            (antcomb->total_pkt_count > 50))
-                                antcomb->second_ratio = true;
-                        else
-                                antcomb->second_ratio = false;
-                }
-
-                /* set alt to the conf with maximun ratio */
-                if (antcomb->first_ratio && antcomb->second_ratio) {
-                        if (antcomb->rssi_second > antcomb->rssi_third) {
-                                /* first alt*/
-                                if ((antcomb->first_quick_scan_conf ==
-                                    ATH_ANT_DIV_COMB_LNA1) ||
-                                    (antcomb->first_quick_scan_conf ==
-                                    ATH_ANT_DIV_COMB_LNA2))
-                                        /* Set alt LNA1 or LNA2*/
-                                        if (div_ant_conf->main_lna_conf ==
-                                            ATH_ANT_DIV_COMB_LNA2)
-                                                div_ant_conf->alt_lna_conf =
-                                                        ATH_ANT_DIV_COMB_LNA1;
-                                        else
-                                                div_ant_conf->alt_lna_conf =
-                                                        ATH_ANT_DIV_COMB_LNA2;
-                                else
-                                        /* Set alt to A+B or A-B */
-                                        div_ant_conf->alt_lna_conf =
-                                                antcomb->first_quick_scan_conf;
-                        } else if ((antcomb->second_quick_scan_conf ==
-                                   ATH_ANT_DIV_COMB_LNA1) ||
-                                   (antcomb->second_quick_scan_conf ==
-                                   ATH_ANT_DIV_COMB_LNA2)) {
-                                /* Set alt LNA1 or LNA2 */
-                                if (div_ant_conf->main_lna_conf ==
-                                    ATH_ANT_DIV_COMB_LNA2)
-                                        div_ant_conf->alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                else
-                                        div_ant_conf->alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                        } else {
-                                /* Set alt to A+B or A-B */
-                                div_ant_conf->alt_lna_conf =
-                                        antcomb->second_quick_scan_conf;
-                        }
-                } else if (antcomb->first_ratio) {
-                        /* first alt */
-                        if ((antcomb->first_quick_scan_conf ==
-                            ATH_ANT_DIV_COMB_LNA1) ||
-                            (antcomb->first_quick_scan_conf ==
-                            ATH_ANT_DIV_COMB_LNA2))
-                                        /* Set alt LNA1 or LNA2 */
-                                if (div_ant_conf->main_lna_conf ==
-                                    ATH_ANT_DIV_COMB_LNA2)
-                                        div_ant_conf->alt_lna_conf =
-                                                        ATH_ANT_DIV_COMB_LNA1;
-                                else
-                                        div_ant_conf->alt_lna_conf =
-                                                        ATH_ANT_DIV_COMB_LNA2;
-                        else
-                                /* Set alt to A+B or A-B */
-                                div_ant_conf->alt_lna_conf =
-                                                antcomb->first_quick_scan_conf;
-                } else if (antcomb->second_ratio) {
-                                /* second alt */
-                        if ((antcomb->second_quick_scan_conf ==
-                            ATH_ANT_DIV_COMB_LNA1) ||
-                            (antcomb->second_quick_scan_conf ==
-                            ATH_ANT_DIV_COMB_LNA2))
-                                /* Set alt LNA1 or LNA2 */
-                                if (div_ant_conf->main_lna_conf ==
-                                    ATH_ANT_DIV_COMB_LNA2)
-                                        div_ant_conf->alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                else
-                                        div_ant_conf->alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                        else
-                                /* Set alt to A+B or A-B */
-                                div_ant_conf->alt_lna_conf =
-                                                antcomb->second_quick_scan_conf;
-                } else {
-                        /* main is largest */
-                        if ((antcomb->main_conf == ATH_ANT_DIV_COMB_LNA1) ||
-                            (antcomb->main_conf == ATH_ANT_DIV_COMB_LNA2))
-                                /* Set alt LNA1 or LNA2 */
-                                if (div_ant_conf->main_lna_conf ==
-                                    ATH_ANT_DIV_COMB_LNA2)
-                                        div_ant_conf->alt_lna_conf =
-                                                        ATH_ANT_DIV_COMB_LNA1;
-                                else
-                                        div_ant_conf->alt_lna_conf =
-                                                        ATH_ANT_DIV_COMB_LNA2;
-                        else
-                                /* Set alt to A+B or A-B */
-                                div_ant_conf->alt_lna_conf = antcomb->main_conf;
-                }
-                break;
-        default:
-                break;
-        }
-}
-
-static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
-                struct ath_ant_comb *antcomb, int alt_ratio)
-{
-        if (ant_conf->div_group == 0) {
-                /* Adjust the fast_div_bias based on main and alt lna conf */
-                switch ((ant_conf->main_lna_conf << 4) |
-                                ant_conf->alt_lna_conf) {
-                case 0x01: /* A-B LNA2 */
-                        ant_conf->fast_div_bias = 0x3b;
-                        break;
-                case 0x02: /* A-B LNA1 */
-                        ant_conf->fast_div_bias = 0x3d;
-                        break;
-                case 0x03: /* A-B A+B */
-                        ant_conf->fast_div_bias = 0x1;
-                        break;
-                case 0x10: /* LNA2 A-B */
-                        ant_conf->fast_div_bias = 0x7;
-                        break;
-                case 0x12: /* LNA2 LNA1 */
-                        ant_conf->fast_div_bias = 0x2;
-                        break;
-                case 0x13: /* LNA2 A+B */
-                        ant_conf->fast_div_bias = 0x7;
-                        break;
-                case 0x20: /* LNA1 A-B */
-                        ant_conf->fast_div_bias = 0x6;
-                        break;
-                case 0x21: /* LNA1 LNA2 */
-                        ant_conf->fast_div_bias = 0x0;
-                        break;
-                case 0x23: /* LNA1 A+B */
-                        ant_conf->fast_div_bias = 0x6;
-                        break;
-                case 0x30: /* A+B A-B */
-                        ant_conf->fast_div_bias = 0x1;
-                        break;
-                case 0x31: /* A+B LNA2 */
-                        ant_conf->fast_div_bias = 0x3b;
-                        break;
-                case 0x32: /* A+B LNA1 */
-                        ant_conf->fast_div_bias = 0x3d;
-                        break;
-                default:
-                        break;
-                }
-        } else if (ant_conf->div_group == 1) {
-                /* Adjust the fast_div_bias based on main and alt_lna_conf */
-                switch ((ant_conf->main_lna_conf << 4) |
-                        ant_conf->alt_lna_conf) {
-                case 0x01: /* A-B LNA2 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x02: /* A-B LNA1 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x03: /* A-B A+B */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x10: /* LNA2 A-B */
-                        if (!(antcomb->scan) &&
-                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x3f;
-                        else
-                                ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x12: /* LNA2 LNA1 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x13: /* LNA2 A+B */
-                        if (!(antcomb->scan) &&
-                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x3f;
-                        else
-                                ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x20: /* LNA1 A-B */
-                        if (!(antcomb->scan) &&
-                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x3f;
-                        else
-                                ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x21: /* LNA1 LNA2 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x23: /* LNA1 A+B */
-                        if (!(antcomb->scan) &&
-                            (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x3f;
-                        else
-                                ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x30: /* A+B A-B */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x31: /* A+B LNA2 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x32: /* A+B LNA1 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                default:
-                        break;
-                }
-        } else if (ant_conf->div_group == 2) {
-                /* Adjust the fast_div_bias based on main and alt_lna_conf */
-                switch ((ant_conf->main_lna_conf << 4) |
-                                ant_conf->alt_lna_conf) {
-                case 0x01: /* A-B LNA2 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x02: /* A-B LNA1 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x03: /* A-B A+B */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x10: /* LNA2 A-B */
-                        if (!(antcomb->scan) &&
-                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x1;
-                        else
-                                ant_conf->fast_div_bias = 0x2;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x12: /* LNA2 LNA1 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x13: /* LNA2 A+B */
-                        if (!(antcomb->scan) &&
-                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x1;
-                        else
-                                ant_conf->fast_div_bias = 0x2;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x20: /* LNA1 A-B */
-                        if (!(antcomb->scan) &&
-                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x1;
-                        else
-                                ant_conf->fast_div_bias = 0x2;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x21: /* LNA1 LNA2 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x23: /* LNA1 A+B */
-                        if (!(antcomb->scan) &&
-                                (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
-                                ant_conf->fast_div_bias = 0x1;
-                        else
-                                ant_conf->fast_div_bias = 0x2;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x30: /* A+B A-B */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x31: /* A+B LNA2 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                case 0x32: /* A+B LNA1 */
-                        ant_conf->fast_div_bias = 0x1;
-                        ant_conf->main_gaintb = 0;
-                        ant_conf->alt_gaintb = 0;
-                        break;
-                default:
-                        break;
-                }
-        }
-}
-
-/* Antenna diversity and combining */
-static void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs)
-{
-        struct ath_hw_antcomb_conf div_ant_conf;
-        struct ath_ant_comb *antcomb = &sc->ant_comb;
-        int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set;
-        int curr_main_set;
-        int main_rssi = rs->rs_rssi_ctl0;
-        int alt_rssi = rs->rs_rssi_ctl1;
-        int rx_ant_conf,  main_ant_conf;
-        bool short_scan = false;
-
-        rx_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_CURRENT_SHIFT) &
-                       ATH_ANT_RX_MASK;
-        main_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_MAIN_SHIFT) &
-                         ATH_ANT_RX_MASK;
-
-        /* Record packet only when both main_rssi and  alt_rssi is positive */
-        if (main_rssi > 0 && alt_rssi > 0) {
-                antcomb->total_pkt_count++;
-                antcomb->main_total_rssi += main_rssi;
-                antcomb->alt_total_rssi  += alt_rssi;
-                if (main_ant_conf == rx_ant_conf)
-                        antcomb->main_recv_cnt++;
-                else
-                        antcomb->alt_recv_cnt++;
-        }
-
-        /* Short scan check */
-        if (antcomb->scan && antcomb->alt_good) {
-                if (time_after(jiffies, antcomb->scan_start_time +
-                    msecs_to_jiffies(ATH_ANT_DIV_COMB_SHORT_SCAN_INTR)))
-                        short_scan = true;
-                else
-                        if (antcomb->total_pkt_count ==
-                            ATH_ANT_DIV_COMB_SHORT_SCAN_PKTCOUNT) {
-                                alt_ratio = ((antcomb->alt_recv_cnt * 100) /
-                                            antcomb->total_pkt_count);
-                                if (alt_ratio < ATH_ANT_DIV_COMB_ALT_ANT_RATIO)
-                                        short_scan = true;
-                        }
-        }
-
-        if (((antcomb->total_pkt_count < ATH_ANT_DIV_COMB_MAX_PKTCOUNT) ||
-            rs->rs_moreaggr) && !short_scan)
-                return;
-
-        if (antcomb->total_pkt_count) {
-                alt_ratio = ((antcomb->alt_recv_cnt * 100) /
-                             antcomb->total_pkt_count);
-                main_rssi_avg = (antcomb->main_total_rssi /
-                                 antcomb->total_pkt_count);
-                alt_rssi_avg = (antcomb->alt_total_rssi /
-                                 antcomb->total_pkt_count);
-        }
-
-
-        ath9k_hw_antdiv_comb_conf_get(sc->sc_ah, &div_ant_conf);
-        curr_alt_set = div_ant_conf.alt_lna_conf;
-        curr_main_set = div_ant_conf.main_lna_conf;
-
-        antcomb->count++;
-
-        if (antcomb->count == ATH_ANT_DIV_COMB_MAX_COUNT) {
-                if (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO) {
-                        ath_lnaconf_alt_good_scan(antcomb, div_ant_conf,
-                                                  main_rssi_avg);
-                        antcomb->alt_good = true;
-                } else {
-                        antcomb->alt_good = false;
-                }
-
-                antcomb->count = 0;
-                antcomb->scan = true;
-                antcomb->scan_not_start = true;
-        }
-
-        if (!antcomb->scan) {
-                if (ath_ant_div_comb_alt_check(div_ant_conf.div_group,
-                                        alt_ratio, curr_main_set, curr_alt_set,
-                                        alt_rssi_avg, main_rssi_avg)) {
-                        if (curr_alt_set == ATH_ANT_DIV_COMB_LNA2) {
-                                /* Switch main and alt LNA */
-                                div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                                div_ant_conf.alt_lna_conf  =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                        } else if (curr_alt_set == ATH_ANT_DIV_COMB_LNA1) {
-                                div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                div_ant_conf.alt_lna_conf  =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                        }
-
-                        goto div_comb_done;
-                } else if ((curr_alt_set != ATH_ANT_DIV_COMB_LNA1) &&
-                           (curr_alt_set != ATH_ANT_DIV_COMB_LNA2)) {
-                        /* Set alt to another LNA */
-                        if (curr_main_set == ATH_ANT_DIV_COMB_LNA2)
-                                div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                        else if (curr_main_set == ATH_ANT_DIV_COMB_LNA1)
-                                div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-
-                        goto div_comb_done;
-                }
-
-                if ((alt_rssi_avg < (main_rssi_avg +
-                                                div_ant_conf.lna1_lna2_delta)))
-                        goto div_comb_done;
-        }
-
-        if (!antcomb->scan_not_start) {
-                switch (curr_alt_set) {
-                case ATH_ANT_DIV_COMB_LNA2:
-                        antcomb->rssi_lna2 = alt_rssi_avg;
-                        antcomb->rssi_lna1 = main_rssi_avg;
-                        antcomb->scan = true;
-                        /* set to A+B */
-                        div_ant_conf.main_lna_conf =
-                                ATH_ANT_DIV_COMB_LNA1;
-                        div_ant_conf.alt_lna_conf  =
-                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                        break;
-                case ATH_ANT_DIV_COMB_LNA1:
-                        antcomb->rssi_lna1 = alt_rssi_avg;
-                        antcomb->rssi_lna2 = main_rssi_avg;
-                        antcomb->scan = true;
-                        /* set to A+B */
-                        div_ant_conf.main_lna_conf = ATH_ANT_DIV_COMB_LNA2;
-                        div_ant_conf.alt_lna_conf  =
-                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                        break;
-                case ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2:
-                        antcomb->rssi_add = alt_rssi_avg;
-                        antcomb->scan = true;
-                        /* set to A-B */
-                        div_ant_conf.alt_lna_conf =
-                                ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                        break;
-                case ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2:
-                        antcomb->rssi_sub = alt_rssi_avg;
-                        antcomb->scan = false;
-                        if (antcomb->rssi_lna2 >
-                            (antcomb->rssi_lna1 +
-                            ATH_ANT_DIV_COMB_LNA1_LNA2_SWITCH_DELTA)) {
-                                /* use LNA2 as main LNA */
-                                if ((antcomb->rssi_add > antcomb->rssi_lna1) &&
-                                    (antcomb->rssi_add > antcomb->rssi_sub)) {
-                                        /* set to A+B */
-                                        div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                                        div_ant_conf.alt_lna_conf  =
-                                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                                } else if (antcomb->rssi_sub >
-                                           antcomb->rssi_lna1) {
-                                        /* set to A-B */
-                                        div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                                        div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                                } else {
-                                        /* set to LNA1 */
-                                        div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                                        div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                }
-                        } else {
-                                /* use LNA1 as main LNA */
-                                if ((antcomb->rssi_add > antcomb->rssi_lna2) &&
-                                    (antcomb->rssi_add > antcomb->rssi_sub)) {
-                                        /* set to A+B */
-                                        div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                        div_ant_conf.alt_lna_conf  =
-                                                ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
-                                } else if (antcomb->rssi_sub >
-                                           antcomb->rssi_lna1) {
-                                        /* set to A-B */
-                                        div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                        div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
-                                } else {
-                                        /* set to LNA2 */
-                                        div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                        div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                                }
-                        }
-                        break;
-                default:
-                        break;
-                }
-        } else {
-                if (!antcomb->alt_good) {
-                        antcomb->scan_not_start = false;
-                        /* Set alt to another LNA */
-                        if (curr_main_set == ATH_ANT_DIV_COMB_LNA2) {
-                                div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                                div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                        } else if (curr_main_set == ATH_ANT_DIV_COMB_LNA1) {
-                                div_ant_conf.main_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA1;
-                                div_ant_conf.alt_lna_conf =
-                                                ATH_ANT_DIV_COMB_LNA2;
-                        }
-                        goto div_comb_done;
-                }
-        }
-
-        ath_select_ant_div_from_quick_scan(antcomb, &div_ant_conf,
-                                           main_rssi_avg, alt_rssi_avg,
-                                           alt_ratio);
-
-        antcomb->quick_scan_cnt++;
-
-div_comb_done:
-        ath_ant_div_conf_fast_divbias(&div_ant_conf, antcomb, alt_ratio);
-        ath9k_hw_antdiv_comb_conf_set(sc->sc_ah, &div_ant_conf);
-
-        antcomb->scan_start_time = jiffies;
-        antcomb->total_pkt_count = 0;
-        antcomb->main_total_rssi = 0;
-        antcomb->alt_total_rssi = 0;
-        antcomb->main_recv_cnt = 0;
-        antcomb->alt_recv_cnt = 0;
-}
-
 int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
 {
         struct ath_buf *bf;
@@ -1803,7 +1063,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
 
         do {
                 /* If handling rx interrupt and flush is in progress => exit */
-                if ((sc->sc_flags & SC_OP_RXFLUSH) && (flush == 0))
+                if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags) && (flush == 0))
                         break;
 
                 memset(&rs, 0, sizeof(rs));
@@ -1841,13 +1101,14 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                 else
                         rs.is_mybeacon = false;
 
+                sc->rx.num_pkts++;
                 ath_debug_stat_rx(sc, &rs);
 
                 /*
                  * If we're asked to flush receive queue, directly
                  * chain it back at the queue without processing it.
                  */
-                if (sc->sc_flags & SC_OP_RXFLUSH) {
+                if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags)) {
                         RX_STAT_INC(rx_drop_rxflush);
                         goto requeue_drop_frag;
                 }
@@ -1968,7 +1229,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                         skb_trim(skb, skb->len - 8);
 
                 spin_lock_irqsave(&sc->sc_pm_lock, flags);
-
                 if ((sc->ps_flags & (PS_WAIT_FOR_BEACON |
                                      PS_WAIT_FOR_CAB |
                                      PS_WAIT_FOR_PSPOLL_DATA)) ||
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index 458f81b4a7cb..560d6effac7a 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -2211,5 +2211,7 @@ enum {
 #define AR_BTCOEX_CTRL3_CONT_INFO_TIMEOUT       0x00000fff
 #define AR_BTCOEX_CTRL3_CONT_INFO_TIMEOUT_S     0
 
+#define AR_GLB_SWREG_DISCONT_MODE         0x2002c
+#define AR_GLB_SWREG_DISCONT_EN_BT_WLAN   0x3
 
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index d59dd01d6cde..f777ddcd1172 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -105,19 +105,19 @@ static int ath_max_4ms_framelen[4][32] = {
 /* Aggregation logic */
 /*********************/
 
-static void ath_txq_lock(struct ath_softc *sc, struct ath_txq *txq)
+void ath_txq_lock(struct ath_softc *sc, struct ath_txq *txq)
         __acquires(&txq->axq_lock)
 {
         spin_lock_bh(&txq->axq_lock);
 }
 
-static void ath_txq_unlock(struct ath_softc *sc, struct ath_txq *txq)
+void ath_txq_unlock(struct ath_softc *sc, struct ath_txq *txq)
         __releases(&txq->axq_lock)
 {
         spin_unlock_bh(&txq->axq_lock);
 }
 
-static void ath_txq_unlock_complete(struct ath_softc *sc, struct ath_txq *txq)
+void ath_txq_unlock_complete(struct ath_softc *sc, struct ath_txq *txq)
         __releases(&txq->axq_lock)
 {
         struct sk_buff_head q;
@@ -1536,7 +1536,7 @@ bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
         int i;
         u32 npend = 0;
 
-        if (sc->sc_flags & SC_OP_INVALID)
+        if (test_bit(SC_OP_INVALID, &sc->sc_flags))
                 return true;
 
         ath9k_hw_abort_tx_dma(ah);
@@ -1994,6 +1994,7 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ieee80211_hdr * hdr = (struct ieee80211_hdr *)skb->data;
         int q, padpos, padsize;
+        unsigned long flags;
 
         ath_dbg(common, XMIT, "TX complete: skb: %p\n", skb);
 
@@ -2012,6 +2013,7 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
                 skb_pull(skb, padsize);
         }
 
+        spin_lock_irqsave(&sc->sc_pm_lock, flags);
         if ((sc->ps_flags & PS_WAIT_FOR_TX_ACK) && !txq->axq_depth) {
                 sc->ps_flags &= ~PS_WAIT_FOR_TX_ACK;
                 ath_dbg(common, PS,
@@ -2021,6 +2023,7 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
                                         PS_WAIT_FOR_PSPOLL_DATA |
                                         PS_WAIT_FOR_TX_ACK));
         }
+        spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
 
         q = skb_get_queue_mapping(skb);
         if (txq == sc->tx.txq_map[q]) {
@@ -2231,46 +2234,6 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
         ath_txq_unlock_complete(sc, txq);
 }
 
-static void ath_tx_complete_poll_work(struct work_struct *work)
-{
-        struct ath_softc *sc = container_of(work, struct ath_softc,
-                        tx_complete_work.work);
-        struct ath_txq *txq;
-        int i;
-        bool needreset = false;
-#ifdef CONFIG_ATH9K_DEBUGFS
-        sc->tx_complete_poll_work_seen++;
-#endif
-
-        for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)
-                if (ATH_TXQ_SETUP(sc, i)) {
-                        txq = &sc->tx.txq[i];
-                        ath_txq_lock(sc, txq);
-                        if (txq->axq_depth) {
-                                if (txq->axq_tx_inprogress) {
-                                        needreset = true;
-                                        ath_txq_unlock(sc, txq);
-                                        break;
-                                } else {
-                                        txq->axq_tx_inprogress = true;
-                                }
-                        }
-                        ath_txq_unlock_complete(sc, txq);
-                }
-
-        if (needreset) {
-                ath_dbg(ath9k_hw_common(sc->sc_ah), RESET,
-                        "tx hung, resetting the chip\n");
-                RESET_STAT_INC(sc, RESET_TYPE_TX_HANG);
-                ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
-        }
-
-        ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,
-                        msecs_to_jiffies(ATH_TX_COMPLETE_POLL_INT));
-}
-
-
-
 void ath_tx_tasklet(struct ath_softc *sc)
 {
         struct ath_hw *ah = sc->sc_ah;
diff --git a/drivers/net/wireless/ath/carl9170/cmd.c b/drivers/net/wireless/ath/carl9170/cmd.c
index 195dc6538110..39a63874b275 100644
--- a/drivers/net/wireless/ath/carl9170/cmd.c
+++ b/drivers/net/wireless/ath/carl9170/cmd.c
@@ -138,7 +138,7 @@ int carl9170_reboot(struct ar9170 *ar)
         if (!cmd)
                 return -ENOMEM;
 
-        err = __carl9170_exec_cmd(ar, (struct carl9170_cmd *)cmd, true);
+        err = __carl9170_exec_cmd(ar, cmd, true);
         return err;
 }
 
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
index 84b22eec7abd..7a8e90eaad83 100644
--- a/drivers/net/wireless/ath/carl9170/rx.c
+++ b/drivers/net/wireless/ath/carl9170/rx.c
@@ -161,7 +161,7 @@ static void carl9170_cmd_callback(struct ar9170 *ar, u32 len, void *buffer)
 
 void carl9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len)
 {
-        struct carl9170_rsp *cmd = (void *) buf;
+        struct carl9170_rsp *cmd = buf;
         struct ieee80211_vif *vif;
 
         if (carl9170_check_sequence(ar, cmd->hdr.seq))
@@ -520,7 +520,7 @@ static u8 *carl9170_find_ie(u8 *data, unsigned int len, u8 ie)
  */
 static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len)
 {
-        struct ieee80211_hdr *hdr = (void *) data;
+        struct ieee80211_hdr *hdr = data;
         struct ieee80211_tim_ie *tim_ie;
         u8 *tim;
         u8 tim_len;
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index d07c0301da6a..4a4e98f71807 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -2952,10 +2952,10 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
         /* current AP address - only in reassoc frame */
         if (is_reassoc) {
                 memcpy(body.ap, priv->CurrentBSSID, 6);
-                ssid_el_p = (u8 *)&body.ssid_el_id;
+                ssid_el_p = &body.ssid_el_id;
                 bodysize = 18 + priv->SSID_size;
         } else {
-                ssid_el_p = (u8 *)&body.ap[0];
+                ssid_el_p = &body.ap[0];
                 bodysize = 12 + priv->SSID_size;
         }
 
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index f1f8bd09bd87..ff50cb4290e4 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -52,7 +52,7 @@ struct b43legacy_dmadesc32 *op32_idx2desc(struct b43legacy_dmaring *ring,
         desc = ring->descbase;
         desc = &(desc[slot]);
 
-        return (struct b43legacy_dmadesc32 *)desc;
+        return desc;
 }
 
 static void op32_fill_descriptor(struct b43legacy_dmaring *ring,
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index cd9c9bc186d9..8b06ca56125e 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -1508,7 +1508,7 @@ static void b43legacy_release_firmware(struct b43legacy_wldev *dev)
 
 static void b43legacy_print_fw_helptext(struct b43legacy_wl *wl)
 {
-        b43legacyerr(wl, "You must go to http://linuxwireless.org/en/users/"
+        b43legacyerr(wl, "You must go to http://wireless.kernel.org/en/users/"
                      "Drivers/b43#devicefirmware "
                      "and download the correct firmware (version 3).\n");
 }
diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
index a8012f2749ee..b8ffea6f5c64 100644
--- a/drivers/net/wireless/b43legacy/xmit.c
+++ b/drivers/net/wireless/b43legacy/xmit.c
@@ -269,8 +269,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
         b43legacy_generate_plcp_hdr((struct b43legacy_plcp_hdr4 *)
                                     (&txhdr->plcp), plcp_fragment_len,
                                     rate);
-        b43legacy_generate_plcp_hdr((struct b43legacy_plcp_hdr4 *)
-                                    (&txhdr->plcp_fb), plcp_fragment_len,
+        b43legacy_generate_plcp_hdr(&txhdr->plcp_fb, plcp_fragment_len,
                                     rate_fb->hw_value);
 
         /* PHY TX Control word */
@@ -340,8 +339,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
                 b43legacy_generate_plcp_hdr((struct b43legacy_plcp_hdr4 *)
                                             (&txhdr->rts_plcp),
                                             len, rts_rate);
-                b43legacy_generate_plcp_hdr((struct b43legacy_plcp_hdr4 *)
-                                            (&txhdr->rts_plcp_fb),
+                b43legacy_generate_plcp_hdr(&txhdr->rts_plcp_fb,
                                             len, rts_rate_fb);
                 hdr = (struct ieee80211_hdr *)(&txhdr->rts_frame);
                 txhdr->rts_dur_fb = hdr->duration_id;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 1dbf2be478c8..4deae28fc211 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -2502,7 +2502,7 @@ clkwait:
                 int ret, i;
 
                 ret = brcmf_sdcard_send_buf(bus->sdiodev, bus->sdiodev->sbwad,
-                        SDIO_FUNC_2, F2SYNC, (u8 *) bus->ctrl_frame_buf,
+                        SDIO_FUNC_2, F2SYNC, bus->ctrl_frame_buf,
                         (u32) bus->ctrl_frame_len);
 
                 if (ret < 0) {
@@ -3327,7 +3327,7 @@ static int brcmf_sdbrcm_download_nvram(struct brcmf_sdio *bus)
         len = brcmf_sdbrcm_get_image(memblock, MEMBLOCK, bus);
 
         if (len > 0 && len < MEMBLOCK) {
-                bufp = (char *)memblock;
+                bufp = memblock;
                 bufp[len] = 0;
                 len = brcmf_process_nvram_vars(bufp, len);
                 bufp += len;
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
index 6d8b7213643a..3c6f9b1e8d05 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
@@ -631,9 +631,8 @@ uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val)
         cc = sii->icbus->drv_cc.core;
 
         /* mask and set */
-        if (mask || val) {
+        if (mask || val)
                 bcma_maskset32(cc, regoff, ~mask, val);
-        }
 
         /* readback */
         w = bcma_read32(cc, regoff);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
index d9f04a683bdb..d6fa9829af9a 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
@@ -193,7 +193,7 @@ extern void ai_detach(struct si_pub *sih);
 extern uint ai_cc_reg(struct si_pub *sih, uint regoff, u32 mask, u32 val);
 extern void ai_clkctl_init(struct si_pub *sih);
 extern u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih);
-extern bool ai_clkctl_cc(struct si_pub *sih, uint mode);
+extern bool ai_clkctl_cc(struct si_pub *sih, enum bcma_clkmode mode);
 extern bool ai_deviceremoved(struct si_pub *sih);
 
 extern void ai_pci_down(struct si_pub *sih);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
index 11054ae9d4f6..7516639412ec 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
@@ -1433,7 +1433,7 @@ void dma_walk_packets(struct dma_pub *dmah, void (*callback_fnc)
         struct ieee80211_tx_info *tx_info;
 
         while (i != end) {
-                skb = (struct sk_buff *)di->txp[i];
+                skb = di->txp[i];
                 if (skb != NULL) {
                         tx_info = (struct ieee80211_tx_info *)skb->cb;
                         (callback_fnc)(tx_info, arg_a);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 19db4052c44c..e67556780a31 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -8318,7 +8318,7 @@ brcms_c_attach(struct brcms_info *wl, struct bcma_device *core, uint unit,
         struct brcms_pub *pub;
 
         /* allocate struct brcms_c_info state and its substructures */
-        wlc = (struct brcms_c_info *) brcms_c_attach_malloc(unit, &err, 0);
+        wlc = brcms_c_attach_malloc(unit, &err, 0);
         if (wlc == NULL)
                 goto fail;
         wlc->wiphy = wl->wiphy;
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
index 13b261517cce..366718146418 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
@@ -14358,7 +14358,7 @@ void wlc_phy_nphy_tkip_rifs_war(struct brcms_phy *pi, u8 rifs)
 
         wlc_phy_write_txmacreg_nphy(pi, holdoff, delay);
 
-        if (pi && pi->sh && (pi->sh->_rifs_phy != rifs))
+        if (pi->sh && (pi->sh->_rifs_phy != rifs))
                 pi->sh->_rifs_phy = rifs;
 }
 
diff --git a/drivers/net/wireless/brcm80211/brcmutil/utils.c b/drivers/net/wireless/brcm80211/brcmutil/utils.c
index b45ab34cdfdc..3e6405e06ac0 100644
--- a/drivers/net/wireless/brcm80211/brcmutil/utils.c
+++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c
@@ -43,6 +43,8 @@ EXPORT_SYMBOL(brcmu_pkt_buf_get_skb);
 /* Free the driver packet. Free the tag if present */
 void brcmu_pkt_buf_free_skb(struct sk_buff *skb)
 {
+        if (!skb)
+                return;
         WARN_ON(skb->next);
         if (skb->destructor)
                 /* cannot kfree_skb() on hard IRQ (net/core/skbuff.c) if
diff --git a/drivers/net/wireless/hostap/hostap_proc.c b/drivers/net/wireless/hostap/hostap_proc.c
index 75ef8f04aabe..dc447c1b5abe 100644
--- a/drivers/net/wireless/hostap/hostap_proc.c
+++ b/drivers/net/wireless/hostap/hostap_proc.c
@@ -58,8 +58,7 @@ static int prism2_stats_proc_read(char *page, char **start, off_t off,
 {
         char *p = page;
         local_info_t *local = (local_info_t *) data;
-        struct comm_tallies_sums *sums = (struct comm_tallies_sums *)
-                &local->comm_tallies;
+        struct comm_tallies_sums *sums = &local->comm_tallies;
 
         if (off != 0) {
                 *eof = 1;
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 0036737fe8e3..0df459147394 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -2701,6 +2701,20 @@ static void eeprom_parse_mac(struct ipw_priv *priv, u8 * mac)
         memcpy(mac, &priv->eeprom[EEPROM_MAC_ADDRESS], 6);
 }
 
+static void ipw_read_eeprom(struct ipw_priv *priv)
+{
+        int i;
+        __le16 *eeprom = (__le16 *) priv->eeprom;
+
+        IPW_DEBUG_TRACE(">>\n");
+
+        /* read entire contents of eeprom into private buffer */
+        for (i = 0; i < 128; i++)
+                eeprom[i] = cpu_to_le16(eeprom_read_u16(priv, (u8) i));
+
+        IPW_DEBUG_TRACE("<<\n");
+}
+
 /*
  * Either the device driver (i.e. the host) or the firmware can
  * load eeprom data into the designated region in SRAM.  If neither
@@ -2712,14 +2726,9 @@ static void eeprom_parse_mac(struct ipw_priv *priv, u8 * mac)
 static void ipw_eeprom_init_sram(struct ipw_priv *priv)
 {
         int i;
-        __le16 *eeprom = (__le16 *) priv->eeprom;
 
         IPW_DEBUG_TRACE(">>\n");
 
-        /* read entire contents of eeprom into private buffer */
-        for (i = 0; i < 128; i++)
-                eeprom[i] = cpu_to_le16(eeprom_read_u16(priv, (u8) i));
-
         /*
            If the data looks correct, then copy it to our private
            copy.  Otherwise let the firmware know to perform the operation
@@ -3643,8 +3652,10 @@ static int ipw_load(struct ipw_priv *priv)
         /* ack fw init done interrupt */
         ipw_write32(priv, IPW_INTA_RW, IPW_INTA_BIT_FW_INITIALIZATION_DONE);
 
-        /* read eeprom data and initialize the eeprom region of sram */
+        /* read eeprom data */
         priv->eeprom_delay = 1;
+        ipw_read_eeprom(priv);
+        /* initialize the eeprom region of sram */
         ipw_eeprom_init_sram(priv);
 
         /* enable interrupts */
@@ -7069,9 +7080,7 @@ static int ipw_qos_activate(struct ipw_priv *priv,
         }
 
         IPW_DEBUG_QOS("QoS sending IPW_CMD_QOS_PARAMETERS\n");
-        err = ipw_send_qos_params_command(priv,
-                                          (struct libipw_qos_parameters *)
-                                          &(qos_parameters[0]));
+        err = ipw_send_qos_params_command(priv, &qos_parameters[0]);
         if (err)
                 IPW_DEBUG_QOS("QoS IPW_CMD_QOS_PARAMETERS failed\n");
 
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 509301a5e7e2..d24eaf89ffb5 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -5724,7 +5724,8 @@ il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length)
             BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
 
         hw->wiphy->flags |=
-            WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS;
+            WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS |
+            WIPHY_FLAG_IBSS_RSN;
 
         /*
          * For now, disable PS by default because it affects
@@ -5873,6 +5874,16 @@ il4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 return -EOPNOTSUPP;
         }
 
+        /*
+         * To support IBSS RSN, don't program group keys in IBSS, the
+         * hardware will then not attempt to decrypt the frames.
+         */
+        if (vif->type == NL80211_IFTYPE_ADHOC &&
+            !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
+                D_MAC80211("leave - ad-hoc group key\n");
+                return -EOPNOTSUPP;
+        }
+
         sta_id = il_sta_id_or_broadcast(il, sta);
         if (sta_id == IL_INVALID_STATION)
                 return -EINVAL;
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 2463c0626438..727fbb5db9da 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -6,6 +6,7 @@ config IWLWIFI
         select LEDS_CLASS
         select LEDS_TRIGGERS
         select MAC80211_LEDS
+        select IWLDVM
         ---help---
           Select to build the driver supporting the:
 
@@ -41,6 +42,10 @@ config IWLWIFI
           say M here and read <file:Documentation/kbuild/modules.txt>.  The
           module will be called iwlwifi.
 
+config IWLDVM
+        tristate "Intel Wireless WiFi"
+        depends on IWLWIFI
+
 menu "Debugging Options"
         depends on IWLWIFI
 
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index d615eacbf050..98c8f6449649 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,27 +1,17 @@
-# WIFI
-obj-$(CONFIG_IWLWIFI)   += iwlwifi.o
-iwlwifi-objs            := iwl-agn.o iwl-agn-rs.o iwl-mac80211.o
-iwlwifi-objs            += iwl-ucode.o iwl-agn-tx.o iwl-debug.o
-iwlwifi-objs            += iwl-agn-lib.o iwl-agn-calib.o iwl-io.o
-iwlwifi-objs            += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-rx.o
+obj-$(CONFIG_IWLDVM)    += dvm/
+
+CFLAGS_iwl-devtrace.o := -I$(src)
 
-iwlwifi-objs            += iwl-eeprom.o iwl-power.o
-iwlwifi-objs            += iwl-scan.o iwl-led.o
-iwlwifi-objs            += iwl-agn-rxon.o iwl-agn-devices.o
-iwlwifi-objs            += iwl-5000.o
-iwlwifi-objs            += iwl-6000.o
-iwlwifi-objs            += iwl-1000.o
-iwlwifi-objs            += iwl-2000.o
-iwlwifi-objs            += iwl-pci.o
+# common
+obj-$(CONFIG_IWLWIFI)   += iwlwifi.o
+iwlwifi-objs            += iwl-io.o
 iwlwifi-objs            += iwl-drv.o
+iwlwifi-objs            += iwl-debug.o
 iwlwifi-objs            += iwl-notif-wait.o
-iwlwifi-objs            += iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o
+iwlwifi-objs            += iwl-eeprom-read.o iwl-eeprom-parse.o
+iwlwifi-objs            += pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o
+iwlwifi-objs            += pcie/1000.o pcie/2000.o pcie/5000.o pcie/6000.o
 
-
-iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
 iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
-iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-testmode.o
-
-CFLAGS_iwl-devtrace.o := -I$(src)
 
-ccflags-y += -D__CHECK_ENDIAN__
+ccflags-y += -D__CHECK_ENDIAN__ -I$(src)
diff --git a/drivers/net/wireless/iwlwifi/dvm/Makefile b/drivers/net/wireless/iwlwifi/dvm/Makefile
new file mode 100644
index 000000000000..5ff76b204141
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/dvm/Makefile
@@ -0,0 +1,13 @@
+# DVM
+obj-$(CONFIG_IWLDVM)    += iwldvm.o
+iwldvm-objs             += main.o rs.o mac80211.o ucode.o tx.o
+iwldvm-objs             += lib.o calib.o tt.o sta.o rx.o
+
+iwldvm-objs             += power.o
+iwldvm-objs             += scan.o led.o
+iwldvm-objs             += rxon.o devices.o
+
+iwldvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o
+iwldvm-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += testmode.o
+
+ccflags-y += -D__CHECK_ENDIAN__ -I$(src)/../
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/dvm/agn.h
index 79c0fe06f4db..2ae3608472a6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/dvm/agn.h
@@ -63,9 +63,10 @@
 #ifndef __iwl_agn_h__
 #define __iwl_agn_h__
 
-#include "iwl-dev.h"
 #include "iwl-config.h"
 
+#include "dev.h"
+
 /* The first 11 queues (0-10) are used otherwise */
 #define IWLAGN_FIRST_AMPDU_QUEUE        11
 
@@ -91,7 +92,6 @@ extern struct iwl_lib_ops iwl6030_lib;
 #define STATUS_CT_KILL          1
 #define STATUS_ALIVE            2
 #define STATUS_READY            3
-#define STATUS_GEO_CONFIGURED   4
 #define STATUS_EXIT_PENDING     5
 #define STATUS_STATISTICS       6
 #define STATUS_SCANNING         7
@@ -101,6 +101,7 @@ extern struct iwl_lib_ops iwl6030_lib;
 #define STATUS_CHANNEL_SWITCH_PENDING 11
 #define STATUS_SCAN_COMPLETE    12
 #define STATUS_POWER_PMI        13
+#define STATUS_SCAN_ROC_EXPIRED 14
 
 struct iwl_ucode_capabilities;
 
@@ -255,6 +256,10 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv,
                                    enum iwl_scan_type scan_type,
                                    enum ieee80211_band band);
 
+void iwl_scan_roc_expired(struct iwl_priv *priv);
+void iwl_scan_offchannel_skb(struct iwl_priv *priv);
+void iwl_scan_offchannel_skb_status(struct iwl_priv *priv);
+
 /* For faster active scanning, scan will move to the next channel if fewer than
  * PLCP_QUIET_THRESH packets are heard on this channel within
  * ACTIVE_QUIET_TIME after sending probe request.  This shortens the dwell
@@ -437,10 +442,8 @@ static inline void iwl_print_rx_config_cmd(struct iwl_priv *priv,
 
 static inline int iwl_is_ready(struct iwl_priv *priv)
 {
-        /* The adapter is 'ready' if READY and GEO_CONFIGURED bits are
-         * set but EXIT_PENDING is not */
+        /* The adapter is 'ready' if READY EXIT_PENDING is not set */
         return test_bit(STATUS_READY, &priv->status) &&
-               test_bit(STATUS_GEO_CONFIGURED, &priv->status) &&
                !test_bit(STATUS_EXIT_PENDING, &priv->status);
 }
 
@@ -518,85 +521,4 @@ static inline const char *iwl_dvm_get_cmd_string(u8 cmd)
                 return s;
         return "UNKNOWN";
 }
-
-/* API method exported for mvm hybrid state */
-void iwl_setup_deferred_work(struct iwl_priv *priv);
-int iwl_send_wimax_coex(struct iwl_priv *priv);
-int iwl_send_bt_env(struct iwl_priv *priv, u8 action, u8 type);
-void iwl_option_config(struct iwl_priv *priv);
-void iwl_set_hw_params(struct iwl_priv *priv);
-void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags);
-int iwl_init_drv(struct iwl_priv *priv);
-void iwl_uninit_drv(struct iwl_priv *priv);
-void iwl_send_bt_config(struct iwl_priv *priv);
-void iwl_rf_kill_ct_config(struct iwl_priv *priv);
-int iwl_setup_interface(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
-void iwl_teardown_interface(struct iwl_priv *priv,
-                            struct ieee80211_vif *vif,
-                            bool mode_change);
-int iwl_full_rxon_required(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
-void iwlagn_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
-void iwlagn_check_needed_chains(struct iwl_priv *priv,
-                                struct iwl_rxon_context *ctx,
-                                struct ieee80211_bss_conf *bss_conf);
-void iwlagn_chain_noise_reset(struct iwl_priv *priv);
-int iwlagn_update_beacon(struct iwl_priv *priv,
-                         struct ieee80211_vif *vif);
-void iwl_tt_handler(struct iwl_priv *priv);
-void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode);
-void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, int queue);
-void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state);
-void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb);
-void iwl_nic_error(struct iwl_op_mode *op_mode);
-void iwl_cmd_queue_full(struct iwl_op_mode *op_mode);
-void iwl_nic_config(struct iwl_op_mode *op_mode);
-int iwlagn_mac_set_tim(struct ieee80211_hw *hw,
-                       struct ieee80211_sta *sta, bool set);
-void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
-                              enum ieee80211_rssi_event rssi_event);
-int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw);
-int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw);
-void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop);
-void iwl_wake_sw_queue(struct iwl_op_mode *op_mode, int queue);
-void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
-                               struct ieee80211_channel_switch *ch_switch);
-int iwlagn_mac_sta_state(struct ieee80211_hw *hw,
-                         struct ieee80211_vif *vif,
-                         struct ieee80211_sta *sta,
-                         enum ieee80211_sta_state old_state,
-                         enum ieee80211_sta_state new_state);
-int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
-                            struct ieee80211_vif *vif,
-                            enum ieee80211_ampdu_mlme_action action,
-                            struct ieee80211_sta *sta, u16 tid, u16 *ssn,
-                            u8 buf_size);
-int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,
-                       struct ieee80211_vif *vif,
-                       struct cfg80211_scan_request *req);
-void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,
-                           struct ieee80211_vif *vif,
-                           enum sta_notify_cmd cmd,
-                           struct ieee80211_sta *sta);
-void iwlagn_configure_filter(struct ieee80211_hw *hw,
-                             unsigned int changed_flags,
-                             unsigned int *total_flags,
-                             u64 multicast);
-int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,
-                       struct ieee80211_vif *vif, u16 queue,
-                       const struct ieee80211_tx_queue_params *params);
-void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,
-                               struct ieee80211_vif *vif,
-                               struct cfg80211_gtk_rekey_data *data);
-void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,
-                                struct ieee80211_vif *vif,
-                                struct ieee80211_key_conf *keyconf,
-                                struct ieee80211_sta *sta,
-                                u32 iv32, u16 *phase1key);
-int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
-                       struct ieee80211_vif *vif,
-                       struct ieee80211_sta *sta,
-                       struct ieee80211_key_conf *key);
-void iwlagn_mac_stop(struct ieee80211_hw *hw);
-void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb);
-int iwlagn_mac_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan);
 #endif /* __iwl_agn_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c b/drivers/net/wireless/iwlwifi/dvm/calib.c
index 95f27f1a423b..f2dd671d7dc8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
+++ b/drivers/net/wireless/iwlwifi/dvm/calib.c
@@ -63,10 +63,11 @@
 #include <linux/slab.h>
 #include <net/mac80211.h>
 
-#include "iwl-dev.h"
-#include "iwl-agn-calib.h"
 #include "iwl-trans.h"
-#include "iwl-agn.h"
+
+#include "dev.h"
+#include "calib.h"
+#include "agn.h"
 
 /*****************************************************************************
  * INIT calibrations framework
@@ -832,14 +833,14 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
          * To be safe, simply mask out any chains that we know
          * are not on the device.
          */
-        active_chains &= priv->hw_params.valid_rx_ant;
+        active_chains &= priv->eeprom_data->valid_rx_ant;
 
         num_tx_chains = 0;
         for (i = 0; i < NUM_RX_CHAINS; i++) {
                 /* loops on all the bits of
                  * priv->hw_setting.valid_tx_ant */
                 u8 ant_msk = (1 << i);
-                if (!(priv->hw_params.valid_tx_ant & ant_msk))
+                if (!(priv->eeprom_data->valid_tx_ant & ant_msk))
                         continue;
 
                 num_tx_chains++;
@@ -853,7 +854,7 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
                          * connect the first valid tx chain
                          */
                         first_chain =
-                                find_first_chain(priv->hw_params.valid_tx_ant);
+                                find_first_chain(priv->eeprom_data->valid_tx_ant);
                         data->disconn_array[first_chain] = 0;
                         active_chains |= BIT(first_chain);
                         IWL_DEBUG_CALIB(priv,
@@ -863,13 +864,13 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig,
                 }
         }
 
-        if (active_chains != priv->hw_params.valid_rx_ant &&
+        if (active_chains != priv->eeprom_data->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);
+                                priv->eeprom_data->valid_rx_ant);
 
         /* Save for use within RXON, TX, SCAN commands, etc. */
         data->active_chains = active_chains;
@@ -1054,7 +1055,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
             priv->cfg->bt_params->advanced_bt_coexist) {
                 /* Disable disconnected antenna algorithm for advanced
                    bt coex, assuming valid antennas are connected */
-                data->active_chains = priv->hw_params.valid_rx_ant;
+                data->active_chains = priv->eeprom_data->valid_rx_ant;
                 for (i = 0; i < NUM_RX_CHAINS; i++)
                         if (!(data->active_chains & (1<<i)))
                                 data->disconn_array[i] = 1;
@@ -1083,8 +1084,9 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv)
         IWL_DEBUG_CALIB(priv, "min_average_noise = %d, antenna %d\n",
                         min_average_noise, min_average_noise_antenna_i);
 
-        iwlagn_gain_computation(priv, average_noise,
-                                find_first_chain(priv->hw_params.valid_rx_ant));
+        iwlagn_gain_computation(
+                priv, average_noise,
+                find_first_chain(priv->eeprom_data->valid_rx_ant));
 
         /* Some power changes may have been made during the calibration.
          * Update and commit the RXON
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-calib.h b/drivers/net/wireless/iwlwifi/dvm/calib.h
index dbe13787f272..2349f393cc42 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-calib.h
+++ b/drivers/net/wireless/iwlwifi/dvm/calib.h
@@ -62,8 +62,8 @@
 #ifndef __iwl_calib_h__
 #define __iwl_calib_h__
 
-#include "iwl-dev.h"
-#include "iwl-commands.h"
+#include "dev.h"
+#include "commands.h"
 
 void iwl_chain_noise_calibration(struct iwl_priv *priv);
 void iwl_sensitivity_calibration(struct iwl_priv *priv);
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/dvm/commands.h
index 9af6a239b384..64811cd91635 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/dvm/commands.h
@@ -61,9 +61,9 @@
  *
  *****************************************************************************/
 /*
- * Please use this file (iwl-commands.h) only for uCode API definitions.
+ * Please use this file (commands.h) only for uCode API definitions.
  * Please use iwl-xxxx-hw.h for hardware-related definitions.
- * Please use iwl-dev.h for driver implementation definitions.
+ * Please use dev.h for driver implementation definitions.
  */
 
 #ifndef __iwl_commands_h__
@@ -197,9 +197,6 @@ enum {
  *
  *****************************************************************************/
 
-/* iwl_cmd_header flags value */
-#define IWL_CMD_FAILED_MSK 0x40
-
 /**
  * iwlagn rate_n_flags bit fields
  *
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
index e7c157e5ebeb..8a2d9e643b14 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
@@ -30,16 +30,12 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/debugfs.h>
-
 #include <linux/ieee80211.h>
 #include <net/mac80211.h>
-
-
-#include "iwl-dev.h"
 #include "iwl-debug.h"
 #include "iwl-io.h"
-#include "iwl-agn.h"
-#include "iwl-modparams.h"
+#include "dev.h"
+#include "agn.h"
 
 /* create and remove of files */
 #define DEBUGFS_ADD_FILE(name, parent, mode) do {                       \
@@ -307,13 +303,13 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,
         const u8 *ptr;
         char *buf;
         u16 eeprom_ver;
-        size_t eeprom_len = priv->cfg->base_params->eeprom_size;
+        size_t eeprom_len = priv->eeprom_blob_size;
         buf_size = 4 * eeprom_len + 256;
 
         if (eeprom_len % 16)
                 return -ENODATA;
 
-        ptr = priv->eeprom;
+        ptr = priv->eeprom_blob;
         if (!ptr)
                 return -ENOMEM;
 
@@ -322,11 +318,9 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file,
         if (!buf)
                 return -ENOMEM;
 
-        eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);
-        pos += scnprintf(buf + pos, buf_size - pos, "NVM Type: %s, "
-                        "version: 0x%x\n",
-                        (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
-                         ? "OTP" : "EEPROM", eeprom_ver);
+        eeprom_ver = priv->eeprom_data->eeprom_version;
+        pos += scnprintf(buf + pos, buf_size - pos,
+                         "NVM version: 0x%x\n", eeprom_ver);
         for (ofs = 0 ; ofs < eeprom_len ; ofs += 16) {
                 pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x ", ofs);
                 hex_dump_to_buffer(ptr + ofs, 16 , 16, 2, buf + pos,
@@ -351,9 +345,6 @@ static ssize_t iwl_dbgfs_channels_read(struct file *file, char __user *user_buf,
         char *buf;
         ssize_t ret;
 
-        if (!test_bit(STATUS_GEO_CONFIGURED, &priv->status))
-                return -EAGAIN;
-
         buf = kzalloc(bufsz, GFP_KERNEL);
         if (!buf)
                 return -ENOMEM;
@@ -426,8 +417,6 @@ static ssize_t iwl_dbgfs_status_read(struct file *file,
                 test_bit(STATUS_ALIVE, &priv->status));
         pos += scnprintf(buf + pos, bufsz - pos, "STATUS_READY:\t\t %d\n",
                 test_bit(STATUS_READY, &priv->status));
-        pos += scnprintf(buf + pos, bufsz - pos, "STATUS_GEO_CONFIGURED:\t %d\n",
-                test_bit(STATUS_GEO_CONFIGURED, &priv->status));
         pos += scnprintf(buf + pos, bufsz - pos, "STATUS_EXIT_PENDING:\t %d\n",
                 test_bit(STATUS_EXIT_PENDING, &priv->status));
         pos += scnprintf(buf + pos, bufsz - pos, "STATUS_STATISTICS:\t %d\n",
@@ -1341,17 +1330,17 @@ static ssize_t iwl_dbgfs_ucode_tx_stats_read(struct file *file,
         if (tx->tx_power.ant_a || tx->tx_power.ant_b || tx->tx_power.ant_c) {
                 pos += scnprintf(buf + pos, bufsz - pos,
                         "tx power: (1/2 dB step)\n");
-                if ((priv->hw_params.valid_tx_ant & ANT_A) &&
+                if ((priv->eeprom_data->valid_tx_ant & ANT_A) &&
                     tx->tx_power.ant_a)
                         pos += scnprintf(buf + pos, bufsz - pos,
                                         fmt_hex, "antenna A:",
                                         tx->tx_power.ant_a);
-                if ((priv->hw_params.valid_tx_ant & ANT_B) &&
+                if ((priv->eeprom_data->valid_tx_ant & ANT_B) &&
                     tx->tx_power.ant_b)
                         pos += scnprintf(buf + pos, bufsz - pos,
                                         fmt_hex, "antenna B:",
                                         tx->tx_power.ant_b);
-                if ((priv->hw_params.valid_tx_ant & ANT_C) &&
+                if ((priv->eeprom_data->valid_tx_ant & ANT_C) &&
                     tx->tx_power.ant_c)
                         pos += scnprintf(buf + pos, bufsz - pos,
                                         fmt_hex, "antenna C:",
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/dvm/dev.h
index 70062379d0ec..89f2e1040e7f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/dvm/dev.h
@@ -24,8 +24,8 @@
  *
  *****************************************************************************/
 /*
- * Please use this file (iwl-dev.h) for driver implementation definitions.
- * Please use iwl-commands.h for uCode API definitions.
+ * Please use this file (dev.h) for driver implementation definitions.
+ * Please use commands.h for uCode API definitions.
  */
 
 #ifndef __iwl_dev_h__
@@ -39,17 +39,18 @@
 #include <linux/mutex.h>
 
 #include "iwl-fw.h"
-#include "iwl-eeprom.h"
+#include "iwl-eeprom-parse.h"
 #include "iwl-csr.h"
 #include "iwl-debug.h"
 #include "iwl-agn-hw.h"
-#include "iwl-led.h"
-#include "iwl-power.h"
-#include "iwl-agn-rs.h"
-#include "iwl-agn-tt.h"
-#include "iwl-trans.h"
 #include "iwl-op-mode.h"
 #include "iwl-notif-wait.h"
+#include "iwl-trans.h"
+
+#include "led.h"
+#include "power.h"
+#include "rs.h"
+#include "tt.h"
 
 /* CT-KILL constants */
 #define CT_KILL_THRESHOLD_LEGACY   110 /* in Celsius */
@@ -88,33 +89,6 @@
 #define IWL_NUM_SCAN_RATES         (2)
 
 /*
- * One for each channel, holds all channel setup data
- * Some of the fields (e.g. eeprom and flags/max_power_avg) are redundant
- *     with one another!
- */
-struct iwl_channel_info {
-        struct iwl_eeprom_channel eeprom;       /* EEPROM regulatory limit */
-        struct iwl_eeprom_channel ht40_eeprom;  /* EEPROM regulatory limit for
-                                                 * HT40 channel */
-
-        u8 channel;       /* channel number */
-        u8 flags;         /* flags copied from EEPROM */
-        s8 max_power_avg; /* (dBm) regul. eeprom, normal Tx, any rate */
-        s8 curr_txpow;    /* (dBm) regulatory/spectrum/user (not h/w) limit */
-        s8 min_power;     /* always 0 */
-        s8 scan_power;    /* (dBm) regul. eeprom, direct scans, any rate */
-
-        u8 group_index;   /* 0-4, maps channel to group1/2/3/4/5 */
-        u8 band_index;    /* 0-4, maps channel to band1/2/3/4/5 */
-        enum ieee80211_band band;
-
-        /* HT40 channel info */
-        s8 ht40_max_power_avg;  /* (dBm) regul. eeprom, normal Tx, any rate */
-        u8 ht40_flags;          /* flags copied from EEPROM */
-        u8 ht40_extension_channel; /* HT_IE_EXT_CHANNEL_* */
-};
-
-/*
  * Minimum number of queues. MAX_NUM is defined in hw specific files.
  * Set the minimum to accommodate
  *  - 4 standard TX queues
@@ -153,29 +127,6 @@ union iwl_ht_rate_supp {
         };
 };
 
-#define CFG_HT_RX_AMPDU_FACTOR_8K   (0x0)
-#define CFG_HT_RX_AMPDU_FACTOR_16K  (0x1)
-#define CFG_HT_RX_AMPDU_FACTOR_32K  (0x2)
-#define CFG_HT_RX_AMPDU_FACTOR_64K  (0x3)
-#define CFG_HT_RX_AMPDU_FACTOR_DEF  CFG_HT_RX_AMPDU_FACTOR_64K
-#define CFG_HT_RX_AMPDU_FACTOR_MAX  CFG_HT_RX_AMPDU_FACTOR_64K
-#define CFG_HT_RX_AMPDU_FACTOR_MIN  CFG_HT_RX_AMPDU_FACTOR_8K
-
-/*
- * Maximal MPDU density for TX aggregation
- * 4 - 2us density
- * 5 - 4us density
- * 6 - 8us density
- * 7 - 16us density
- */
-#define CFG_HT_MPDU_DENSITY_2USEC   (0x4)
-#define CFG_HT_MPDU_DENSITY_4USEC   (0x5)
-#define CFG_HT_MPDU_DENSITY_8USEC   (0x6)
-#define CFG_HT_MPDU_DENSITY_16USEC  (0x7)
-#define CFG_HT_MPDU_DENSITY_DEF CFG_HT_MPDU_DENSITY_4USEC
-#define CFG_HT_MPDU_DENSITY_MAX CFG_HT_MPDU_DENSITY_16USEC
-#define CFG_HT_MPDU_DENSITY_MIN     (0x1)
-
 struct iwl_ht_config {
         bool single_chain_sufficient;
         enum ieee80211_smps_mode smps; /* current smps mode */
@@ -445,23 +396,6 @@ enum {
         MEASUREMENT_ACTIVE = (1 << 1),
 };
 
-enum iwl_nvm_type {
-        NVM_DEVICE_TYPE_EEPROM = 0,
-        NVM_DEVICE_TYPE_OTP,
-};
-
-/*
- * Two types of OTP memory access modes
- *   IWL_OTP_ACCESS_ABSOLUTE - absolute address mode,
- *                              based on physical memory addressing
- *   IWL_OTP_ACCESS_RELATIVE - relative address mode,
- *                             based on logical memory addressing
- */
-enum iwl_access_mode {
-        IWL_OTP_ACCESS_ABSOLUTE,
-        IWL_OTP_ACCESS_RELATIVE,
-};
-
 /* reply_tx_statistics (for _agn devices) */
 struct reply_tx_error_statistics {
         u32 pp_delay;
@@ -632,9 +566,6 @@ enum iwl_scan_type {
  *
  * @tx_chains_num: Number of TX chains
  * @rx_chains_num: Number of RX chains
- * @valid_tx_ant: usable antennas for TX
- * @valid_rx_ant: usable antennas for RX
- * @ht40_channel: is 40MHz width possible: BIT(IEEE80211_BAND_XXX)
  * @sku: sku read from EEPROM
  * @ct_kill_threshold: temperature threshold - in hw dependent unit
  * @ct_kill_exit_threshold: when to reeable the device - in hw dependent unit
@@ -645,9 +576,6 @@ enum iwl_scan_type {
 struct iwl_hw_params {
         u8  tx_chains_num;
         u8  rx_chains_num;
-        u8  valid_tx_ant;
-        u8  valid_rx_ant;
-        u8  ht40_channel;
         bool use_rts_for_aggregation;
         u16 sku;
         u32 ct_kill_threshold;
@@ -664,9 +592,6 @@ struct iwl_lib_ops {
         /* device specific configuration */
         void (*nic_config)(struct iwl_priv *priv);
 
-        /* eeprom operations (as defined in iwl-eeprom.h) */
-        struct iwl_eeprom_ops eeprom_ops;
-
         /* temperature */
         void (*temperature)(struct iwl_priv *priv);
 };
@@ -735,8 +660,6 @@ struct iwl_priv {
 
         /* ieee device used by generic ieee processing code */
         struct ieee80211_hw *hw;
-        struct ieee80211_channel *ieee_channels;
-        struct ieee80211_rate *ieee_rates;
 
         struct list_head calib_results;
 
@@ -755,8 +678,6 @@ struct iwl_priv {
 
         struct iwl_notif_wait_data notif_wait;
 
-        struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
-
         /* spectrum measurement report caching */
         struct iwl_spectrum_notification measure_report;
         u8 measurement_status;
@@ -787,11 +708,6 @@ struct iwl_priv {
         bool ucode_loaded;
         bool init_ucode_run;            /* Don't run init uCode again */
 
-        /* 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 */
-
         u8 plcp_delta_threshold;
 
         /* thermal calibration */
@@ -846,6 +762,7 @@ struct iwl_priv {
         struct iwl_station_entry stations[IWLAGN_STATION_COUNT];
         unsigned long ucode_key_table;
         struct iwl_tid_data tid_data[IWLAGN_STATION_COUNT][IWL_MAX_TID_COUNT];
+        atomic_t num_aux_in_flight;
 
         u8 mac80211_registered;
 
@@ -950,10 +867,8 @@ struct iwl_priv {
 
         struct delayed_work scan_check;
 
-        /* TX Power */
+        /* TX Power settings */
         s8 tx_power_user_lmt;
-        s8 tx_power_device_lmt;
-        s8 tx_power_lmt_in_half_dbm; /* max tx power in half-dBm format */
         s8 tx_power_next;
 
 #ifdef CONFIG_IWLWIFI_DEBUGFS
@@ -964,9 +879,10 @@ struct iwl_priv {
         void *wowlan_sram;
 #endif /* CONFIG_IWLWIFI_DEBUGFS */
 
-        /* eeprom -- this is in the card's little endian byte order */
-        u8 *eeprom;
-        enum iwl_nvm_type nvm_device_type;
+        struct iwl_eeprom_data *eeprom_data;
+        /* eeprom blob for debugfs/testmode */
+        u8 *eeprom_blob;
+        size_t eeprom_blob_size;
 
         struct work_struct txpower_work;
         u32 calib_disabled;
@@ -1001,8 +917,6 @@ struct iwl_priv {
         enum iwl_ucode_type cur_ucode;
 }; /*iwl_priv */
 
-extern struct kmem_cache *iwl_tx_cmd_pool;
-
 static inline struct iwl_rxon_context *
 iwl_rxon_ctx_from_vif(struct ieee80211_vif *vif)
 {
@@ -1036,36 +950,4 @@ static inline int iwl_is_any_associated(struct iwl_priv *priv)
         return false;
 }
 
-static inline int is_channel_valid(const struct iwl_channel_info *ch_info)
-{
-        if (ch_info == NULL)
-                return 0;
-        return (ch_info->flags & EEPROM_CHANNEL_VALID) ? 1 : 0;
-}
-
-static inline int is_channel_radar(const struct iwl_channel_info *ch_info)
-{
-        return (ch_info->flags & EEPROM_CHANNEL_RADAR) ? 1 : 0;
-}
-
-static inline u8 is_channel_a_band(const struct iwl_channel_info *ch_info)
-{
-        return ch_info->band == IEEE80211_BAND_5GHZ;
-}
-
-static inline u8 is_channel_bg_band(const struct iwl_channel_info *ch_info)
-{
-        return ch_info->band == IEEE80211_BAND_2GHZ;
-}
-
-static inline int is_channel_passive(const struct iwl_channel_info *ch)
-{
-        return (!(ch->flags & EEPROM_CHANNEL_ACTIVE)) ? 1 : 0;
-}
-
-static inline int is_channel_ibss(const struct iwl_channel_info *ch)
-{
-        return ((ch->flags & EEPROM_CHANNEL_IBSS)) ? 1 : 0;
-}
-
 #endif                          /* __iwl_dev_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-devices.c b/drivers/net/wireless/iwlwifi/dvm/devices.c
index 48533b3a0f9a..0521a6be09d2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-devices.c
+++ b/drivers/net/wireless/iwlwifi/dvm/devices.c
@@ -27,11 +27,14 @@
 /*
  * DVM device-specific data & functions
  */
-#include "iwl-agn.h"
-#include "iwl-dev.h"
-#include "iwl-commands.h"
 #include "iwl-io.h"
 #include "iwl-prph.h"
+#include "iwl-eeprom-parse.h"
+
+#include "agn.h"
+#include "dev.h"
+#include "commands.h"
+
 
 /*
  * 1000 series
@@ -58,11 +61,6 @@ static void iwl1000_set_ct_threshold(struct iwl_priv *priv)
 /* NIC configuration for 1000 series */
 static void iwl1000_nic_config(struct iwl_priv *priv)
 {
-        /* set CSR_HW_CONFIG_REG for uCode use */
-        iwl_set_bit(priv->trans, CSR_HW_IF_CONFIG_REG,
-                    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
-                    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
-
         /* Setting digital SVR for 1000 card to 1.32V */
         /* locking is acquired in iwl_set_bits_mask_prph() function */
         iwl_set_bits_mask_prph(priv->trans, APMG_DIGITAL_SVR_REG,
@@ -170,16 +168,6 @@ static const struct iwl_sensitivity_ranges iwl1000_sensitivity = {
 
 static void iwl1000_hw_set_hw_params(struct iwl_priv *priv)
 {
-        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ);
-
-        priv->hw_params.tx_chains_num =
-                num_of_ant(priv->hw_params.valid_tx_ant);
-        if (priv->cfg->rx_with_siso_diversity)
-                priv->hw_params.rx_chains_num = 1;
-        else
-                priv->hw_params.rx_chains_num =
-                        num_of_ant(priv->hw_params.valid_rx_ant);
-
         iwl1000_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
@@ -189,17 +177,6 @@ static void iwl1000_hw_set_hw_params(struct iwl_priv *priv)
 struct iwl_lib_ops iwl1000_lib = {
         .set_hw_params = iwl1000_hw_set_hw_params,
         .nic_config = iwl1000_nic_config,
-        .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_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REGULATORY_BAND_NO_HT40,
-                },
-        },
         .temperature = iwlagn_temperature,
 };
 
@@ -219,8 +196,6 @@ static void iwl2000_set_ct_threshold(struct iwl_priv *priv)
 /* NIC configuration for 2000 series */
 static void iwl2000_nic_config(struct iwl_priv *priv)
 {
-        iwl_rf_config(priv);
-
         iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
                     CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);
 }
@@ -251,16 +226,6 @@ static const struct iwl_sensitivity_ranges iwl2000_sensitivity = {
 
 static void iwl2000_hw_set_hw_params(struct iwl_priv *priv)
 {
-        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ);
-
-        priv->hw_params.tx_chains_num =
-                num_of_ant(priv->hw_params.valid_tx_ant);
-        if (priv->cfg->rx_with_siso_diversity)
-                priv->hw_params.rx_chains_num = 1;
-        else
-                priv->hw_params.rx_chains_num =
-                        num_of_ant(priv->hw_params.valid_rx_ant);
-
         iwl2000_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
@@ -270,36 +235,12 @@ static void iwl2000_hw_set_hw_params(struct iwl_priv *priv)
 struct iwl_lib_ops iwl2000_lib = {
         .set_hw_params = iwl2000_hw_set_hw_params,
         .nic_config = iwl2000_nic_config,
-        .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_REGULATORY_BAND_NO_HT40,
-                },
-                .enhanced_txpower = true,
-        },
         .temperature = iwlagn_temperature,
 };
 
 struct iwl_lib_ops iwl2030_lib = {
         .set_hw_params = iwl2000_hw_set_hw_params,
         .nic_config = iwl2000_nic_config,
-        .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_REGULATORY_BAND_NO_HT40,
-                },
-                .enhanced_txpower = true,
-        },
         .temperature = iwlagn_temperature,
 };
 
@@ -311,8 +252,6 @@ struct iwl_lib_ops iwl2030_lib = {
 /* NIC configuration for 5000 series */
 static void iwl5000_nic_config(struct iwl_priv *priv)
 {
-        iwl_rf_config(priv);
-
         /* W/A : NIC is stuck in a reset state after Early PCIe power off
          * (PCIe power is lost before PERST# is asserted),
          * causing ME FW to lose ownership and not being able to obtain it back.
@@ -376,11 +315,9 @@ static struct iwl_sensitivity_ranges iwl5150_sensitivity = {
 static s32 iwl_temp_calib_to_offset(struct iwl_priv *priv)
 {
         u16 temperature, voltage;
-        __le16 *temp_calib = (__le16 *)iwl_eeprom_query_addr(priv,
-                                EEPROM_KELVIN_TEMPERATURE);
 
-        temperature = le16_to_cpu(temp_calib[0]);
-        voltage = le16_to_cpu(temp_calib[1]);
+        temperature = le16_to_cpu(priv->eeprom_data->kelvin_temperature);
+        voltage = le16_to_cpu(priv->eeprom_data->kelvin_voltage);
 
         /* offset = temp - volt / coeff */
         return (s32)(temperature -
@@ -404,14 +341,6 @@ static void iwl5000_set_ct_threshold(struct iwl_priv *priv)
 
 static void iwl5000_hw_set_hw_params(struct iwl_priv *priv)
 {
-        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
-                                        BIT(IEEE80211_BAND_5GHZ);
-
-        priv->hw_params.tx_chains_num =
-                num_of_ant(priv->hw_params.valid_tx_ant);
-        priv->hw_params.rx_chains_num =
-                num_of_ant(priv->hw_params.valid_rx_ant);
-
         iwl5000_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
@@ -420,14 +349,6 @@ static void iwl5000_hw_set_hw_params(struct iwl_priv *priv)
 
 static void iwl5150_hw_set_hw_params(struct iwl_priv *priv)
 {
-        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
-                                        BIT(IEEE80211_BAND_5GHZ);
-
-        priv->hw_params.tx_chains_num =
-                num_of_ant(priv->hw_params.valid_tx_ant);
-        priv->hw_params.rx_chains_num =
-                num_of_ant(priv->hw_params.valid_rx_ant);
-
         iwl5150_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
@@ -455,7 +376,6 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
          */
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
         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;
@@ -505,14 +425,7 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
         }
         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",
-                        ctx->active.channel, ch);
-                return -EFAULT;
-        }
+        cmd.expect_beacon = ch_switch->channel->flags & IEEE80211_CHAN_RADAR;
 
         return iwl_dvm_send_cmd(priv, &hcmd);
 }
@@ -521,17 +434,6 @@ struct iwl_lib_ops iwl5000_lib = {
         .set_hw_params = iwl5000_hw_set_hw_params,
         .set_channel_switch = iwl5000_hw_channel_switch,
         .nic_config = iwl5000_nic_config,
-        .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_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REG_BAND_52_HT40_CHANNELS
-                },
-        },
         .temperature = iwlagn_temperature,
 };
 
@@ -539,17 +441,6 @@ struct iwl_lib_ops iwl5150_lib = {
         .set_hw_params = iwl5150_hw_set_hw_params,
         .set_channel_switch = iwl5000_hw_channel_switch,
         .nic_config = iwl5000_nic_config,
-        .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_REG_BAND_24_HT40_CHANNELS,
-                        EEPROM_REG_BAND_52_HT40_CHANNELS
-                },
-        },
         .temperature = iwl5150_temperature,
 };
 
@@ -570,8 +461,6 @@ static void iwl6000_set_ct_threshold(struct iwl_priv *priv)
 /* NIC configuration for 6000 series */
 static void iwl6000_nic_config(struct iwl_priv *priv)
 {
-        iwl_rf_config(priv);
-
         switch (priv->cfg->device_family) {
         case IWL_DEVICE_FAMILY_6005:
         case IWL_DEVICE_FAMILY_6030:
@@ -584,13 +473,13 @@ static void iwl6000_nic_config(struct iwl_priv *priv)
                 break;
         case IWL_DEVICE_FAMILY_6050:
                 /* Indicate calibration version to uCode. */
-                if (iwl_eeprom_calib_version(priv) >= 6)
+                if (priv->eeprom_data->calib_version >= 6)
                         iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
                                         CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
                 break;
         case IWL_DEVICE_FAMILY_6150:
                 /* Indicate calibration version to uCode. */
-                if (iwl_eeprom_calib_version(priv) >= 6)
+                if (priv->eeprom_data->calib_version >= 6)
                         iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
                                         CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
                 iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
@@ -627,17 +516,6 @@ static const struct iwl_sensitivity_ranges iwl6000_sensitivity = {
 
 static void iwl6000_hw_set_hw_params(struct iwl_priv *priv)
 {
-        priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
-                                        BIT(IEEE80211_BAND_5GHZ);
-
-        priv->hw_params.tx_chains_num =
-                num_of_ant(priv->hw_params.valid_tx_ant);
-        if (priv->cfg->rx_with_siso_diversity)
-                priv->hw_params.rx_chains_num = 1;
-        else
-                priv->hw_params.rx_chains_num =
-                        num_of_ant(priv->hw_params.valid_rx_ant);
-
         iwl6000_set_ct_threshold(priv);
 
         /* Set initial sensitivity parameters */
@@ -654,7 +532,6 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
          */
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
         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;
@@ -704,14 +581,7 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
         }
         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",
-                        ctx->active.channel, ch);
-                return -EFAULT;
-        }
+        cmd.expect_beacon = ch_switch->channel->flags & IEEE80211_CHAN_RADAR;
 
         return iwl_dvm_send_cmd(priv, &hcmd);
 }
@@ -720,18 +590,6 @@ struct iwl_lib_ops iwl6000_lib = {
         .set_hw_params = iwl6000_hw_set_hw_params,
         .set_channel_switch = iwl6000_hw_channel_switch,
         .nic_config = iwl6000_nic_config,
-        .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
-                },
-                .enhanced_txpower = true,
-        },
         .temperature = iwlagn_temperature,
 };
 
@@ -739,17 +597,5 @@ struct iwl_lib_ops iwl6030_lib = {
         .set_hw_params = iwl6000_hw_set_hw_params,
         .set_channel_switch = iwl6000_hw_channel_switch,
         .nic_config = iwl6000_nic_config,
-        .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
-                },
-                .enhanced_txpower = true,
-        },
         .temperature = iwlagn_temperature,
 };
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/dvm/led.c
index 47000419f916..bf479f709091 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/dvm/led.c
@@ -34,12 +34,11 @@
 #include <net/mac80211.h>
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>
-
-#include "iwl-dev.h"
-#include "iwl-agn.h"
 #include "iwl-io.h"
 #include "iwl-trans.h"
 #include "iwl-modparams.h"
+#include "dev.h"
+#include "agn.h"
 
 /* Throughput           OFF time(ms)    ON time (ms)
  *      >300                    25              25
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.h b/drivers/net/wireless/iwlwifi/dvm/led.h
index b02a853103d3..b02a853103d3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.h
+++ b/drivers/net/wireless/iwlwifi/dvm/led.h
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/dvm/lib.c
index e55ec6c8a920..cb1ca7a25dd5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/dvm/lib.c
@@ -33,13 +33,14 @@
 #include <linux/sched.h>
 #include <net/mac80211.h>
 
-#include "iwl-dev.h"
 #include "iwl-io.h"
 #include "iwl-agn-hw.h"
-#include "iwl-agn.h"
 #include "iwl-trans.h"
 #include "iwl-modparams.h"
 
+#include "dev.h"
+#include "agn.h"
+
 int iwlagn_hw_valid_rtc_data_addr(u32 addr)
 {
         return (addr >= IWLAGN_RTC_DATA_LOWER_BOUND) &&
@@ -58,8 +59,7 @@ int iwlagn_send_tx_power(struct iwl_priv *priv)
         /* half dBm need to multiply */
         tx_power_cmd.global_lmt = (s8)(2 * priv->tx_power_user_lmt);
 
-        if (priv->tx_power_lmt_in_half_dbm &&
-            priv->tx_power_lmt_in_half_dbm < tx_power_cmd.global_lmt) {
+        if (tx_power_cmd.global_lmt > priv->eeprom_data->max_tx_pwr_half_dbm) {
                 /*
                  * For the newer devices which using enhanced/extend tx power
                  * table in EEPROM, the format is in half dBm. driver need to
@@ -71,7 +71,8 @@ int iwlagn_send_tx_power(struct iwl_priv *priv)
                  * "tx_power_user_lmt" is higher than EEPROM value (in
                  * half-dBm format), lower the tx power based on EEPROM
                  */
-                tx_power_cmd.global_lmt = priv->tx_power_lmt_in_half_dbm;
+                tx_power_cmd.global_lmt =
+                        priv->eeprom_data->max_tx_pwr_half_dbm;
         }
         tx_power_cmd.flags = IWLAGN_TX_POWER_NO_CLOSED;
         tx_power_cmd.srv_chan_lmt = IWLAGN_TX_POWER_AUTO;
@@ -617,6 +618,11 @@ static bool iwlagn_fill_txpower_mode(struct iwl_priv *priv,
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
         int ave_rssi;
 
+        if (!ctx->vif || (ctx->vif->type != NL80211_IFTYPE_STATION)) {
+                IWL_DEBUG_INFO(priv, "BSS ctx not active or not in sta mode\n");
+                return false;
+        }
+
         ave_rssi = ieee80211_ave_rssi(ctx->vif);
         if (!ave_rssi) {
                 /* no rssi data, no changes to reduce tx power */
@@ -818,7 +824,7 @@ void iwlagn_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
         if (priv->chain_noise_data.active_chains)
                 active_chains = priv->chain_noise_data.active_chains;
         else
-                active_chains = priv->hw_params.valid_rx_ant;
+                active_chains = priv->eeprom_data->valid_rx_ant;
 
         if (priv->cfg->bt_params &&
             priv->cfg->bt_params->advanced_bt_coexist &&
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index 3ee23134c02b..599e8b41f5a8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -38,19 +38,20 @@
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
 
+#include <net/ieee80211_radiotap.h>
 #include <net/mac80211.h>
 
 #include <asm/div64.h>
 
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
 #include "iwl-io.h"
-#include "iwl-agn-calib.h"
-#include "iwl-agn.h"
 #include "iwl-trans.h"
 #include "iwl-op-mode.h"
 #include "iwl-modparams.h"
 
+#include "dev.h"
+#include "calib.h"
+#include "agn.h"
+
 /*****************************************************************************
  *
  * mac80211 entry point functions
@@ -154,6 +155,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
                     IEEE80211_HW_SCAN_WHILE_IDLE;
 
         hw->offchannel_tx_hw_queue = IWL_AUX_QUEUE;
+        hw->radiotap_mcs_details |= IEEE80211_RADIOTAP_MCS_HAVE_FMT;
 
         /*
          * Including the following line will crash some AP's.  This
@@ -237,12 +239,12 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
 
         hw->max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;
 
-        if (priv->bands[IEEE80211_BAND_2GHZ].n_channels)
+        if (priv->eeprom_data->bands[IEEE80211_BAND_2GHZ].n_channels)
                 priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
-                        &priv->bands[IEEE80211_BAND_2GHZ];
-        if (priv->bands[IEEE80211_BAND_5GHZ].n_channels)
+                        &priv->eeprom_data->bands[IEEE80211_BAND_2GHZ];
+        if (priv->eeprom_data->bands[IEEE80211_BAND_5GHZ].n_channels)
                 priv->hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
-                        &priv->bands[IEEE80211_BAND_5GHZ];
+                        &priv->eeprom_data->bands[IEEE80211_BAND_5GHZ];
 
         hw->wiphy->hw_version = priv->trans->hw_id;
 
@@ -341,7 +343,7 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw)
         return 0;
 }
 
-void iwlagn_mac_stop(struct ieee80211_hw *hw)
+static void iwlagn_mac_stop(struct ieee80211_hw *hw)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -369,9 +371,9 @@ void iwlagn_mac_stop(struct ieee80211_hw *hw)
         IWL_DEBUG_MAC80211(priv, "leave\n");
 }
 
-void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,
-                               struct ieee80211_vif *vif,
-                               struct cfg80211_gtk_rekey_data *data)
+static void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,
+                                      struct ieee80211_vif *vif,
+                                      struct cfg80211_gtk_rekey_data *data)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -397,7 +399,8 @@ void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw,
 
 #ifdef CONFIG_PM_SLEEP
 
-int iwlagn_mac_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
+static int iwlagn_mac_suspend(struct ieee80211_hw *hw,
+                              struct cfg80211_wowlan *wowlan)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
@@ -420,8 +423,6 @@ int iwlagn_mac_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
         if (ret)
                 goto error;
 
-        device_set_wakeup_enable(priv->trans->dev, true);
-
         iwl_trans_wowlan_suspend(priv->trans);
 
         goto out;
@@ -488,8 +489,6 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
 
         priv->wowlan = false;
 
-        device_set_wakeup_enable(priv->trans->dev, false);
-
         iwlagn_prepare_restart(priv);
 
         memset((void *)&ctx->active, 0, sizeof(ctx->active));
@@ -504,9 +503,15 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
         return 1;
 }
 
+static void iwlagn_mac_set_wakeup(struct ieee80211_hw *hw, bool enabled)
+{
+        struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
+
+        device_set_wakeup_enable(priv->trans->dev, enabled);
+}
 #endif
 
-void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
+static void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -517,21 +522,21 @@ void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                 dev_kfree_skb_any(skb);
 }
 
-void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,
-                                struct ieee80211_vif *vif,
-                                struct ieee80211_key_conf *keyconf,
-                                struct ieee80211_sta *sta,
-                                u32 iv32, u16 *phase1key)
+static void iwlagn_mac_update_tkip_key(struct ieee80211_hw *hw,
+                                       struct ieee80211_vif *vif,
+                                       struct ieee80211_key_conf *keyconf,
+                                       struct ieee80211_sta *sta,
+                                       u32 iv32, u16 *phase1key)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
         iwl_update_tkip_key(priv, vif, keyconf, sta, iv32, phase1key);
 }
 
-int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
-                       struct ieee80211_vif *vif,
-                       struct ieee80211_sta *sta,
-                       struct ieee80211_key_conf *key)
+static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+                              struct ieee80211_vif *vif,
+                              struct ieee80211_sta *sta,
+                              struct ieee80211_key_conf *key)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
@@ -631,11 +636,11 @@ int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         return ret;
 }
 
-int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
-                            struct ieee80211_vif *vif,
-                            enum ieee80211_ampdu_mlme_action action,
-                            struct ieee80211_sta *sta, u16 tid, u16 *ssn,
-                            u8 buf_size)
+static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
+                                   struct ieee80211_vif *vif,
+                                   enum ieee80211_ampdu_mlme_action action,
+                                   struct ieee80211_sta *sta, u16 tid, u16 *ssn,
+                                   u8 buf_size)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         int ret = -EINVAL;
@@ -662,7 +667,7 @@ int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
                 ret = iwl_sta_rx_agg_stop(priv, sta, tid);
                 break;
         case IEEE80211_AMPDU_TX_START:
-                if (!priv->trans->ops->tx_agg_setup)
+                if (!priv->trans->ops->txq_enable)
                         break;
                 if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_TXAGG)
                         break;
@@ -757,11 +762,11 @@ static int iwlagn_mac_sta_remove(struct ieee80211_hw *hw,
         return ret;
 }
 
-int iwlagn_mac_sta_state(struct ieee80211_hw *hw,
-                         struct ieee80211_vif *vif,
-                         struct ieee80211_sta *sta,
-                         enum ieee80211_sta_state old_state,
-                         enum ieee80211_sta_state new_state)
+static int iwlagn_mac_sta_state(struct ieee80211_hw *hw,
+                                struct ieee80211_vif *vif,
+                                struct ieee80211_sta *sta,
+                                enum ieee80211_sta_state old_state,
+                                enum ieee80211_sta_state new_state)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
@@ -840,11 +845,10 @@ int iwlagn_mac_sta_state(struct ieee80211_hw *hw,
         return ret;
 }
 
-void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
-                               struct ieee80211_channel_switch *ch_switch)
+static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
+                                      struct ieee80211_channel_switch *ch_switch)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        const struct iwl_channel_info *ch_info;
         struct ieee80211_conf *conf = &hw->conf;
         struct ieee80211_channel *channel = ch_switch->channel;
         struct iwl_ht_config *ht_conf = &priv->current_ht_config;
@@ -881,12 +885,6 @@ void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,
         if (le16_to_cpu(ctx->active.channel) == ch)
                 goto out;
 
-        ch_info = iwl_get_channel_info(priv, channel->band, ch);
-        if (!is_channel_valid(ch_info)) {
-                IWL_DEBUG_MAC80211(priv, "invalid channel\n");
-                goto out;
-        }
-
         priv->current_ht_config.smps = conf->smps_mode;
 
         /* Configure HT40 channels */
@@ -935,10 +933,10 @@ void iwl_chswitch_done(struct iwl_priv *priv, bool is_success)
                 ieee80211_chswitch_done(ctx->vif, is_success);
 }
 
-void iwlagn_configure_filter(struct ieee80211_hw *hw,
-                             unsigned int changed_flags,
-                             unsigned int *total_flags,
-                             u64 multicast)
+static void iwlagn_configure_filter(struct ieee80211_hw *hw,
+                                    unsigned int changed_flags,
+                                    unsigned int *total_flags,
+                                    u64 multicast)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         __le32 filter_or = 0, filter_nand = 0;
@@ -985,7 +983,7 @@ void iwlagn_configure_filter(struct ieee80211_hw *hw,
                         FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
 }
 
-void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)
+static void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -1112,7 +1110,7 @@ static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw,
         return err;
 }
 
-int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)
+static int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -1129,8 +1127,8 @@ int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)
         return 0;
 }
 
-void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
-                              enum ieee80211_rssi_event rssi_event)
+static void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
+                                     enum ieee80211_rssi_event rssi_event)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -1154,8 +1152,8 @@ void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
         IWL_DEBUG_MAC80211(priv, "leave\n");
 }
 
-int iwlagn_mac_set_tim(struct ieee80211_hw *hw,
-                       struct ieee80211_sta *sta, bool set)
+static int iwlagn_mac_set_tim(struct ieee80211_hw *hw,
+                              struct ieee80211_sta *sta, bool set)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -1164,9 +1162,9 @@ int iwlagn_mac_set_tim(struct ieee80211_hw *hw,
         return 0;
 }
 
-int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,
-                       struct ieee80211_vif *vif, u16 queue,
-                       const struct ieee80211_tx_queue_params *params)
+static int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,
+                              struct ieee80211_vif *vif, u16 queue,
+                              const struct ieee80211_tx_queue_params *params)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
@@ -1208,7 +1206,7 @@ int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,
         return 0;
 }
 
-int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw)
+static int iwlagn_mac_tx_last_beacon(struct ieee80211_hw *hw)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
@@ -1224,7 +1222,8 @@ static int iwl_set_mode(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
         return iwlagn_commit_rxon(priv, ctx);
 }
 
-int iwl_setup_interface(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
+static int iwl_setup_interface(struct iwl_priv *priv,
+                               struct iwl_rxon_context *ctx)
 {
         struct ieee80211_vif *vif = ctx->vif;
         int err, ac;
@@ -1344,9 +1343,9 @@ static int iwlagn_mac_add_interface(struct ieee80211_hw *hw,
         return err;
 }
 
-void iwl_teardown_interface(struct iwl_priv *priv,
-                            struct ieee80211_vif *vif,
-                            bool mode_change)
+static void iwl_teardown_interface(struct iwl_priv *priv,
+                                   struct ieee80211_vif *vif,
+                                   bool mode_change)
 {
         struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);
 
@@ -1487,9 +1486,9 @@ static int iwlagn_mac_change_interface(struct ieee80211_hw *hw,
         return err;
 }
 
-int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,
-                       struct ieee80211_vif *vif,
-                       struct cfg80211_scan_request *req)
+static int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,
+                              struct ieee80211_vif *vif,
+                              struct cfg80211_scan_request *req)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         int ret;
@@ -1544,10 +1543,10 @@ static void iwl_sta_modify_ps_wake(struct iwl_priv *priv, int sta_id)
         iwl_send_add_sta(priv, &cmd, CMD_ASYNC);
 }
 
-void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,
-                           struct ieee80211_vif *vif,
-                           enum sta_notify_cmd cmd,
-                           struct ieee80211_sta *sta)
+static void iwlagn_mac_sta_notify(struct ieee80211_hw *hw,
+                                  struct ieee80211_vif *vif,
+                                  enum sta_notify_cmd cmd,
+                                  struct ieee80211_sta *sta)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
         struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
@@ -1584,6 +1583,7 @@ struct ieee80211_ops iwlagn_hw_ops = {
 #ifdef CONFIG_PM_SLEEP
         .suspend = iwlagn_mac_suspend,
         .resume = iwlagn_mac_resume,
+        .set_wakeup = iwlagn_mac_set_wakeup,
 #endif
         .add_interface = iwlagn_mac_add_interface,
         .remove_interface = iwlagn_mac_remove_interface,
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/dvm/main.c
index ec36e2b020b6..1c2d0233a405 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -44,16 +44,18 @@
 
 #include <asm/div64.h>
 
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
+#include "iwl-eeprom-read.h"
+#include "iwl-eeprom-parse.h"
 #include "iwl-io.h"
-#include "iwl-agn-calib.h"
-#include "iwl-agn.h"
 #include "iwl-trans.h"
 #include "iwl-op-mode.h"
 #include "iwl-drv.h"
 #include "iwl-modparams.h"
 
+#include "dev.h"
+#include "calib.h"
+#include "agn.h"
+
 /******************************************************************************
  *
  * module boiler plate
@@ -78,7 +80,8 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION);
 MODULE_VERSION(DRV_VERSION);
 MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("iwlagn");
+
+static const struct iwl_op_mode_ops iwl_dvm_ops;
 
 void iwl_update_chain_flags(struct iwl_priv *priv)
 {
@@ -180,7 +183,7 @@ int iwlagn_send_beacon_cmd(struct iwl_priv *priv)
                 rate = info->control.rates[0].idx;
 
         priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
-                                              priv->hw_params.valid_tx_ant);
+                                              priv->eeprom_data->valid_tx_ant);
         rate_flags = iwl_ant_idx_to_flags(priv->mgmt_tx_ant);
 
         /* In mac80211, rates for 5 GHz start at 0 */
@@ -578,7 +581,7 @@ static const u8 iwlagn_pan_ac_to_queue[] = {
         7, 6, 5, 4,
 };
 
-void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
+static void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
 {
         int i;
 
@@ -645,7 +648,7 @@ void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
         BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);
 }
 
-void iwl_rf_kill_ct_config(struct iwl_priv *priv)
+static void iwl_rf_kill_ct_config(struct iwl_priv *priv)
 {
         struct iwl_ct_kill_config cmd;
         struct iwl_ct_kill_throttling_config adv_cmd;
@@ -726,7 +729,7 @@ static int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant)
         }
 }
 
-void iwl_send_bt_config(struct iwl_priv *priv)
+static void iwl_send_bt_config(struct iwl_priv *priv)
 {
         struct iwl_bt_cmd bt_cmd = {
                 .lead_time = BT_LEAD_TIME_DEF,
@@ -814,7 +817,7 @@ int iwl_alive_start(struct iwl_priv *priv)
         ieee80211_wake_queues(priv->hw);
 
         /* Configure Tx antenna selection based on H/W config */
-        iwlagn_send_tx_ant_config(priv, priv->hw_params.valid_tx_ant);
+        iwlagn_send_tx_ant_config(priv, priv->eeprom_data->valid_tx_ant);
 
         if (iwl_is_associated_ctx(ctx) && !priv->wowlan) {
                 struct iwl_rxon_cmd *active_rxon =
@@ -932,11 +935,12 @@ void iwl_down(struct iwl_priv *priv)
         priv->ucode_loaded = false;
         iwl_trans_stop_device(priv->trans);
 
+        /* Set num_aux_in_flight must be done after the transport is stopped */
+        atomic_set(&priv->num_aux_in_flight, 0);
+
         /* Clear out all status bits but a few that are stable across reset */
         priv->status &= test_bit(STATUS_RF_KILL_HW, &priv->status) <<
                                 STATUS_RF_KILL_HW |
-                        test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<
-                                STATUS_GEO_CONFIGURED |
                         test_bit(STATUS_FW_ERROR, &priv->status) <<
                                 STATUS_FW_ERROR |
                         test_bit(STATUS_EXIT_PENDING, &priv->status) <<
@@ -1078,7 +1082,7 @@ static void iwlagn_disable_roc_work(struct work_struct *work)
  *
  *****************************************************************************/
 
-void iwl_setup_deferred_work(struct iwl_priv *priv)
+static void iwl_setup_deferred_work(struct iwl_priv *priv)
 {
         priv->workqueue = create_singlethread_workqueue(DRV_NAME);
 
@@ -1123,224 +1127,14 @@ void iwl_cancel_deferred_work(struct iwl_priv *priv)
         del_timer_sync(&priv->ucode_trace);
 }
 
-static void iwl_init_hw_rates(struct ieee80211_rate *rates)
-{
-        int i;
-
-        for (i = 0; i < IWL_RATE_COUNT_LEGACY; i++) {
-                rates[i].bitrate = iwl_rates[i].ieee * 5;
-                rates[i].hw_value = i; /* Rate scaling will work on indexes */
-                rates[i].hw_value_short = i;
-                rates[i].flags = 0;
-                if ((i >= IWL_FIRST_CCK_RATE) && (i <= IWL_LAST_CCK_RATE)) {
-                        /*
-                         * If CCK != 1M then set short preamble rate flag.
-                         */
-                        rates[i].flags |=
-                                (iwl_rates[i].plcp == IWL_RATE_1M_PLCP) ?
-                                        0 : IEEE80211_RATE_SHORT_PREAMBLE;
-                }
-        }
-}
-
-#define MAX_BIT_RATE_40_MHZ 150 /* Mbps */
-#define MAX_BIT_RATE_20_MHZ 72 /* Mbps */
-static void iwl_init_ht_hw_capab(const struct iwl_priv *priv,
-                              struct ieee80211_sta_ht_cap *ht_info,
-                              enum ieee80211_band band)
-{
-        u16 max_bit_rate = 0;
-        u8 rx_chains_num = priv->hw_params.rx_chains_num;
-        u8 tx_chains_num = priv->hw_params.tx_chains_num;
-
-        ht_info->cap = 0;
-        memset(&ht_info->mcs, 0, sizeof(ht_info->mcs));
-
-        ht_info->ht_supported = true;
-
-        if (priv->cfg->ht_params &&
-            priv->cfg->ht_params->ht_greenfield_support)
-                ht_info->cap |= IEEE80211_HT_CAP_GRN_FLD;
-        ht_info->cap |= IEEE80211_HT_CAP_SGI_20;
-        max_bit_rate = MAX_BIT_RATE_20_MHZ;
-        if (priv->hw_params.ht40_channel & BIT(band)) {
-                ht_info->cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
-                ht_info->cap |= IEEE80211_HT_CAP_SGI_40;
-                ht_info->mcs.rx_mask[4] = 0x01;
-                max_bit_rate = MAX_BIT_RATE_40_MHZ;
-        }
-
-        if (iwlwifi_mod_params.amsdu_size_8K)
-                ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;
-
-        ht_info->ampdu_factor = CFG_HT_RX_AMPDU_FACTOR_DEF;
-        ht_info->ampdu_density = CFG_HT_MPDU_DENSITY_DEF;
-
-        ht_info->mcs.rx_mask[0] = 0xFF;
-        if (rx_chains_num >= 2)
-                ht_info->mcs.rx_mask[1] = 0xFF;
-        if (rx_chains_num >= 3)
-                ht_info->mcs.rx_mask[2] = 0xFF;
-
-        /* Highest supported Rx data rate */
-        max_bit_rate *= rx_chains_num;
-        WARN_ON(max_bit_rate & ~IEEE80211_HT_MCS_RX_HIGHEST_MASK);
-        ht_info->mcs.rx_highest = cpu_to_le16(max_bit_rate);
-
-        /* Tx MCS capabilities */
-        ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
-        if (tx_chains_num != rx_chains_num) {
-                ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;
-                ht_info->mcs.tx_params |= ((tx_chains_num - 1) <<
-                                IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT);
-        }
-}
-
-/**
- * iwl_init_geos - Initialize mac80211's geo/channel info based from eeprom
- */
-static int iwl_init_geos(struct iwl_priv *priv)
-{
-        struct iwl_channel_info *ch;
-        struct ieee80211_supported_band *sband;
-        struct ieee80211_channel *channels;
-        struct ieee80211_channel *geo_ch;
-        struct ieee80211_rate *rates;
-        int i = 0;
-        s8 max_tx_power = IWLAGN_TX_POWER_TARGET_POWER_MIN;
-
-        if (priv->bands[IEEE80211_BAND_2GHZ].n_bitrates ||
-            priv->bands[IEEE80211_BAND_5GHZ].n_bitrates) {
-                IWL_DEBUG_INFO(priv, "Geography modes already initialized.\n");
-                set_bit(STATUS_GEO_CONFIGURED, &priv->status);
-                return 0;
-        }
-
-        channels = kcalloc(priv->channel_count,
-                           sizeof(struct ieee80211_channel), GFP_KERNEL);
-        if (!channels)
-                return -ENOMEM;
-
-        rates = kcalloc(IWL_RATE_COUNT_LEGACY, sizeof(struct ieee80211_rate),
-                        GFP_KERNEL);
-        if (!rates) {
-                kfree(channels);
-                return -ENOMEM;
-        }
-
-        /* 5.2GHz channels start after the 2.4GHz channels */
-        sband = &priv->bands[IEEE80211_BAND_5GHZ];
-        sband->channels = &channels[ARRAY_SIZE(iwl_eeprom_band_1)];
-        /* just OFDM */
-        sband->bitrates = &rates[IWL_FIRST_OFDM_RATE];
-        sband->n_bitrates = IWL_RATE_COUNT_LEGACY - IWL_FIRST_OFDM_RATE;
-
-        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)
-                iwl_init_ht_hw_capab(priv, &sband->ht_cap,
-                                         IEEE80211_BAND_5GHZ);
-
-        sband = &priv->bands[IEEE80211_BAND_2GHZ];
-        sband->channels = channels;
-        /* OFDM & CCK */
-        sband->bitrates = rates;
-        sband->n_bitrates = IWL_RATE_COUNT_LEGACY;
-
-        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)
-                iwl_init_ht_hw_capab(priv, &sband->ht_cap,
-                                         IEEE80211_BAND_2GHZ);
-
-        priv->ieee_channels = channels;
-        priv->ieee_rates = rates;
-
-        for (i = 0;  i < priv->channel_count; i++) {
-                ch = &priv->channel_info[i];
-
-                /* FIXME: might be removed if scan is OK */
-                if (!is_channel_valid(ch))
-                        continue;
-
-                sband =  &priv->bands[ch->band];
-
-                geo_ch = &sband->channels[sband->n_channels++];
-
-                geo_ch->center_freq =
-                        ieee80211_channel_to_frequency(ch->channel, ch->band);
-                geo_ch->max_power = ch->max_power_avg;
-                geo_ch->max_antenna_gain = 0xff;
-                geo_ch->hw_value = ch->channel;
-
-                if (is_channel_valid(ch)) {
-                        if (!(ch->flags & EEPROM_CHANNEL_IBSS))
-                                geo_ch->flags |= IEEE80211_CHAN_NO_IBSS;
-
-                        if (!(ch->flags & EEPROM_CHANNEL_ACTIVE))
-                                geo_ch->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
-
-                        if (ch->flags & EEPROM_CHANNEL_RADAR)
-                                geo_ch->flags |= IEEE80211_CHAN_RADAR;
-
-                        geo_ch->flags |= ch->ht40_extension_channel;
-
-                        if (ch->max_power_avg > max_tx_power)
-                                max_tx_power = ch->max_power_avg;
-                } else {
-                        geo_ch->flags |= IEEE80211_CHAN_DISABLED;
-                }
-
-                IWL_DEBUG_INFO(priv, "Channel %d Freq=%d[%sGHz] %s flag=0x%X\n",
-                                ch->channel, geo_ch->center_freq,
-                                is_channel_a_band(ch) ?  "5.2" : "2.4",
-                                geo_ch->flags & IEEE80211_CHAN_DISABLED ?
-                                "restricted" : "valid",
-                                 geo_ch->flags);
-        }
-
-        priv->tx_power_device_lmt = max_tx_power;
-        priv->tx_power_user_lmt = max_tx_power;
-        priv->tx_power_next = max_tx_power;
-
-        if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) &&
-             priv->hw_params.sku & EEPROM_SKU_CAP_BAND_52GHZ) {
-                IWL_INFO(priv, "Incorrectly detected BG card as ABG. "
-                        "Please send your %s to maintainer.\n",
-                        priv->trans->hw_id_str);
-                priv->hw_params.sku &= ~EEPROM_SKU_CAP_BAND_52GHZ;
-        }
-
-        if (iwlwifi_mod_params.disable_5ghz)
-                priv->bands[IEEE80211_BAND_5GHZ].n_channels = 0;
-
-        IWL_INFO(priv, "Tunable channels: %d 802.11bg, %d 802.11a channels\n",
-                   priv->bands[IEEE80211_BAND_2GHZ].n_channels,
-                   priv->bands[IEEE80211_BAND_5GHZ].n_channels);
-
-        set_bit(STATUS_GEO_CONFIGURED, &priv->status);
-
-        return 0;
-}
-
-/*
- * iwl_free_geos - undo allocations in iwl_init_geos
- */
-static void iwl_free_geos(struct iwl_priv *priv)
+static int iwl_init_drv(struct iwl_priv *priv)
 {
-        kfree(priv->ieee_channels);
-        kfree(priv->ieee_rates);
-        clear_bit(STATUS_GEO_CONFIGURED, &priv->status);
-}
-
-int iwl_init_drv(struct iwl_priv *priv)
-{
-        int ret;
-
         spin_lock_init(&priv->sta_lock);
 
         mutex_init(&priv->mutex);
 
         INIT_LIST_HEAD(&priv->calib_results);
 
-        priv->ieee_channels = NULL;
-        priv->ieee_rates = NULL;
         priv->band = IEEE80211_BAND_2GHZ;
 
         priv->plcp_delta_threshold =
@@ -1371,31 +1165,11 @@ int iwl_init_drv(struct iwl_priv *priv)
                 priv->dynamic_frag_thresh = BT_FRAG_THRESHOLD_DEF;
         }
 
-        ret = iwl_init_channel_map(priv);
-        if (ret) {
-                IWL_ERR(priv, "initializing regulatory failed: %d\n", ret);
-                goto err;
-        }
-
-        ret = iwl_init_geos(priv);
-        if (ret) {
-                IWL_ERR(priv, "initializing geos failed: %d\n", ret);
-                goto err_free_channel_map;
-        }
-        iwl_init_hw_rates(priv->ieee_rates);
-
         return 0;
-
-err_free_channel_map:
-        iwl_free_channel_map(priv);
-err:
-        return ret;
 }
 
-void iwl_uninit_drv(struct iwl_priv *priv)
+static void iwl_uninit_drv(struct iwl_priv *priv)
 {
-        iwl_free_geos(priv);
-        iwl_free_channel_map(priv);
         kfree(priv->scan_cmd);
         kfree(priv->beacon_cmd);
         kfree(rcu_dereference_raw(priv->noa_data));
@@ -1405,7 +1179,7 @@ void iwl_uninit_drv(struct iwl_priv *priv)
 #endif
 }
 
-void iwl_set_hw_params(struct iwl_priv *priv)
+static void iwl_set_hw_params(struct iwl_priv *priv)
 {
         if (priv->cfg->ht_params)
                 priv->hw_params.use_rts_for_aggregation =
@@ -1421,7 +1195,7 @@ void iwl_set_hw_params(struct iwl_priv *priv)
 
 
 /* show what optional capabilities we have */
-void iwl_option_config(struct iwl_priv *priv)
+static void iwl_option_config(struct iwl_priv *priv)
 {
 #ifdef CONFIG_IWLWIFI_DEBUG
         IWL_INFO(priv, "CONFIG_IWLWIFI_DEBUG enabled\n");
@@ -1454,6 +1228,42 @@ void iwl_option_config(struct iwl_priv *priv)
 #endif
 }
 
+static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
+{
+        u16 radio_cfg;
+
+        priv->hw_params.sku = priv->eeprom_data->sku;
+
+        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE &&
+            !priv->cfg->ht_params) {
+                IWL_ERR(priv, "Invalid 11n configuration\n");
+                return -EINVAL;
+        }
+
+        if (!priv->hw_params.sku) {
+                IWL_ERR(priv, "Invalid device sku\n");
+                return -EINVAL;
+        }
+
+        IWL_INFO(priv, "Device SKU: 0x%X\n", priv->hw_params.sku);
+
+        radio_cfg = priv->eeprom_data->radio_cfg;
+
+        priv->hw_params.tx_chains_num =
+                num_of_ant(priv->eeprom_data->valid_tx_ant);
+        if (priv->cfg->rx_with_siso_diversity)
+                priv->hw_params.rx_chains_num = 1;
+        else
+                priv->hw_params.rx_chains_num =
+                        num_of_ant(priv->eeprom_data->valid_rx_ant);
+
+        IWL_INFO(priv, "Valid Tx ant: 0x%X, Valid Rx ant: 0x%X\n",
+                 priv->eeprom_data->valid_tx_ant,
+                 priv->eeprom_data->valid_rx_ant);
+
+        return 0;
+}
+
 static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
                                                  const struct iwl_cfg *cfg,
                                                  const struct iwl_fw *fw)
@@ -1539,7 +1349,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
                 trans_cfg.queue_watchdog_timeout =
                         priv->cfg->base_params->wd_timeout;
         else
-                trans_cfg.queue_watchdog_timeout = IWL_WATCHHDOG_DISABLED;
+                trans_cfg.queue_watchdog_timeout = IWL_WATCHDOG_DISABLED;
         trans_cfg.command_names = iwl_dvm_cmd_strings;
 
         ucode_flags = fw->ucode_capa.flags;
@@ -1599,25 +1409,33 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
                 goto out_free_hw;
 
         /* Read the EEPROM */
-        if (iwl_eeprom_init(priv, priv->trans->hw_rev)) {
+        if (iwl_read_eeprom(priv->trans, &priv->eeprom_blob,
+                            &priv->eeprom_blob_size)) {
                 IWL_ERR(priv, "Unable to init EEPROM\n");
                 goto out_free_hw;
         }
+
         /* Reset chip to save power until we load uCode during "up". */
         iwl_trans_stop_hw(priv->trans, false);
 
-        if (iwl_eeprom_check_version(priv))
+        priv->eeprom_data = iwl_parse_eeprom_data(priv->trans->dev, priv->cfg,
+                                                  priv->eeprom_blob,
+                                                  priv->eeprom_blob_size);
+        if (!priv->eeprom_data)
+                goto out_free_eeprom_blob;
+
+        if (iwl_eeprom_check_version(priv->eeprom_data, priv->trans))
                 goto out_free_eeprom;
 
         if (iwl_eeprom_init_hw_params(priv))
                 goto out_free_eeprom;
 
         /* extract MAC Address */
-        iwl_eeprom_get_mac(priv, priv->addresses[0].addr);
+        memcpy(priv->addresses[0].addr, priv->eeprom_data->hw_addr, ETH_ALEN);
         IWL_DEBUG_INFO(priv, "MAC address: %pM\n", priv->addresses[0].addr);
         priv->hw->wiphy->addresses = priv->addresses;
         priv->hw->wiphy->n_addresses = 1;
-        num_mac = iwl_eeprom_query16(priv, EEPROM_NUM_MAC_ADDRESS);
+        num_mac = priv->eeprom_data->n_hw_addrs;
         if (num_mac > 1) {
                 memcpy(priv->addresses[1].addr, priv->addresses[0].addr,
                        ETH_ALEN);
@@ -1711,8 +1529,10 @@ out_destroy_workqueue:
         destroy_workqueue(priv->workqueue);
         priv->workqueue = NULL;
         iwl_uninit_drv(priv);
+out_free_eeprom_blob:
+        kfree(priv->eeprom_blob);
 out_free_eeprom:
-        iwl_eeprom_free(priv);
+        iwl_free_eeprom_data(priv->eeprom_data);
 out_free_hw:
         ieee80211_free_hw(priv->hw);
 out:
@@ -1720,7 +1540,7 @@ out:
         return op_mode;
 }
 
-void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)
+static void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
 
@@ -1737,7 +1557,8 @@ void iwl_op_mode_dvm_stop(struct iwl_op_mode *op_mode)
         priv->ucode_loaded = false;
         iwl_trans_stop_device(priv->trans);
 
-        iwl_eeprom_free(priv);
+        kfree(priv->eeprom_blob);
+        iwl_free_eeprom_data(priv->eeprom_data);
 
         /*netif_stop_queue(dev); */
         flush_workqueue(priv->workqueue);
@@ -2185,7 +2006,7 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
         }
 }
 
-void iwl_nic_error(struct iwl_op_mode *op_mode)
+static void iwl_nic_error(struct iwl_op_mode *op_mode)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
 
@@ -2198,7 +2019,7 @@ void iwl_nic_error(struct iwl_op_mode *op_mode)
         iwlagn_fw_error(priv, false);
 }
 
-void iwl_cmd_queue_full(struct iwl_op_mode *op_mode)
+static void iwl_cmd_queue_full(struct iwl_op_mode *op_mode)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
 
@@ -2208,9 +2029,49 @@ void iwl_cmd_queue_full(struct iwl_op_mode *op_mode)
         }
 }
 
-void iwl_nic_config(struct iwl_op_mode *op_mode)
+#define EEPROM_RF_CONFIG_TYPE_MAX      0x3
+
+static void iwl_nic_config(struct iwl_op_mode *op_mode)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
+        u16 radio_cfg = priv->eeprom_data->radio_cfg;
+
+        /* SKU Control */
+        iwl_set_bits_mask(priv->trans, CSR_HW_IF_CONFIG_REG,
+                          CSR_HW_IF_CONFIG_REG_MSK_MAC_DASH |
+                          CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP,
+                          (CSR_HW_REV_STEP(priv->trans->hw_rev) <<
+                                CSR_HW_IF_CONFIG_REG_POS_MAC_STEP) |
+                          (CSR_HW_REV_DASH(priv->trans->hw_rev) <<
+                                CSR_HW_IF_CONFIG_REG_POS_MAC_DASH));
+
+        /* write radio config values to register */
+        if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <= EEPROM_RF_CONFIG_TYPE_MAX) {
+                u32 reg_val =
+                        EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <<
+                                CSR_HW_IF_CONFIG_REG_POS_PHY_TYPE |
+                        EEPROM_RF_CFG_STEP_MSK(radio_cfg) <<
+                                CSR_HW_IF_CONFIG_REG_POS_PHY_STEP |
+                        EEPROM_RF_CFG_DASH_MSK(radio_cfg) <<
+                                CSR_HW_IF_CONFIG_REG_POS_PHY_DASH;
+
+                iwl_set_bits_mask(priv->trans, CSR_HW_IF_CONFIG_REG,
+                                  CSR_HW_IF_CONFIG_REG_MSK_PHY_TYPE |
+                                  CSR_HW_IF_CONFIG_REG_MSK_PHY_STEP |
+                                  CSR_HW_IF_CONFIG_REG_MSK_PHY_DASH, reg_val);
+
+                IWL_INFO(priv, "Radio type=0x%x-0x%x-0x%x\n",
+                         EEPROM_RF_CFG_TYPE_MSK(radio_cfg),
+                         EEPROM_RF_CFG_STEP_MSK(radio_cfg),
+                         EEPROM_RF_CFG_DASH_MSK(radio_cfg));
+        } else {
+                WARN_ON(1);
+        }
+
+        /* set CSR_HW_CONFIG_REG for uCode use */
+        iwl_set_bit(priv->trans, CSR_HW_IF_CONFIG_REG,
+                    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
+                    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
 
         priv->lib->nic_config(priv);
 }
@@ -2223,7 +2084,7 @@ static void iwl_wimax_active(struct iwl_op_mode *op_mode)
         IWL_ERR(priv, "RF is used by WiMAX\n");
 }
 
-void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, int queue)
+static void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, int queue)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
         int mq = priv->queue_to_mac80211[queue];
@@ -2242,7 +2103,7 @@ void iwl_stop_sw_queue(struct iwl_op_mode *op_mode, int queue)
         ieee80211_stop_queue(priv->hw, mq);
 }
 
-void iwl_wake_sw_queue(struct iwl_op_mode *op_mode, int queue)
+static void iwl_wake_sw_queue(struct iwl_op_mode *op_mode, int queue)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
         int mq = priv->queue_to_mac80211[queue];
@@ -2282,16 +2143,17 @@ void iwlagn_lift_passive_no_rx(struct iwl_priv *priv)
         priv->passive_no_rx = false;
 }
 
-void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb)
+static void iwl_free_skb(struct iwl_op_mode *op_mode, struct sk_buff *skb)
 {
+        struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
         struct ieee80211_tx_info *info;
 
         info = IEEE80211_SKB_CB(skb);
-        kmem_cache_free(iwl_tx_cmd_pool, (info->driver_data[1]));
+        iwl_trans_free_tx_cmd(priv->trans, info->driver_data[1]);
         dev_kfree_skb_any(skb);
 }
 
-void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)
+static void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)
 {
         struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
 
@@ -2303,7 +2165,7 @@ void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)
         wiphy_rfkill_set_hw_state(priv->hw->wiphy, state);
 }
 
-const struct iwl_op_mode_ops iwl_dvm_ops = {
+static const struct iwl_op_mode_ops iwl_dvm_ops = {
         .start = iwl_op_mode_dvm_start,
         .stop = iwl_op_mode_dvm_stop,
         .rx = iwl_rx_dispatch,
@@ -2322,9 +2184,6 @@ const struct iwl_op_mode_ops iwl_dvm_ops = {
  * driver and module entry point
  *
  *****************************************************************************/
-
-struct kmem_cache *iwl_tx_cmd_pool;
-
 static int __init iwl_init(void)
 {
 
@@ -2332,36 +2191,25 @@ static int __init iwl_init(void)
         pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");
         pr_info(DRV_COPYRIGHT "\n");
 
-        iwl_tx_cmd_pool = kmem_cache_create("iwl_dev_cmd",
-                                            sizeof(struct iwl_device_cmd),
-                                            sizeof(void *), 0, NULL);
-        if (!iwl_tx_cmd_pool)
-                return -ENOMEM;
-
         ret = iwlagn_rate_control_register();
         if (ret) {
                 pr_err("Unable to register rate control algorithm: %d\n", ret);
-                goto error_rc_register;
+                return ret;
         }
 
-        ret = iwl_pci_register_driver();
-        if (ret)
-                goto error_pci_register;
-        return ret;
+        ret = iwl_opmode_register("iwldvm", &iwl_dvm_ops);
+        if (ret) {
+                pr_err("Unable to register op_mode: %d\n", ret);
+                iwlagn_rate_control_unregister();
+        }
 
-error_pci_register:
-        iwlagn_rate_control_unregister();
-error_rc_register:
-        kmem_cache_destroy(iwl_tx_cmd_pool);
         return ret;
 }
+module_init(iwl_init);
 
 static void __exit iwl_exit(void)
 {
-        iwl_pci_unregister_driver();
+        iwl_opmode_deregister("iwldvm");
         iwlagn_rate_control_unregister();
-        kmem_cache_destroy(iwl_tx_cmd_pool);
 }
-
 module_exit(iwl_exit);
-module_init(iwl_init);
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/dvm/power.c
index 544ddf17f5bd..518cf3715809 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.c
+++ b/drivers/net/wireless/iwlwifi/dvm/power.c
@@ -31,18 +31,15 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-
 #include <net/mac80211.h>
-
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-agn.h"
 #include "iwl-io.h"
-#include "iwl-commands.h"
 #include "iwl-debug.h"
-#include "iwl-power.h"
 #include "iwl-trans.h"
 #include "iwl-modparams.h"
+#include "dev.h"
+#include "agn.h"
+#include "commands.h"
+#include "power.h"
 
 /*
  * Setting power level allows the card to go to sleep when not busy.
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.h b/drivers/net/wireless/iwlwifi/dvm/power.h
index 21afc92efacb..a2cee7f04848 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.h
+++ b/drivers/net/wireless/iwlwifi/dvm/power.h
@@ -28,7 +28,7 @@
 #ifndef __iwl_power_setting_h__
 #define __iwl_power_setting_h__
 
-#include "iwl-commands.h"
+#include "commands.h"
 
 struct iwl_power_mgr {
         struct iwl_powertable_cmd sleep_cmd;
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/dvm/rs.c
index 8cebd7c363fc..6fddd2785e6e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rs.c
@@ -35,10 +35,8 @@
 
 #include <linux/workqueue.h>
 
-#include "iwl-dev.h"
-#include "iwl-agn.h"
-#include "iwl-op-mode.h"
-#include "iwl-modparams.h"
+#include "dev.h"
+#include "agn.h"
 
 #define RS_NAME "iwl-agn-rs"
 
@@ -819,7 +817,7 @@ static u32 rs_get_lower_rate(struct iwl_lq_sta *lq_sta,
 
                 if (num_of_ant(tbl->ant_type) > 1)
                         tbl->ant_type =
-                            first_antenna(priv->hw_params.valid_tx_ant);
+                            first_antenna(priv->eeprom_data->valid_tx_ant);
 
                 tbl->is_ht40 = 0;
                 tbl->is_SGI = 0;
@@ -1447,7 +1445,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
+        u8 valid_tx_ant = priv->eeprom_data->valid_tx_ant;
         u8 tx_chains_num = priv->hw_params.tx_chains_num;
         int ret = 0;
         u8 update_search_tbl_counter = 0;
@@ -1465,7 +1463,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv,
         case IWL_BT_COEX_TRAFFIC_LOAD_CONTINUOUS:
                 /* avoid antenna B and MIMO */
                 valid_tx_ant =
-                        first_antenna(priv->hw_params.valid_tx_ant);
+                        first_antenna(priv->eeprom_data->valid_tx_ant);
                 if (tbl->action >= IWL_LEGACY_SWITCH_ANTENNA2 &&
                     tbl->action != IWL_LEGACY_SWITCH_SISO)
                         tbl->action = IWL_LEGACY_SWITCH_SISO;
@@ -1489,7 +1487,7 @@ static int rs_move_legacy_other(struct iwl_priv *priv,
                 else if (tbl->action >= IWL_LEGACY_SWITCH_ANTENNA2)
                         tbl->action = IWL_LEGACY_SWITCH_SISO;
                 valid_tx_ant =
-                        first_antenna(priv->hw_params.valid_tx_ant);
+                        first_antenna(priv->eeprom_data->valid_tx_ant);
         }
 
         start_action = tbl->action;
@@ -1623,7 +1621,7 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
+        u8 valid_tx_ant = priv->eeprom_data->valid_tx_ant;
         u8 tx_chains_num = priv->hw_params.tx_chains_num;
         u8 update_search_tbl_counter = 0;
         int ret;
@@ -1641,7 +1639,7 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
         case IWL_BT_COEX_TRAFFIC_LOAD_CONTINUOUS:
                 /* avoid antenna B and MIMO */
                 valid_tx_ant =
-                        first_antenna(priv->hw_params.valid_tx_ant);
+                        first_antenna(priv->eeprom_data->valid_tx_ant);
                 if (tbl->action != IWL_SISO_SWITCH_ANTENNA1)
                         tbl->action = IWL_SISO_SWITCH_ANTENNA1;
                 break;
@@ -1659,7 +1657,7 @@ static int rs_move_siso_to_other(struct iwl_priv *priv,
         /* configure as 1x1 if bt full concurrency */
         if (priv->bt_full_concurrent) {
                 valid_tx_ant =
-                        first_antenna(priv->hw_params.valid_tx_ant);
+                        first_antenna(priv->eeprom_data->valid_tx_ant);
                 if (tbl->action >= IWL_LEGACY_SWITCH_ANTENNA2)
                         tbl->action = IWL_SISO_SWITCH_ANTENNA1;
         }
@@ -1795,7 +1793,7 @@ static int rs_move_mimo2_to_other(struct iwl_priv *priv,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
+        u8 valid_tx_ant = priv->eeprom_data->valid_tx_ant;
         u8 tx_chains_num = priv->hw_params.tx_chains_num;
         u8 update_search_tbl_counter = 0;
         int ret;
@@ -1965,7 +1963,7 @@ static int rs_move_mimo3_to_other(struct iwl_priv *priv,
         u32 sz = (sizeof(struct iwl_scale_tbl_info) -
                   (sizeof(struct iwl_rate_scale_data) * IWL_RATE_COUNT));
         u8 start_action;
-        u8 valid_tx_ant = priv->hw_params.valid_tx_ant;
+        u8 valid_tx_ant = priv->eeprom_data->valid_tx_ant;
         u8 tx_chains_num = priv->hw_params.tx_chains_num;
         int ret;
         u8 update_search_tbl_counter = 0;
@@ -2699,7 +2697,7 @@ static void rs_initialize_lq(struct iwl_priv *priv,
 
         i = lq_sta->last_txrate_idx;
 
-        valid_tx_ant = priv->hw_params.valid_tx_ant;
+        valid_tx_ant = priv->eeprom_data->valid_tx_ant;
 
         if (!lq_sta->search_better_tbl)
                 active_tbl = lq_sta->active_tbl;
@@ -2893,15 +2891,15 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i
 
         /* These values will be overridden later */
         lq_sta->lq.general_params.single_stream_ant_msk =
-                first_antenna(priv->hw_params.valid_tx_ant);
+                first_antenna(priv->eeprom_data->valid_tx_ant);
         lq_sta->lq.general_params.dual_stream_ant_msk =
-                priv->hw_params.valid_tx_ant &
-                ~first_antenna(priv->hw_params.valid_tx_ant);
+                priv->eeprom_data->valid_tx_ant &
+                ~first_antenna(priv->eeprom_data->valid_tx_ant);
         if (!lq_sta->lq.general_params.dual_stream_ant_msk) {
                 lq_sta->lq.general_params.dual_stream_ant_msk = ANT_AB;
-        } else if (num_of_ant(priv->hw_params.valid_tx_ant) == 2) {
+        } else if (num_of_ant(priv->eeprom_data->valid_tx_ant) == 2) {
                 lq_sta->lq.general_params.dual_stream_ant_msk =
-                        priv->hw_params.valid_tx_ant;
+                        priv->eeprom_data->valid_tx_ant;
         }
 
         /* as default allow aggregation for all tids */
@@ -2947,7 +2945,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
         if (priv && priv->bt_full_concurrent) {
                 /* 1x1 only */
                 tbl_type.ant_type =
-                        first_antenna(priv->hw_params.valid_tx_ant);
+                        first_antenna(priv->eeprom_data->valid_tx_ant);
         }
 
         /* How many times should we repeat the initial rate? */
@@ -2979,7 +2977,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
                 if (priv->bt_full_concurrent)
                         valid_tx_ant = ANT_A;
                 else
-                        valid_tx_ant = priv->hw_params.valid_tx_ant;
+                        valid_tx_ant = priv->eeprom_data->valid_tx_ant;
         }
 
         /* Fill rest of rate table */
@@ -3013,7 +3011,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
                 if (priv && priv->bt_full_concurrent) {
                         /* 1x1 only */
                         tbl_type.ant_type =
-                            first_antenna(priv->hw_params.valid_tx_ant);
+                            first_antenna(priv->eeprom_data->valid_tx_ant);
                 }
 
                 /* Indicate to uCode which entries might be MIMO.
@@ -3100,7 +3098,7 @@ static void rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta,
         u8 ant_sel_tx;
 
         priv = lq_sta->drv;
-        valid_tx_ant = priv->hw_params.valid_tx_ant;
+        valid_tx_ant = priv->eeprom_data->valid_tx_ant;
         if (lq_sta->dbg_fixed_rate) {
                 ant_sel_tx =
                   ((lq_sta->dbg_fixed_rate & RATE_MCS_ANT_ABC_MSK)
@@ -3171,9 +3169,9 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
         desc += sprintf(buff+desc, "fixed rate 0x%X\n",
                         lq_sta->dbg_fixed_rate);
         desc += sprintf(buff+desc, "valid_tx_ant %s%s%s\n",
-            (priv->hw_params.valid_tx_ant & ANT_A) ? "ANT_A," : "",
-            (priv->hw_params.valid_tx_ant & ANT_B) ? "ANT_B," : "",
-            (priv->hw_params.valid_tx_ant & ANT_C) ? "ANT_C" : "");
+            (priv->eeprom_data->valid_tx_ant & ANT_A) ? "ANT_A," : "",
+            (priv->eeprom_data->valid_tx_ant & ANT_B) ? "ANT_B," : "",
+            (priv->eeprom_data->valid_tx_ant & ANT_C) ? "ANT_C" : "");
         desc += sprintf(buff+desc, "lq type %s\n",
            (is_legacy(tbl->lq_type)) ? "legacy" : "HT");
         if (is_Ht(tbl->lq_type)) {
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h b/drivers/net/wireless/iwlwifi/dvm/rs.h
index 82d02e1ae89f..ad3aea8f626a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h
+++ b/drivers/net/wireless/iwlwifi/dvm/rs.h
@@ -29,9 +29,10 @@
 
 #include <net/mac80211.h>
 
-#include "iwl-commands.h"
 #include "iwl-config.h"
 
+#include "commands.h"
+
 struct iwl_rate_info {
         u8 plcp;        /* uCode API:  IWL_RATE_6M_PLCP, etc. */
         u8 plcp_siso;   /* uCode API:  IWL_RATE_SISO_6M_PLCP, etc. */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/dvm/rx.c
index 403de96f9747..0ed90bb8b56a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rx.c
@@ -32,12 +32,10 @@
 #include <linux/sched.h>
 #include <net/mac80211.h>
 #include <asm/unaligned.h>
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
 #include "iwl-io.h"
-#include "iwl-agn-calib.h"
-#include "iwl-agn.h"
-#include "iwl-modparams.h"
+#include "dev.h"
+#include "calib.h"
+#include "agn.h"
 
 #define IWL_CMD_ENTRY(x) [x] = #x
 
@@ -1012,6 +1010,8 @@ static int iwlagn_rx_reply_rx(struct iwl_priv *priv,
                 rx_status.flag |= RX_FLAG_40MHZ;
         if (rate_n_flags & RATE_MCS_SGI_MSK)
                 rx_status.flag |= RX_FLAG_SHORT_GI;
+        if (rate_n_flags & RATE_MCS_GF_MSK)
+                rx_status.flag |= RX_FLAG_HT_GF;
 
         iwlagn_pass_packet_to_mac80211(priv, header, len, ampdu_status,
                                     rxb, &rx_status);
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c
index 0a3aa7c83003..6ee940f497f9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
@@ -25,11 +25,11 @@
  *****************************************************************************/
 
 #include <linux/etherdevice.h>
-#include "iwl-dev.h"
-#include "iwl-agn.h"
-#include "iwl-agn-calib.h"
 #include "iwl-trans.h"
 #include "iwl-modparams.h"
+#include "dev.h"
+#include "agn.h"
+#include "calib.h"
 
 /*
  * initialize rxon structure with default values from eeprom
@@ -37,8 +37,6 @@
 void iwl_connection_init_rx_config(struct iwl_priv *priv,
                                    struct iwl_rxon_context *ctx)
 {
-        const struct iwl_channel_info *ch_info;
-
         memset(&ctx->staging, 0, sizeof(ctx->staging));
 
         if (!ctx->vif) {
@@ -80,14 +78,8 @@ void iwl_connection_init_rx_config(struct iwl_priv *priv,
                 ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
 #endif
 
-        ch_info = iwl_get_channel_info(priv, priv->band,
-                                       le16_to_cpu(ctx->active.channel));
-
-        if (!ch_info)
-                ch_info = &priv->channel_info[0];
-
-        ctx->staging.channel = cpu_to_le16(ch_info->channel);
-        priv->band = ch_info->band;
+        ctx->staging.channel = cpu_to_le16(priv->hw->conf.channel->hw_value);
+        priv->band = priv->hw->conf.channel->band;
 
         iwl_set_flags_for_band(priv, ctx, priv->band, ctx->vif);
 
@@ -175,7 +167,8 @@ static int iwlagn_disconn_pan(struct iwl_priv *priv,
         return ret;
 }
 
-void iwlagn_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
+static void iwlagn_update_qos(struct iwl_priv *priv,
+                              struct iwl_rxon_context *ctx)
 {
         int ret;
 
@@ -202,8 +195,8 @@ void iwlagn_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
                 IWL_DEBUG_QUIET_RFKILL(priv, "Failed to update QoS\n");
 }
 
-int iwlagn_update_beacon(struct iwl_priv *priv,
-                         struct ieee80211_vif *vif)
+static int iwlagn_update_beacon(struct iwl_priv *priv,
+                                struct ieee80211_vif *vif)
 {
         lockdep_assert_held(&priv->mutex);
 
@@ -215,7 +208,7 @@ int iwlagn_update_beacon(struct iwl_priv *priv,
 }
 
 static int iwlagn_send_rxon_assoc(struct iwl_priv *priv,
-                           struct iwl_rxon_context *ctx)
+                                  struct iwl_rxon_context *ctx)
 {
         int ret = 0;
         struct iwl_rxon_assoc_cmd rxon_assoc;
@@ -427,10 +420,10 @@ static int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)
                 return -EINVAL;
         }
 
-        if (tx_power > priv->tx_power_device_lmt) {
+        if (tx_power > DIV_ROUND_UP(priv->eeprom_data->max_tx_pwr_half_dbm, 2)) {
                 IWL_WARN(priv,
                         "Requested user TXPOWER %d above upper limit %d.\n",
-                         tx_power, priv->tx_power_device_lmt);
+                         tx_power, priv->eeprom_data->max_tx_pwr_half_dbm);
                 return -EINVAL;
         }
 
@@ -863,8 +856,8 @@ static int iwl_check_rxon_cmd(struct iwl_priv *priv,
  * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that
  * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required.
  */
-int iwl_full_rxon_required(struct iwl_priv *priv,
-                           struct iwl_rxon_context *ctx)
+static int iwl_full_rxon_required(struct iwl_priv *priv,
+                                  struct iwl_rxon_context *ctx)
 {
         const struct iwl_rxon_cmd *staging = &ctx->staging;
         const struct iwl_rxon_cmd *active = &ctx->active;
@@ -1189,7 +1182,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
         struct iwl_rxon_context *ctx;
         struct ieee80211_conf *conf = &hw->conf;
         struct ieee80211_channel *channel = conf->channel;
-        const struct iwl_channel_info *ch_info;
         int ret = 0;
 
         IWL_DEBUG_MAC80211(priv, "enter: changed %#x\n", changed);
@@ -1223,14 +1215,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
         }
 
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
-                ch_info = iwl_get_channel_info(priv, channel->band,
-                                               channel->hw_value);
-                if (!is_channel_valid(ch_info)) {
-                        IWL_DEBUG_MAC80211(priv, "leave - invalid channel\n");
-                        ret = -EINVAL;
-                        goto out;
-                }
-
                 for_each_context(priv, ctx) {
                         /* Configure HT40 channels */
                         if (ctx->ht.enabled != conf_is_ht(conf))
@@ -1294,9 +1278,9 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
         return ret;
 }
 
-void iwlagn_check_needed_chains(struct iwl_priv *priv,
-                                struct iwl_rxon_context *ctx,
-                                struct ieee80211_bss_conf *bss_conf)
+static void iwlagn_check_needed_chains(struct iwl_priv *priv,
+                                       struct iwl_rxon_context *ctx,
+                                       struct ieee80211_bss_conf *bss_conf)
 {
         struct ieee80211_vif *vif = ctx->vif;
         struct iwl_rxon_context *tmp;
@@ -1388,7 +1372,7 @@ void iwlagn_check_needed_chains(struct iwl_priv *priv,
         ht_conf->single_chain_sufficient = !need_multiple;
 }
 
-void iwlagn_chain_noise_reset(struct iwl_priv *priv)
+static void iwlagn_chain_noise_reset(struct iwl_priv *priv)
 {
         struct iwl_chain_noise_data *data = &priv->chain_noise_data;
         int ret;
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/dvm/scan.c
index 031d8e21f82f..2f271c96ed39 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/dvm/scan.c
@@ -30,11 +30,8 @@
 #include <linux/etherdevice.h>
 #include <net/mac80211.h>
 
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
-#include "iwl-io.h"
-#include "iwl-agn.h"
-#include "iwl-trans.h"
+#include "dev.h"
+#include "agn.h"
 
 /* For active scan, listen ACTIVE_DWELL_TIME (msec) on each channel after
  * sending probe req.  This should be set long enough to hear probe responses
@@ -67,7 +64,6 @@ static int iwl_send_scan_abort(struct iwl_priv *priv)
          * to receive scan abort command or it does not perform
          * hardware scan currently */
         if (!test_bit(STATUS_READY, &priv->status) ||
-            !test_bit(STATUS_GEO_CONFIGURED, &priv->status) ||
             !test_bit(STATUS_SCAN_HW, &priv->status) ||
             test_bit(STATUS_FW_ERROR, &priv->status))
                 return -EIO;
@@ -101,11 +97,8 @@ static void iwl_complete_scan(struct iwl_priv *priv, bool aborted)
                 ieee80211_scan_completed(priv->hw, aborted);
         }
 
-        if (priv->scan_type == IWL_SCAN_ROC) {
-                ieee80211_remain_on_channel_expired(priv->hw);
-                priv->hw_roc_channel = NULL;
-                schedule_delayed_work(&priv->hw_roc_disable_work, 10 * HZ);
-        }
+        if (priv->scan_type == IWL_SCAN_ROC)
+                iwl_scan_roc_expired(priv);
 
         priv->scan_type = IWL_SCAN_NORMAL;
         priv->scan_vif = NULL;
@@ -134,11 +127,8 @@ static void iwl_process_scan_complete(struct iwl_priv *priv)
                 goto out_settings;
         }
 
-        if (priv->scan_type == IWL_SCAN_ROC) {
-                ieee80211_remain_on_channel_expired(priv->hw);
-                priv->hw_roc_channel = NULL;
-                schedule_delayed_work(&priv->hw_roc_disable_work, 10 * HZ);
-        }
+        if (priv->scan_type == IWL_SCAN_ROC)
+                iwl_scan_roc_expired(priv);
 
         if (priv->scan_type != IWL_SCAN_NORMAL && !aborted) {
                 int err;
@@ -453,27 +443,17 @@ static u16 iwl_get_passive_dwell_time(struct iwl_priv *priv,
 
 /* Return valid, unused, channel for a passive scan to reset the RF */
 static u8 iwl_get_single_channel_number(struct iwl_priv *priv,
-                                 enum ieee80211_band band)
+                                        enum ieee80211_band band)
 {
-        const struct iwl_channel_info *ch_info;
-        int i;
-        u8 channel = 0;
-        u8 min, max;
+        struct ieee80211_supported_band *sband = priv->hw->wiphy->bands[band];
         struct iwl_rxon_context *ctx;
+        int i;
 
-        if (band == IEEE80211_BAND_5GHZ) {
-                min = 14;
-                max = priv->channel_count;
-        } else {
-                min = 0;
-                max = 14;
-        }
-
-        for (i = min; i < max; i++) {
+        for (i = 0; i < sband->n_channels; i++) {
                 bool busy = false;
 
                 for_each_context(priv, ctx) {
-                        busy = priv->channel_info[i].channel ==
+                        busy = sband->channels[i].hw_value ==
                                 le16_to_cpu(ctx->staging.channel);
                         if (busy)
                                 break;
@@ -482,13 +462,11 @@ static u8 iwl_get_single_channel_number(struct iwl_priv *priv,
                 if (busy)
                         continue;
 
-                channel = priv->channel_info[i].channel;
-                ch_info = iwl_get_channel_info(priv, band, channel);
-                if (is_channel_valid(ch_info))
-                        break;
+                if (!(sband->channels[i].flags & IEEE80211_CHAN_DISABLED))
+                        return sband->channels[i].hw_value;
         }
 
-        return channel;
+        return 0;
 }
 
 static int iwl_get_single_channel_for_scan(struct iwl_priv *priv,
@@ -540,7 +518,6 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv,
 {
         struct ieee80211_channel *chan;
         const struct ieee80211_supported_band *sband;
-        const struct iwl_channel_info *ch_info;
         u16 passive_dwell = 0;
         u16 active_dwell = 0;
         int added, i;
@@ -565,16 +542,7 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv,
                 channel = chan->hw_value;
                 scan_ch->channel = cpu_to_le16(channel);
 
-                ch_info = iwl_get_channel_info(priv, band, channel);
-                if (!is_channel_valid(ch_info)) {
-                        IWL_DEBUG_SCAN(priv,
-                                       "Channel %d is INVALID for this band.\n",
-                                       channel);
-                        continue;
-                }
-
-                if (!is_active || is_channel_passive(ch_info) ||
-                    (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
+                if (!is_active || (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN))
                         scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
                 else
                         scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE;
@@ -678,12 +646,12 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         u16 rx_chain = 0;
         enum ieee80211_band band;
         u8 n_probes = 0;
-        u8 rx_ant = priv->hw_params.valid_rx_ant;
+        u8 rx_ant = priv->eeprom_data->valid_rx_ant;
         u8 rate;
         bool is_active = false;
         int  chan_mod;
         u8 active_chains;
-        u8 scan_tx_antennas = priv->hw_params.valid_tx_ant;
+        u8 scan_tx_antennas = priv->eeprom_data->valid_tx_ant;
         int ret;
         int scan_cmd_size = sizeof(struct iwl_scan_cmd) +
                             MAX_SCAN_CHANNEL * sizeof(struct iwl_scan_channel) +
@@ -893,7 +861,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 
         /* MIMO is not used here, but value is required */
         rx_chain |=
-                priv->hw_params.valid_rx_ant << RXON_RX_CHAIN_VALID_POS;
+                priv->eeprom_data->valid_rx_ant << RXON_RX_CHAIN_VALID_POS;
         rx_chain |= rx_ant << RXON_RX_CHAIN_FORCE_MIMO_SEL_POS;
         rx_chain |= rx_ant << RXON_RX_CHAIN_FORCE_SEL_POS;
         rx_chain |= 0x1 << RXON_RX_CHAIN_DRIVER_FORCE_POS;
@@ -994,8 +962,10 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         set_bit(STATUS_SCAN_HW, &priv->status);
 
         ret = iwlagn_set_pan_params(priv);
-        if (ret)
+        if (ret) {
+                clear_bit(STATUS_SCAN_HW, &priv->status);
                 return ret;
+        }
 
         ret = iwl_dvm_send_cmd(priv, &cmd);
         if (ret) {
@@ -1008,7 +978,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 
 void iwl_init_scan_params(struct iwl_priv *priv)
 {
-        u8 ant_idx = fls(priv->hw_params.valid_tx_ant) - 1;
+        u8 ant_idx = fls(priv->eeprom_data->valid_tx_ant) - 1;
         if (!priv->scan_tx_ant[IEEE80211_BAND_5GHZ])
                 priv->scan_tx_ant[IEEE80211_BAND_5GHZ] = ant_idx;
         if (!priv->scan_tx_ant[IEEE80211_BAND_2GHZ])
@@ -1158,3 +1128,40 @@ void iwl_cancel_scan_deferred_work(struct iwl_priv *priv)
                 mutex_unlock(&priv->mutex);
         }
 }
+
+void iwl_scan_roc_expired(struct iwl_priv *priv)
+{
+        /*
+         * The status bit should be set here, to prevent a race
+         * where the atomic_read returns 1, but before the execution continues
+         * iwl_scan_offchannel_skb_status() checks if the status bit is set
+         */
+        set_bit(STATUS_SCAN_ROC_EXPIRED, &priv->status);
+
+        if (atomic_read(&priv->num_aux_in_flight) == 0) {
+                ieee80211_remain_on_channel_expired(priv->hw);
+                priv->hw_roc_channel = NULL;
+                schedule_delayed_work(&priv->hw_roc_disable_work,
+                                      10 * HZ);
+
+                clear_bit(STATUS_SCAN_ROC_EXPIRED, &priv->status);
+        } else {
+                IWL_DEBUG_SCAN(priv, "ROC done with %d frames in aux\n",
+                               atomic_read(&priv->num_aux_in_flight));
+        }
+}
+
+void iwl_scan_offchannel_skb(struct iwl_priv *priv)
+{
+        WARN_ON(!priv->hw_roc_start_notified);
+        atomic_inc(&priv->num_aux_in_flight);
+}
+
+void iwl_scan_offchannel_skb_status(struct iwl_priv *priv)
+{
+        if (atomic_dec_return(&priv->num_aux_in_flight) == 0 &&
+            test_bit(STATUS_SCAN_ROC_EXPIRED, &priv->status)) {
+                IWL_DEBUG_SCAN(priv, "0 aux frames. Calling ROC expired\n");
+                iwl_scan_roc_expired(priv);
+        }
+}
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/dvm/sta.c
index eb6a8eaf42fc..b29b798f7550 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+++ b/drivers/net/wireless/iwlwifi/dvm/sta.c
@@ -28,10 +28,9 @@
  *****************************************************************************/
 #include <linux/etherdevice.h>
 #include <net/mac80211.h>
-
-#include "iwl-dev.h"
-#include "iwl-agn.h"
 #include "iwl-trans.h"
+#include "dev.h"
+#include "agn.h"
 
 const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 
@@ -171,26 +170,6 @@ int iwl_send_add_sta(struct iwl_priv *priv,
         return cmd.handler_status;
 }
 
-static bool iwl_is_channel_extension(struct iwl_priv *priv,
-                                     enum ieee80211_band band,
-                                     u16 channel, u8 extension_chan_offset)
-{
-        const struct iwl_channel_info *ch_info;
-
-        ch_info = iwl_get_channel_info(priv, band, channel);
-        if (!is_channel_valid(ch_info))
-                return false;
-
-        if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_ABOVE)
-                return !(ch_info->ht40_extension_channel &
-                                        IEEE80211_CHAN_NO_HT40PLUS);
-        else if (extension_chan_offset == IEEE80211_HT_PARAM_CHA_SEC_BELOW)
-                return !(ch_info->ht40_extension_channel &
-                                        IEEE80211_CHAN_NO_HT40MINUS);
-
-        return false;
-}
-
 bool iwl_is_ht40_tx_allowed(struct iwl_priv *priv,
                             struct iwl_rxon_context *ctx,
                             struct ieee80211_sta_ht_cap *ht_cap)
@@ -198,21 +177,25 @@ bool iwl_is_ht40_tx_allowed(struct iwl_priv *priv,
         if (!ctx->ht.enabled || !ctx->ht.is_40mhz)
                 return false;
 
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+        if (priv->disable_ht40)
+                return false;
+#endif
+
         /*
-         * We do not check for IEEE80211_HT_CAP_SUP_WIDTH_20_40
-         * the bit will not set if it is pure 40MHz case
+         * Remainder of this function checks ht_cap, but if it's
+         * NULL then we can do HT40 (special case for RXON)
          */
-        if (ht_cap && !ht_cap->ht_supported)
+        if (!ht_cap)
+                return true;
+
+        if (!ht_cap->ht_supported)
                 return false;
 
-#ifdef CONFIG_IWLWIFI_DEBUGFS
-        if (priv->disable_ht40)
+        if (!(ht_cap->cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40))
                 return false;
-#endif
 
-        return iwl_is_channel_extension(priv, priv->band,
-                        le16_to_cpu(ctx->staging.channel),
-                        ctx->ht.extension_chan_offset);
+        return true;
 }
 
 static void iwl_sta_calc_ht_flags(struct iwl_priv *priv,
@@ -236,6 +219,7 @@ static void iwl_sta_calc_ht_flags(struct iwl_priv *priv,
         mimo_ps_mode = (sta_ht_inf->cap & IEEE80211_HT_CAP_SM_PS) >> 2;
 
         IWL_DEBUG_INFO(priv, "STA %pM SM PS mode: %s\n",
+                        sta->addr,
                         (mimo_ps_mode == WLAN_HT_CAP_SM_PS_STATIC) ?
                         "static" :
                         (mimo_ps_mode == WLAN_HT_CAP_SM_PS_DYNAMIC) ?
@@ -649,23 +633,23 @@ static void iwl_sta_fill_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
         if (r >= IWL_FIRST_CCK_RATE && r <= IWL_LAST_CCK_RATE)
                 rate_flags |= RATE_MCS_CCK_MSK;
 
-        rate_flags |= first_antenna(priv->hw_params.valid_tx_ant) <<
+        rate_flags |= first_antenna(priv->eeprom_data->valid_tx_ant) <<
                                 RATE_MCS_ANT_POS;
         rate_n_flags = iwl_hw_set_rate_n_flags(iwl_rates[r].plcp, rate_flags);
         for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
                 link_cmd->rs_table[i].rate_n_flags = rate_n_flags;
 
         link_cmd->general_params.single_stream_ant_msk =
-                        first_antenna(priv->hw_params.valid_tx_ant);
+                        first_antenna(priv->eeprom_data->valid_tx_ant);
 
         link_cmd->general_params.dual_stream_ant_msk =
-                priv->hw_params.valid_tx_ant &
-                ~first_antenna(priv->hw_params.valid_tx_ant);
+                priv->eeprom_data->valid_tx_ant &
+                ~first_antenna(priv->eeprom_data->valid_tx_ant);
         if (!link_cmd->general_params.dual_stream_ant_msk) {
                 link_cmd->general_params.dual_stream_ant_msk = ANT_AB;
-        } else if (num_of_ant(priv->hw_params.valid_tx_ant) == 2) {
+        } else if (num_of_ant(priv->eeprom_data->valid_tx_ant) == 2) {
                 link_cmd->general_params.dual_stream_ant_msk =
-                        priv->hw_params.valid_tx_ant;
+                        priv->eeprom_data->valid_tx_ant;
         }
 
         link_cmd->agg_params.agg_dis_start_th =
diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.c b/drivers/net/wireless/iwlwifi/dvm/testmode.c
index 060aac3e22f1..e08b1a383594 100644
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/dvm/testmode.c
@@ -69,15 +69,14 @@
 #include <net/cfg80211.h>
 #include <net/mac80211.h>
 #include <net/netlink.h>
-
-#include "iwl-dev.h"
 #include "iwl-debug.h"
 #include "iwl-io.h"
-#include "iwl-agn.h"
-#include "iwl-testmode.h"
 #include "iwl-trans.h"
 #include "iwl-fh.h"
 #include "iwl-prph.h"
+#include "dev.h"
+#include "agn.h"
+#include "testmode.h"
 
 
 /* Periphery registers absolute lower bound. This is used in order to
@@ -89,7 +88,7 @@
 /* The TLVs used in the gnl message policy between the kernel module and
  * user space application. iwl_testmode_gnl_msg_policy is to be carried
  * through the NL80211_CMD_TESTMODE channel regulated by nl80211.
- * See iwl-testmode.h
+ * See testmode.h
  */
 static
 struct nla_policy iwl_testmode_gnl_msg_policy[IWL_TM_ATTR_MAX] = {
@@ -129,7 +128,7 @@ struct nla_policy iwl_testmode_gnl_msg_policy[IWL_TM_ATTR_MAX] = {
 };
 
 /*
- * See the struct iwl_rx_packet in iwl-commands.h for the format of the
+ * See the struct iwl_rx_packet in commands.h for the format of the
  * received events from the device
  */
 static inline int get_event_length(struct iwl_rx_cmd_buffer *rxb)
@@ -170,7 +169,7 @@ static void iwl_testmode_ucode_rx_pkt(struct iwl_priv *priv,
         void *data;
         int length;
 
-        data = (void *)rxb_addr(rxb);
+        data = rxb_addr(rxb);
         length = get_event_length(rxb);
 
         if (!data || length == 0)
@@ -535,9 +534,9 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                 break;
 
         case IWL_TM_CMD_APP2DEV_GET_EEPROM:
-                if (priv->eeprom) {
+                if (priv->eeprom_blob) {
                         skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy,
-                                priv->cfg->base_params->eeprom_size + 20);
+                                priv->eeprom_blob_size + 20);
                         if (!skb) {
                                 IWL_ERR(priv, "Memory allocation fail\n");
                                 return -ENOMEM;
@@ -545,15 +544,15 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                         if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
                                         IWL_TM_CMD_DEV2APP_EEPROM_RSP) ||
                             nla_put(skb, IWL_TM_ATTR_EEPROM,
-                                    priv->cfg->base_params->eeprom_size,
-                                    priv->eeprom))
+                                    priv->eeprom_blob_size,
+                                    priv->eeprom_blob))
                                 goto nla_put_failure;
                         status = cfg80211_testmode_reply(skb);
                         if (status < 0)
                                 IWL_ERR(priv, "Error sending msg : %d\n",
                                         status);
                 } else
-                        return -EFAULT;
+                        return -ENODATA;
                 break;
 
         case IWL_TM_CMD_APP2DEV_FIXRATE_REQ:
diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.h b/drivers/net/wireless/iwlwifi/dvm/testmode.h
index 6ba211b09426..6ba211b09426 100644
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.h
+++ b/drivers/net/wireless/iwlwifi/dvm/testmode.h
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c b/drivers/net/wireless/iwlwifi/dvm/tt.c
index a5cfe0aceedb..eb864433e59d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tt.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tt.c
@@ -31,17 +31,14 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-
 #include <net/mac80211.h>
-
-#include "iwl-agn.h"
-#include "iwl-eeprom.h"
-#include "iwl-dev.h"
 #include "iwl-io.h"
-#include "iwl-commands.h"
-#include "iwl-debug.h"
-#include "iwl-agn-tt.h"
 #include "iwl-modparams.h"
+#include "iwl-debug.h"
+#include "agn.h"
+#include "dev.h"
+#include "commands.h"
+#include "tt.h"
 
 /* default Thermal Throttling transaction table
  * Current state   |         Throttling Down               |  Throttling Up
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tt.h b/drivers/net/wireless/iwlwifi/dvm/tt.h
index 86bbf47501c1..44c7c8f30a2d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tt.h
+++ b/drivers/net/wireless/iwlwifi/dvm/tt.h
@@ -28,7 +28,7 @@
 #ifndef __iwl_tt_setting_h__
 #define __iwl_tt_setting_h__
 
-#include "iwl-commands.h"
+#include "commands.h"
 
 #define IWL_ABSOLUTE_ZERO               0
 #define IWL_ABSOLUTE_MAX                0xFFFFFFFF
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
index 3366e2e2f00f..0dfaf649b257 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
@@ -32,12 +32,11 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/ieee80211.h>
-
-#include "iwl-dev.h"
 #include "iwl-io.h"
-#include "iwl-agn-hw.h"
-#include "iwl-agn.h"
 #include "iwl-trans.h"
+#include "iwl-agn-hw.h"
+#include "dev.h"
+#include "agn.h"
 
 static const u8 tid_to_ac[] = {
         IEEE80211_AC_BE,
@@ -187,7 +186,8 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,
         rate_idx = info->control.rates[0].idx;
         if (info->control.rates[0].flags & IEEE80211_TX_RC_MCS ||
                         (rate_idx < 0) || (rate_idx > IWL_RATE_COUNT_LEGACY))
-                rate_idx = rate_lowest_index(&priv->bands[info->band],
+                rate_idx = rate_lowest_index(
+                                &priv->eeprom_data->bands[info->band],
                                 info->control.sta);
         /* For 5 GHZ band, remap mac80211 rate indices into driver indices */
         if (info->band == IEEE80211_BAND_5GHZ)
@@ -207,10 +207,11 @@ static void iwlagn_tx_cmd_build_rate(struct iwl_priv *priv,
              priv->bt_full_concurrent) {
                 /* operated as 1x1 in full concurrency mode */
                 priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
-                                first_antenna(priv->hw_params.valid_tx_ant));
+                                first_antenna(priv->eeprom_data->valid_tx_ant));
         } else
-                priv->mgmt_tx_ant = iwl_toggle_tx_ant(priv, priv->mgmt_tx_ant,
-                                                priv->hw_params.valid_tx_ant);
+                priv->mgmt_tx_ant = iwl_toggle_tx_ant(
+                                        priv, priv->mgmt_tx_ant,
+                                        priv->eeprom_data->valid_tx_ant);
         rate_flags |= iwl_ant_idx_to_flags(priv->mgmt_tx_ant);
 
         /* Set the rate in the TX cmd */
@@ -296,7 +297,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         struct iwl_station_priv *sta_priv = NULL;
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        struct iwl_device_cmd *dev_cmd = NULL;
+        struct iwl_device_cmd *dev_cmd;
         struct iwl_tx_cmd *tx_cmd;
         __le16 fc;
         u8 hdr_len;
@@ -378,7 +379,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         if (info->flags & IEEE80211_TX_CTL_AMPDU)
                 is_agg = true;
 
-        dev_cmd = kmem_cache_alloc(iwl_tx_cmd_pool, GFP_ATOMIC);
+        dev_cmd = iwl_trans_alloc_tx_cmd(priv->trans);
 
         if (unlikely(!dev_cmd))
                 goto drop_unlock_priv;
@@ -486,11 +487,14 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         if (sta_priv && sta_priv->client && !is_agg)
                 atomic_inc(&sta_priv->pending_frames);
 
+        if (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)
+                iwl_scan_offchannel_skb(priv);
+
         return 0;
 
 drop_unlock_sta:
         if (dev_cmd)
-                kmem_cache_free(iwl_tx_cmd_pool, dev_cmd);
+                iwl_trans_free_tx_cmd(priv->trans, dev_cmd);
         spin_unlock(&priv->sta_lock);
 drop_unlock_priv:
         return -1;
@@ -597,7 +601,7 @@ turn_off:
                  * time, or we hadn't time to drain the AC queues.
                  */
                 if (agg_state == IWL_AGG_ON)
-                        iwl_trans_tx_agg_disable(priv->trans, txq_id);
+                        iwl_trans_txq_disable(priv->trans, txq_id);
                 else
                         IWL_DEBUG_TX_QUEUES(priv, "Don't disable tx agg: %d\n",
                                             agg_state);
@@ -686,9 +690,8 @@ int iwlagn_tx_agg_oper(struct iwl_priv *priv, struct ieee80211_vif *vif,
 
         fifo = ctx->ac_to_fifo[tid_to_ac[tid]];
 
-        iwl_trans_tx_agg_setup(priv->trans, q, fifo,
-                               sta_priv->sta_id, tid,
-                               buf_size, ssn);
+        iwl_trans_txq_enable(priv->trans, q, fifo, sta_priv->sta_id, tid,
+                             buf_size, ssn);
 
         /*
          * If the limit is 0, then it wasn't initialised yet,
@@ -753,8 +756,8 @@ static void iwlagn_check_ratid_empty(struct iwl_priv *priv, int sta_id, u8 tid)
                         IWL_DEBUG_TX_QUEUES(priv,
                                 "Can continue DELBA flow ssn = next_recl ="
                                 " %d", tid_data->next_reclaimed);
-                        iwl_trans_tx_agg_disable(priv->trans,
-                                                 tid_data->agg.txq_id);
+                        iwl_trans_txq_disable(priv->trans,
+                                              tid_data->agg.txq_id);
                         iwlagn_dealloc_agg_txq(priv, tid_data->agg.txq_id);
                         tid_data->agg.state = IWL_AGG_OFF;
                         ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid);
@@ -1136,6 +1139,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
         struct sk_buff *skb;
         struct iwl_rxon_context *ctx;
         bool is_agg = (txq_id >= IWLAGN_FIRST_AMPDU_QUEUE);
+        bool is_offchannel_skb;
 
         tid = (tx_resp->ra_tid & IWLAGN_TX_RES_TID_MSK) >>
                 IWLAGN_TX_RES_TID_POS;
@@ -1149,6 +1153,8 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
 
         __skb_queue_head_init(&skbs);
 
+        is_offchannel_skb = false;
+
         if (tx_resp->frame_count == 1) {
                 u16 next_reclaimed = le16_to_cpu(tx_resp->seq_ctl);
                 next_reclaimed = SEQ_TO_SN(next_reclaimed + 0x10);
@@ -1189,8 +1195,8 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
 
                         info = IEEE80211_SKB_CB(skb);
                         ctx = info->driver_data[0];
-                        kmem_cache_free(iwl_tx_cmd_pool,
-                                        (info->driver_data[1]));
+                        iwl_trans_free_tx_cmd(priv->trans,
+                                              info->driver_data[1]);
 
                         memset(&info->status, 0, sizeof(info->status));
 
@@ -1225,10 +1231,19 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
                         if (!is_agg)
                                 iwlagn_non_agg_tx_status(priv, ctx, hdr->addr1);
 
+                        is_offchannel_skb =
+                                (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN);
                         freed++;
                 }
 
                 WARN_ON(!is_agg && freed != 1);
+
+                /*
+                 * An offchannel frame can be send only on the AUX queue, where
+                 * there is no aggregation (and reordering) so it only is single
+                 * skb is expected to be processed.
+                 */
+                WARN_ON(is_offchannel_skb && freed != 1);
         }
 
         iwl_check_abort_status(priv, tx_resp->frame_count, status);
@@ -1239,6 +1254,9 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
                 ieee80211_tx_status(priv->hw, skb);
         }
 
+        if (is_offchannel_skb)
+                iwl_scan_offchannel_skb_status(priv);
+
         return 0;
 }
 
@@ -1341,7 +1359,7 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
                         WARN_ON_ONCE(1);
 
                 info = IEEE80211_SKB_CB(skb);
-                kmem_cache_free(iwl_tx_cmd_pool, (info->driver_data[1]));
+                iwl_trans_free_tx_cmd(priv->trans, info->driver_data[1]);
 
                 if (freed == 1) {
                         /* this is the first skb we deliver in this batch */
diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.c b/drivers/net/wireless/iwlwifi/dvm/ucode.c
index bc40dc68b0f4..b3a314ba48c7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-ucode.c
+++ b/drivers/net/wireless/iwlwifi/dvm/ucode.c
@@ -30,15 +30,16 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 
-#include "iwl-dev.h"
 #include "iwl-io.h"
 #include "iwl-agn-hw.h"
-#include "iwl-agn.h"
-#include "iwl-agn-calib.h"
 #include "iwl-trans.h"
 #include "iwl-fh.h"
 #include "iwl-op-mode.h"
 
+#include "dev.h"
+#include "agn.h"
+#include "calib.h"
+
 /******************************************************************************
  *
  * uCode download functions
@@ -60,8 +61,7 @@ iwl_get_ucode_image(struct iwl_priv *priv, enum iwl_ucode_type ucode_type)
 static int iwl_set_Xtal_calib(struct iwl_priv *priv)
 {
         struct iwl_calib_xtal_freq_cmd cmd;
-        __le16 *xtal_calib =
-                (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_XTAL);
+        __le16 *xtal_calib = priv->eeprom_data->xtal_calib;
 
         iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_CRYSTAL_FRQ_CMD);
         cmd.cap_pin1 = le16_to_cpu(xtal_calib[0]);
@@ -72,12 +72,10 @@ static int iwl_set_Xtal_calib(struct iwl_priv *priv)
 static int iwl_set_temperature_offset_calib(struct iwl_priv *priv)
 {
         struct iwl_calib_temperature_offset_cmd cmd;
-        __le16 *offset_calib =
-                (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_RAW_TEMPERATURE);
 
         memset(&cmd, 0, sizeof(cmd));
         iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD);
-        memcpy(&cmd.radio_sensor_offset, offset_calib, sizeof(*offset_calib));
+        cmd.radio_sensor_offset = priv->eeprom_data->raw_temperature;
         if (!(cmd.radio_sensor_offset))
                 cmd.radio_sensor_offset = DEFAULT_RADIO_SENSOR_OFFSET;
 
@@ -89,27 +87,17 @@ static int iwl_set_temperature_offset_calib(struct iwl_priv *priv)
 static int iwl_set_temperature_offset_calib_v2(struct iwl_priv *priv)
 {
         struct iwl_calib_temperature_offset_v2_cmd cmd;
-        __le16 *offset_calib_high = (__le16 *)iwl_eeprom_query_addr(priv,
-                                     EEPROM_KELVIN_TEMPERATURE);
-        __le16 *offset_calib_low =
-                (__le16 *)iwl_eeprom_query_addr(priv, EEPROM_RAW_TEMPERATURE);
-        struct iwl_eeprom_calib_hdr *hdr;
 
         memset(&cmd, 0, sizeof(cmd));
         iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD);
-        hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv,
-                                                        EEPROM_CALIB_ALL);
-        memcpy(&cmd.radio_sensor_offset_high, offset_calib_high,
-                sizeof(*offset_calib_high));
-        memcpy(&cmd.radio_sensor_offset_low, offset_calib_low,
-                sizeof(*offset_calib_low));
-        if (!(cmd.radio_sensor_offset_low)) {
+        cmd.radio_sensor_offset_high = priv->eeprom_data->kelvin_temperature;
+        cmd.radio_sensor_offset_low = priv->eeprom_data->raw_temperature;
+        if (!cmd.radio_sensor_offset_low) {
                 IWL_DEBUG_CALIB(priv, "no info in EEPROM, use default\n");
                 cmd.radio_sensor_offset_low = DEFAULT_RADIO_SENSOR_OFFSET;
                 cmd.radio_sensor_offset_high = DEFAULT_RADIO_SENSOR_OFFSET;
         }
-        memcpy(&cmd.burntVoltageRef, &hdr->voltage,
-                sizeof(hdr->voltage));
+        cmd.burntVoltageRef = priv->eeprom_data->calib_voltage;
 
         IWL_DEBUG_CALIB(priv, "Radio sensor offset high: %d\n",
                         le16_to_cpu(cmd.radio_sensor_offset_high));
@@ -177,7 +165,7 @@ int iwl_init_alive_start(struct iwl_priv *priv)
         return 0;
 }
 
-int iwl_send_wimax_coex(struct iwl_priv *priv)
+static int iwl_send_wimax_coex(struct iwl_priv *priv)
 {
         struct iwl_wimax_coex_cmd coex_cmd;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h
index 67b28aa7f9be..10e47938b635 100644
--- a/drivers/net/wireless/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/iwlwifi/iwl-config.h
@@ -113,7 +113,7 @@ enum iwl_led_mode {
 #define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE      0
 
 /* TX queue watchdog timeouts in mSecs */
-#define IWL_WATCHHDOG_DISABLED  0
+#define IWL_WATCHDOG_DISABLED   0
 #define IWL_DEF_WD_TIMEOUT      2000
 #define IWL_LONG_WD_TIMEOUT     10000
 #define IWL_MAX_WD_TIMEOUT      120000
@@ -143,7 +143,7 @@ enum iwl_led_mode {
  * @chain_noise_scale: default chain noise scale used for gain computation
  * @wd_timeout: TX queues watchdog timeout
  * @max_event_log_size: size of event log buffer size for ucode event logging
- * @shadow_reg_enable: HW shadhow register bit
+ * @shadow_reg_enable: HW shadow register support
  * @hd_v2: v2 of enhanced sensitivity value, used for 2000 series and up
  * @no_idle_support: do not support idle mode
  */
@@ -182,13 +182,34 @@ struct iwl_bt_params {
         bool bt_sco_disable;
         bool bt_session_2;
 };
+
 /*
  * @use_rts_for_aggregation: use rts/cts protection for HT traffic
+ * @ht40_bands: bitmap of bands (using %IEEE80211_BAND_*) that support HT40
  */
 struct iwl_ht_params {
+        enum ieee80211_smps_mode smps_mode;
         const bool ht_greenfield_support; /* if used set to true */
         bool use_rts_for_aggregation;
-        enum ieee80211_smps_mode smps_mode;
+        u8 ht40_bands;
+};
+
+/*
+ * information on how to parse the EEPROM
+ */
+#define EEPROM_REG_BAND_1_CHANNELS              0x08
+#define EEPROM_REG_BAND_2_CHANNELS              0x26
+#define EEPROM_REG_BAND_3_CHANNELS              0x42
+#define EEPROM_REG_BAND_4_CHANNELS              0x5C
+#define EEPROM_REG_BAND_5_CHANNELS              0x74
+#define EEPROM_REG_BAND_24_HT40_CHANNELS        0x82
+#define EEPROM_REG_BAND_52_HT40_CHANNELS        0x92
+#define EEPROM_6000_REG_BAND_24_HT40_CHANNELS   0x80
+#define EEPROM_REGULATORY_BAND_NO_HT40          0
+
+struct iwl_eeprom_params {
+        const u8 regulatory_bands[7];
+        bool enhanced_txpower;
 };
 
 /**
@@ -243,6 +264,7 @@ struct iwl_cfg {
         /* params likely to change within a device family */
         const struct iwl_ht_params *ht_params;
         const struct iwl_bt_params *bt_params;
+        const struct iwl_eeprom_params *eeprom_params;
         const bool need_temp_offset_calib; /* if used set to true */
         const bool no_xtal_calib;
         enum iwl_led_mode led_mode;
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h
index 59750543fce7..34a5287dfc2f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/iwlwifi/iwl-csr.h
@@ -97,13 +97,10 @@
 /*
  * Hardware revision info
  * Bit fields:
- * 31-8:  Reserved
- *  7-4:  Type of device:  see CSR_HW_REV_TYPE_xxx definitions
+ * 31-16:  Reserved
+ *  15-4:  Type of device:  see CSR_HW_REV_TYPE_xxx definitions
  *  3-2:  Revision step:  0 = A, 1 = B, 2 = C, 3 = D
  *  1-0:  "Dash" (-) value, as in A-1, etc.
- *
- * NOTE:  Revision step affects calculation of CCK txpower for 4965.
- * NOTE:  See also CSR_HW_REV_WA_REG (work-around for bug in 4965).
  */
 #define CSR_HW_REV              (CSR_BASE+0x028)
 
@@ -155,9 +152,21 @@
 #define CSR_DBG_LINK_PWR_MGMT_REG       (CSR_BASE+0x250)
 
 /* Bits for CSR_HW_IF_CONFIG_REG */
-#define CSR_HW_IF_CONFIG_REG_MSK_BOARD_VER      (0x00000C00)
-#define CSR_HW_IF_CONFIG_REG_BIT_MAC_SI         (0x00000100)
+#define CSR_HW_IF_CONFIG_REG_MSK_MAC_DASH       (0x00000003)
+#define CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP       (0x0000000C)
+#define CSR_HW_IF_CONFIG_REG_MSK_BOARD_VER      (0x000000C0)
+#define CSR_HW_IF_CONFIG_REG_BIT_MAC_SI         (0x00000100)
 #define CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI       (0x00000200)
+#define CSR_HW_IF_CONFIG_REG_MSK_PHY_TYPE       (0x00000C00)
+#define CSR_HW_IF_CONFIG_REG_MSK_PHY_DASH       (0x00003000)
+#define CSR_HW_IF_CONFIG_REG_MSK_PHY_STEP       (0x0000C000)
+
+#define CSR_HW_IF_CONFIG_REG_POS_MAC_DASH       (0)
+#define CSR_HW_IF_CONFIG_REG_POS_MAC_STEP       (2)
+#define CSR_HW_IF_CONFIG_REG_POS_BOARD_VER      (6)
+#define CSR_HW_IF_CONFIG_REG_POS_PHY_TYPE       (10)
+#define CSR_HW_IF_CONFIG_REG_POS_PHY_DASH       (12)
+#define CSR_HW_IF_CONFIG_REG_POS_PHY_STEP       (14)
 
 #define CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A   (0x00080000)
 #define CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM (0x00200000)
@@ -270,7 +279,10 @@
 
 
 /* HW REV */
-#define CSR_HW_REV_TYPE_MSK            (0x00001F0)
+#define CSR_HW_REV_DASH(_val)          (((_val) & 0x0000003) >> 0)
+#define CSR_HW_REV_STEP(_val)          (((_val) & 0x000000C) >> 2)
+
+#define CSR_HW_REV_TYPE_MSK            (0x000FFF0)
 #define CSR_HW_REV_TYPE_5300           (0x0000020)
 #define CSR_HW_REV_TYPE_5350           (0x0000030)
 #define CSR_HW_REV_TYPE_5100           (0x0000050)
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.c b/drivers/net/wireless/iwlwifi/iwl-debug.c
index 2d1b42847b9b..0f8fcd1d4fe2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debug.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.c
@@ -62,6 +62,7 @@
  *****************************************************************************/
 
 #include <linux/interrupt.h>
+#include <linux/export.h>
 #include "iwl-debug.h"
 #include "iwl-devtrace.h"
 
@@ -81,8 +82,11 @@ void __iwl_ ##fn(struct device *dev, const char *fmt, ...)	\
 }
 
 __iwl_fn(warn)
+EXPORT_SYMBOL_GPL(__iwl_warn);
 __iwl_fn(info)
+EXPORT_SYMBOL_GPL(__iwl_info);
 __iwl_fn(crit)
+EXPORT_SYMBOL_GPL(__iwl_crit);
 
 void __iwl_err(struct device *dev, bool rfkill_prefix, bool trace_only,
                 const char *fmt, ...)
@@ -103,6 +107,7 @@ void __iwl_err(struct device *dev, bool rfkill_prefix, bool trace_only,
         trace_iwlwifi_err(&vaf);
         va_end(args);
 }
+EXPORT_SYMBOL_GPL(__iwl_err);
 
 #if defined(CONFIG_IWLWIFI_DEBUG) || defined(CONFIG_IWLWIFI_DEVICE_TRACING)
 void __iwl_dbg(struct device *dev,
@@ -125,4 +130,5 @@ void __iwl_dbg(struct device *dev,
         trace_iwlwifi_dbg(level, in_interrupt(), function, &vaf);
         va_end(args);
 }
+EXPORT_SYMBOL_GPL(__iwl_dbg);
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
index 8376b842bdba..42b20b0e83bc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
@@ -38,13 +38,14 @@ static inline bool iwl_have_debug_level(u32 level)
 }
 
 void __iwl_err(struct device *dev, bool rfkill_prefix, bool only_trace,
-                const char *fmt, ...);
-void __iwl_warn(struct device *dev, const char *fmt, ...);
-void __iwl_info(struct device *dev, const char *fmt, ...);
-void __iwl_crit(struct device *dev, const char *fmt, ...);
+                const char *fmt, ...) __printf(4, 5);
+void __iwl_warn(struct device *dev, const char *fmt, ...) __printf(2, 3);
+void __iwl_info(struct device *dev, const char *fmt, ...) __printf(2, 3);
+void __iwl_crit(struct device *dev, const char *fmt, ...) __printf(2, 3);
 
 /* No matter what is m (priv, bus, trans), this will work */
 #define IWL_ERR(m, f, a...) __iwl_err((m)->dev, false, false, f, ## a)
+#define IWL_ERR_DEV(d, f, a...) __iwl_err((d), false, false, f, ## a)
 #define IWL_WARN(m, f, a...) __iwl_warn((m)->dev, f, ## a)
 #define IWL_INFO(m, f, a...) __iwl_info((m)->dev, f, ## a)
 #define IWL_CRIT(m, f, a...) __iwl_crit((m)->dev, f, ## a)
@@ -52,9 +53,9 @@ void __iwl_crit(struct device *dev, const char *fmt, ...);
 #if defined(CONFIG_IWLWIFI_DEBUG) || defined(CONFIG_IWLWIFI_DEVICE_TRACING)
 void __iwl_dbg(struct device *dev,
                u32 level, bool limit, const char *function,
-               const char *fmt, ...);
+               const char *fmt, ...) __printf(5, 6);
 #else
-static inline void
+__printf(5, 6) static inline void
 __iwl_dbg(struct device *dev,
           u32 level, bool limit, const char *function,
           const char *fmt, ...)
@@ -69,6 +70,8 @@ do {									\
 
 #define IWL_DEBUG(m, level, fmt, args...)                               \
         __iwl_dbg((m)->dev, level, false, __func__, fmt, ##args)
+#define IWL_DEBUG_DEV(dev, level, fmt, args...)                         \
+        __iwl_dbg((dev), level, false, __func__, fmt, ##args)
 #define IWL_DEBUG_LIMIT(m, level, fmt, args...)                         \
         __iwl_dbg((m)->dev, level, true, __func__, fmt, ##args)
 
@@ -153,7 +156,7 @@ do {                                            			\
 #define IWL_DEBUG_LED(p, f, a...)       IWL_DEBUG(p, IWL_DL_LED, f, ## a)
 #define IWL_DEBUG_WEP(p, f, a...)       IWL_DEBUG(p, IWL_DL_WEP, f, ## a)
 #define IWL_DEBUG_HC(p, f, a...)        IWL_DEBUG(p, IWL_DL_HCMD, f, ## a)
-#define IWL_DEBUG_EEPROM(p, f, a...)    IWL_DEBUG(p, IWL_DL_EEPROM, f, ## a)
+#define IWL_DEBUG_EEPROM(d, f, a...)    IWL_DEBUG_DEV(d, IWL_DL_EEPROM, f, ## a)
 #define IWL_DEBUG_CALIB(p, f, a...)     IWL_DEBUG(p, IWL_DL_CALIB, f, ## a)
 #define IWL_DEBUG_FW(p, f, a...)        IWL_DEBUG(p, IWL_DL_FW, f, ## a)
 #define IWL_DEBUG_RF_KILL(p, f, a...)   IWL_DEBUG(p, IWL_DL_RF_KILL, f, ## a)
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.c b/drivers/net/wireless/iwlwifi/iwl-devtrace.c
index 91f45e71e0a2..70191ddbd8f6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.c
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.c
@@ -42,4 +42,9 @@ EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ucode_event);
 EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ucode_error);
 EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ucode_cont_event);
 EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dev_ucode_wrap_event);
+EXPORT_TRACEPOINT_SYMBOL(iwlwifi_info);
+EXPORT_TRACEPOINT_SYMBOL(iwlwifi_warn);
+EXPORT_TRACEPOINT_SYMBOL(iwlwifi_crit);
+EXPORT_TRACEPOINT_SYMBOL(iwlwifi_err);
+EXPORT_TRACEPOINT_SYMBOL(iwlwifi_dbg);
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
index 06203d6a1d86..65364793021f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
@@ -28,6 +28,7 @@
 #define __IWLWIFI_DEVICE_TRACE
 
 #include <linux/tracepoint.h>
+#include <linux/device.h>
 
 
 #if !defined(CONFIG_IWLWIFI_DEVICE_TRACING) || defined(__CHECKER__)
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index fac67a526a30..49df0e9d5c5f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -77,8 +77,33 @@
 /* private includes */
 #include "iwl-fw-file.h"
 
+/******************************************************************************
+ *
+ * module boiler plate
+ *
+ ******************************************************************************/
+
+/*
+ * module name, copyright, version, etc.
+ */
+#define DRV_DESCRIPTION "Intel(R) Wireless WiFi driver for Linux"
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+#define VD "d"
+#else
+#define VD
+#endif
+
+#define DRV_VERSION     IWLWIFI_VERSION VD
+
+MODULE_DESCRIPTION(DRV_DESCRIPTION);
+MODULE_VERSION(DRV_VERSION);
+MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
+MODULE_LICENSE("GPL");
+
 /**
  * struct iwl_drv - drv common data
+ * @list: list of drv structures using this opmode
  * @fw: the iwl_fw structure
  * @op_mode: the running op_mode
  * @trans: transport layer
@@ -89,6 +114,7 @@
  * @request_firmware_complete: the firmware has been obtained from user space
  */
 struct iwl_drv {
+        struct list_head list;
         struct iwl_fw fw;
 
         struct iwl_op_mode *op_mode;
@@ -102,7 +128,17 @@ struct iwl_drv {
         struct completion request_firmware_complete;
 };
 
+#define DVM_OP_MODE     0
+#define MVM_OP_MODE     1
 
+static struct iwlwifi_opmode_table {
+        const char *name;                       /* name: iwldvm, iwlmvm, etc */
+        const struct iwl_op_mode_ops *ops;      /* pointer to op_mode ops */
+        struct list_head drv;           /* list of devices using this op_mode */
+} iwlwifi_opmode_table[] = {            /* ops set when driver is initialized */
+        { .name = "iwldvm", .ops = NULL },
+        { .name = "iwlmvm", .ops = NULL },
+};
 
 /*
  * struct fw_sec: Just for the image parsing proccess.
@@ -721,7 +757,6 @@ static int validate_sec_sizes(struct iwl_drv *drv,
         return 0;
 }
 
-
 /**
  * iwl_ucode_callback - callback when firmware was loaded
  *
@@ -733,6 +768,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
         struct iwl_drv *drv = context;
         struct iwl_fw *fw = &drv->fw;
         struct iwl_ucode_header *ucode;
+        struct iwlwifi_opmode_table *op;
         int err;
         struct iwl_firmware_pieces pieces;
         const unsigned int api_max = drv->cfg->ucode_api_max;
@@ -862,10 +898,20 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
         /* We have our copies now, allow OS release its copies */
         release_firmware(ucode_raw);
 
-        drv->op_mode = iwl_dvm_ops.start(drv->trans, drv->cfg, &drv->fw);
+        op = &iwlwifi_opmode_table[DVM_OP_MODE];
 
-        if (!drv->op_mode)
-                goto out_unbind;
+        /* add this device to the list of devices using this op_mode */
+        list_add_tail(&drv->list, &op->drv);
+
+        if (op->ops) {
+                const struct iwl_op_mode_ops *ops = op->ops;
+                drv->op_mode = ops->start(drv->trans, drv->cfg, &drv->fw);
+
+                if (!drv->op_mode)
+                        goto out_unbind;
+        } else {
+                request_module_nowait("%s", op->name);
+        }
 
         /*
          * Complete the firmware request last so that
@@ -943,6 +989,67 @@ struct iwl_mod_params iwlwifi_mod_params = {
         .auto_agg = true,
         /* the rest are 0 by default */
 };
+EXPORT_SYMBOL_GPL(iwlwifi_mod_params);
+
+int iwl_opmode_register(const char *name, const struct iwl_op_mode_ops *ops)
+{
+        int i;
+        struct iwl_drv *drv;
+
+        for (i = 0; i < ARRAY_SIZE(iwlwifi_opmode_table); i++) {
+                if (strcmp(iwlwifi_opmode_table[i].name, name))
+                        continue;
+                iwlwifi_opmode_table[i].ops = ops;
+                list_for_each_entry(drv, &iwlwifi_opmode_table[i].drv, list)
+                        drv->op_mode = ops->start(drv->trans, drv->cfg,
+                                                  &drv->fw);
+                return 0;
+        }
+        return -EIO;
+}
+EXPORT_SYMBOL_GPL(iwl_opmode_register);
+
+void iwl_opmode_deregister(const char *name)
+{
+        int i;
+        struct iwl_drv *drv;
+
+        for (i = 0; i < ARRAY_SIZE(iwlwifi_opmode_table); i++) {
+                if (strcmp(iwlwifi_opmode_table[i].name, name))
+                        continue;
+                iwlwifi_opmode_table[i].ops = NULL;
+
+                /* call the stop routine for all devices */
+                list_for_each_entry(drv, &iwlwifi_opmode_table[i].drv, list) {
+                        if (drv->op_mode) {
+                                iwl_op_mode_stop(drv->op_mode);
+                                drv->op_mode = NULL;
+                        }
+                }
+                return;
+        }
+}
+EXPORT_SYMBOL_GPL(iwl_opmode_deregister);
+
+static int __init iwl_drv_init(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(iwlwifi_opmode_table); i++)
+                INIT_LIST_HEAD(&iwlwifi_opmode_table[i].drv);
+
+        pr_info(DRV_DESCRIPTION ", " DRV_VERSION "\n");
+        pr_info(DRV_COPYRIGHT "\n");
+
+        return iwl_pci_register_driver();
+}
+module_init(iwl_drv_init);
+
+static void __exit iwl_drv_exit(void)
+{
+        iwl_pci_unregister_driver();
+}
+module_exit(iwl_drv_exit);
 
 #ifdef CONFIG_IWLWIFI_DEBUG
 module_param_named(debug, iwlwifi_mod_params.debug_level, uint,
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
new file mode 100644
index 000000000000..c87a05cbec12
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
@@ -0,0 +1,900 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/export.h>
+#include "iwl-modparams.h"
+#include "iwl-eeprom-parse.h"
+
+/* EEPROM offset definitions */
+
+/* indirect access definitions */
+#define ADDRESS_MSK                 0x0000FFFF
+#define INDIRECT_TYPE_MSK           0x000F0000
+#define INDIRECT_HOST               0x00010000
+#define INDIRECT_GENERAL            0x00020000
+#define INDIRECT_REGULATORY         0x00030000
+#define INDIRECT_CALIBRATION        0x00040000
+#define INDIRECT_PROCESS_ADJST      0x00050000
+#define INDIRECT_OTHERS             0x00060000
+#define INDIRECT_TXP_LIMIT          0x00070000
+#define INDIRECT_TXP_LIMIT_SIZE     0x00080000
+#define INDIRECT_ADDRESS            0x00100000
+
+/* corresponding link offsets in EEPROM */
+#define EEPROM_LINK_HOST             (2*0x64)
+#define EEPROM_LINK_GENERAL          (2*0x65)
+#define EEPROM_LINK_REGULATORY       (2*0x66)
+#define EEPROM_LINK_CALIBRATION      (2*0x67)
+#define EEPROM_LINK_PROCESS_ADJST    (2*0x68)
+#define EEPROM_LINK_OTHERS           (2*0x69)
+#define EEPROM_LINK_TXP_LIMIT        (2*0x6a)
+#define EEPROM_LINK_TXP_LIMIT_SIZE   (2*0x6b)
+
+/* General */
+#define EEPROM_DEVICE_ID                    (2*0x08)    /* 2 bytes */
+#define EEPROM_SUBSYSTEM_ID                 (2*0x0A)    /* 2 bytes */
+#define EEPROM_MAC_ADDRESS                  (2*0x15)    /* 6  bytes */
+#define EEPROM_BOARD_REVISION               (2*0x35)    /* 2  bytes */
+#define EEPROM_BOARD_PBA_NUMBER             (2*0x3B+1)  /* 9  bytes */
+#define EEPROM_VERSION                      (2*0x44)    /* 2  bytes */
+#define EEPROM_SKU_CAP                      (2*0x45)    /* 2  bytes */
+#define EEPROM_OEM_MODE                     (2*0x46)    /* 2  bytes */
+#define EEPROM_RADIO_CONFIG                 (2*0x48)    /* 2  bytes */
+#define EEPROM_NUM_MAC_ADDRESS              (2*0x4C)    /* 2  bytes */
+
+/* calibration */
+struct iwl_eeprom_calib_hdr {
+        u8 version;
+        u8 pa_type;
+        __le16 voltage;
+} __packed;
+
+#define EEPROM_CALIB_ALL        (INDIRECT_ADDRESS | INDIRECT_CALIBRATION)
+#define EEPROM_XTAL             ((2*0x128) | EEPROM_CALIB_ALL)
+
+/* temperature */
+#define EEPROM_KELVIN_TEMPERATURE       ((2*0x12A) | EEPROM_CALIB_ALL)
+#define EEPROM_RAW_TEMPERATURE          ((2*0x12B) | EEPROM_CALIB_ALL)
+
+/*
+ * EEPROM bands
+ * These are the channel numbers from each band in the order
+ * that they are stored in the EEPROM band information. Note
+ * that EEPROM bands aren't the same as mac80211 bands, and
+ * there are even special "ht40 bands" in the EEPROM.
+ */
+static const u8 iwl_eeprom_band_1[14] = { /* 2.4 GHz */
+        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
+};
+
+static const u8 iwl_eeprom_band_2[] = { /* 4915-5080MHz */
+        183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16
+};
+
+static const u8 iwl_eeprom_band_3[] = { /* 5170-5320MHz */
+        34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
+};
+
+static const u8 iwl_eeprom_band_4[] = { /* 5500-5700MHz */
+        100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
+};
+
+static const u8 iwl_eeprom_band_5[] = { /* 5725-5825MHz */
+        145, 149, 153, 157, 161, 165
+};
+
+static const u8 iwl_eeprom_band_6[] = { /* 2.4 ht40 channel */
+        1, 2, 3, 4, 5, 6, 7
+};
+
+static const u8 iwl_eeprom_band_7[] = { /* 5.2 ht40 channel */
+        36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157
+};
+
+#define IWL_NUM_CHANNELS        (ARRAY_SIZE(iwl_eeprom_band_1) + \
+                                 ARRAY_SIZE(iwl_eeprom_band_2) + \
+                                 ARRAY_SIZE(iwl_eeprom_band_3) + \
+                                 ARRAY_SIZE(iwl_eeprom_band_4) + \
+                                 ARRAY_SIZE(iwl_eeprom_band_5))
+
+/* rate data (static) */
+static struct ieee80211_rate iwl_cfg80211_rates[] = {
+        { .bitrate = 1 * 10, .hw_value = 0, .hw_value_short = 0, },
+        { .bitrate = 2 * 10, .hw_value = 1, .hw_value_short = 1,
+          .flags = IEEE80211_RATE_SHORT_PREAMBLE, },
+        { .bitrate = 5.5 * 10, .hw_value = 2, .hw_value_short = 2,
+          .flags = IEEE80211_RATE_SHORT_PREAMBLE, },
+        { .bitrate = 11 * 10, .hw_value = 3, .hw_value_short = 3,
+          .flags = IEEE80211_RATE_SHORT_PREAMBLE, },
+        { .bitrate = 6 * 10, .hw_value = 4, .hw_value_short = 4, },
+        { .bitrate = 9 * 10, .hw_value = 5, .hw_value_short = 5, },
+        { .bitrate = 12 * 10, .hw_value = 6, .hw_value_short = 6, },
+        { .bitrate = 18 * 10, .hw_value = 7, .hw_value_short = 7, },
+        { .bitrate = 24 * 10, .hw_value = 8, .hw_value_short = 8, },
+        { .bitrate = 36 * 10, .hw_value = 9, .hw_value_short = 9, },
+        { .bitrate = 48 * 10, .hw_value = 10, .hw_value_short = 10, },
+        { .bitrate = 54 * 10, .hw_value = 11, .hw_value_short = 11, },
+};
+#define RATES_24_OFFS   0
+#define N_RATES_24      ARRAY_SIZE(iwl_cfg80211_rates)
+#define RATES_52_OFFS   4
+#define N_RATES_52      (N_RATES_24 - RATES_52_OFFS)
+
+/* EEPROM reading functions */
+
+static u16 iwl_eeprom_query16(const u8 *eeprom, size_t eeprom_size, int offset)
+{
+        if (WARN_ON(offset + sizeof(u16) > eeprom_size))
+                return 0;
+        return le16_to_cpup((__le16 *)(eeprom + offset));
+}
+
+static u32 eeprom_indirect_address(const u8 *eeprom, size_t eeprom_size,
+                                   u32 address)
+{
+        u16 offset = 0;
+
+        if ((address & INDIRECT_ADDRESS) == 0)
+                return address;
+
+        switch (address & INDIRECT_TYPE_MSK) {
+        case INDIRECT_HOST:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_HOST);
+                break;
+        case INDIRECT_GENERAL:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_GENERAL);
+                break;
+        case INDIRECT_REGULATORY:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_REGULATORY);
+                break;
+        case INDIRECT_TXP_LIMIT:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_TXP_LIMIT);
+                break;
+        case INDIRECT_TXP_LIMIT_SIZE:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_TXP_LIMIT_SIZE);
+                break;
+        case INDIRECT_CALIBRATION:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_CALIBRATION);
+                break;
+        case INDIRECT_PROCESS_ADJST:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_PROCESS_ADJST);
+                break;
+        case INDIRECT_OTHERS:
+                offset = iwl_eeprom_query16(eeprom, eeprom_size,
+                                            EEPROM_LINK_OTHERS);
+                break;
+        default:
+                WARN_ON(1);
+                break;
+        }
+
+        /* translate the offset from words to byte */
+        return (address & ADDRESS_MSK) + (offset << 1);
+}
+
+static const u8 *iwl_eeprom_query_addr(const u8 *eeprom, size_t eeprom_size,
+                                       u32 offset)
+{
+        u32 address = eeprom_indirect_address(eeprom, eeprom_size, offset);
+
+        if (WARN_ON(address >= eeprom_size))
+                return NULL;
+
+        return &eeprom[address];
+}
+
+static int iwl_eeprom_read_calib(const u8 *eeprom, size_t eeprom_size,
+                                 struct iwl_eeprom_data *data)
+{
+        struct iwl_eeprom_calib_hdr *hdr;
+
+        hdr = (void *)iwl_eeprom_query_addr(eeprom, eeprom_size,
+                                            EEPROM_CALIB_ALL);
+        if (!hdr)
+                return -ENODATA;
+        data->calib_version = hdr->version;
+        data->calib_voltage = hdr->voltage;
+
+        return 0;
+}
+
+/**
+ * enum iwl_eeprom_channel_flags - channel flags in EEPROM
+ * @EEPROM_CHANNEL_VALID: channel is usable for this SKU/geo
+ * @EEPROM_CHANNEL_IBSS: usable as an IBSS channel
+ * @EEPROM_CHANNEL_ACTIVE: active scanning allowed
+ * @EEPROM_CHANNEL_RADAR: radar detection required
+ * @EEPROM_CHANNEL_WIDE: 20 MHz channel okay (?)
+ * @EEPROM_CHANNEL_DFS: dynamic freq selection candidate
+ */
+enum iwl_eeprom_channel_flags {
+        EEPROM_CHANNEL_VALID = BIT(0),
+        EEPROM_CHANNEL_IBSS = BIT(1),
+        EEPROM_CHANNEL_ACTIVE = BIT(3),
+        EEPROM_CHANNEL_RADAR = BIT(4),
+        EEPROM_CHANNEL_WIDE = BIT(5),
+        EEPROM_CHANNEL_DFS = BIT(7),
+};
+
+/**
+ * struct iwl_eeprom_channel - EEPROM channel data
+ * @flags: %EEPROM_CHANNEL_* flags
+ * @max_power_avg: max power (in dBm) on this channel, at most 31 dBm
+ */
+struct iwl_eeprom_channel {
+        u8 flags;
+        s8 max_power_avg;
+} __packed;
+
+
+enum iwl_eeprom_enhanced_txpwr_flags {
+        IWL_EEPROM_ENH_TXP_FL_VALID = BIT(0),
+        IWL_EEPROM_ENH_TXP_FL_BAND_52G = BIT(1),
+        IWL_EEPROM_ENH_TXP_FL_OFDM = BIT(2),
+        IWL_EEPROM_ENH_TXP_FL_40MHZ = BIT(3),
+        IWL_EEPROM_ENH_TXP_FL_HT_AP = BIT(4),
+        IWL_EEPROM_ENH_TXP_FL_RES1 = BIT(5),
+        IWL_EEPROM_ENH_TXP_FL_RES2 = BIT(6),
+        IWL_EEPROM_ENH_TXP_FL_COMMON_TYPE = BIT(7),
+};
+
+/**
+ * iwl_eeprom_enhanced_txpwr structure
+ * @flags: entry flags
+ * @channel: channel number
+ * @chain_a_max_pwr: chain a max power in 1/2 dBm
+ * @chain_b_max_pwr: chain b max power in 1/2 dBm
+ * @chain_c_max_pwr: chain c max power in 1/2 dBm
+ * @delta_20_in_40: 20-in-40 deltas (hi/lo)
+ * @mimo2_max_pwr: mimo2 max power in 1/2 dBm
+ * @mimo3_max_pwr: mimo3 max power in 1/2 dBm
+ *
+ * This structure presents the enhanced regulatory tx power limit layout
+ * in an EEPROM image.
+ */
+struct iwl_eeprom_enhanced_txpwr {
+        u8 flags;
+        u8 channel;
+        s8 chain_a_max;
+        s8 chain_b_max;
+        s8 chain_c_max;
+        u8 delta_20_in_40;
+        s8 mimo2_max;
+        s8 mimo3_max;
+} __packed;
+
+static s8 iwl_get_max_txpwr_half_dbm(const struct iwl_eeprom_data *data,
+                                     struct iwl_eeprom_enhanced_txpwr *txp)
+{
+        s8 result = 0; /* (.5 dBm) */
+
+        /* Take the highest tx power from any valid chains */
+        if (data->valid_tx_ant & ANT_A && txp->chain_a_max > result)
+                result = txp->chain_a_max;
+
+        if (data->valid_tx_ant & ANT_B && txp->chain_b_max > result)
+                result = txp->chain_b_max;
+
+        if (data->valid_tx_ant & ANT_C && txp->chain_c_max > result)
+                result = txp->chain_c_max;
+
+        if ((data->valid_tx_ant == ANT_AB ||
+             data->valid_tx_ant == ANT_BC ||
+             data->valid_tx_ant == ANT_AC) && txp->mimo2_max > result)
+                result = txp->mimo2_max;
+
+        if (data->valid_tx_ant == ANT_ABC && txp->mimo3_max > result)
+                result = txp->mimo3_max;
+
+        return result;
+}
+
+#define EEPROM_TXP_OFFS (0x00 | INDIRECT_ADDRESS | INDIRECT_TXP_LIMIT)
+#define EEPROM_TXP_ENTRY_LEN sizeof(struct iwl_eeprom_enhanced_txpwr)
+#define EEPROM_TXP_SZ_OFFS (0x00 | INDIRECT_ADDRESS | INDIRECT_TXP_LIMIT_SIZE)
+
+#define TXP_CHECK_AND_PRINT(x) \
+        ((txp->flags & IWL_EEPROM_ENH_TXP_FL_##x) ? # x " " : "")
+
+static void
+iwl_eeprom_enh_txp_read_element(struct iwl_eeprom_data *data,
+                                struct iwl_eeprom_enhanced_txpwr *txp,
+                                int n_channels, s8 max_txpower_avg)
+{
+        int ch_idx;
+        enum ieee80211_band band;
+
+        band = txp->flags & IWL_EEPROM_ENH_TXP_FL_BAND_52G ?
+                IEEE80211_BAND_5GHZ : IEEE80211_BAND_2GHZ;
+
+        for (ch_idx = 0; ch_idx < n_channels; ch_idx++) {
+                struct ieee80211_channel *chan = &data->channels[ch_idx];
+
+                /* update matching channel or from common data only */
+                if (txp->channel != 0 && chan->hw_value != txp->channel)
+                        continue;
+
+                /* update matching band only */
+                if (band != chan->band)
+                        continue;
+
+                if (chan->max_power < max_txpower_avg &&
+                    !(txp->flags & IWL_EEPROM_ENH_TXP_FL_40MHZ))
+                        chan->max_power = max_txpower_avg;
+        }
+}
+
+static void iwl_eeprom_enhanced_txpower(struct device *dev,
+                                        struct iwl_eeprom_data *data,
+                                        const u8 *eeprom, size_t eeprom_size,
+                                        int n_channels)
+{
+        struct iwl_eeprom_enhanced_txpwr *txp_array, *txp;
+        int idx, entries;
+        __le16 *txp_len;
+        s8 max_txp_avg_halfdbm;
+
+        BUILD_BUG_ON(sizeof(struct iwl_eeprom_enhanced_txpwr) != 8);
+
+        /* the length is in 16-bit words, but we want entries */
+        txp_len = (__le16 *)iwl_eeprom_query_addr(eeprom, eeprom_size,
+                                                  EEPROM_TXP_SZ_OFFS);
+        entries = le16_to_cpup(txp_len) * 2 / EEPROM_TXP_ENTRY_LEN;
+
+        txp_array = (void *)iwl_eeprom_query_addr(eeprom, eeprom_size,
+                                                  EEPROM_TXP_OFFS);
+
+        for (idx = 0; idx < entries; idx++) {
+                txp = &txp_array[idx];
+                /* skip invalid entries */
+                if (!(txp->flags & IWL_EEPROM_ENH_TXP_FL_VALID))
+                        continue;
+
+                IWL_DEBUG_EEPROM(dev, "%s %d:\t %s%s%s%s%s%s%s%s (0x%02x)\n",
+                                 (txp->channel && (txp->flags &
+                                        IWL_EEPROM_ENH_TXP_FL_COMMON_TYPE)) ?
+                                        "Common " : (txp->channel) ?
+                                        "Channel" : "Common",
+                                 (txp->channel),
+                                 TXP_CHECK_AND_PRINT(VALID),
+                                 TXP_CHECK_AND_PRINT(BAND_52G),
+                                 TXP_CHECK_AND_PRINT(OFDM),
+                                 TXP_CHECK_AND_PRINT(40MHZ),
+                                 TXP_CHECK_AND_PRINT(HT_AP),
+                                 TXP_CHECK_AND_PRINT(RES1),
+                                 TXP_CHECK_AND_PRINT(RES2),
+                                 TXP_CHECK_AND_PRINT(COMMON_TYPE),
+                                 txp->flags);
+                IWL_DEBUG_EEPROM(dev,
+                                 "\t\t chain_A: 0x%02x chain_B: 0X%02x chain_C: 0X%02x\n",
+                                 txp->chain_a_max, txp->chain_b_max,
+                                 txp->chain_c_max);
+                IWL_DEBUG_EEPROM(dev,
+                                 "\t\t MIMO2: 0x%02x MIMO3: 0x%02x High 20_on_40: 0x%02x Low 20_on_40: 0x%02x\n",
+                                 txp->mimo2_max, txp->mimo3_max,
+                                 ((txp->delta_20_in_40 & 0xf0) >> 4),
+                                 (txp->delta_20_in_40 & 0x0f));
+
+                max_txp_avg_halfdbm = iwl_get_max_txpwr_half_dbm(data, txp);
+
+                iwl_eeprom_enh_txp_read_element(data, txp, n_channels,
+                                DIV_ROUND_UP(max_txp_avg_halfdbm, 2));
+
+                if (max_txp_avg_halfdbm > data->max_tx_pwr_half_dbm)
+                        data->max_tx_pwr_half_dbm = max_txp_avg_halfdbm;
+        }
+}
+
+static void iwl_init_band_reference(const struct iwl_cfg *cfg,
+                                    const u8 *eeprom, size_t eeprom_size,
+                                    int eeprom_band, int *eeprom_ch_count,
+                                    const struct iwl_eeprom_channel **ch_info,
+                                    const u8 **eeprom_ch_array)
+{
+        u32 offset = cfg->eeprom_params->regulatory_bands[eeprom_band - 1];
+
+        offset |= INDIRECT_ADDRESS | INDIRECT_REGULATORY;
+
+        *ch_info = (void *)iwl_eeprom_query_addr(eeprom, eeprom_size, offset);
+
+        switch (eeprom_band) {
+        case 1:         /* 2.4GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_1);
+                *eeprom_ch_array = iwl_eeprom_band_1;
+                break;
+        case 2:         /* 4.9GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_2);
+                *eeprom_ch_array = iwl_eeprom_band_2;
+                break;
+        case 3:         /* 5.2GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_3);
+                *eeprom_ch_array = iwl_eeprom_band_3;
+                break;
+        case 4:         /* 5.5GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_4);
+                *eeprom_ch_array = iwl_eeprom_band_4;
+                break;
+        case 5:         /* 5.7GHz band */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_5);
+                *eeprom_ch_array = iwl_eeprom_band_5;
+                break;
+        case 6:         /* 2.4GHz ht40 channels */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_6);
+                *eeprom_ch_array = iwl_eeprom_band_6;
+                break;
+        case 7:         /* 5 GHz ht40 channels */
+                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_7);
+                *eeprom_ch_array = iwl_eeprom_band_7;
+                break;
+        default:
+                *eeprom_ch_count = 0;
+                *eeprom_ch_array = NULL;
+                WARN_ON(1);
+        }
+}
+
+#define CHECK_AND_PRINT(x) \
+        ((eeprom_ch->flags & EEPROM_CHANNEL_##x) ? # x " " : "")
+
+static void iwl_mod_ht40_chan_info(struct device *dev,
+                                   struct iwl_eeprom_data *data, int n_channels,
+                                   enum ieee80211_band band, u16 channel,
+                                   const struct iwl_eeprom_channel *eeprom_ch,
+                                   u8 clear_ht40_extension_channel)
+{
+        struct ieee80211_channel *chan = NULL;
+        int i;
+
+        for (i = 0; i < n_channels; i++) {
+                if (data->channels[i].band != band)
+                        continue;
+                if (data->channels[i].hw_value != channel)
+                        continue;
+                chan = &data->channels[i];
+                break;
+        }
+
+        if (!chan)
+                return;
+
+        IWL_DEBUG_EEPROM(dev,
+                         "HT40 Ch. %d [%sGHz] %s%s%s%s%s(0x%02x %ddBm): Ad-Hoc %ssupported\n",
+                         channel,
+                         band == IEEE80211_BAND_5GHZ ? "5.2" : "2.4",
+                         CHECK_AND_PRINT(IBSS),
+                         CHECK_AND_PRINT(ACTIVE),
+                         CHECK_AND_PRINT(RADAR),
+                         CHECK_AND_PRINT(WIDE),
+                         CHECK_AND_PRINT(DFS),
+                         eeprom_ch->flags,
+                         eeprom_ch->max_power_avg,
+                         ((eeprom_ch->flags & EEPROM_CHANNEL_IBSS) &&
+                          !(eeprom_ch->flags & EEPROM_CHANNEL_RADAR)) ? ""
+                                                                      : "not ");
+
+        if (eeprom_ch->flags & EEPROM_CHANNEL_VALID)
+                chan->flags &= ~clear_ht40_extension_channel;
+}
+
+#define CHECK_AND_PRINT_I(x)    \
+        ((eeprom_ch_info[ch_idx].flags & EEPROM_CHANNEL_##x) ? # x " " : "")
+
+static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
+                                struct iwl_eeprom_data *data,
+                                const u8 *eeprom, size_t eeprom_size)
+{
+        int band, ch_idx;
+        const struct iwl_eeprom_channel *eeprom_ch_info;
+        const u8 *eeprom_ch_array;
+        int eeprom_ch_count;
+        int n_channels = 0;
+
+        /*
+         * Loop through the 5 EEPROM bands and add them to the parse list
+         */
+        for (band = 1; band <= 5; band++) {
+                struct ieee80211_channel *channel;
+
+                iwl_init_band_reference(cfg, eeprom, eeprom_size, band,
+                                        &eeprom_ch_count, &eeprom_ch_info,
+                                        &eeprom_ch_array);
+
+                /* Loop through each band adding each of the channels */
+                for (ch_idx = 0; ch_idx < eeprom_ch_count; ch_idx++) {
+                        const struct iwl_eeprom_channel *eeprom_ch;
+
+                        eeprom_ch = &eeprom_ch_info[ch_idx];
+
+                        if (!(eeprom_ch->flags & EEPROM_CHANNEL_VALID)) {
+                                IWL_DEBUG_EEPROM(dev,
+                                                 "Ch. %d Flags %x [%sGHz] - No traffic\n",
+                                                 eeprom_ch_array[ch_idx],
+                                                 eeprom_ch_info[ch_idx].flags,
+                                                 (band != 1) ? "5.2" : "2.4");
+                                continue;
+                        }
+
+                        channel = &data->channels[n_channels];
+                        n_channels++;
+
+                        channel->hw_value = eeprom_ch_array[ch_idx];
+                        channel->band = (band == 1) ? IEEE80211_BAND_2GHZ
+                                                    : IEEE80211_BAND_5GHZ;
+                        channel->center_freq =
+                                ieee80211_channel_to_frequency(
+                                        channel->hw_value, channel->band);
+
+                        /* set no-HT40, will enable as appropriate later */
+                        channel->flags = IEEE80211_CHAN_NO_HT40;
+
+                        if (!(eeprom_ch->flags & EEPROM_CHANNEL_IBSS))
+                                channel->flags |= IEEE80211_CHAN_NO_IBSS;
+
+                        if (!(eeprom_ch->flags & EEPROM_CHANNEL_ACTIVE))
+                                channel->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
+
+                        if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR)
+                                channel->flags |= IEEE80211_CHAN_RADAR;
+
+                        /* Initialize regulatory-based run-time data */
+                        channel->max_power =
+                                eeprom_ch_info[ch_idx].max_power_avg;
+                        IWL_DEBUG_EEPROM(dev,
+                                         "Ch. %d [%sGHz] %s%s%s%s%s%s(0x%02x %ddBm): Ad-Hoc %ssupported\n",
+                                         channel->hw_value,
+                                         (band != 1) ? "5.2" : "2.4",
+                                         CHECK_AND_PRINT_I(VALID),
+                                         CHECK_AND_PRINT_I(IBSS),
+                                         CHECK_AND_PRINT_I(ACTIVE),
+                                         CHECK_AND_PRINT_I(RADAR),
+                                         CHECK_AND_PRINT_I(WIDE),
+                                         CHECK_AND_PRINT_I(DFS),
+                                         eeprom_ch_info[ch_idx].flags,
+                                         eeprom_ch_info[ch_idx].max_power_avg,
+                                         ((eeprom_ch_info[ch_idx].flags &
+                                                        EEPROM_CHANNEL_IBSS) &&
+                                          !(eeprom_ch_info[ch_idx].flags &
+                                                        EEPROM_CHANNEL_RADAR))
+                                                ? "" : "not ");
+                }
+        }
+
+        if (cfg->eeprom_params->enhanced_txpower) {
+                /*
+                 * for newer device (6000 series and up)
+                 * EEPROM contain enhanced tx power information
+                 * driver need to process addition information
+                 * to determine the max channel tx power limits
+                 */
+                iwl_eeprom_enhanced_txpower(dev, data, eeprom, eeprom_size,
+                                            n_channels);
+        } else {
+                /* All others use data from channel map */
+                int i;
+
+                data->max_tx_pwr_half_dbm = -128;
+
+                for (i = 0; i < n_channels; i++)
+                        data->max_tx_pwr_half_dbm =
+                                max_t(s8, data->max_tx_pwr_half_dbm,
+                                      data->channels[i].max_power * 2);
+        }
+
+        /* Check if we do have HT40 channels */
+        if (cfg->eeprom_params->regulatory_bands[5] ==
+                                EEPROM_REGULATORY_BAND_NO_HT40 &&
+            cfg->eeprom_params->regulatory_bands[6] ==
+                                EEPROM_REGULATORY_BAND_NO_HT40)
+                return n_channels;
+
+        /* Two additional EEPROM bands for 2.4 and 5 GHz HT40 channels */
+        for (band = 6; band <= 7; band++) {
+                enum ieee80211_band ieeeband;
+
+                iwl_init_band_reference(cfg, eeprom, eeprom_size, band,
+                                        &eeprom_ch_count, &eeprom_ch_info,
+                                        &eeprom_ch_array);
+
+                /* EEPROM band 6 is 2.4, band 7 is 5 GHz */
+                ieeeband = (band == 6) ? IEEE80211_BAND_2GHZ
+                                       : IEEE80211_BAND_5GHZ;
+
+                /* Loop through each band adding each of the channels */
+                for (ch_idx = 0; ch_idx < eeprom_ch_count; ch_idx++) {
+                        /* Set up driver's info for lower half */
+                        iwl_mod_ht40_chan_info(dev, data, n_channels, ieeeband,
+                                               eeprom_ch_array[ch_idx],
+                                               &eeprom_ch_info[ch_idx],
+                                               IEEE80211_CHAN_NO_HT40PLUS);
+
+                        /* Set up driver's info for upper half */
+                        iwl_mod_ht40_chan_info(dev, data, n_channels, ieeeband,
+                                               eeprom_ch_array[ch_idx] + 4,
+                                               &eeprom_ch_info[ch_idx],
+                                               IEEE80211_CHAN_NO_HT40MINUS);
+                }
+        }
+
+        return n_channels;
+}
+
+static int iwl_init_sband_channels(struct iwl_eeprom_data *data,
+                                   struct ieee80211_supported_band *sband,
+                                   int n_channels, enum ieee80211_band band)
+{
+        struct ieee80211_channel *chan = &data->channels[0];
+        int n = 0, idx = 0;
+
+        while (chan->band != band && idx < n_channels)
+                chan = &data->channels[++idx];
+
+        sband->channels = &data->channels[idx];
+
+        while (chan->band == band && idx < n_channels) {
+                chan = &data->channels[++idx];
+                n++;
+        }
+
+        sband->n_channels = n;
+
+        return n;
+}
+
+#define MAX_BIT_RATE_40_MHZ     150 /* Mbps */
+#define MAX_BIT_RATE_20_MHZ     72 /* Mbps */
+
+static void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg,
+                                 struct iwl_eeprom_data *data,
+                                 struct ieee80211_sta_ht_cap *ht_info,
+                                 enum ieee80211_band band)
+{
+        int max_bit_rate = 0;
+        u8 rx_chains;
+        u8 tx_chains;
+
+        tx_chains = hweight8(data->valid_tx_ant);
+        if (cfg->rx_with_siso_diversity)
+                rx_chains = 1;
+        else
+                rx_chains = hweight8(data->valid_rx_ant);
+
+        if (!(data->sku & EEPROM_SKU_CAP_11N_ENABLE) || !cfg->ht_params) {
+                ht_info->ht_supported = false;
+                return;
+        }
+
+        ht_info->ht_supported = true;
+        ht_info->cap = 0;
+
+        if (iwlwifi_mod_params.amsdu_size_8K)
+                ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;
+
+        ht_info->ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
+        ht_info->ampdu_density = IEEE80211_HT_MPDU_DENSITY_4;
+
+        ht_info->mcs.rx_mask[0] = 0xFF;
+        if (rx_chains >= 2)
+                ht_info->mcs.rx_mask[1] = 0xFF;
+        if (rx_chains >= 3)
+                ht_info->mcs.rx_mask[2] = 0xFF;
+
+        if (cfg->ht_params->ht_greenfield_support)
+                ht_info->cap |= IEEE80211_HT_CAP_GRN_FLD;
+        ht_info->cap |= IEEE80211_HT_CAP_SGI_20;
+
+        max_bit_rate = MAX_BIT_RATE_20_MHZ;
+
+        if (cfg->ht_params->ht40_bands & BIT(band)) {
+                ht_info->cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+                ht_info->cap |= IEEE80211_HT_CAP_SGI_40;
+                ht_info->mcs.rx_mask[4] = 0x01;
+                max_bit_rate = MAX_BIT_RATE_40_MHZ;
+        }
+
+        /* Highest supported Rx data rate */
+        max_bit_rate *= rx_chains;
+        WARN_ON(max_bit_rate & ~IEEE80211_HT_MCS_RX_HIGHEST_MASK);
+        ht_info->mcs.rx_highest = cpu_to_le16(max_bit_rate);
+
+        /* Tx MCS capabilities */
+        ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
+        if (tx_chains != rx_chains) {
+                ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_RX_DIFF;
+                ht_info->mcs.tx_params |= ((tx_chains - 1) <<
+                                IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT);
+        }
+}
+
+static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg,
+                            struct iwl_eeprom_data *data,
+                            const u8 *eeprom, size_t eeprom_size)
+{
+        int n_channels = iwl_init_channel_map(dev, cfg, data,
+                                              eeprom, eeprom_size);
+        int n_used = 0;
+        struct ieee80211_supported_band *sband;
+
+        sband = &data->bands[IEEE80211_BAND_2GHZ];
+        sband->band = IEEE80211_BAND_2GHZ;
+        sband->bitrates = &iwl_cfg80211_rates[RATES_24_OFFS];
+        sband->n_bitrates = N_RATES_24;
+        n_used += iwl_init_sband_channels(data, sband, n_channels,
+                                          IEEE80211_BAND_2GHZ);
+        iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, IEEE80211_BAND_2GHZ);
+
+        sband = &data->bands[IEEE80211_BAND_5GHZ];
+        sband->band = IEEE80211_BAND_5GHZ;
+        sband->bitrates = &iwl_cfg80211_rates[RATES_52_OFFS];
+        sband->n_bitrates = N_RATES_52;
+        n_used += iwl_init_sband_channels(data, sband, n_channels,
+                                          IEEE80211_BAND_5GHZ);
+        iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, IEEE80211_BAND_5GHZ);
+
+        if (n_channels != n_used)
+                IWL_ERR_DEV(dev, "EEPROM: used only %d of %d channels\n",
+                            n_used, n_channels);
+}
+
+/* EEPROM data functions */
+
+struct iwl_eeprom_data *
+iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg,
+                      const u8 *eeprom, size_t eeprom_size)
+{
+        struct iwl_eeprom_data *data;
+        const void *tmp;
+
+        if (WARN_ON(!cfg || !cfg->eeprom_params))
+                return NULL;
+
+        data = kzalloc(sizeof(*data) +
+                       sizeof(struct ieee80211_channel) * IWL_NUM_CHANNELS,
+                       GFP_KERNEL);
+        if (!data)
+                return NULL;
+
+        /* get MAC address(es) */
+        tmp = iwl_eeprom_query_addr(eeprom, eeprom_size, EEPROM_MAC_ADDRESS);
+        if (!tmp)
+                goto err_free;
+        memcpy(data->hw_addr, tmp, ETH_ALEN);
+        data->n_hw_addrs = iwl_eeprom_query16(eeprom, eeprom_size,
+                                              EEPROM_NUM_MAC_ADDRESS);
+
+        if (iwl_eeprom_read_calib(eeprom, eeprom_size, data))
+                goto err_free;
+
+        tmp = iwl_eeprom_query_addr(eeprom, eeprom_size, EEPROM_XTAL);
+        if (!tmp)
+                goto err_free;
+        memcpy(data->xtal_calib, tmp, sizeof(data->xtal_calib));
+
+        tmp = iwl_eeprom_query_addr(eeprom, eeprom_size,
+                                    EEPROM_RAW_TEMPERATURE);
+        if (!tmp)
+                goto err_free;
+        data->raw_temperature = *(__le16 *)tmp;
+
+        tmp = iwl_eeprom_query_addr(eeprom, eeprom_size,
+                                    EEPROM_KELVIN_TEMPERATURE);
+        if (!tmp)
+                goto err_free;
+        data->kelvin_temperature = *(__le16 *)tmp;
+        data->kelvin_voltage = *((__le16 *)tmp + 1);
+
+        data->radio_cfg = iwl_eeprom_query16(eeprom, eeprom_size,
+                                             EEPROM_RADIO_CONFIG);
+        data->sku = iwl_eeprom_query16(eeprom, eeprom_size,
+                                       EEPROM_SKU_CAP);
+        data->eeprom_version = iwl_eeprom_query16(eeprom, eeprom_size,
+                                                  EEPROM_VERSION);
+
+        data->valid_tx_ant = EEPROM_RF_CFG_TX_ANT_MSK(data->radio_cfg);
+        data->valid_rx_ant = EEPROM_RF_CFG_RX_ANT_MSK(data->radio_cfg);
+
+        /* check overrides (some devices have wrong EEPROM) */
+        if (cfg->valid_tx_ant)
+                data->valid_tx_ant = cfg->valid_tx_ant;
+        if (cfg->valid_rx_ant)
+                data->valid_rx_ant = cfg->valid_rx_ant;
+
+        if (!data->valid_tx_ant || !data->valid_rx_ant) {
+                IWL_ERR_DEV(dev, "invalid antennas (0x%x, 0x%x)\n",
+                            data->valid_tx_ant, data->valid_rx_ant);
+                goto err_free;
+        }
+
+        iwl_init_sbands(dev, cfg, data, eeprom, eeprom_size);
+
+        return data;
+ err_free:
+        kfree(data);
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(iwl_parse_eeprom_data);
+
+/* helper functions */
+int iwl_eeprom_check_version(struct iwl_eeprom_data *data,
+                             struct iwl_trans *trans)
+{
+        if (data->eeprom_version >= trans->cfg->eeprom_ver ||
+            data->calib_version >= trans->cfg->eeprom_calib_ver) {
+                IWL_INFO(trans, "device EEPROM VER=0x%x, CALIB=0x%x\n",
+                         data->eeprom_version, data->calib_version);
+                return 0;
+        }
+
+        IWL_ERR(trans,
+                "Unsupported (too old) EEPROM VER=0x%x < 0x%x CALIB=0x%x < 0x%x\n",
+                data->eeprom_version, trans->cfg->eeprom_ver,
+                data->calib_version,  trans->cfg->eeprom_calib_ver);
+        return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(iwl_eeprom_check_version);
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
new file mode 100644
index 000000000000..9c07c670a1ce
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
@@ -0,0 +1,138 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+#ifndef __iwl_eeprom_parse_h__
+#define __iwl_eeprom_parse_h__
+
+#include <linux/types.h>
+#include <linux/if_ether.h>
+#include "iwl-trans.h"
+
+/* SKU Capabilities (actual values from EEPROM definition) */
+#define EEPROM_SKU_CAP_BAND_24GHZ       (1 << 4)
+#define EEPROM_SKU_CAP_BAND_52GHZ       (1 << 5)
+#define EEPROM_SKU_CAP_11N_ENABLE       (1 << 6)
+#define EEPROM_SKU_CAP_AMT_ENABLE       (1 << 7)
+#define EEPROM_SKU_CAP_IPAN_ENABLE      (1 << 8)
+
+/* radio config bits (actual values from EEPROM definition) */
+#define EEPROM_RF_CFG_TYPE_MSK(x)   (x & 0x3)         /* bits 0-1   */
+#define EEPROM_RF_CFG_STEP_MSK(x)   ((x >> 2)  & 0x3) /* bits 2-3   */
+#define EEPROM_RF_CFG_DASH_MSK(x)   ((x >> 4)  & 0x3) /* bits 4-5   */
+#define EEPROM_RF_CFG_PNUM_MSK(x)   ((x >> 6)  & 0x3) /* bits 6-7   */
+#define EEPROM_RF_CFG_TX_ANT_MSK(x) ((x >> 8)  & 0xF) /* bits 8-11  */
+#define EEPROM_RF_CFG_RX_ANT_MSK(x) ((x >> 12) & 0xF) /* bits 12-15 */
+
+struct iwl_eeprom_data {
+        int n_hw_addrs;
+        u8 hw_addr[ETH_ALEN];
+
+        u16 radio_config;
+
+        u8 calib_version;
+        __le16 calib_voltage;
+
+        __le16 raw_temperature;
+        __le16 kelvin_temperature;
+        __le16 kelvin_voltage;
+        __le16 xtal_calib[2];
+
+        u16 sku;
+        u16 radio_cfg;
+        u16 eeprom_version;
+        s8 max_tx_pwr_half_dbm;
+
+        u8 valid_tx_ant, valid_rx_ant;
+
+        struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
+        struct ieee80211_channel channels[];
+};
+
+/**
+ * iwl_parse_eeprom_data - parse EEPROM data and return values
+ *
+ * @dev: device pointer we're parsing for, for debug only
+ * @cfg: device configuration for parsing and overrides
+ * @eeprom: the EEPROM data
+ * @eeprom_size: length of the EEPROM data
+ *
+ * This function parses all EEPROM values we need and then
+ * returns a (newly allocated) struct containing all the
+ * relevant values for driver use. The struct must be freed
+ * later with iwl_free_eeprom_data().
+ */
+struct iwl_eeprom_data *
+iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg,
+                      const u8 *eeprom, size_t eeprom_size);
+
+/**
+ * iwl_free_eeprom_data - free EEPROM data
+ * @data: the data to free
+ */
+static inline void iwl_free_eeprom_data(struct iwl_eeprom_data *data)
+{
+        kfree(data);
+}
+
+int iwl_eeprom_check_version(struct iwl_eeprom_data *data,
+                             struct iwl_trans *trans);
+
+#endif /* __iwl_eeprom_parse_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
new file mode 100644
index 000000000000..27c7da3c6ed1
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
@@ -0,0 +1,463 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/export.h>
+
+#include "iwl-debug.h"
+#include "iwl-eeprom-read.h"
+#include "iwl-io.h"
+#include "iwl-prph.h"
+#include "iwl-csr.h"
+
+/*
+ * EEPROM access time values:
+ *
+ * Driver initiates EEPROM read by writing byte address << 1 to CSR_EEPROM_REG.
+ * Driver then polls CSR_EEPROM_REG for CSR_EEPROM_REG_READ_VALID_MSK (0x1).
+ * When polling, wait 10 uSec between polling loops, up to a maximum 5000 uSec.
+ * Driver reads 16-bit value from bits 31-16 of CSR_EEPROM_REG.
+ */
+#define IWL_EEPROM_ACCESS_TIMEOUT       5000 /* uSec */
+
+#define IWL_EEPROM_SEM_TIMEOUT          10   /* microseconds */
+#define IWL_EEPROM_SEM_RETRY_LIMIT      1000 /* number of attempts (not time) */
+
+
+/*
+ * The device's EEPROM semaphore prevents conflicts between driver and uCode
+ * when accessing the EEPROM; each access is a series of pulses to/from the
+ * EEPROM chip, not a single event, so even reads could conflict if they
+ * weren't arbitrated by the semaphore.
+ */
+
+#define EEPROM_SEM_TIMEOUT 10           /* milliseconds */
+#define EEPROM_SEM_RETRY_LIMIT 1000     /* number of attempts (not time) */
+
+static int iwl_eeprom_acquire_semaphore(struct iwl_trans *trans)
+{
+        u16 count;
+        int ret;
+
+        for (count = 0; count < EEPROM_SEM_RETRY_LIMIT; count++) {
+                /* Request semaphore */
+                iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,
+                            CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
+
+                /* See if we got it */
+                ret = iwl_poll_bit(trans, CSR_HW_IF_CONFIG_REG,
+                                CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
+                                CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
+                                EEPROM_SEM_TIMEOUT);
+                if (ret >= 0) {
+                        IWL_DEBUG_EEPROM(trans->dev,
+                                         "Acquired semaphore after %d tries.\n",
+                                         count+1);
+                        return ret;
+                }
+        }
+
+        return ret;
+}
+
+static void iwl_eeprom_release_semaphore(struct iwl_trans *trans)
+{
+        iwl_clear_bit(trans, CSR_HW_IF_CONFIG_REG,
+                      CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
+}
+
+static int iwl_eeprom_verify_signature(struct iwl_trans *trans, bool nvm_is_otp)
+{
+        u32 gp = iwl_read32(trans, CSR_EEPROM_GP) & CSR_EEPROM_GP_VALID_MSK;
+
+        IWL_DEBUG_EEPROM(trans->dev, "EEPROM signature=0x%08x\n", gp);
+
+        switch (gp) {
+        case CSR_EEPROM_GP_BAD_SIG_EEP_GOOD_SIG_OTP:
+                if (!nvm_is_otp) {
+                        IWL_ERR(trans, "EEPROM with bad signature: 0x%08x\n",
+                                gp);
+                        return -ENOENT;
+                }
+                return 0;
+        case CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K:
+        case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K:
+                if (nvm_is_otp) {
+                        IWL_ERR(trans, "OTP with bad signature: 0x%08x\n", gp);
+                        return -ENOENT;
+                }
+                return 0;
+        case CSR_EEPROM_GP_BAD_SIGNATURE_BOTH_EEP_AND_OTP:
+        default:
+                IWL_ERR(trans,
+                        "bad EEPROM/OTP signature, type=%s, EEPROM_GP=0x%08x\n",
+                        nvm_is_otp ? "OTP" : "EEPROM", gp);
+                return -ENOENT;
+        }
+}
+
+/******************************************************************************
+ *
+ * OTP related functions
+ *
+******************************************************************************/
+
+static void iwl_set_otp_access_absolute(struct iwl_trans *trans)
+{
+        iwl_read32(trans, CSR_OTP_GP_REG);
+
+        iwl_clear_bit(trans, CSR_OTP_GP_REG,
+                      CSR_OTP_GP_REG_OTP_ACCESS_MODE);
+}
+
+static int iwl_nvm_is_otp(struct iwl_trans *trans)
+{
+        u32 otpgp;
+
+        /* OTP only valid for CP/PP and after */
+        switch (trans->hw_rev & CSR_HW_REV_TYPE_MSK) {
+        case CSR_HW_REV_TYPE_NONE:
+                IWL_ERR(trans, "Unknown hardware type\n");
+                return -EIO;
+        case CSR_HW_REV_TYPE_5300:
+        case CSR_HW_REV_TYPE_5350:
+        case CSR_HW_REV_TYPE_5100:
+        case CSR_HW_REV_TYPE_5150:
+                return 0;
+        default:
+                otpgp = iwl_read32(trans, CSR_OTP_GP_REG);
+                if (otpgp & CSR_OTP_GP_REG_DEVICE_SELECT)
+                        return 1;
+                return 0;
+        }
+}
+
+static int iwl_init_otp_access(struct iwl_trans *trans)
+{
+        int ret;
+
+        /* Enable 40MHz radio clock */
+        iwl_write32(trans, CSR_GP_CNTRL,
+                    iwl_read32(trans, CSR_GP_CNTRL) |
+                    CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
+
+        /* wait for clock to be ready */
+        ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
+                           CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
+                           CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
+                           25000);
+        if (ret < 0) {
+                IWL_ERR(trans, "Time out access OTP\n");
+        } else {
+                iwl_set_bits_prph(trans, APMG_PS_CTRL_REG,
+                                  APMG_PS_CTRL_VAL_RESET_REQ);
+                udelay(5);
+                iwl_clear_bits_prph(trans, APMG_PS_CTRL_REG,
+                                    APMG_PS_CTRL_VAL_RESET_REQ);
+
+                /*
+                 * CSR auto clock gate disable bit -
+                 * this is only applicable for HW with OTP shadow RAM
+                 */
+                if (trans->cfg->base_params->shadow_ram_support)
+                        iwl_set_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,
+                                    CSR_RESET_LINK_PWR_MGMT_DISABLED);
+        }
+        return ret;
+}
+
+static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr,
+                             __le16 *eeprom_data)
+{
+        int ret = 0;
+        u32 r;
+        u32 otpgp;
+
+        iwl_write32(trans, CSR_EEPROM_REG,
+                    CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
+        ret = iwl_poll_bit(trans, CSR_EEPROM_REG,
+                                 CSR_EEPROM_REG_READ_VALID_MSK,
+                                 CSR_EEPROM_REG_READ_VALID_MSK,
+                                 IWL_EEPROM_ACCESS_TIMEOUT);
+        if (ret < 0) {
+                IWL_ERR(trans, "Time out reading OTP[%d]\n", addr);
+                return ret;
+        }
+        r = iwl_read32(trans, CSR_EEPROM_REG);
+        /* check for ECC errors: */
+        otpgp = iwl_read32(trans, CSR_OTP_GP_REG);
+        if (otpgp & CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK) {
+                /* stop in this case */
+                /* set the uncorrectable OTP ECC bit for acknowledgement */
+                iwl_set_bit(trans, CSR_OTP_GP_REG,
+                            CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
+                IWL_ERR(trans, "Uncorrectable OTP ECC error, abort OTP read\n");
+                return -EINVAL;
+        }
+        if (otpgp & CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK) {
+                /* continue in this case */
+                /* set the correctable OTP ECC bit for acknowledgement */
+                iwl_set_bit(trans, CSR_OTP_GP_REG,
+                            CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK);
+                IWL_ERR(trans, "Correctable OTP ECC error, continue read\n");
+        }
+        *eeprom_data = cpu_to_le16(r >> 16);
+        return 0;
+}
+
+/*
+ * iwl_is_otp_empty: check for empty OTP
+ */
+static bool iwl_is_otp_empty(struct iwl_trans *trans)
+{
+        u16 next_link_addr = 0;
+        __le16 link_value;
+        bool is_empty = false;
+
+        /* locate the beginning of OTP link list */
+        if (!iwl_read_otp_word(trans, next_link_addr, &link_value)) {
+                if (!link_value) {
+                        IWL_ERR(trans, "OTP is empty\n");
+                        is_empty = true;
+                }
+        } else {
+                IWL_ERR(trans, "Unable to read first block of OTP list.\n");
+                is_empty = true;
+        }
+
+        return is_empty;
+}
+
+
+/*
+ * iwl_find_otp_image: find EEPROM image in OTP
+ *   finding the OTP block that contains the EEPROM image.
+ *   the last valid block on the link list (the block _before_ the last block)
+ *   is the block we should read and used to configure the device.
+ *   If all the available OTP blocks are full, the last block will be the block
+ *   we should read and used to configure the device.
+ *   only perform this operation if shadow RAM is disabled
+ */
+static int iwl_find_otp_image(struct iwl_trans *trans,
+                                        u16 *validblockaddr)
+{
+        u16 next_link_addr = 0, valid_addr;
+        __le16 link_value = 0;
+        int usedblocks = 0;
+
+        /* set addressing mode to absolute to traverse the link list */
+        iwl_set_otp_access_absolute(trans);
+
+        /* checking for empty OTP or error */
+        if (iwl_is_otp_empty(trans))
+                return -EINVAL;
+
+        /*
+         * start traverse link list
+         * until reach the max number of OTP blocks
+         * different devices have different number of OTP blocks
+         */
+        do {
+                /* save current valid block address
+                 * check for more block on the link list
+                 */
+                valid_addr = next_link_addr;
+                next_link_addr = le16_to_cpu(link_value) * sizeof(u16);
+                IWL_DEBUG_EEPROM(trans->dev, "OTP blocks %d addr 0x%x\n",
+                                 usedblocks, next_link_addr);
+                if (iwl_read_otp_word(trans, next_link_addr, &link_value))
+                        return -EINVAL;
+                if (!link_value) {
+                        /*
+                         * reach the end of link list, return success and
+                         * set address point to the starting address
+                         * of the image
+                         */
+                        *validblockaddr = valid_addr;
+                        /* skip first 2 bytes (link list pointer) */
+                        *validblockaddr += 2;
+                        return 0;
+                }
+                /* more in the link list, continue */
+                usedblocks++;
+        } while (usedblocks <= trans->cfg->base_params->max_ll_items);
+
+        /* OTP has no valid blocks */
+        IWL_DEBUG_EEPROM(trans->dev, "OTP has no valid blocks\n");
+        return -EINVAL;
+}
+
+/**
+ * iwl_read_eeprom - read EEPROM contents
+ *
+ * Load the EEPROM contents from adapter and return it
+ * and its size.
+ *
+ * NOTE:  This routine uses the non-debug IO access functions.
+ */
+int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size)
+{
+        __le16 *e;
+        u32 gp = iwl_read32(trans, CSR_EEPROM_GP);
+        int sz;
+        int ret;
+        u16 addr;
+        u16 validblockaddr = 0;
+        u16 cache_addr = 0;
+        int nvm_is_otp;
+
+        if (!eeprom || !eeprom_size)
+                return -EINVAL;
+
+        nvm_is_otp = iwl_nvm_is_otp(trans);
+        if (nvm_is_otp < 0)
+                return nvm_is_otp;
+
+        sz = trans->cfg->base_params->eeprom_size;
+        IWL_DEBUG_EEPROM(trans->dev, "NVM size = %d\n", sz);
+
+        e = kmalloc(sz, GFP_KERNEL);
+        if (!e)
+                return -ENOMEM;
+
+        ret = iwl_eeprom_verify_signature(trans, nvm_is_otp);
+        if (ret < 0) {
+                IWL_ERR(trans, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);
+                goto err_free;
+        }
+
+        /* Make sure driver (instead of uCode) is allowed to read EEPROM */
+        ret = iwl_eeprom_acquire_semaphore(trans);
+        if (ret < 0) {
+                IWL_ERR(trans, "Failed to acquire EEPROM semaphore.\n");
+                goto err_free;
+        }
+
+        if (nvm_is_otp) {
+                ret = iwl_init_otp_access(trans);
+                if (ret) {
+                        IWL_ERR(trans, "Failed to initialize OTP access.\n");
+                        goto err_unlock;
+                }
+
+                iwl_write32(trans, CSR_EEPROM_GP,
+                            iwl_read32(trans, CSR_EEPROM_GP) &
+                            ~CSR_EEPROM_GP_IF_OWNER_MSK);
+
+                iwl_set_bit(trans, CSR_OTP_GP_REG,
+                            CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK |
+                            CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
+                /* traversing the linked list if no shadow ram supported */
+                if (!trans->cfg->base_params->shadow_ram_support) {
+                        ret = iwl_find_otp_image(trans, &validblockaddr);
+                        if (ret)
+                                goto err_unlock;
+                }
+                for (addr = validblockaddr; addr < validblockaddr + sz;
+                     addr += sizeof(u16)) {
+                        __le16 eeprom_data;
+
+                        ret = iwl_read_otp_word(trans, addr, &eeprom_data);
+                        if (ret)
+                                goto err_unlock;
+                        e[cache_addr / 2] = eeprom_data;
+                        cache_addr += sizeof(u16);
+                }
+        } else {
+                /* eeprom is an array of 16bit values */
+                for (addr = 0; addr < sz; addr += sizeof(u16)) {
+                        u32 r;
+
+                        iwl_write32(trans, CSR_EEPROM_REG,
+                                    CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
+
+                        ret = iwl_poll_bit(trans, CSR_EEPROM_REG,
+                                           CSR_EEPROM_REG_READ_VALID_MSK,
+                                           CSR_EEPROM_REG_READ_VALID_MSK,
+                                           IWL_EEPROM_ACCESS_TIMEOUT);
+                        if (ret < 0) {
+                                IWL_ERR(trans,
+                                        "Time out reading EEPROM[%d]\n", addr);
+                                goto err_unlock;
+                        }
+                        r = iwl_read32(trans, CSR_EEPROM_REG);
+                        e[addr / 2] = cpu_to_le16(r >> 16);
+                }
+        }
+
+        IWL_DEBUG_EEPROM(trans->dev, "NVM Type: %s\n",
+                         nvm_is_otp ? "OTP" : "EEPROM");
+
+        iwl_eeprom_release_semaphore(trans);
+
+        *eeprom_size = sz;
+        *eeprom = (u8 *)e;
+        return 0;
+
+ err_unlock:
+        iwl_eeprom_release_semaphore(trans);
+ err_free:
+        kfree(e);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(iwl_read_eeprom);
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h
new file mode 100644
index 000000000000..1337c9d36fee
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h
@@ -0,0 +1,70 @@
+/******************************************************************************
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ *  Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *  * Neither the name Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *****************************************************************************/
+
+#ifndef __iwl_eeprom_h__
+#define __iwl_eeprom_h__
+
+#include "iwl-trans.h"
+
+int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size);
+
+#endif  /* __iwl_eeprom_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
deleted file mode 100644
index b8e2b223ac36..000000000000
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ /dev/null
@@ -1,1148 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * Contact Information:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *****************************************************************************/
-
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-
-#include <net/mac80211.h>
-
-#include "iwl-dev.h"
-#include "iwl-debug.h"
-#include "iwl-agn.h"
-#include "iwl-eeprom.h"
-#include "iwl-io.h"
-#include "iwl-prph.h"
-
-/************************** EEPROM BANDS ****************************
- *
- * The iwl_eeprom_band definitions below provide the mapping from the
- * EEPROM contents to the specific channel number supported for each
- * band.
- *
- * For example, iwl_priv->eeprom.band_3_channels[4] from the band_3
- * definition below maps to physical channel 42 in the 5.2GHz spectrum.
- * The specific geography and calibration information for that channel
- * is contained in the eeprom map itself.
- *
- * During init, we copy the eeprom information and channel map
- * information into priv->channel_info_24/52 and priv->channel_map_24/52
- *
- * channel_map_24/52 provides the index in the channel_info array for a
- * given channel.  We have to have two separate maps as there is channel
- * overlap with the 2.4GHz and 5.2GHz spectrum as seen in band_1 and
- * band_2
- *
- * A value of 0xff stored in the channel_map indicates that the channel
- * is not supported by the hardware at all.
- *
- * A value of 0xfe in the channel_map indicates that the channel is not
- * valid for Tx with the current hardware.  This means that
- * while the system can tune and receive on a given channel, it may not
- * be able to associate or transmit any frames on that
- * channel.  There is no corresponding channel information for that
- * entry.
- *
- *********************************************************************/
-
-/* 2.4 GHz */
-const u8 iwl_eeprom_band_1[14] = {
-        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
-};
-
-/* 5.2 GHz bands */
-static const u8 iwl_eeprom_band_2[] = { /* 4915-5080MHz */
-        183, 184, 185, 187, 188, 189, 192, 196, 7, 8, 11, 12, 16
-};
-
-static const u8 iwl_eeprom_band_3[] = { /* 5170-5320MHz */
-        34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64
-};
-
-static const u8 iwl_eeprom_band_4[] = { /* 5500-5700MHz */
-        100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140
-};
-
-static const u8 iwl_eeprom_band_5[] = { /* 5725-5825MHz */
-        145, 149, 153, 157, 161, 165
-};
-
-static const u8 iwl_eeprom_band_6[] = {       /* 2.4 ht40 channel */
-        1, 2, 3, 4, 5, 6, 7
-};
-
-static const u8 iwl_eeprom_band_7[] = {       /* 5.2 ht40 channel */
-        36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157
-};
-
-/******************************************************************************
- *
- * generic NVM functions
- *
-******************************************************************************/
-
-/*
- * The device's EEPROM semaphore prevents conflicts between driver and uCode
- * when accessing the EEPROM; each access is a series of pulses to/from the
- * EEPROM chip, not a single event, so even reads could conflict if they
- * weren't arbitrated by the semaphore.
- */
-
-#define EEPROM_SEM_TIMEOUT 10           /* milliseconds */
-#define EEPROM_SEM_RETRY_LIMIT 1000     /* number of attempts (not time) */
-
-static int iwl_eeprom_acquire_semaphore(struct iwl_trans *trans)
-{
-        u16 count;
-        int ret;
-
-        for (count = 0; count < EEPROM_SEM_RETRY_LIMIT; count++) {
-                /* Request semaphore */
-                iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,
-                            CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
-
-                /* See if we got it */
-                ret = iwl_poll_bit(trans, CSR_HW_IF_CONFIG_REG,
-                                CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
-                                CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,
-                                EEPROM_SEM_TIMEOUT);
-                if (ret >= 0) {
-                        IWL_DEBUG_EEPROM(trans,
-                                "Acquired semaphore after %d tries.\n",
-                                count+1);
-                        return ret;
-                }
-        }
-
-        return ret;
-}
-
-static void iwl_eeprom_release_semaphore(struct iwl_trans *trans)
-{
-        iwl_clear_bit(trans, CSR_HW_IF_CONFIG_REG,
-                CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
-
-}
-
-static int iwl_eeprom_verify_signature(struct iwl_priv *priv)
-{
-        u32 gp = iwl_read32(priv->trans, CSR_EEPROM_GP) &
-                           CSR_EEPROM_GP_VALID_MSK;
-        int ret = 0;
-
-        IWL_DEBUG_EEPROM(priv, "EEPROM signature=0x%08x\n", gp);
-        switch (gp) {
-        case CSR_EEPROM_GP_BAD_SIG_EEP_GOOD_SIG_OTP:
-                if (priv->nvm_device_type != NVM_DEVICE_TYPE_OTP) {
-                        IWL_ERR(priv, "EEPROM with bad signature: 0x%08x\n",
-                                gp);
-                        ret = -ENOENT;
-                }
-                break;
-        case CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K:
-        case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K:
-                if (priv->nvm_device_type != NVM_DEVICE_TYPE_EEPROM) {
-                        IWL_ERR(priv, "OTP with bad signature: 0x%08x\n", gp);
-                        ret = -ENOENT;
-                }
-                break;
-        case CSR_EEPROM_GP_BAD_SIGNATURE_BOTH_EEP_AND_OTP:
-        default:
-                IWL_ERR(priv, "bad EEPROM/OTP signature, type=%s, "
-                        "EEPROM_GP=0x%08x\n",
-                        (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
-                        ? "OTP" : "EEPROM", gp);
-                ret = -ENOENT;
-                break;
-        }
-        return ret;
-}
-
-u16 iwl_eeprom_query16(struct iwl_priv *priv, size_t offset)
-{
-        if (!priv->eeprom)
-                return 0;
-        return (u16)priv->eeprom[offset] | ((u16)priv->eeprom[offset + 1] << 8);
-}
-
-int iwl_eeprom_check_version(struct iwl_priv *priv)
-{
-        u16 eeprom_ver;
-        u16 calib_ver;
-
-        eeprom_ver = iwl_eeprom_query16(priv, EEPROM_VERSION);
-        calib_ver = iwl_eeprom_calib_version(priv);
-
-        if (eeprom_ver < priv->cfg->eeprom_ver ||
-            calib_ver < priv->cfg->eeprom_calib_ver)
-                goto err;
-
-        IWL_INFO(priv, "device EEPROM VER=0x%x, CALIB=0x%x\n",
-                 eeprom_ver, calib_ver);
-
-        return 0;
-err:
-        IWL_ERR(priv, "Unsupported (too old) EEPROM VER=0x%x < 0x%x "
-                  "CALIB=0x%x < 0x%x\n",
-                  eeprom_ver, priv->cfg->eeprom_ver,
-                  calib_ver,  priv->cfg->eeprom_calib_ver);
-        return -EINVAL;
-
-}
-
-int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
-{
-        u16 radio_cfg;
-
-        priv->hw_params.sku = iwl_eeprom_query16(priv, EEPROM_SKU_CAP);
-        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE &&
-            !priv->cfg->ht_params) {
-                IWL_ERR(priv, "Invalid 11n configuration\n");
-                return -EINVAL;
-        }
-
-        if (!priv->hw_params.sku) {
-                IWL_ERR(priv, "Invalid device sku\n");
-                return -EINVAL;
-        }
-
-        IWL_INFO(priv, "Device SKU: 0x%X\n", priv->hw_params.sku);
-
-        radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);
-
-        priv->hw_params.valid_tx_ant = EEPROM_RF_CFG_TX_ANT_MSK(radio_cfg);
-        priv->hw_params.valid_rx_ant = EEPROM_RF_CFG_RX_ANT_MSK(radio_cfg);
-
-        /* check overrides (some devices have wrong EEPROM) */
-        if (priv->cfg->valid_tx_ant)
-                priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;
-        if (priv->cfg->valid_rx_ant)
-                priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;
-
-        if (!priv->hw_params.valid_tx_ant || !priv->hw_params.valid_rx_ant) {
-                IWL_ERR(priv, "Invalid chain (0x%X, 0x%X)\n",
-                        priv->hw_params.valid_tx_ant,
-                        priv->hw_params.valid_rx_ant);
-                return -EINVAL;
-        }
-
-        IWL_INFO(priv, "Valid Tx ant: 0x%X, Valid Rx ant: 0x%X\n",
-                 priv->hw_params.valid_tx_ant, priv->hw_params.valid_rx_ant);
-
-        return 0;
-}
-
-u16 iwl_eeprom_calib_version(struct iwl_priv *priv)
-{
-        struct iwl_eeprom_calib_hdr *hdr;
-
-        hdr = (struct iwl_eeprom_calib_hdr *)iwl_eeprom_query_addr(priv,
-                                                        EEPROM_CALIB_ALL);
-        return hdr->version;
-}
-
-static u32 eeprom_indirect_address(struct iwl_priv *priv, u32 address)
-{
-        u16 offset = 0;
-
-        if ((address & INDIRECT_ADDRESS) == 0)
-                return address;
-
-        switch (address & INDIRECT_TYPE_MSK) {
-        case INDIRECT_HOST:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_HOST);
-                break;
-        case INDIRECT_GENERAL:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_GENERAL);
-                break;
-        case INDIRECT_REGULATORY:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_REGULATORY);
-                break;
-        case INDIRECT_TXP_LIMIT:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_TXP_LIMIT);
-                break;
-        case INDIRECT_TXP_LIMIT_SIZE:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_TXP_LIMIT_SIZE);
-                break;
-        case INDIRECT_CALIBRATION:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_CALIBRATION);
-                break;
-        case INDIRECT_PROCESS_ADJST:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_PROCESS_ADJST);
-                break;
-        case INDIRECT_OTHERS:
-                offset = iwl_eeprom_query16(priv, EEPROM_LINK_OTHERS);
-                break;
-        default:
-                IWL_ERR(priv, "illegal indirect type: 0x%X\n",
-                address & INDIRECT_TYPE_MSK);
-                break;
-        }
-
-        /* translate the offset from words to byte */
-        return (address & ADDRESS_MSK) + (offset << 1);
-}
-
-const u8 *iwl_eeprom_query_addr(struct iwl_priv *priv, size_t offset)
-{
-        u32 address = eeprom_indirect_address(priv, offset);
-        BUG_ON(address >= priv->cfg->base_params->eeprom_size);
-        return &priv->eeprom[address];
-}
-
-void iwl_eeprom_get_mac(struct iwl_priv *priv, u8 *mac)
-{
-        const u8 *addr = iwl_eeprom_query_addr(priv,
-                                        EEPROM_MAC_ADDRESS);
-        memcpy(mac, addr, ETH_ALEN);
-}
-
-/******************************************************************************
- *
- * OTP related functions
- *
-******************************************************************************/
-
-static void iwl_set_otp_access(struct iwl_trans *trans,
-                               enum iwl_access_mode mode)
-{
-        iwl_read32(trans, CSR_OTP_GP_REG);
-
-        if (mode == IWL_OTP_ACCESS_ABSOLUTE)
-                iwl_clear_bit(trans, CSR_OTP_GP_REG,
-                              CSR_OTP_GP_REG_OTP_ACCESS_MODE);
-        else
-                iwl_set_bit(trans, CSR_OTP_GP_REG,
-                            CSR_OTP_GP_REG_OTP_ACCESS_MODE);
-}
-
-static int iwl_get_nvm_type(struct iwl_trans *trans, u32 hw_rev)
-{
-        u32 otpgp;
-        int nvm_type;
-
-        /* OTP only valid for CP/PP and after */
-        switch (hw_rev & CSR_HW_REV_TYPE_MSK) {
-        case CSR_HW_REV_TYPE_NONE:
-                IWL_ERR(trans, "Unknown hardware type\n");
-                return -ENOENT;
-        case CSR_HW_REV_TYPE_5300:
-        case CSR_HW_REV_TYPE_5350:
-        case CSR_HW_REV_TYPE_5100:
-        case CSR_HW_REV_TYPE_5150:
-                nvm_type = NVM_DEVICE_TYPE_EEPROM;
-                break;
-        default:
-                otpgp = iwl_read32(trans, CSR_OTP_GP_REG);
-                if (otpgp & CSR_OTP_GP_REG_DEVICE_SELECT)
-                        nvm_type = NVM_DEVICE_TYPE_OTP;
-                else
-                        nvm_type = NVM_DEVICE_TYPE_EEPROM;
-                break;
-        }
-        return  nvm_type;
-}
-
-static int iwl_init_otp_access(struct iwl_trans *trans)
-{
-        int ret;
-
-        /* Enable 40MHz radio clock */
-        iwl_write32(trans, CSR_GP_CNTRL,
-                    iwl_read32(trans, CSR_GP_CNTRL) |
-                    CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
-
-        /* wait for clock to be ready */
-        ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
-                                 CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
-                                 CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
-                                 25000);
-        if (ret < 0)
-                IWL_ERR(trans, "Time out access OTP\n");
-        else {
-                iwl_set_bits_prph(trans, APMG_PS_CTRL_REG,
-                                  APMG_PS_CTRL_VAL_RESET_REQ);
-                udelay(5);
-                iwl_clear_bits_prph(trans, APMG_PS_CTRL_REG,
-                                    APMG_PS_CTRL_VAL_RESET_REQ);
-
-                /*
-                 * CSR auto clock gate disable bit -
-                 * this is only applicable for HW with OTP shadow RAM
-                 */
-                if (trans->cfg->base_params->shadow_ram_support)
-                        iwl_set_bit(trans, CSR_DBG_LINK_PWR_MGMT_REG,
-                                CSR_RESET_LINK_PWR_MGMT_DISABLED);
-        }
-        return ret;
-}
-
-static int iwl_read_otp_word(struct iwl_trans *trans, u16 addr,
-                             __le16 *eeprom_data)
-{
-        int ret = 0;
-        u32 r;
-        u32 otpgp;
-
-        iwl_write32(trans, CSR_EEPROM_REG,
-                    CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
-        ret = iwl_poll_bit(trans, CSR_EEPROM_REG,
-                                 CSR_EEPROM_REG_READ_VALID_MSK,
-                                 CSR_EEPROM_REG_READ_VALID_MSK,
-                                 IWL_EEPROM_ACCESS_TIMEOUT);
-        if (ret < 0) {
-                IWL_ERR(trans, "Time out reading OTP[%d]\n", addr);
-                return ret;
-        }
-        r = iwl_read32(trans, CSR_EEPROM_REG);
-        /* check for ECC errors: */
-        otpgp = iwl_read32(trans, CSR_OTP_GP_REG);
-        if (otpgp & CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK) {
-                /* stop in this case */
-                /* set the uncorrectable OTP ECC bit for acknowledgement */
-                iwl_set_bit(trans, CSR_OTP_GP_REG,
-                        CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
-                IWL_ERR(trans, "Uncorrectable OTP ECC error, abort OTP read\n");
-                return -EINVAL;
-        }
-        if (otpgp & CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK) {
-                /* continue in this case */
-                /* set the correctable OTP ECC bit for acknowledgement */
-                iwl_set_bit(trans, CSR_OTP_GP_REG,
-                                CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK);
-                IWL_ERR(trans, "Correctable OTP ECC error, continue read\n");
-        }
-        *eeprom_data = cpu_to_le16(r >> 16);
-        return 0;
-}
-
-/*
- * iwl_is_otp_empty: check for empty OTP
- */
-static bool iwl_is_otp_empty(struct iwl_trans *trans)
-{
-        u16 next_link_addr = 0;
-        __le16 link_value;
-        bool is_empty = false;
-
-        /* locate the beginning of OTP link list */
-        if (!iwl_read_otp_word(trans, next_link_addr, &link_value)) {
-                if (!link_value) {
-                        IWL_ERR(trans, "OTP is empty\n");
-                        is_empty = true;
-                }
-        } else {
-                IWL_ERR(trans, "Unable to read first block of OTP list.\n");
-                is_empty = true;
-        }
-
-        return is_empty;
-}
-
-
-/*
- * iwl_find_otp_image: find EEPROM image in OTP
- *   finding the OTP block that contains the EEPROM image.
- *   the last valid block on the link list (the block _before_ the last block)
- *   is the block we should read and used to configure the device.
- *   If all the available OTP blocks are full, the last block will be the block
- *   we should read and used to configure the device.
- *   only perform this operation if shadow RAM is disabled
- */
-static int iwl_find_otp_image(struct iwl_trans *trans,
-                                        u16 *validblockaddr)
-{
-        u16 next_link_addr = 0, valid_addr;
-        __le16 link_value = 0;
-        int usedblocks = 0;
-
-        /* set addressing mode to absolute to traverse the link list */
-        iwl_set_otp_access(trans, IWL_OTP_ACCESS_ABSOLUTE);
-
-        /* checking for empty OTP or error */
-        if (iwl_is_otp_empty(trans))
-                return -EINVAL;
-
-        /*
-         * start traverse link list
-         * until reach the max number of OTP blocks
-         * different devices have different number of OTP blocks
-         */
-        do {
-                /* save current valid block address
-                 * check for more block on the link list
-                 */
-                valid_addr = next_link_addr;
-                next_link_addr = le16_to_cpu(link_value) * sizeof(u16);
-                IWL_DEBUG_EEPROM(trans, "OTP blocks %d addr 0x%x\n",
-                               usedblocks, next_link_addr);
-                if (iwl_read_otp_word(trans, next_link_addr, &link_value))
-                        return -EINVAL;
-                if (!link_value) {
-                        /*
-                         * reach the end of link list, return success and
-                         * set address point to the starting address
-                         * of the image
-                         */
-                        *validblockaddr = valid_addr;
-                        /* skip first 2 bytes (link list pointer) */
-                        *validblockaddr += 2;
-                        return 0;
-                }
-                /* more in the link list, continue */
-                usedblocks++;
-        } while (usedblocks <= trans->cfg->base_params->max_ll_items);
-
-        /* OTP has no valid blocks */
-        IWL_DEBUG_EEPROM(trans, "OTP has no valid blocks\n");
-        return -EINVAL;
-}
-
-/******************************************************************************
- *
- * Tx Power related functions
- *
-******************************************************************************/
-/**
- * iwl_get_max_txpower_avg - get the highest tx power from all chains.
- *     find the highest tx power from all chains for the channel
- */
-static s8 iwl_get_max_txpower_avg(struct iwl_priv *priv,
-                struct iwl_eeprom_enhanced_txpwr *enhanced_txpower,
-                int element, s8 *max_txpower_in_half_dbm)
-{
-        s8 max_txpower_avg = 0; /* (dBm) */
-
-        /* Take the highest tx power from any valid chains */
-        if ((priv->hw_params.valid_tx_ant & ANT_A) &&
-            (enhanced_txpower[element].chain_a_max > max_txpower_avg))
-                max_txpower_avg = enhanced_txpower[element].chain_a_max;
-        if ((priv->hw_params.valid_tx_ant & ANT_B) &&
-            (enhanced_txpower[element].chain_b_max > max_txpower_avg))
-                max_txpower_avg = enhanced_txpower[element].chain_b_max;
-        if ((priv->hw_params.valid_tx_ant & ANT_C) &&
-            (enhanced_txpower[element].chain_c_max > max_txpower_avg))
-                max_txpower_avg = enhanced_txpower[element].chain_c_max;
-        if (((priv->hw_params.valid_tx_ant == ANT_AB) |
-            (priv->hw_params.valid_tx_ant == ANT_BC) |
-            (priv->hw_params.valid_tx_ant == ANT_AC)) &&
-            (enhanced_txpower[element].mimo2_max > max_txpower_avg))
-                max_txpower_avg =  enhanced_txpower[element].mimo2_max;
-        if ((priv->hw_params.valid_tx_ant == ANT_ABC) &&
-            (enhanced_txpower[element].mimo3_max > max_txpower_avg))
-                max_txpower_avg = enhanced_txpower[element].mimo3_max;
-
-        /*
-         * max. tx power in EEPROM is in 1/2 dBm format
-         * convert from 1/2 dBm to dBm (round-up convert)
-         * but we also do not want to loss 1/2 dBm resolution which
-         * will impact performance
-         */
-        *max_txpower_in_half_dbm = max_txpower_avg;
-        return (max_txpower_avg & 0x01) + (max_txpower_avg >> 1);
-}
-
-static void
-iwl_eeprom_enh_txp_read_element(struct iwl_priv *priv,
-                                    struct iwl_eeprom_enhanced_txpwr *txp,
-                                    s8 max_txpower_avg)
-{
-        int ch_idx;
-        bool is_ht40 = txp->flags & IWL_EEPROM_ENH_TXP_FL_40MHZ;
-        enum ieee80211_band band;
-
-        band = txp->flags & IWL_EEPROM_ENH_TXP_FL_BAND_52G ?
-                IEEE80211_BAND_5GHZ : IEEE80211_BAND_2GHZ;
-
-        for (ch_idx = 0; ch_idx < priv->channel_count; ch_idx++) {
-                struct iwl_channel_info *ch_info = &priv->channel_info[ch_idx];
-
-                /* update matching channel or from common data only */
-                if (txp->channel != 0 && ch_info->channel != txp->channel)
-                        continue;
-
-                /* update matching band only */
-                if (band != ch_info->band)
-                        continue;
-
-                if (ch_info->max_power_avg < max_txpower_avg && !is_ht40) {
-                        ch_info->max_power_avg = max_txpower_avg;
-                        ch_info->curr_txpow = max_txpower_avg;
-                        ch_info->scan_power = max_txpower_avg;
-                }
-
-                if (is_ht40 && ch_info->ht40_max_power_avg < max_txpower_avg)
-                        ch_info->ht40_max_power_avg = max_txpower_avg;
-        }
-}
-
-#define EEPROM_TXP_OFFS (0x00 | INDIRECT_ADDRESS | INDIRECT_TXP_LIMIT)
-#define EEPROM_TXP_ENTRY_LEN sizeof(struct iwl_eeprom_enhanced_txpwr)
-#define EEPROM_TXP_SZ_OFFS (0x00 | INDIRECT_ADDRESS | INDIRECT_TXP_LIMIT_SIZE)
-
-#define TXP_CHECK_AND_PRINT(x) ((txp->flags & IWL_EEPROM_ENH_TXP_FL_##x) \
-                            ? # x " " : "")
-
-static void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)
-{
-        struct iwl_eeprom_enhanced_txpwr *txp_array, *txp;
-        int idx, entries;
-        __le16 *txp_len;
-        s8 max_txp_avg, max_txp_avg_halfdbm;
-
-        BUILD_BUG_ON(sizeof(struct iwl_eeprom_enhanced_txpwr) != 8);
-
-        /* the length is in 16-bit words, but we want entries */
-        txp_len = (__le16 *) iwl_eeprom_query_addr(priv, EEPROM_TXP_SZ_OFFS);
-        entries = le16_to_cpup(txp_len) * 2 / EEPROM_TXP_ENTRY_LEN;
-
-        txp_array = (void *) iwl_eeprom_query_addr(priv, EEPROM_TXP_OFFS);
-
-        for (idx = 0; idx < entries; idx++) {
-                txp = &txp_array[idx];
-                /* skip invalid entries */
-                if (!(txp->flags & IWL_EEPROM_ENH_TXP_FL_VALID))
-                        continue;
-
-                IWL_DEBUG_EEPROM(priv, "%s %d:\t %s%s%s%s%s%s%s%s (0x%02x)\n",
-                                 (txp->channel && (txp->flags &
-                                        IWL_EEPROM_ENH_TXP_FL_COMMON_TYPE)) ?
-                                        "Common " : (txp->channel) ?
-                                        "Channel" : "Common",
-                                 (txp->channel),
-                                 TXP_CHECK_AND_PRINT(VALID),
-                                 TXP_CHECK_AND_PRINT(BAND_52G),
-                                 TXP_CHECK_AND_PRINT(OFDM),
-                                 TXP_CHECK_AND_PRINT(40MHZ),
-                                 TXP_CHECK_AND_PRINT(HT_AP),
-                                 TXP_CHECK_AND_PRINT(RES1),
-                                 TXP_CHECK_AND_PRINT(RES2),
-                                 TXP_CHECK_AND_PRINT(COMMON_TYPE),
-                                 txp->flags);
-                IWL_DEBUG_EEPROM(priv, "\t\t chain_A: 0x%02x "
-                                 "chain_B: 0X%02x chain_C: 0X%02x\n",
-                                 txp->chain_a_max, txp->chain_b_max,
-                                 txp->chain_c_max);
-                IWL_DEBUG_EEPROM(priv, "\t\t MIMO2: 0x%02x "
-                                 "MIMO3: 0x%02x High 20_on_40: 0x%02x "
-                                 "Low 20_on_40: 0x%02x\n",
-                                 txp->mimo2_max, txp->mimo3_max,
-                                 ((txp->delta_20_in_40 & 0xf0) >> 4),
-                                 (txp->delta_20_in_40 & 0x0f));
-
-                max_txp_avg = iwl_get_max_txpower_avg(priv, txp_array, idx,
-                                                      &max_txp_avg_halfdbm);
-
-                /*
-                 * Update the user limit values values to the highest
-                 * power supported by any channel
-                 */
-                if (max_txp_avg > priv->tx_power_user_lmt)
-                        priv->tx_power_user_lmt = max_txp_avg;
-                if (max_txp_avg_halfdbm > priv->tx_power_lmt_in_half_dbm)
-                        priv->tx_power_lmt_in_half_dbm = max_txp_avg_halfdbm;
-
-                iwl_eeprom_enh_txp_read_element(priv, txp, max_txp_avg);
-        }
-}
-
-/**
- * iwl_eeprom_init - read EEPROM contents
- *
- * Load the EEPROM contents from adapter into priv->eeprom
- *
- * NOTE:  This routine uses the non-debug IO access functions.
- */
-int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)
-{
-        __le16 *e;
-        u32 gp = iwl_read32(priv->trans, CSR_EEPROM_GP);
-        int sz;
-        int ret;
-        u16 addr;
-        u16 validblockaddr = 0;
-        u16 cache_addr = 0;
-
-        priv->nvm_device_type = iwl_get_nvm_type(priv->trans, hw_rev);
-        if (priv->nvm_device_type == -ENOENT)
-                return -ENOENT;
-        /* allocate eeprom */
-        sz = priv->cfg->base_params->eeprom_size;
-        IWL_DEBUG_EEPROM(priv, "NVM size = %d\n", sz);
-        priv->eeprom = kzalloc(sz, GFP_KERNEL);
-        if (!priv->eeprom) {
-                ret = -ENOMEM;
-                goto alloc_err;
-        }
-        e = (__le16 *)priv->eeprom;
-
-        ret = iwl_eeprom_verify_signature(priv);
-        if (ret < 0) {
-                IWL_ERR(priv, "EEPROM not found, EEPROM_GP=0x%08x\n", gp);
-                ret = -ENOENT;
-                goto err;
-        }
-
-        /* Make sure driver (instead of uCode) is allowed to read EEPROM */
-        ret = iwl_eeprom_acquire_semaphore(priv->trans);
-        if (ret < 0) {
-                IWL_ERR(priv, "Failed to acquire EEPROM semaphore.\n");
-                ret = -ENOENT;
-                goto err;
-        }
-
-        if (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP) {
-
-                ret = iwl_init_otp_access(priv->trans);
-                if (ret) {
-                        IWL_ERR(priv, "Failed to initialize OTP access.\n");
-                        ret = -ENOENT;
-                        goto done;
-                }
-                iwl_write32(priv->trans, CSR_EEPROM_GP,
-                            iwl_read32(priv->trans, CSR_EEPROM_GP) &
-                            ~CSR_EEPROM_GP_IF_OWNER_MSK);
-
-                iwl_set_bit(priv->trans, CSR_OTP_GP_REG,
-                             CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK |
-                             CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK);
-                /* traversing the linked list if no shadow ram supported */
-                if (!priv->cfg->base_params->shadow_ram_support) {
-                        if (iwl_find_otp_image(priv->trans, &validblockaddr)) {
-                                ret = -ENOENT;
-                                goto done;
-                        }
-                }
-                for (addr = validblockaddr; addr < validblockaddr + sz;
-                     addr += sizeof(u16)) {
-                        __le16 eeprom_data;
-
-                        ret = iwl_read_otp_word(priv->trans, addr,
-                                                &eeprom_data);
-                        if (ret)
-                                goto done;
-                        e[cache_addr / 2] = eeprom_data;
-                        cache_addr += sizeof(u16);
-                }
-        } else {
-                /* eeprom is an array of 16bit values */
-                for (addr = 0; addr < sz; addr += sizeof(u16)) {
-                        u32 r;
-
-                        iwl_write32(priv->trans, CSR_EEPROM_REG,
-                                    CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
-
-                        ret = iwl_poll_bit(priv->trans, CSR_EEPROM_REG,
-                                                  CSR_EEPROM_REG_READ_VALID_MSK,
-                                                  CSR_EEPROM_REG_READ_VALID_MSK,
-                                                  IWL_EEPROM_ACCESS_TIMEOUT);
-                        if (ret < 0) {
-                                IWL_ERR(priv,
-                                        "Time out reading EEPROM[%d]\n", addr);
-                                goto done;
-                        }
-                        r = iwl_read32(priv->trans, CSR_EEPROM_REG);
-                        e[addr / 2] = cpu_to_le16(r >> 16);
-                }
-        }
-
-        IWL_DEBUG_EEPROM(priv, "NVM Type: %s, version: 0x%x\n",
-                       (priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)
-                       ? "OTP" : "EEPROM",
-                       iwl_eeprom_query16(priv, EEPROM_VERSION));
-
-        ret = 0;
-done:
-        iwl_eeprom_release_semaphore(priv->trans);
-
-err:
-        if (ret)
-                iwl_eeprom_free(priv);
-alloc_err:
-        return ret;
-}
-
-void iwl_eeprom_free(struct iwl_priv *priv)
-{
-        kfree(priv->eeprom);
-        priv->eeprom = NULL;
-}
-
-static void iwl_init_band_reference(struct iwl_priv *priv,
-                        int eep_band, int *eeprom_ch_count,
-                        const struct iwl_eeprom_channel **eeprom_ch_info,
-                        const u8 **eeprom_ch_index)
-{
-        u32 offset = priv->lib->
-                        eeprom_ops.regulatory_bands[eep_band - 1];
-        switch (eep_band) {
-        case 1:         /* 2.4GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_1);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwl_eeprom_band_1;
-                break;
-        case 2:         /* 4.9GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_2);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwl_eeprom_band_2;
-                break;
-        case 3:         /* 5.2GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_3);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwl_eeprom_band_3;
-                break;
-        case 4:         /* 5.5GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_4);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwl_eeprom_band_4;
-                break;
-        case 5:         /* 5.7GHz band */
-                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_5);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwl_eeprom_band_5;
-                break;
-        case 6:         /* 2.4GHz ht40 channels */
-                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_6);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwl_eeprom_band_6;
-                break;
-        case 7:         /* 5 GHz ht40 channels */
-                *eeprom_ch_count = ARRAY_SIZE(iwl_eeprom_band_7);
-                *eeprom_ch_info = (struct iwl_eeprom_channel *)
-                                iwl_eeprom_query_addr(priv, offset);
-                *eeprom_ch_index = iwl_eeprom_band_7;
-                break;
-        default:
-                BUG();
-                return;
-        }
-}
-
-#define CHECK_AND_PRINT(x) ((eeprom_ch->flags & EEPROM_CHANNEL_##x) \
-                            ? # x " " : "")
-/**
- * iwl_mod_ht40_chan_info - Copy ht40 channel info into driver's priv.
- *
- * Does not set up a command, or touch hardware.
- */
-static int iwl_mod_ht40_chan_info(struct iwl_priv *priv,
-                              enum ieee80211_band band, u16 channel,
-                              const struct iwl_eeprom_channel *eeprom_ch,
-                              u8 clear_ht40_extension_channel)
-{
-        struct iwl_channel_info *ch_info;
-
-        ch_info = (struct iwl_channel_info *)
-                        iwl_get_channel_info(priv, band, channel);
-
-        if (!is_channel_valid(ch_info))
-                return -1;
-
-        IWL_DEBUG_EEPROM(priv, "HT40 Ch. %d [%sGHz] %s%s%s%s%s(0x%02x %ddBm):"
-                        " Ad-Hoc %ssupported\n",
-                        ch_info->channel,
-                        is_channel_a_band(ch_info) ?
-                        "5.2" : "2.4",
-                        CHECK_AND_PRINT(IBSS),
-                        CHECK_AND_PRINT(ACTIVE),
-                        CHECK_AND_PRINT(RADAR),
-                        CHECK_AND_PRINT(WIDE),
-                        CHECK_AND_PRINT(DFS),
-                        eeprom_ch->flags,
-                        eeprom_ch->max_power_avg,
-                        ((eeprom_ch->flags & EEPROM_CHANNEL_IBSS)
-                         && !(eeprom_ch->flags & EEPROM_CHANNEL_RADAR)) ?
-                        "" : "not ");
-
-        ch_info->ht40_eeprom = *eeprom_ch;
-        ch_info->ht40_max_power_avg = eeprom_ch->max_power_avg;
-        ch_info->ht40_flags = eeprom_ch->flags;
-        if (eeprom_ch->flags & EEPROM_CHANNEL_VALID)
-                ch_info->ht40_extension_channel &= ~clear_ht40_extension_channel;
-
-        return 0;
-}
-
-#define CHECK_AND_PRINT_I(x) ((eeprom_ch_info[ch].flags & EEPROM_CHANNEL_##x) \
-                            ? # x " " : "")
-
-/**
- * iwl_init_channel_map - Set up driver's info for all possible channels
- */
-int iwl_init_channel_map(struct iwl_priv *priv)
-{
-        int eeprom_ch_count = 0;
-        const u8 *eeprom_ch_index = NULL;
-        const struct iwl_eeprom_channel *eeprom_ch_info = NULL;
-        int band, ch;
-        struct iwl_channel_info *ch_info;
-
-        if (priv->channel_count) {
-                IWL_DEBUG_EEPROM(priv, "Channel map already initialized.\n");
-                return 0;
-        }
-
-        IWL_DEBUG_EEPROM(priv, "Initializing regulatory info from EEPROM\n");
-
-        priv->channel_count =
-            ARRAY_SIZE(iwl_eeprom_band_1) +
-            ARRAY_SIZE(iwl_eeprom_band_2) +
-            ARRAY_SIZE(iwl_eeprom_band_3) +
-            ARRAY_SIZE(iwl_eeprom_band_4) +
-            ARRAY_SIZE(iwl_eeprom_band_5);
-
-        IWL_DEBUG_EEPROM(priv, "Parsing data for %d channels.\n",
-                        priv->channel_count);
-
-        priv->channel_info = kcalloc(priv->channel_count,
-                                     sizeof(struct iwl_channel_info),
-                                     GFP_KERNEL);
-        if (!priv->channel_info) {
-                IWL_ERR(priv, "Could not allocate channel_info\n");
-                priv->channel_count = 0;
-                return -ENOMEM;
-        }
-
-        ch_info = priv->channel_info;
-
-        /* Loop through the 5 EEPROM bands adding them in order to the
-         * channel map we maintain (that contains additional information than
-         * what just in the EEPROM) */
-        for (band = 1; band <= 5; band++) {
-
-                iwl_init_band_reference(priv, band, &eeprom_ch_count,
-                                        &eeprom_ch_info, &eeprom_ch_index);
-
-                /* Loop through each band adding each of the channels */
-                for (ch = 0; ch < eeprom_ch_count; ch++) {
-                        ch_info->channel = eeprom_ch_index[ch];
-                        ch_info->band = (band == 1) ? IEEE80211_BAND_2GHZ :
-                            IEEE80211_BAND_5GHZ;
-
-                        /* permanently store EEPROM's channel regulatory flags
-                         *   and max power in channel info database. */
-                        ch_info->eeprom = eeprom_ch_info[ch];
-
-                        /* Copy the run-time flags so they are there even on
-                         * invalid channels */
-                        ch_info->flags = eeprom_ch_info[ch].flags;
-                        /* First write that ht40 is not enabled, and then enable
-                         * one by one */
-                        ch_info->ht40_extension_channel =
-                                        IEEE80211_CHAN_NO_HT40;
-
-                        if (!(is_channel_valid(ch_info))) {
-                                IWL_DEBUG_EEPROM(priv,
-                                               "Ch. %d Flags %x [%sGHz] - "
-                                               "No traffic\n",
-                                               ch_info->channel,
-                                               ch_info->flags,
-                                               is_channel_a_band(ch_info) ?
-                                               "5.2" : "2.4");
-                                ch_info++;
-                                continue;
-                        }
-
-                        /* Initialize regulatory-based run-time data */
-                        ch_info->max_power_avg = ch_info->curr_txpow =
-                            eeprom_ch_info[ch].max_power_avg;
-                        ch_info->scan_power = eeprom_ch_info[ch].max_power_avg;
-                        ch_info->min_power = 0;
-
-                        IWL_DEBUG_EEPROM(priv, "Ch. %d [%sGHz] "
-                                       "%s%s%s%s%s%s(0x%02x %ddBm):"
-                                       " Ad-Hoc %ssupported\n",
-                                       ch_info->channel,
-                                       is_channel_a_band(ch_info) ?
-                                       "5.2" : "2.4",
-                                       CHECK_AND_PRINT_I(VALID),
-                                       CHECK_AND_PRINT_I(IBSS),
-                                       CHECK_AND_PRINT_I(ACTIVE),
-                                       CHECK_AND_PRINT_I(RADAR),
-                                       CHECK_AND_PRINT_I(WIDE),
-                                       CHECK_AND_PRINT_I(DFS),
-                                       eeprom_ch_info[ch].flags,
-                                       eeprom_ch_info[ch].max_power_avg,
-                                       ((eeprom_ch_info[ch].
-                                         flags & EEPROM_CHANNEL_IBSS)
-                                        && !(eeprom_ch_info[ch].
-                                             flags & EEPROM_CHANNEL_RADAR))
-                                       ? "" : "not ");
-
-                        ch_info++;
-                }
-        }
-
-        /* Check if we do have HT40 channels */
-        if (priv->lib->eeprom_ops.regulatory_bands[5] ==
-            EEPROM_REGULATORY_BAND_NO_HT40 &&
-            priv->lib->eeprom_ops.regulatory_bands[6] ==
-            EEPROM_REGULATORY_BAND_NO_HT40)
-                return 0;
-
-        /* Two additional EEPROM bands for 2.4 and 5 GHz HT40 channels */
-        for (band = 6; band <= 7; band++) {
-                enum ieee80211_band ieeeband;
-
-                iwl_init_band_reference(priv, band, &eeprom_ch_count,
-                                        &eeprom_ch_info, &eeprom_ch_index);
-
-                /* EEPROM band 6 is 2.4, band 7 is 5 GHz */
-                ieeeband =
-                        (band == 6) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
-
-                /* Loop through each band adding each of the channels */
-                for (ch = 0; ch < eeprom_ch_count; ch++) {
-                        /* Set up driver's info for lower half */
-                        iwl_mod_ht40_chan_info(priv, ieeeband,
-                                                eeprom_ch_index[ch],
-                                                &eeprom_ch_info[ch],
-                                                IEEE80211_CHAN_NO_HT40PLUS);
-
-                        /* Set up driver's info for upper half */
-                        iwl_mod_ht40_chan_info(priv, ieeeband,
-                                                eeprom_ch_index[ch] + 4,
-                                                &eeprom_ch_info[ch],
-                                                IEEE80211_CHAN_NO_HT40MINUS);
-                }
-        }
-
-        /* for newer device (6000 series and up)
-         * EEPROM contain enhanced tx power information
-         * driver need to process addition information
-         * to determine the max channel tx power limits
-         */
-        if (priv->lib->eeprom_ops.enhanced_txpower)
-                iwl_eeprom_enhanced_txpower(priv);
-
-        return 0;
-}
-
-/*
- * iwl_free_channel_map - undo allocations in iwl_init_channel_map
- */
-void iwl_free_channel_map(struct iwl_priv *priv)
-{
-        kfree(priv->channel_info);
-        priv->channel_count = 0;
-}
-
-/**
- * iwl_get_channel_info - Find driver's private channel info
- *
- * Based on band and channel number.
- */
-const struct iwl_channel_info *iwl_get_channel_info(const struct iwl_priv *priv,
-                                        enum ieee80211_band band, u16 channel)
-{
-        int i;
-
-        switch (band) {
-        case IEEE80211_BAND_5GHZ:
-                for (i = 14; i < priv->channel_count; i++) {
-                        if (priv->channel_info[i].channel == channel)
-                                return &priv->channel_info[i];
-                }
-                break;
-        case IEEE80211_BAND_2GHZ:
-                if (channel >= 1 && channel <= 14)
-                        return &priv->channel_info[channel - 1];
-                break;
-        default:
-                BUG();
-        }
-
-        return NULL;
-}
-
-void iwl_rf_config(struct iwl_priv *priv)
-{
-        u16 radio_cfg;
-
-        radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);
-
-        /* write radio config values to register */
-        if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <= EEPROM_RF_CONFIG_TYPE_MAX) {
-                iwl_set_bit(priv->trans, CSR_HW_IF_CONFIG_REG,
-                            EEPROM_RF_CFG_TYPE_MSK(radio_cfg) |
-                            EEPROM_RF_CFG_STEP_MSK(radio_cfg) |
-                            EEPROM_RF_CFG_DASH_MSK(radio_cfg));
-                IWL_INFO(priv, "Radio type=0x%x-0x%x-0x%x\n",
-                         EEPROM_RF_CFG_TYPE_MSK(radio_cfg),
-                         EEPROM_RF_CFG_STEP_MSK(radio_cfg),
-                         EEPROM_RF_CFG_DASH_MSK(radio_cfg));
-        } else
-                WARN_ON(1);
-
-        /* set CSR_HW_CONFIG_REG for uCode use */
-        iwl_set_bit(priv->trans, CSR_HW_IF_CONFIG_REG,
-                    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
-                    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
-}
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
deleted file mode 100644
index 64bfd947caeb..000000000000
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2008 - 2012 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
- * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.GPL.
- *
- * Contact Information:
- *  Intel Linux Wireless <ilw@linux.intel.com>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2005 - 2012 Intel Corporation. All rights reserved.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *****************************************************************************/
-
-#ifndef __iwl_eeprom_h__
-#define __iwl_eeprom_h__
-
-#include <net/mac80211.h>
-
-struct iwl_priv;
-
-/*
- * EEPROM access time values:
- *
- * Driver initiates EEPROM read by writing byte address << 1 to CSR_EEPROM_REG.
- * Driver then polls CSR_EEPROM_REG for CSR_EEPROM_REG_READ_VALID_MSK (0x1).
- * When polling, wait 10 uSec between polling loops, up to a maximum 5000 uSec.
- * Driver reads 16-bit value from bits 31-16 of CSR_EEPROM_REG.
- */
-#define IWL_EEPROM_ACCESS_TIMEOUT       5000 /* uSec */
-
-#define IWL_EEPROM_SEM_TIMEOUT          10   /* microseconds */
-#define IWL_EEPROM_SEM_RETRY_LIMIT      1000 /* number of attempts (not time) */
-
-
-/*
- * Regulatory channel usage flags in EEPROM struct iwl4965_eeprom_channel.flags.
- *
- * IBSS and/or AP operation is allowed *only* on those channels with
- * (VALID && IBSS && ACTIVE && !RADAR).  This restriction is in place because
- * RADAR detection is not supported by the 4965 driver, but is a
- * requirement for establishing a new network for legal operation on channels
- * requiring RADAR detection or restricting ACTIVE scanning.
- *
- * NOTE:  "WIDE" flag does not indicate anything about "HT40" 40 MHz channels.
- *        It only indicates that 20 MHz channel use is supported; HT40 channel
- *        usage is indicated by a separate set of regulatory flags for each
- *        HT40 channel pair.
- *
- * NOTE:  Using a channel inappropriately will result in a uCode error!
- */
-#define IWL_NUM_TX_CALIB_GROUPS 5
-enum {
-        EEPROM_CHANNEL_VALID = (1 << 0),        /* usable for this SKU/geo */
-        EEPROM_CHANNEL_IBSS = (1 << 1),         /* usable as an IBSS channel */
-        /* Bit 2 Reserved */
-        EEPROM_CHANNEL_ACTIVE = (1 << 3),       /* active scanning allowed */
-        EEPROM_CHANNEL_RADAR = (1 << 4),        /* radar detection required */
-        EEPROM_CHANNEL_WIDE = (1 << 5),         /* 20 MHz channel okay */
-        /* Bit 6 Reserved (was Narrow Channel) */
-        EEPROM_CHANNEL_DFS = (1 << 7),  /* dynamic freq selection candidate */
-};
-
-/* SKU Capabilities */
-#define EEPROM_SKU_CAP_BAND_24GHZ                       (1 << 4)
-#define EEPROM_SKU_CAP_BAND_52GHZ                       (1 << 5)
-#define EEPROM_SKU_CAP_11N_ENABLE                       (1 << 6)
-#define EEPROM_SKU_CAP_AMT_ENABLE                       (1 << 7)
-#define EEPROM_SKU_CAP_IPAN_ENABLE                      (1 << 8)
-
-/* *regulatory* channel data format in eeprom, one for each channel.
- * There are separate entries for HT40 (40 MHz) vs. normal (20 MHz) channels. */
-struct iwl_eeprom_channel {
-        u8 flags;               /* EEPROM_CHANNEL_* flags copied from EEPROM */
-        s8 max_power_avg;       /* max power (dBm) on this chnl, limit 31 */
-} __packed;
-
-enum iwl_eeprom_enhanced_txpwr_flags {
-        IWL_EEPROM_ENH_TXP_FL_VALID             = BIT(0),
-        IWL_EEPROM_ENH_TXP_FL_BAND_52G          = BIT(1),
-        IWL_EEPROM_ENH_TXP_FL_OFDM              = BIT(2),
-        IWL_EEPROM_ENH_TXP_FL_40MHZ             = BIT(3),
-        IWL_EEPROM_ENH_TXP_FL_HT_AP             = BIT(4),
-        IWL_EEPROM_ENH_TXP_FL_RES1              = BIT(5),
-        IWL_EEPROM_ENH_TXP_FL_RES2              = BIT(6),
-        IWL_EEPROM_ENH_TXP_FL_COMMON_TYPE       = BIT(7),
-};
-
-/**
- * iwl_eeprom_enhanced_txpwr structure
- *    This structure presents the enhanced regulatory tx power limit layout
- *    in eeprom image
- *    Enhanced regulatory tx power portion of eeprom image can be broken down
- *    into individual structures; each one is 8 bytes in size and contain the
- *    following information
- * @flags: entry flags
- * @channel: channel number
- * @chain_a_max_pwr: chain a max power in 1/2 dBm
- * @chain_b_max_pwr: chain b max power in 1/2 dBm
- * @chain_c_max_pwr: chain c max power in 1/2 dBm
- * @delta_20_in_40: 20-in-40 deltas (hi/lo)
- * @mimo2_max_pwr: mimo2 max power in 1/2 dBm
- * @mimo3_max_pwr: mimo3 max power in 1/2 dBm
- *
- */
-struct iwl_eeprom_enhanced_txpwr {
-        u8 flags;
-        u8 channel;
-        s8 chain_a_max;
-        s8 chain_b_max;
-        s8 chain_c_max;
-        u8 delta_20_in_40;
-        s8 mimo2_max;
-        s8 mimo3_max;
-} __packed;
-
-/* calibration */
-struct iwl_eeprom_calib_hdr {
-        u8 version;
-        u8 pa_type;
-        __le16 voltage;
-} __packed;
-
-#define EEPROM_CALIB_ALL        (INDIRECT_ADDRESS | INDIRECT_CALIBRATION)
-#define EEPROM_XTAL             ((2*0x128) | EEPROM_CALIB_ALL)
-
-/* temperature */
-#define EEPROM_KELVIN_TEMPERATURE       ((2*0x12A) | EEPROM_CALIB_ALL)
-#define EEPROM_RAW_TEMPERATURE          ((2*0x12B) | EEPROM_CALIB_ALL)
-
-
-/* agn links */
-#define EEPROM_LINK_HOST             (2*0x64)
-#define EEPROM_LINK_GENERAL          (2*0x65)
-#define EEPROM_LINK_REGULATORY       (2*0x66)
-#define EEPROM_LINK_CALIBRATION      (2*0x67)
-#define EEPROM_LINK_PROCESS_ADJST    (2*0x68)
-#define EEPROM_LINK_OTHERS           (2*0x69)
-#define EEPROM_LINK_TXP_LIMIT        (2*0x6a)
-#define EEPROM_LINK_TXP_LIMIT_SIZE   (2*0x6b)
-
-/* agn regulatory - indirect access */
-#define EEPROM_REG_BAND_1_CHANNELS       ((0x08)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 28 bytes */
-#define EEPROM_REG_BAND_2_CHANNELS       ((0x26)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 26 bytes */
-#define EEPROM_REG_BAND_3_CHANNELS       ((0x42)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 24 bytes */
-#define EEPROM_REG_BAND_4_CHANNELS       ((0x5C)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 22 bytes */
-#define EEPROM_REG_BAND_5_CHANNELS       ((0x74)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 12 bytes */
-#define EEPROM_REG_BAND_24_HT40_CHANNELS  ((0x82)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 14  bytes */
-#define EEPROM_REG_BAND_52_HT40_CHANNELS  ((0x92)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 22  bytes */
-
-/* 6000 regulatory - indirect access */
-#define EEPROM_6000_REG_BAND_24_HT40_CHANNELS  ((0x80)\
-                | INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 14  bytes */
-/* 2.4 GHz */
-extern const u8 iwl_eeprom_band_1[14];
-
-#define ADDRESS_MSK                 0x0000FFFF
-#define INDIRECT_TYPE_MSK           0x000F0000
-#define INDIRECT_HOST               0x00010000
-#define INDIRECT_GENERAL            0x00020000
-#define INDIRECT_REGULATORY         0x00030000
-#define INDIRECT_CALIBRATION        0x00040000
-#define INDIRECT_PROCESS_ADJST      0x00050000
-#define INDIRECT_OTHERS             0x00060000
-#define INDIRECT_TXP_LIMIT          0x00070000
-#define INDIRECT_TXP_LIMIT_SIZE     0x00080000
-#define INDIRECT_ADDRESS            0x00100000
-
-/* General */
-#define EEPROM_DEVICE_ID                    (2*0x08)    /* 2 bytes */
-#define EEPROM_SUBSYSTEM_ID                 (2*0x0A)    /* 2 bytes */
-#define EEPROM_MAC_ADDRESS                  (2*0x15)    /* 6  bytes */
-#define EEPROM_BOARD_REVISION               (2*0x35)    /* 2  bytes */
-#define EEPROM_BOARD_PBA_NUMBER             (2*0x3B+1)  /* 9  bytes */
-#define EEPROM_VERSION                      (2*0x44)    /* 2  bytes */
-#define EEPROM_SKU_CAP                      (2*0x45)    /* 2  bytes */
-#define EEPROM_OEM_MODE                     (2*0x46)    /* 2  bytes */
-#define EEPROM_RADIO_CONFIG                 (2*0x48)    /* 2  bytes */
-#define EEPROM_NUM_MAC_ADDRESS              (2*0x4C)    /* 2  bytes */
-
-/* The following masks are to be applied on EEPROM_RADIO_CONFIG */
-#define EEPROM_RF_CFG_TYPE_MSK(x)   (x & 0x3)         /* bits 0-1   */
-#define EEPROM_RF_CFG_STEP_MSK(x)   ((x >> 2)  & 0x3) /* bits 2-3   */
-#define EEPROM_RF_CFG_DASH_MSK(x)   ((x >> 4)  & 0x3) /* bits 4-5   */
-#define EEPROM_RF_CFG_PNUM_MSK(x)   ((x >> 6)  & 0x3) /* bits 6-7   */
-#define EEPROM_RF_CFG_TX_ANT_MSK(x) ((x >> 8)  & 0xF) /* bits 8-11  */
-#define EEPROM_RF_CFG_RX_ANT_MSK(x) ((x >> 12) & 0xF) /* bits 12-15 */
-
-#define EEPROM_RF_CONFIG_TYPE_MAX       0x3
-
-#define EEPROM_REGULATORY_BAND_NO_HT40                  (0)
-
-struct iwl_eeprom_ops {
-        const u32 regulatory_bands[7];
-        bool enhanced_txpower;
-};
-
-
-int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev);
-void iwl_eeprom_free(struct iwl_priv *priv);
-int iwl_eeprom_check_version(struct iwl_priv *priv);
-int iwl_eeprom_init_hw_params(struct iwl_priv *priv);
-u16 iwl_eeprom_calib_version(struct iwl_priv *priv);
-const u8 *iwl_eeprom_query_addr(struct iwl_priv *priv, size_t offset);
-u16 iwl_eeprom_query16(struct iwl_priv *priv, size_t offset);
-void iwl_eeprom_get_mac(struct iwl_priv *priv, u8 *mac);
-int iwl_init_channel_map(struct iwl_priv *priv);
-void iwl_free_channel_map(struct iwl_priv *priv);
-const struct iwl_channel_info *iwl_get_channel_info(
-                const struct iwl_priv *priv,
-                enum ieee80211_band band, u16 channel);
-void iwl_rf_config(struct iwl_priv *priv);
-
-#endif  /* __iwl_eeprom_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index 081dd34d2387..5f2df70b73c1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -27,6 +27,7 @@
  *****************************************************************************/
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/export.h>
 
 #include "iwl-io.h"
 #include"iwl-csr.h"
@@ -52,6 +53,7 @@ void iwl_set_bit(struct iwl_trans *trans, u32 reg, u32 mask)
         __iwl_set_bit(trans, reg, mask);
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(iwl_set_bit);
 
 void iwl_clear_bit(struct iwl_trans *trans, u32 reg, u32 mask)
 {
@@ -61,6 +63,25 @@ void iwl_clear_bit(struct iwl_trans *trans, u32 reg, u32 mask)
         __iwl_clear_bit(trans, reg, mask);
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(iwl_clear_bit);
+
+void iwl_set_bits_mask(struct iwl_trans *trans, u32 reg, u32 mask, u32 value)
+{
+        unsigned long flags;
+        u32 v;
+
+#ifdef CONFIG_IWLWIFI_DEBUG
+        WARN_ON_ONCE(value & ~mask);
+#endif
+
+        spin_lock_irqsave(&trans->reg_lock, flags);
+        v = iwl_read32(trans, reg);
+        v &= ~mask;
+        v |= value;
+        iwl_write32(trans, reg, v);
+        spin_unlock_irqrestore(&trans->reg_lock, flags);
+}
+EXPORT_SYMBOL_GPL(iwl_set_bits_mask);
 
 int iwl_poll_bit(struct iwl_trans *trans, u32 addr,
                  u32 bits, u32 mask, int timeout)
@@ -76,6 +97,7 @@ int iwl_poll_bit(struct iwl_trans *trans, u32 addr,
 
         return -ETIMEDOUT;
 }
+EXPORT_SYMBOL_GPL(iwl_poll_bit);
 
 int iwl_grab_nic_access_silent(struct iwl_trans *trans)
 {
@@ -117,6 +139,7 @@ int iwl_grab_nic_access_silent(struct iwl_trans *trans)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(iwl_grab_nic_access_silent);
 
 bool iwl_grab_nic_access(struct iwl_trans *trans)
 {
@@ -130,6 +153,7 @@ bool iwl_grab_nic_access(struct iwl_trans *trans)
 
         return true;
 }
+EXPORT_SYMBOL_GPL(iwl_grab_nic_access);
 
 void iwl_release_nic_access(struct iwl_trans *trans)
 {
@@ -144,6 +168,7 @@ void iwl_release_nic_access(struct iwl_trans *trans)
          */
         mmiowb();
 }
+EXPORT_SYMBOL_GPL(iwl_release_nic_access);
 
 u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg)
 {
@@ -158,6 +183,7 @@ u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg)
 
         return value;
 }
+EXPORT_SYMBOL_GPL(iwl_read_direct32);
 
 void iwl_write_direct32(struct iwl_trans *trans, u32 reg, u32 value)
 {
@@ -170,6 +196,7 @@ void iwl_write_direct32(struct iwl_trans *trans, u32 reg, u32 value)
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(iwl_write_direct32);
 
 int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,
                         int timeout)
@@ -185,6 +212,7 @@ int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,
 
         return -ETIMEDOUT;
 }
+EXPORT_SYMBOL_GPL(iwl_poll_direct_bit);
 
 static inline u32 __iwl_read_prph(struct iwl_trans *trans, u32 reg)
 {
@@ -211,6 +239,7 @@ u32 iwl_read_prph(struct iwl_trans *trans, u32 reg)
         spin_unlock_irqrestore(&trans->reg_lock, flags);
         return val;
 }
+EXPORT_SYMBOL_GPL(iwl_read_prph);
 
 void iwl_write_prph(struct iwl_trans *trans, u32 addr, u32 val)
 {
@@ -223,6 +252,7 @@ void iwl_write_prph(struct iwl_trans *trans, u32 addr, u32 val)
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(iwl_write_prph);
 
 void iwl_set_bits_prph(struct iwl_trans *trans, u32 reg, u32 mask)
 {
@@ -236,6 +266,7 @@ void iwl_set_bits_prph(struct iwl_trans *trans, u32 reg, u32 mask)
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(iwl_set_bits_prph);
 
 void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 reg,
                             u32 bits, u32 mask)
@@ -250,6 +281,7 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 reg,
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(iwl_set_bits_mask_prph);
 
 void iwl_clear_bits_prph(struct iwl_trans *trans, u32 reg, u32 mask)
 {
@@ -264,6 +296,7 @@ void iwl_clear_bits_prph(struct iwl_trans *trans, u32 reg, u32 mask)
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(iwl_clear_bits_prph);
 
 void _iwl_read_targ_mem_words(struct iwl_trans *trans, u32 addr,
                               void *buf, int words)
@@ -281,6 +314,7 @@ void _iwl_read_targ_mem_words(struct iwl_trans *trans, u32 addr,
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
+EXPORT_SYMBOL_GPL(_iwl_read_targ_mem_words);
 
 u32 iwl_read_targ_mem(struct iwl_trans *trans, u32 addr)
 {
@@ -290,6 +324,7 @@ u32 iwl_read_targ_mem(struct iwl_trans *trans, u32 addr)
 
         return value;
 }
+EXPORT_SYMBOL_GPL(iwl_read_targ_mem);
 
 int _iwl_write_targ_mem_words(struct iwl_trans *trans, u32 addr,
                                 void *buf, int words)
@@ -310,8 +345,10 @@ int _iwl_write_targ_mem_words(struct iwl_trans *trans, u32 addr,
 
         return result;
 }
+EXPORT_SYMBOL_GPL(_iwl_write_targ_mem_words);
 
 int iwl_write_targ_mem(struct iwl_trans *trans, u32 addr, u32 val)
 {
         return _iwl_write_targ_mem_words(trans, addr, &val, 1);
 }
+EXPORT_SYMBOL_GPL(iwl_write_targ_mem);
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
index abb3250164ba..4a9a45f771ed 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -54,6 +54,8 @@ static inline u32 iwl_read32(struct iwl_trans *trans, u32 ofs)
 void iwl_set_bit(struct iwl_trans *trans, u32 reg, u32 mask);
 void iwl_clear_bit(struct iwl_trans *trans, u32 reg, u32 mask);
 
+void iwl_set_bits_mask(struct iwl_trans *trans, u32 reg, u32 mask, u32 value);
+
 int iwl_poll_bit(struct iwl_trans *trans, u32 addr,
                  u32 bits, u32 mask, int timeout);
 int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,
diff --git a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c b/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
index 0066b899fe5c..5cfed29b1b18 100644
--- a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
+++ b/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
@@ -61,6 +61,7 @@
  *
  *****************************************************************************/
 #include <linux/sched.h>
+#include <linux/export.h>
 
 #include "iwl-notif-wait.h"
 
@@ -71,6 +72,7 @@ void iwl_notification_wait_init(struct iwl_notif_wait_data *notif_wait)
         INIT_LIST_HEAD(&notif_wait->notif_waits);
         init_waitqueue_head(&notif_wait->notif_waitq);
 }
+EXPORT_SYMBOL_GPL(iwl_notification_wait_init);
 
 void iwl_notification_wait_notify(struct iwl_notif_wait_data *notif_wait,
                                   struct iwl_rx_packet *pkt)
@@ -115,6 +117,7 @@ void iwl_notification_wait_notify(struct iwl_notif_wait_data *notif_wait,
         if (triggered)
                 wake_up_all(&notif_wait->notif_waitq);
 }
+EXPORT_SYMBOL_GPL(iwl_notification_wait_notify);
 
 void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_wait)
 {
@@ -128,7 +131,7 @@ void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_wait)
 
         wake_up_all(&notif_wait->notif_waitq);
 }
-
+EXPORT_SYMBOL_GPL(iwl_abort_notification_waits);
 
 void
 iwl_init_notification_wait(struct iwl_notif_wait_data *notif_wait,
@@ -152,6 +155,7 @@ iwl_init_notification_wait(struct iwl_notif_wait_data *notif_wait,
         list_add(&wait_entry->list, &notif_wait->notif_waits);
         spin_unlock_bh(&notif_wait->notif_wait_lock);
 }
+EXPORT_SYMBOL_GPL(iwl_init_notification_wait);
 
 int iwl_wait_notification(struct iwl_notif_wait_data *notif_wait,
                           struct iwl_notification_wait *wait_entry,
@@ -175,6 +179,7 @@ int iwl_wait_notification(struct iwl_notif_wait_data *notif_wait,
                 return -ETIMEDOUT;
         return 0;
 }
+EXPORT_SYMBOL_GPL(iwl_wait_notification);
 
 void iwl_remove_notification(struct iwl_notif_wait_data *notif_wait,
                              struct iwl_notification_wait *wait_entry)
@@ -183,3 +188,4 @@ void iwl_remove_notification(struct iwl_notif_wait_data *notif_wait,
         list_del(&wait_entry->list);
         spin_unlock_bh(&notif_wait->notif_wait_lock);
 }
+EXPORT_SYMBOL_GPL(iwl_remove_notification);
diff --git a/drivers/net/wireless/iwlwifi/iwl-op-mode.h b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
index 4ef742b28e08..cd9ef114d3a3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-op-mode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
@@ -145,6 +145,9 @@ struct iwl_op_mode_ops {
         void (*wimax_active)(struct iwl_op_mode *op_mode);
 };
 
+int iwl_opmode_register(const char *name, const struct iwl_op_mode_ops *ops);
+void iwl_opmode_deregister(const char *name);
+
 /**
  * struct iwl_op_mode - operational mode
  *
@@ -218,9 +221,4 @@ static inline void iwl_op_mode_wimax_active(struct iwl_op_mode *op_mode)
         op_mode->ops->wimax_active(op_mode);
 }
 
-/*****************************************************
-* Op mode layers implementations
-******************************************************/
-extern const struct iwl_op_mode_ops iwl_dvm_ops;
-
 #endif /* __iwl_op_mode_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/iwlwifi/iwl-prph.h
index dfd54662e3e6..9253ef1dba72 100644
--- a/drivers/net/wireless/iwlwifi/iwl-prph.h
+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
@@ -187,7 +187,7 @@
 #define SCD_QUEUE_STTS_REG_POS_ACTIVE   (3)
 #define SCD_QUEUE_STTS_REG_POS_WSL      (4)
 #define SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN (19)
-#define SCD_QUEUE_STTS_REG_MSK          (0x00FF0000)
+#define SCD_QUEUE_STTS_REG_MSK          (0x017F0000)
 
 #define SCD_QUEUE_CTX_REG1_CREDIT_POS           (8)
 #define SCD_QUEUE_CTX_REG1_CREDIT_MSK           (0x00FFFF00)
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index 79a1e7ae4995..00efde8e5536 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -154,6 +154,9 @@ struct iwl_cmd_header {
         __le16 sequence;
 } __packed;
 
+/* iwl_cmd_header flags value */
+#define IWL_CMD_FAILED_MSK 0x40
+
 
 #define FH_RSCSR_FRAME_SIZE_MSK         0x00003FFF      /* bits 0-13 */
 #define FH_RSCSR_FRAME_INVALID          0x55550000
@@ -280,6 +283,8 @@ static inline struct page *rxb_steal_page(struct iwl_rx_cmd_buffer *r)
 
 #define MAX_NO_RECLAIM_CMDS     6
 
+#define IWL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))
+
 /*
  * Maximum number of HW queues the transport layer
  * currently supports
@@ -350,10 +355,10 @@ struct iwl_trans;
  *      Must be atomic
  * @reclaim: free packet until ssn. Returns a list of freed packets.
  *      Must be atomic
- * @tx_agg_setup: setup a tx queue for AMPDU - will be called once the HW is
+ * @txq_enable: setup a tx queue for AMPDU - will be called once the HW is
  *      ready and a successful ADDBA response has been received.
  *      May sleep
- * @tx_agg_disable: de-configure a Tx queue to send AMPDUs
+ * @txq_disable: de-configure a Tx queue to send AMPDUs
  *      Must be atomic
  * @wait_tx_queue_empty: wait until all tx queues are empty
  *      May sleep
@@ -386,9 +391,9 @@ struct iwl_trans_ops {
         void (*reclaim)(struct iwl_trans *trans, int queue, int ssn,
                         struct sk_buff_head *skbs);
 
-        void (*tx_agg_setup)(struct iwl_trans *trans, int queue, int fifo,
-                             int sta_id, int tid, int frame_limit, u16 ssn);
-        void (*tx_agg_disable)(struct iwl_trans *trans, int queue);
+        void (*txq_enable)(struct iwl_trans *trans, int queue, int fifo,
+                           int sta_id, int tid, int frame_limit, u16 ssn);
+        void (*txq_disable)(struct iwl_trans *trans, int queue);
 
         int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir);
         int (*wait_tx_queue_empty)(struct iwl_trans *trans);
@@ -428,6 +433,11 @@ enum iwl_trans_state {
  * @hw_id_str: a string with info about HW ID. Set during transport allocation.
  * @pm_support: set to true in start_hw if link pm is supported
  * @wait_command_queue: the wait_queue for SYNC host commands
+ * @dev_cmd_pool: pool for Tx cmd allocation - for internal use only.
+ *      The user should use iwl_trans_{alloc,free}_tx_cmd.
+ * @dev_cmd_headroom: room needed for the transport's private use before the
+ *      device_cmd for Tx - for internal use only
+ *      The user should use iwl_trans_{alloc,free}_tx_cmd.
  */
 struct iwl_trans {
         const struct iwl_trans_ops *ops;
@@ -445,6 +455,10 @@ struct iwl_trans {
 
         wait_queue_head_t wait_command_queue;
 
+        /* The following fields are internal only */
+        struct kmem_cache *dev_cmd_pool;
+        size_t dev_cmd_headroom;
+
         /* pointer to trans specific struct */
         /*Ensure that this pointer will always be aligned to sizeof pointer */
         char trans_specific[0] __aligned(sizeof(void *));
@@ -520,6 +534,26 @@ static inline int iwl_trans_send_cmd(struct iwl_trans *trans,
         return trans->ops->send_cmd(trans, cmd);
 }
 
+static inline struct iwl_device_cmd *
+iwl_trans_alloc_tx_cmd(struct iwl_trans *trans)
+{
+        u8 *dev_cmd_ptr = kmem_cache_alloc(trans->dev_cmd_pool, GFP_ATOMIC);
+
+        if (unlikely(dev_cmd_ptr == NULL))
+                return NULL;
+
+        return (struct iwl_device_cmd *)
+                        (dev_cmd_ptr + trans->dev_cmd_headroom);
+}
+
+static inline void iwl_trans_free_tx_cmd(struct iwl_trans *trans,
+                                         struct iwl_device_cmd *dev_cmd)
+{
+        u8 *dev_cmd_ptr = (u8 *)dev_cmd - trans->dev_cmd_headroom;
+
+        kmem_cache_free(trans->dev_cmd_pool, dev_cmd_ptr);
+}
+
 static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,
                                struct iwl_device_cmd *dev_cmd, int queue)
 {
@@ -538,24 +572,24 @@ static inline void iwl_trans_reclaim(struct iwl_trans *trans, int queue,
         trans->ops->reclaim(trans, queue, ssn, skbs);
 }
 
-static inline void iwl_trans_tx_agg_disable(struct iwl_trans *trans, int queue)
+static inline void iwl_trans_txq_disable(struct iwl_trans *trans, int queue)
 {
         WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,
                   "%s bad state = %d", __func__, trans->state);
 
-        trans->ops->tx_agg_disable(trans, queue);
+        trans->ops->txq_disable(trans, queue);
 }
 
-static inline void iwl_trans_tx_agg_setup(struct iwl_trans *trans, int queue,
-                                          int fifo, int sta_id, int tid,
-                                          int frame_limit, u16 ssn)
+static inline void iwl_trans_txq_enable(struct iwl_trans *trans, int queue,
+                                        int fifo, int sta_id, int tid,
+                                        int frame_limit, u16 ssn)
 {
         might_sleep();
 
         WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,
                   "%s bad state = %d", __func__, trans->state);
 
-        trans->ops->tx_agg_setup(trans, queue, fifo, sta_id, tid,
+        trans->ops->txq_enable(trans, queue, fifo, sta_id, tid,
                                  frame_limit, ssn);
 }
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/pcie/1000.c
index 2629a6602dfa..81b83f484f08 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/1000.c
@@ -27,9 +27,9 @@
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include "iwl-config.h"
-#include "iwl-cfg.h"
 #include "iwl-csr.h"
 #include "iwl-agn-hw.h"
+#include "cfg.h"
 
 /* Highest firmware API version supported */
 #define IWL1000_UCODE_API_MAX 5
@@ -64,13 +64,26 @@ static const struct iwl_base_params iwl1000_base_params = {
         .support_ct_kill_exit = true,
         .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,
         .chain_noise_scale = 1000,
-        .wd_timeout = IWL_WATCHHDOG_DISABLED,
+        .wd_timeout = IWL_WATCHDOG_DISABLED,
         .max_event_log_size = 128,
 };
 
 static const struct iwl_ht_params iwl1000_ht_params = {
         .ht_greenfield_support = true,
         .use_rts_for_aggregation = true, /* use rts/cts protection */
+        .ht40_bands = BIT(IEEE80211_BAND_2GHZ),
+};
+
+static const struct iwl_eeprom_params iwl1000_eeprom_params = {
+        .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_REG_BAND_24_HT40_CHANNELS,
+                EEPROM_REGULATORY_BAND_NO_HT40,
+        }
 };
 
 #define IWL_DEVICE_1000                                         \
@@ -84,6 +97,7 @@ static const struct iwl_ht_params iwl1000_ht_params = {
         .eeprom_ver = EEPROM_1000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,       \
         .base_params = &iwl1000_base_params,                    \
+        .eeprom_params = &iwl1000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK
 
 const struct iwl_cfg iwl1000_bgn_cfg = {
@@ -108,6 +122,7 @@ const struct iwl_cfg iwl1000_bg_cfg = {
         .eeprom_ver = EEPROM_1000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,       \
         .base_params = &iwl1000_base_params,                    \
+        .eeprom_params = &iwl1000_eeprom_params,                \
         .led_mode = IWL_LED_RF_STATE,                           \
         .rx_with_siso_diversity = true
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/pcie/2000.c
index 8133105ac645..fd4e78f56fa6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/2000.c
@@ -27,9 +27,9 @@
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include "iwl-config.h"
-#include "iwl-cfg.h"
 #include "iwl-agn-hw.h"
-#include "iwl-commands.h" /* needed for BT for now */
+#include "cfg.h"
+#include "dvm/commands.h" /* needed for BT for now */
 
 /* Highest firmware API version supported */
 #define IWL2030_UCODE_API_MAX 6
@@ -104,6 +104,7 @@ static const struct iwl_base_params iwl2030_base_params = {
 static const struct iwl_ht_params iwl2000_ht_params = {
         .ht_greenfield_support = true,
         .use_rts_for_aggregation = true, /* use rts/cts protection */
+        .ht40_bands = BIT(IEEE80211_BAND_2GHZ),
 };
 
 static const struct iwl_bt_params iwl2030_bt_params = {
@@ -116,6 +117,19 @@ static const struct iwl_bt_params iwl2030_bt_params = {
         .bt_session_2 = true,
 };
 
+static const struct iwl_eeprom_params iwl20x0_eeprom_params = {
+        .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_REGULATORY_BAND_NO_HT40,
+        },
+        .enhanced_txpower = true,
+};
+
 #define IWL_DEVICE_2000                                         \
         .fw_name_pre = IWL2000_FW_PRE,                          \
         .ucode_api_max = IWL2000_UCODE_API_MAX,                 \
@@ -127,6 +141,7 @@ static const struct iwl_bt_params iwl2030_bt_params = {
         .eeprom_ver = EEPROM_2000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
         .base_params = &iwl2000_base_params,                    \
+        .eeprom_params = &iwl20x0_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE
@@ -155,6 +170,7 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = {
         .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
         .base_params = &iwl2030_base_params,                    \
         .bt_params = &iwl2030_bt_params,                        \
+        .eeprom_params = &iwl20x0_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE,                           \
@@ -177,6 +193,7 @@ const struct iwl_cfg iwl2030_2bgn_cfg = {
         .eeprom_ver = EEPROM_2000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
         .base_params = &iwl2000_base_params,                    \
+        .eeprom_params = &iwl20x0_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE,                           \
@@ -207,6 +224,7 @@ const struct iwl_cfg iwl105_bgn_d_cfg = {
         .eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,       \
         .base_params = &iwl2030_base_params,                    \
         .bt_params = &iwl2030_bt_params,                        \
+        .eeprom_params = &iwl20x0_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
         .temp_offset_v2 = true,                                 \
         .led_mode = IWL_LED_RF_STATE,                           \
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/pcie/5000.c
index 8e26bc825f23..d1665fa6d15a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/5000.c
@@ -27,9 +27,9 @@
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include "iwl-config.h"
-#include "iwl-cfg.h"
 #include "iwl-agn-hw.h"
 #include "iwl-csr.h"
+#include "cfg.h"
 
 /* Highest firmware API version supported */
 #define IWL5000_UCODE_API_MAX 5
@@ -62,13 +62,26 @@ static const struct iwl_base_params iwl5000_base_params = {
         .led_compensation = 51,
         .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
         .chain_noise_scale = 1000,
-        .wd_timeout = IWL_WATCHHDOG_DISABLED,
+        .wd_timeout = IWL_WATCHDOG_DISABLED,
         .max_event_log_size = 512,
         .no_idle_support = true,
 };
 
 static const struct iwl_ht_params iwl5000_ht_params = {
         .ht_greenfield_support = true,
+        .ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),
+};
+
+static const struct iwl_eeprom_params iwl5000_eeprom_params = {
+        .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_REG_BAND_24_HT40_CHANNELS,
+                EEPROM_REG_BAND_52_HT40_CHANNELS
+        },
 };
 
 #define IWL_DEVICE_5000                                         \
@@ -82,6 +95,7 @@ static const struct iwl_ht_params iwl5000_ht_params = {
         .eeprom_ver = EEPROM_5000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,       \
         .base_params = &iwl5000_base_params,                    \
+        .eeprom_params = &iwl5000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK
 
 const struct iwl_cfg iwl5300_agn_cfg = {
@@ -128,6 +142,7 @@ const struct iwl_cfg iwl5350_agn_cfg = {
         .eeprom_ver = EEPROM_5050_EEPROM_VERSION,
         .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,
         .base_params = &iwl5000_base_params,
+        .eeprom_params = &iwl5000_eeprom_params,
         .ht_params = &iwl5000_ht_params,
         .led_mode = IWL_LED_BLINK,
         .internal_wimax_coex = true,
@@ -144,6 +159,7 @@ const struct iwl_cfg iwl5350_agn_cfg = {
         .eeprom_ver = EEPROM_5050_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,       \
         .base_params = &iwl5000_base_params,                    \
+        .eeprom_params = &iwl5000_eeprom_params,                \
         .no_xtal_calib = true,                                  \
         .led_mode = IWL_LED_BLINK,                              \
         .internal_wimax_coex = true
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/pcie/6000.c
index e5e8ada4aaf6..cb08ba03aae7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/pcie/6000.c
@@ -27,9 +27,9 @@
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include "iwl-config.h"
-#include "iwl-cfg.h"
 #include "iwl-agn-hw.h"
-#include "iwl-commands.h" /* needed for BT for now */
+#include "cfg.h"
+#include "dvm/commands.h" /* needed for BT for now */
 
 /* Highest firmware API version supported */
 #define IWL6000_UCODE_API_MAX 6
@@ -127,6 +127,7 @@ static const struct iwl_base_params iwl6000_g2_base_params = {
 static const struct iwl_ht_params iwl6000_ht_params = {
         .ht_greenfield_support = true,
         .use_rts_for_aggregation = true, /* use rts/cts protection */
+        .ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),
 };
 
 static const struct iwl_bt_params iwl6000_bt_params = {
@@ -138,6 +139,19 @@ static const struct iwl_bt_params iwl6000_bt_params = {
         .bt_sco_disable = true,
 };
 
+static const struct iwl_eeprom_params iwl6000_eeprom_params = {
+        .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
+        },
+        .enhanced_txpower = true,
+};
+
 #define IWL_DEVICE_6005                                         \
         .fw_name_pre = IWL6005_FW_PRE,                          \
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,               \
@@ -149,6 +163,7 @@ static const struct iwl_bt_params iwl6000_bt_params = {
         .eeprom_ver = EEPROM_6005_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6005_TX_POWER_VERSION,       \
         .base_params = &iwl6000_g2_base_params,                 \
+        .eeprom_params = &iwl6000_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
         .led_mode = IWL_LED_RF_STATE
 
@@ -204,6 +219,7 @@ const struct iwl_cfg iwl6005_2agn_mow2_cfg = {
         .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION,       \
         .base_params = &iwl6000_g2_base_params,                 \
         .bt_params = &iwl6000_bt_params,                        \
+        .eeprom_params = &iwl6000_eeprom_params,                \
         .need_temp_offset_calib = true,                         \
         .led_mode = IWL_LED_RF_STATE,                           \
         .adv_pm = true                                          \
@@ -292,6 +308,7 @@ const struct iwl_cfg iwl130_bg_cfg = {
         .eeprom_ver = EEPROM_6000_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,       \
         .base_params = &iwl6000_base_params,                    \
+        .eeprom_params = &iwl6000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK
 
 const struct iwl_cfg iwl6000i_2agn_cfg = {
@@ -322,6 +339,7 @@ const struct iwl_cfg iwl6000i_2bg_cfg = {
         .eeprom_ver = EEPROM_6050_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,       \
         .base_params = &iwl6050_base_params,                    \
+        .eeprom_params = &iwl6000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK,                              \
         .internal_wimax_coex = true
 
@@ -346,6 +364,7 @@ const struct iwl_cfg iwl6050_2abg_cfg = {
         .eeprom_ver = EEPROM_6150_EEPROM_VERSION,               \
         .eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION,       \
         .base_params = &iwl6050_base_params,                    \
+        .eeprom_params = &iwl6000_eeprom_params,                \
         .led_mode = IWL_LED_BLINK,                              \
         .internal_wimax_coex = true
 
@@ -372,6 +391,7 @@ const struct iwl_cfg iwl6000_3agn_cfg = {
         .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
         .eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
         .base_params = &iwl6000_base_params,
+        .eeprom_params = &iwl6000_eeprom_params,
         .ht_params = &iwl6000_ht_params,
         .led_mode = IWL_LED_BLINK,
 };
diff --git a/drivers/net/wireless/iwlwifi/iwl-cfg.h b/drivers/net/wireless/iwlwifi/pcie/cfg.h
index 82152311d73b..82152311d73b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-cfg.h
+++ b/drivers/net/wireless/iwlwifi/pcie/cfg.h
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/pcie/drv.c
index 0c8a1c2d8847..f4c3500b68c6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@ -68,10 +68,11 @@
 #include <linux/pci-aspm.h>
 
 #include "iwl-trans.h"
-#include "iwl-cfg.h"
 #include "iwl-drv.h"
 #include "iwl-trans.h"
-#include "iwl-trans-pcie-int.h"
+
+#include "cfg.h"
+#include "internal.h"
 
 #define IWL_PCI_DEVICE(dev, subdev, cfg) \
         .vendor = PCI_VENDOR_ID_INTEL,  .device = (dev), \
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h b/drivers/net/wireless/iwlwifi/pcie/internal.h
index e959207c630a..94201c4d6227 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
+++ b/drivers/net/wireless/iwlwifi/pcie/internal.h
@@ -313,7 +313,7 @@ void iwl_bg_rx_replenish(struct work_struct *data);
 void iwl_irq_tasklet(struct iwl_trans *trans);
 void iwlagn_rx_replenish(struct iwl_trans *trans);
 void iwl_rx_queue_update_write_ptr(struct iwl_trans *trans,
-                        struct iwl_rx_queue *q);
+                                   struct iwl_rx_queue *q);
 
 /*****************************************************
 * ICT
@@ -328,7 +328,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data);
 * TX / HCMD
 ******************************************************/
 void iwl_txq_update_write_ptr(struct iwl_trans *trans,
-                        struct iwl_tx_queue *txq);
+                              struct iwl_tx_queue *txq);
 int iwlagn_txq_attach_buf_to_tfd(struct iwl_trans *trans,
                                  struct iwl_tx_queue *txq,
                                  dma_addr_t addr, u16 len, u8 reset);
@@ -337,17 +337,20 @@ int iwl_trans_pcie_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd);
 void iwl_tx_cmd_complete(struct iwl_trans *trans,
                          struct iwl_rx_cmd_buffer *rxb, int handler_status);
 void iwl_trans_txq_update_byte_cnt_tbl(struct iwl_trans *trans,
-                                           struct iwl_tx_queue *txq,
-                                           u16 byte_cnt);
-void iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, int queue);
+                                       struct iwl_tx_queue *txq,
+                                       u16 byte_cnt);
+void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int queue);
 void iwl_trans_set_wr_ptrs(struct iwl_trans *trans, int txq_id, u32 index);
 void iwl_trans_tx_queue_set_status(struct iwl_trans *trans,
                                    struct iwl_tx_queue *txq,
                                    int tx_fifo_id, bool active);
-void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans, int queue, int fifo,
-                                 int sta_id, int tid, int frame_limit, u16 ssn);
-void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
-                         enum dma_data_direction dma_dir);
+void __iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id,
+                                        int fifo, int sta_id, int tid,
+                                        int frame_limit, u16 ssn);
+void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,
+                               int sta_id, int tid, int frame_limit, u16 ssn);
+void iwl_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
+                      enum dma_data_direction dma_dir);
 int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
                          struct sk_buff_head *skbs);
 int iwl_queue_space(const struct iwl_queue *q);
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/pcie/rx.c
index 08517d3c80bb..d6860c070c16 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/rx.c
@@ -32,7 +32,7 @@
 
 #include "iwl-prph.h"
 #include "iwl-io.h"
-#include "iwl-trans-pcie-int.h"
+#include "internal.h"
 #include "iwl-op-mode.h"
 
 #ifdef CONFIG_IWLWIFI_IDI
@@ -130,7 +130,7 @@ static int iwl_rx_queue_space(const struct iwl_rx_queue *q)
  * iwl_rx_queue_update_write_ptr - Update the write pointer for the RX queue
  */
 void iwl_rx_queue_update_write_ptr(struct iwl_trans *trans,
-                        struct iwl_rx_queue *q)
+                                   struct iwl_rx_queue *q)
 {
         unsigned long flags;
         u32 reg;
@@ -201,9 +201,7 @@ static inline __le32 iwlagn_dma_addr2rbd_ptr(dma_addr_t dma_addr)
  */
 static void iwlagn_rx_queue_restock(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
-
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
         struct list_head *element;
         struct iwl_rx_mem_buffer *rxb;
@@ -253,9 +251,7 @@ static void iwlagn_rx_queue_restock(struct iwl_trans *trans)
  */
 static void iwlagn_rx_allocate(struct iwl_trans *trans, gfp_t priority)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
-
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
         struct list_head *element;
         struct iwl_rx_mem_buffer *rxb;
@@ -278,8 +274,7 @@ static void iwlagn_rx_allocate(struct iwl_trans *trans, gfp_t priority)
                         gfp_mask |= __GFP_COMP;
 
                 /* Alloc a new receive buffer */
-                page = alloc_pages(gfp_mask,
-                                  trans_pcie->rx_page_order);
+                page = alloc_pages(gfp_mask, trans_pcie->rx_page_order);
                 if (!page) {
                         if (net_ratelimit())
                                 IWL_DEBUG_INFO(trans, "alloc_pages failed, "
@@ -315,9 +310,10 @@ static void iwlagn_rx_allocate(struct iwl_trans *trans, gfp_t priority)
                 BUG_ON(rxb->page);
                 rxb->page = page;
                 /* Get physical address of the RB */
-                rxb->page_dma = dma_map_page(trans->dev, page, 0,
-                                PAGE_SIZE << trans_pcie->rx_page_order,
-                                DMA_FROM_DEVICE);
+                rxb->page_dma =
+                        dma_map_page(trans->dev, page, 0,
+                                     PAGE_SIZE << trans_pcie->rx_page_order,
+                                     DMA_FROM_DEVICE);
                 /* dma address must be no more than 36 bits */
                 BUG_ON(rxb->page_dma & ~DMA_BIT_MASK(36));
                 /* and also 256 byte aligned! */
@@ -465,8 +461,8 @@ static void iwl_rx_handle_rxbuf(struct iwl_trans *trans,
         if (rxb->page != NULL) {
                 rxb->page_dma =
                         dma_map_page(trans->dev, rxb->page, 0,
-                                PAGE_SIZE << trans_pcie->rx_page_order,
-                                DMA_FROM_DEVICE);
+                                     PAGE_SIZE << trans_pcie->rx_page_order,
+                                     DMA_FROM_DEVICE);
                 list_add_tail(&rxb->list, &rxq->rx_free);
                 rxq->free_count++;
         } else
@@ -497,7 +493,7 @@ static void iwl_rx_handle(struct iwl_trans *trans)
 
         /* Rx interrupt, but nothing sent from uCode */
         if (i == r)
-                IWL_DEBUG_RX(trans, "r = %d, i = %d\n", r, i);
+                IWL_DEBUG_RX(trans, "HW = SW = %d\n", r);
 
         /* calculate total frames need to be restock after handling RX */
         total_empty = r - rxq->write_actual;
@@ -513,8 +509,8 @@ static void iwl_rx_handle(struct iwl_trans *trans)
                 rxb = rxq->queue[i];
                 rxq->queue[i] = NULL;
 
-                IWL_DEBUG_RX(trans, "rxbuf: r = %d, i = %d (%p)\n", rxb);
-
+                IWL_DEBUG_RX(trans, "rxbuf: HW = %d, SW = %d (%p)\n",
+                             r, i, rxb);
                 iwl_rx_handle_rxbuf(trans, rxb);
 
                 i = (i + 1) & RX_QUEUE_MASK;
@@ -546,12 +542,12 @@ static void iwl_irq_handle_error(struct iwl_trans *trans)
         /* W/A for WiFi/WiMAX coex and WiMAX own the RF */
         if (trans->cfg->internal_wimax_coex &&
             (!(iwl_read_prph(trans, APMG_CLK_CTRL_REG) &
-                        APMS_CLK_VAL_MRB_FUNC_MODE) ||
+                             APMS_CLK_VAL_MRB_FUNC_MODE) ||
              (iwl_read_prph(trans, APMG_PS_CTRL_REG) &
-                        APMG_PS_CTRL_VAL_RESET_REQ))) {
-                struct iwl_trans_pcie *trans_pcie;
+                            APMG_PS_CTRL_VAL_RESET_REQ))) {
+                struct iwl_trans_pcie *trans_pcie =
+                        IWL_TRANS_GET_PCIE_TRANS(trans);
 
-                trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
                 clear_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status);
                 iwl_op_mode_wimax_active(trans->op_mode);
                 wake_up(&trans->wait_command_queue);
@@ -567,6 +563,8 @@ static void iwl_irq_handle_error(struct iwl_trans *trans)
 /* tasklet for iwlagn interrupt */
 void iwl_irq_tasklet(struct iwl_trans *trans)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
         u32 inta = 0;
         u32 handled = 0;
         unsigned long flags;
@@ -575,10 +573,6 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
         u32 inta_mask;
 #endif
 
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
-
-
         spin_lock_irqsave(&trans_pcie->irq_lock, flags);
 
         /* Ack/clear/reset pending uCode interrupts.
@@ -593,7 +587,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
          * interrupt coalescing can still be achieved.
          */
         iwl_write32(trans, CSR_INT,
-                trans_pcie->inta | ~trans_pcie->inta_mask);
+                    trans_pcie->inta | ~trans_pcie->inta_mask);
 
         inta = trans_pcie->inta;
 
@@ -602,7 +596,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
                 /* just for debug */
                 inta_mask = iwl_read32(trans, CSR_INT_MASK);
                 IWL_DEBUG_ISR(trans, "inta 0x%08x, enabled 0x%08x\n",
-                                inta, inta_mask);
+                              inta, inta_mask);
         }
 #endif
 
@@ -651,7 +645,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
 
                 hw_rfkill = iwl_is_rfkill_set(trans);
                 IWL_WARN(trans, "RF_KILL bit toggled to %s.\n",
-                                hw_rfkill ? "disable radio" : "enable radio");
+                         hw_rfkill ? "disable radio" : "enable radio");
 
                 isr_stats->rfkill++;
 
@@ -693,7 +687,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
          * Rx "responses" (frame-received notification), and other
          * notifications from uCode come through here*/
         if (inta & (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX |
-                        CSR_INT_BIT_RX_PERIODIC)) {
+                    CSR_INT_BIT_RX_PERIODIC)) {
                 IWL_DEBUG_ISR(trans, "Rx interrupt\n");
                 if (inta & (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX)) {
                         handled |= (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX);
@@ -733,7 +727,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
                  */
                 if (inta & (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX))
                         iwl_write8(trans, CSR_INT_PERIODIC_REG,
-                                    CSR_INT_PERIODIC_ENA);
+                                   CSR_INT_PERIODIC_ENA);
 
                 isr_stats->rx++;
         }
@@ -782,8 +776,7 @@ void iwl_irq_tasklet(struct iwl_trans *trans)
 /* Free dram table */
 void iwl_free_isr_ict(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         if (trans_pcie->ict_tbl) {
                 dma_free_coherent(trans->dev, ICT_SIZE,
@@ -802,8 +795,7 @@ void iwl_free_isr_ict(struct iwl_trans *trans)
  */
 int iwl_alloc_isr_ict(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         trans_pcie->ict_tbl =
                 dma_alloc_coherent(trans->dev, ICT_SIZE,
@@ -837,10 +829,9 @@ int iwl_alloc_isr_ict(struct iwl_trans *trans)
  */
 void iwl_reset_ict(struct iwl_trans *trans)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         u32 val;
         unsigned long flags;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
 
         if (!trans_pcie->ict_tbl)
                 return;
@@ -868,9 +859,7 @@ void iwl_reset_ict(struct iwl_trans *trans)
 /* Device is going down disable ict interrupt usage */
 void iwl_disable_ict(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
-
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         unsigned long flags;
 
         spin_lock_irqsave(&trans_pcie->irq_lock, flags);
@@ -934,7 +923,7 @@ static irqreturn_t iwl_isr(int irq, void *data)
         if (likely(inta))
                 tasklet_schedule(&trans_pcie->irq_tasklet);
         else if (test_bit(STATUS_INT_ENABLED, &trans_pcie->status) &&
-                        !trans_pcie->inta)
+                 !trans_pcie->inta)
                 iwl_enable_interrupts(trans);
 
  unplugged:
@@ -945,7 +934,7 @@ static irqreturn_t iwl_isr(int irq, void *data)
         /* re-enable interrupts here since we don't have anything to service. */
         /* only Re-enable if disabled by irq  and no schedules tasklet. */
         if (test_bit(STATUS_INT_ENABLED, &trans_pcie->status) &&
-                !trans_pcie->inta)
+            !trans_pcie->inta)
                 iwl_enable_interrupts(trans);
 
         spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
@@ -1036,7 +1025,7 @@ irqreturn_t iwl_isr_ict(int irq, void *data)
 
         inta = (0xff & val) | ((0xff00 & val) << 16);
         IWL_DEBUG_ISR(trans, "ISR inta 0x%08x, enabled 0x%08x ict 0x%08x\n",
-                        inta, inta_mask, val);
+                      inta, inta_mask, val);
 
         inta &= trans_pcie->inta_mask;
         trans_pcie->inta |= inta;
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 79c6b91417f9..7461a6a14338 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -70,15 +70,12 @@
 
 #include "iwl-drv.h"
 #include "iwl-trans.h"
-#include "iwl-trans-pcie-int.h"
 #include "iwl-csr.h"
 #include "iwl-prph.h"
-#include "iwl-eeprom.h"
 #include "iwl-agn-hw.h"
+#include "internal.h"
 /* FIXME: need to abstract out TX command (once we know what it looks like) */
-#include "iwl-commands.h"
-
-#define IWL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))
+#include "dvm/commands.h"
 
 #define SCD_QUEUECHAIN_SEL_ALL(trans, trans_pcie)       \
         (((1<<trans->cfg->base_params->num_of_queues) - 1) &\
@@ -86,8 +83,7 @@
 
 static int iwl_trans_rx_alloc(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
         struct device *dev = trans->dev;
 
@@ -114,7 +110,7 @@ static int iwl_trans_rx_alloc(struct iwl_trans *trans)
 
 err_rb_stts:
         dma_free_coherent(dev, sizeof(__le32) * RX_QUEUE_SIZE,
-                        rxq->bd, rxq->bd_dma);
+                          rxq->bd, rxq->bd_dma);
         memset(&rxq->bd_dma, 0, sizeof(rxq->bd_dma));
         rxq->bd = NULL;
 err_bd:
@@ -123,8 +119,7 @@ err_bd:
 
 static void iwl_trans_rxq_free_rx_bufs(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
         int i;
 
@@ -134,8 +129,8 @@ static void iwl_trans_rxq_free_rx_bufs(struct iwl_trans *trans)
                  * to an SKB, so we need to unmap and free potential storage */
                 if (rxq->pool[i].page != NULL) {
                         dma_unmap_page(trans->dev, rxq->pool[i].page_dma,
-                                PAGE_SIZE << trans_pcie->rx_page_order,
-                                DMA_FROM_DEVICE);
+                                       PAGE_SIZE << trans_pcie->rx_page_order,
+                                       DMA_FROM_DEVICE);
                         __free_pages(rxq->pool[i].page,
                                      trans_pcie->rx_page_order);
                         rxq->pool[i].page = NULL;
@@ -193,8 +188,7 @@ static void iwl_trans_rx_hw_init(struct iwl_trans *trans,
 
 static int iwl_rx_init(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
 
         int i, err;
@@ -236,10 +230,8 @@ static int iwl_rx_init(struct iwl_trans *trans)
 
 static void iwl_trans_pcie_rx_free(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
-
         unsigned long flags;
 
         /*if rxq->bd is NULL, it means that nothing has been allocated,
@@ -274,11 +266,11 @@ static int iwl_trans_rx_stop(struct iwl_trans *trans)
         /* stop Rx DMA */
         iwl_write_direct32(trans, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);
         return iwl_poll_direct_bit(trans, FH_MEM_RSSR_RX_STATUS_REG,
-                            FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);
+                                   FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE, 1000);
 }
 
-static inline int iwlagn_alloc_dma_ptr(struct iwl_trans *trans,
-                                    struct iwl_dma_ptr *ptr, size_t size)
+static int iwlagn_alloc_dma_ptr(struct iwl_trans *trans,
+                                struct iwl_dma_ptr *ptr, size_t size)
 {
         if (WARN_ON(ptr->addr))
                 return -EINVAL;
@@ -291,8 +283,8 @@ static inline int iwlagn_alloc_dma_ptr(struct iwl_trans *trans,
         return 0;
 }
 
-static inline void iwlagn_free_dma_ptr(struct iwl_trans *trans,
-                                    struct iwl_dma_ptr *ptr)
+static void iwlagn_free_dma_ptr(struct iwl_trans *trans,
+                                struct iwl_dma_ptr *ptr)
 {
         if (unlikely(!ptr->addr))
                 return;
@@ -329,12 +321,12 @@ static void iwl_trans_pcie_queue_stuck_timer(unsigned long data)
 }
 
 static int iwl_trans_txq_alloc(struct iwl_trans *trans,
-                                struct iwl_tx_queue *txq, int slots_num,
-                                u32 txq_id)
+                               struct iwl_tx_queue *txq, int slots_num,
+                               u32 txq_id)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         size_t tfd_sz = sizeof(struct iwl_tfd) * TFD_QUEUE_SIZE_MAX;
         int i;
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         if (WARN_ON(txq->entries || txq->tfds))
                 return -EINVAL;
@@ -435,7 +427,7 @@ static void iwl_tx_queue_unmap(struct iwl_trans *trans, int txq_id)
 
         spin_lock_bh(&txq->lock);
         while (q->write_ptr != q->read_ptr) {
-                iwlagn_txq_free_tfd(trans, txq, dma_dir);
+                iwl_txq_free_tfd(trans, txq, dma_dir);
                 q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd);
         }
         spin_unlock_bh(&txq->lock);
@@ -455,6 +447,7 @@ static void iwl_tx_queue_free(struct iwl_trans *trans, int txq_id)
         struct iwl_tx_queue *txq = &trans_pcie->txq[txq_id];
         struct device *dev = trans->dev;
         int i;
+
         if (WARN_ON(!txq))
                 return;
 
@@ -574,11 +567,11 @@ error:
 }
 static int iwl_tx_init(struct iwl_trans *trans)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int ret;
         int txq_id, slots_num;
         unsigned long flags;
         bool alloc = false;
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         if (!trans_pcie->txq) {
                 ret = iwl_trans_tx_alloc(trans);
@@ -643,10 +636,9 @@ static void iwl_set_pwr_vmain(struct iwl_trans *trans)
 
 static u16 iwl_pciexp_link_ctrl(struct iwl_trans *trans)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int pos;
         u16 pci_lnk_ctl;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
 
         struct pci_dev *pci_dev = trans_pcie->pci_dev;
 
@@ -700,14 +692,14 @@ static int iwl_apm_init(struct iwl_trans *trans)
 
         /* Disable L0S exit timer (platform NMI Work/Around) */
         iwl_set_bit(trans, CSR_GIO_CHICKEN_BITS,
-                          CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);
+                    CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER);
 
         /*
          * Disable L0s without affecting L1;
          *  don't wait for ICH L0s (ICH bug W/A)
          */
         iwl_set_bit(trans, CSR_GIO_CHICKEN_BITS,
-                          CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX);
+                    CSR_GIO_CHICKEN_BITS_REG_BIT_L1A_NO_L0S_RX);
 
         /* Set FH wait threshold to maximum (HW error during stress W/A) */
         iwl_set_bit(trans, CSR_DBG_HPET_MEM_REG, CSR_DBG_HPET_MEM_REG_VAL);
@@ -717,7 +709,7 @@ static int iwl_apm_init(struct iwl_trans *trans)
          * wake device's PCI Express link L1a -> L0s
          */
         iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,
-                                    CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A);
+                    CSR_HW_IF_CONFIG_REG_BIT_HAP_WAKE_L1A);
 
         iwl_apm_config(trans);
 
@@ -738,8 +730,8 @@ static int iwl_apm_init(struct iwl_trans *trans)
          * and accesses to uCode SRAM.
          */
         ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
-                        CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
-                        CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
+                           CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
+                           CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
         if (ret < 0) {
                 IWL_DEBUG_INFO(trans, "Failed to init the card\n");
                 goto out;
@@ -773,8 +765,8 @@ static int iwl_apm_stop_master(struct iwl_trans *trans)
         iwl_set_bit(trans, CSR_RESET, CSR_RESET_REG_FLAG_STOP_MASTER);
 
         ret = iwl_poll_bit(trans, CSR_RESET,
-                        CSR_RESET_REG_FLAG_MASTER_DISABLED,
-                        CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);
+                           CSR_RESET_REG_FLAG_MASTER_DISABLED,
+                           CSR_RESET_REG_FLAG_MASTER_DISABLED, 100);
         if (ret)
                 IWL_WARN(trans, "Master Disable Timed Out, 100 usec\n");
 
@@ -816,8 +808,7 @@ static int iwl_nic_init(struct iwl_trans *trans)
         iwl_apm_init(trans);
 
         /* Set interrupt coalescing calibration timer to default (512 usecs) */
-        iwl_write8(trans, CSR_INT_COALESCING,
-                IWL_HOST_INT_CALIB_TIMEOUT_DEF);
+        iwl_write8(trans, CSR_INT_COALESCING, IWL_HOST_INT_CALIB_TIMEOUT_DEF);
 
         spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
 
@@ -836,8 +827,8 @@ static int iwl_nic_init(struct iwl_trans *trans)
 
         if (trans->cfg->base_params->shadow_reg_enable) {
                 /* enable shadow regs in HW */
-                iwl_set_bit(trans, CSR_MAC_SHADOW_REG_CTRL,
-                        0x800FFFFF);
+                iwl_set_bit(trans, CSR_MAC_SHADOW_REG_CTRL, 0x800FFFFF);
+                IWL_DEBUG_INFO(trans, "Enabling shadow registers in device\n");
         }
 
         return 0;
@@ -851,13 +842,13 @@ static int iwl_set_hw_ready(struct iwl_trans *trans)
         int ret;
 
         iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,
-                CSR_HW_IF_CONFIG_REG_BIT_NIC_READY);
+                    CSR_HW_IF_CONFIG_REG_BIT_NIC_READY);
 
         /* See if we got it */
         ret = iwl_poll_bit(trans, CSR_HW_IF_CONFIG_REG,
-                                CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
-                                CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
-                                HW_READY_TIMEOUT);
+                           CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
+                           CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
+                           HW_READY_TIMEOUT);
 
         IWL_DEBUG_INFO(trans, "hardware%s ready\n", ret < 0 ? " not" : "");
         return ret;
@@ -877,11 +868,11 @@ static int iwl_prepare_card_hw(struct iwl_trans *trans)
 
         /* If HW is not ready, prepare the conditions to check again */
         iwl_set_bit(trans, CSR_HW_IF_CONFIG_REG,
-                        CSR_HW_IF_CONFIG_REG_PREPARE);
+                    CSR_HW_IF_CONFIG_REG_PREPARE);
 
         ret = iwl_poll_bit(trans, CSR_HW_IF_CONFIG_REG,
-                        ~CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE,
-                        CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE, 150000);
+                           ~CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE,
+                           CSR_HW_IF_CONFIG_REG_BIT_NIC_PREPARE_DONE, 150000);
 
         if (ret < 0)
                 return ret;
@@ -908,32 +899,33 @@ static int iwl_load_section(struct iwl_trans *trans, u8 section_num,
         trans_pcie->ucode_write_complete = false;
 
         iwl_write_direct32(trans,
-                FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL),
-                FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE);
+                           FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL),
+                           FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_PAUSE);
 
         iwl_write_direct32(trans,
-                FH_SRVC_CHNL_SRAM_ADDR_REG(FH_SRVC_CHNL), dst_addr);
+                           FH_SRVC_CHNL_SRAM_ADDR_REG(FH_SRVC_CHNL),
+                           dst_addr);
 
         iwl_write_direct32(trans,
                 FH_TFDIB_CTRL0_REG(FH_SRVC_CHNL),
                 phy_addr & FH_MEM_TFDIB_DRAM_ADDR_LSB_MSK);
 
         iwl_write_direct32(trans,
-                FH_TFDIB_CTRL1_REG(FH_SRVC_CHNL),
-                (iwl_get_dma_hi_addr(phy_addr)
-                        << FH_MEM_TFDIB_REG1_ADDR_BITSHIFT) | byte_cnt);
+                           FH_TFDIB_CTRL1_REG(FH_SRVC_CHNL),
+                           (iwl_get_dma_hi_addr(phy_addr)
+                                << FH_MEM_TFDIB_REG1_ADDR_BITSHIFT) | byte_cnt);
 
         iwl_write_direct32(trans,
-                FH_TCSR_CHNL_TX_BUF_STS_REG(FH_SRVC_CHNL),
-                1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM |
-                1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_IDX |
-                FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID);
+                           FH_TCSR_CHNL_TX_BUF_STS_REG(FH_SRVC_CHNL),
+                           1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM |
+                           1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_IDX |
+                           FH_TCSR_CHNL_TX_BUF_STS_REG_VAL_TFDB_VALID);
 
         iwl_write_direct32(trans,
-                FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL),
-                FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE       |
-                FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE    |
-                FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD);
+                           FH_TCSR_CHNL_TX_CONFIG_REG(FH_SRVC_CHNL),
+                           FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE    |
+                           FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_DISABLE |
+                           FH_TCSR_TX_CONFIG_REG_VAL_CIRQ_HOST_ENDTFD);
 
         IWL_DEBUG_FW(trans, "[%d] uCode section being loaded...\n",
                      section_num);
@@ -1038,6 +1030,10 @@ static void iwl_tx_start(struct iwl_trans *trans)
 
         spin_lock_irqsave(&trans_pcie->irq_lock, flags);
 
+        /* make sure all queue are not stopped/used */
+        memset(trans_pcie->queue_stopped, 0, sizeof(trans_pcie->queue_stopped));
+        memset(trans_pcie->queue_used, 0, sizeof(trans_pcie->queue_used));
+
         trans_pcie->scd_base_addr =
                 iwl_read_prph(trans, SCD_SRAM_BASE_ADDR);
         a = trans_pcie->scd_base_addr + SCD_CONTEXT_MEM_LOWER_BOUND;
@@ -1058,69 +1054,39 @@ static void iwl_tx_start(struct iwl_trans *trans)
         iwl_write_prph(trans, SCD_DRAM_BASE_ADDR,
                        trans_pcie->scd_bc_tbls.dma >> 10);
 
+        for (i = 0; i < trans_pcie->n_q_to_fifo; i++) {
+                int fifo = trans_pcie->setup_q_to_fifo[i];
+
+                __iwl_trans_pcie_txq_enable(trans, i, fifo, IWL_INVALID_STATION,
+                                            IWL_TID_NON_QOS,
+                                            SCD_FRAME_LIMIT, 0);
+        }
+
+        /* Activate all Tx DMA/FIFO channels */
+        iwl_trans_txq_set_sched(trans, IWL_MASK(0, 7));
+
         /* The chain extension of the SCD doesn't work well. This feature is
          * enabled by default by the HW, so we need to disable it manually.
          */
         iwl_write_prph(trans, SCD_CHAINEXT_EN, 0);
 
+
         /* Enable DMA channel */
         for (chan = 0; chan < FH_TCSR_CHNL_NUM ; chan++)
                 iwl_write_direct32(trans, FH_TCSR_CHNL_TX_CONFIG_REG(chan),
-                                FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |
-                                FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE);
+                                   FH_TCSR_TX_CONFIG_REG_VAL_DMA_CHNL_ENABLE |
+                                   FH_TCSR_TX_CONFIG_REG_VAL_DMA_CREDIT_ENABLE);
 
         /* Update FH chicken bits */
         reg_val = iwl_read_direct32(trans, FH_TX_CHICKEN_BITS_REG);
         iwl_write_direct32(trans, FH_TX_CHICKEN_BITS_REG,
                            reg_val | FH_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN);
 
-        iwl_write_prph(trans, SCD_QUEUECHAIN_SEL,
-                SCD_QUEUECHAIN_SEL_ALL(trans, trans_pcie));
-        iwl_write_prph(trans, SCD_AGGR_SEL, 0);
-
-        /* initiate the queues */
-        for (i = 0; i < trans->cfg->base_params->num_of_queues; i++) {
-                iwl_write_prph(trans, SCD_QUEUE_RDPTR(i), 0);
-                iwl_write_direct32(trans, HBUS_TARG_WRPTR, 0 | (i << 8));
-                iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +
-                                SCD_CONTEXT_QUEUE_OFFSET(i), 0);
-                iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +
-                                SCD_CONTEXT_QUEUE_OFFSET(i) +
-                                sizeof(u32),
-                                ((SCD_WIN_SIZE <<
-                                SCD_QUEUE_CTX_REG2_WIN_SIZE_POS) &
-                                SCD_QUEUE_CTX_REG2_WIN_SIZE_MSK) |
-                                ((SCD_FRAME_LIMIT <<
-                                SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &
-                                SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK));
-        }
-
-        iwl_write_prph(trans, SCD_INTERRUPT_MASK,
-                        IWL_MASK(0, trans->cfg->base_params->num_of_queues));
-
-        /* Activate all Tx DMA/FIFO channels */
-        iwl_trans_txq_set_sched(trans, IWL_MASK(0, 7));
-
-        iwl_trans_set_wr_ptrs(trans, trans_pcie->cmd_queue, 0);
-
-        /* make sure all queue are not stopped/used */
-        memset(trans_pcie->queue_stopped, 0, sizeof(trans_pcie->queue_stopped));
-        memset(trans_pcie->queue_used, 0, sizeof(trans_pcie->queue_used));
-
-        for (i = 0; i < trans_pcie->n_q_to_fifo; i++) {
-                int fifo = trans_pcie->setup_q_to_fifo[i];
-
-                set_bit(i, trans_pcie->queue_used);
-
-                iwl_trans_tx_queue_set_status(trans, &trans_pcie->txq[i],
-                                              fifo, true);
-        }
-
         spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
 
         /* Enable L1-Active */
         iwl_clear_bits_prph(trans, APMG_PCIDEV_STT_REG,
-                          APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
+                            APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
 }
 
 static void iwl_trans_pcie_fw_alive(struct iwl_trans *trans)
@@ -1134,9 +1100,9 @@ static void iwl_trans_pcie_fw_alive(struct iwl_trans *trans)
  */
 static int iwl_trans_tx_stop(struct iwl_trans *trans)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int ch, txq_id, ret;
         unsigned long flags;
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         /* Turn off all Tx DMA fifos */
         spin_lock_irqsave(&trans_pcie->irq_lock, flags);
@@ -1148,13 +1114,13 @@ static int iwl_trans_tx_stop(struct iwl_trans *trans)
                 iwl_write_direct32(trans,
                                    FH_TCSR_CHNL_TX_CONFIG_REG(ch), 0x0);
                 ret = iwl_poll_direct_bit(trans, FH_TSSR_TX_STATUS_REG,
-                                    FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch),
-                                    1000);
+                        FH_TSSR_TX_STATUS_REG_MSK_CHNL_IDLE(ch), 1000);
                 if (ret < 0)
-                        IWL_ERR(trans, "Failing on timeout while stopping"
-                            " DMA channel %d [0x%08x]", ch,
-                            iwl_read_direct32(trans,
-                                              FH_TSSR_TX_STATUS_REG));
+                        IWL_ERR(trans,
+                                "Failing on timeout while stopping DMA channel %d [0x%08x]",
+                                ch,
+                                iwl_read_direct32(trans,
+                                                  FH_TSSR_TX_STATUS_REG));
         }
         spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
 
@@ -1173,8 +1139,8 @@ static int iwl_trans_tx_stop(struct iwl_trans *trans)
 
 static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
 {
-        unsigned long flags;
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+        unsigned long flags;
 
         /* tell the device to stop sending interrupts */
         spin_lock_irqsave(&trans_pcie->irq_lock, flags);
@@ -1204,7 +1170,7 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
 
         /* Make sure (redundant) we've released our request to stay awake */
         iwl_clear_bit(trans, CSR_GP_CNTRL,
-                        CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+                      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
 
         /* Stop the device, and put it in low power state */
         iwl_apm_stop(trans);
@@ -1278,8 +1244,9 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
         txq->entries[q->write_ptr].cmd = dev_cmd;
 
         dev_cmd->hdr.cmd = REPLY_TX;
-        dev_cmd->hdr.sequence = cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) |
-                                INDEX_TO_SEQ(q->write_ptr)));
+        dev_cmd->hdr.sequence =
+                cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) |
+                            INDEX_TO_SEQ(q->write_ptr)));
 
         /* Set up first empty entry in queue's array of Tx/cmd buffers */
         out_meta = &txq->entries[q->write_ptr].meta;
@@ -1344,7 +1311,7 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
 
         /* take back ownership of DMA buffer to enable update */
         dma_sync_single_for_cpu(trans->dev, txcmd_phys, firstlen,
-                        DMA_BIDIRECTIONAL);
+                                DMA_BIDIRECTIONAL);
         tx_cmd->dram_lsb_ptr = cpu_to_le32(scratch_phys);
         tx_cmd->dram_msb_ptr = iwl_get_dma_hi_addr(scratch_phys);
 
@@ -1356,10 +1323,10 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
         iwl_trans_txq_update_byte_cnt_tbl(trans, txq, le16_to_cpu(tx_cmd->len));
 
         dma_sync_single_for_device(trans->dev, txcmd_phys, firstlen,
-                        DMA_BIDIRECTIONAL);
+                                   DMA_BIDIRECTIONAL);
 
         trace_iwlwifi_dev_tx(trans->dev,
-                             &((struct iwl_tfd *)txq->tfds)[txq->q.write_ptr],
+                             &txq->tfds[txq->q.write_ptr],
                              sizeof(struct iwl_tfd),
                              &dev_cmd->hdr, firstlen,
                              skb->data + hdr_len, secondlen);
@@ -1395,8 +1362,7 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
 
 static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int err;
         bool hw_rfkill;
 
@@ -1409,7 +1375,7 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
                 iwl_alloc_isr_ict(trans);
 
                 err = request_irq(trans_pcie->irq, iwl_isr_ict, IRQF_SHARED,
-                        DRV_NAME, trans);
+                                  DRV_NAME, trans);
                 if (err) {
                         IWL_ERR(trans, "Error allocating IRQ %d\n",
                                 trans_pcie->irq);
@@ -1447,9 +1413,9 @@ error:
 static void iwl_trans_pcie_stop_hw(struct iwl_trans *trans,
                                    bool op_mode_leaving)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         bool hw_rfkill;
         unsigned long flags;
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         iwl_apm_stop(trans);
 
@@ -1553,8 +1519,7 @@ static void iwl_trans_pcie_configure(struct iwl_trans *trans,
 
 void iwl_trans_pcie_free(struct iwl_trans *trans)
 {
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
         iwl_trans_pcie_tx_free(trans);
 #ifndef CONFIG_IWLWIFI_IDI
@@ -1569,6 +1534,7 @@ void iwl_trans_pcie_free(struct iwl_trans *trans)
         iounmap(trans_pcie->hw_base);
         pci_release_regions(trans_pcie->pci_dev);
         pci_disable_device(trans_pcie->pci_dev);
+        kmem_cache_destroy(trans->dev_cmd_pool);
 
         kfree(trans);
 }
@@ -1816,8 +1782,8 @@ static const struct file_operations iwl_dbgfs_##name##_ops = {		\
 };
 
 static ssize_t iwl_dbgfs_tx_queue_read(struct file *file,
-                                                char __user *user_buf,
-                                                size_t count, loff_t *ppos)
+                                       char __user *user_buf,
+                                       size_t count, loff_t *ppos)
 {
         struct iwl_trans *trans = file->private_data;
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
@@ -1853,11 +1819,11 @@ static ssize_t iwl_dbgfs_tx_queue_read(struct file *file,
 }
 
 static ssize_t iwl_dbgfs_rx_queue_read(struct file *file,
-                                                char __user *user_buf,
-                                                size_t count, loff_t *ppos) {
+                                       char __user *user_buf,
+                                       size_t count, loff_t *ppos)
+{
         struct iwl_trans *trans = file->private_data;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rx_queue *rxq = &trans_pcie->rxq;
         char buf[256];
         int pos = 0;
@@ -1881,11 +1847,10 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file,
 
 static ssize_t iwl_dbgfs_interrupt_read(struct file *file,
                                         char __user *user_buf,
-                                        size_t count, loff_t *ppos) {
-
+                                        size_t count, loff_t *ppos)
+{
         struct iwl_trans *trans = file->private_data;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
 
         int pos = 0;
@@ -1943,8 +1908,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
                                          size_t count, loff_t *ppos)
 {
         struct iwl_trans *trans = file->private_data;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
 
         char buf[8];
@@ -1964,8 +1928,8 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
 }
 
 static ssize_t iwl_dbgfs_csr_write(struct file *file,
-                                         const char __user *user_buf,
-                                         size_t count, loff_t *ppos)
+                                   const char __user *user_buf,
+                                   size_t count, loff_t *ppos)
 {
         struct iwl_trans *trans = file->private_data;
         char buf[8];
@@ -1985,8 +1949,8 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
 }
 
 static ssize_t iwl_dbgfs_fh_reg_read(struct file *file,
-                                         char __user *user_buf,
-                                         size_t count, loff_t *ppos)
+                                     char __user *user_buf,
+                                     size_t count, loff_t *ppos)
 {
         struct iwl_trans *trans = file->private_data;
         char *buf;
@@ -2029,7 +1993,7 @@ DEBUGFS_WRITE_FILE_OPS(fw_restart);
  *
  */
 static int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans,
-                                        struct dentry *dir)
+                                         struct dentry *dir)
 {
         DEBUGFS_ADD_FILE(rx_queue, dir, S_IRUSR);
         DEBUGFS_ADD_FILE(tx_queue, dir, S_IRUSR);
@@ -2041,9 +2005,10 @@ static int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans,
 }
 #else
 static int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans,
-                                        struct dentry *dir)
-{ return 0; }
-
+                                         struct dentry *dir)
+{
+        return 0;
+}
 #endif /*CONFIG_IWLWIFI_DEBUGFS */
 
 static const struct iwl_trans_ops trans_ops_pcie = {
@@ -2060,8 +2025,8 @@ static const struct iwl_trans_ops trans_ops_pcie = {
         .tx = iwl_trans_pcie_tx,
         .reclaim = iwl_trans_pcie_reclaim,
 
-        .tx_agg_disable = iwl_trans_pcie_tx_agg_disable,
-        .tx_agg_setup = iwl_trans_pcie_tx_agg_setup,
+        .txq_disable = iwl_trans_pcie_txq_disable,
+        .txq_enable = iwl_trans_pcie_txq_enable,
 
         .dbgfs_register = iwl_trans_pcie_dbgfs_register,
 
@@ -2084,11 +2049,12 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
 {
         struct iwl_trans_pcie *trans_pcie;
         struct iwl_trans *trans;
+        char cmd_pool_name[100];
         u16 pci_cmd;
         int err;
 
         trans = kzalloc(sizeof(struct iwl_trans) +
-                             sizeof(struct iwl_trans_pcie), GFP_KERNEL);
+                        sizeof(struct iwl_trans_pcie), GFP_KERNEL);
 
         if (WARN_ON(!trans))
                 return NULL;
@@ -2104,7 +2070,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
         /* W/A - seems to solve weird behavior. We need to remove this if we
          * don't want to stay in L1 all the time. This wastes a lot of power */
         pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
-                                PCIE_LINK_STATE_CLKPM);
+                               PCIE_LINK_STATE_CLKPM);
 
         if (pci_enable_device(pdev)) {
                 err = -ENODEV;
@@ -2120,7 +2086,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
                 err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (!err)
                         err = pci_set_consistent_dma_mask(pdev,
-                                                        DMA_BIT_MASK(32));
+                                                          DMA_BIT_MASK(32));
                 /* both attempts failed: */
                 if (err) {
                         dev_printk(KERN_ERR, &pdev->dev,
@@ -2143,13 +2109,13 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
         }
 
         dev_printk(KERN_INFO, &pdev->dev,
-                "pci_resource_len = 0x%08llx\n",
-                (unsigned long long) pci_resource_len(pdev, 0));
+                   "pci_resource_len = 0x%08llx\n",
+                   (unsigned long long) pci_resource_len(pdev, 0));
         dev_printk(KERN_INFO, &pdev->dev,
-                "pci_resource_base = %p\n", trans_pcie->hw_base);
+                   "pci_resource_base = %p\n", trans_pcie->hw_base);
 
         dev_printk(KERN_INFO, &pdev->dev,
-                "HW Revision ID = 0x%X\n", pdev->revision);
+                   "HW Revision ID = 0x%X\n", pdev->revision);
 
         /* We disable the RETRY_TIMEOUT register (0x41) to keep
          * PCI Tx retries from interfering with C3 CPU state */
@@ -2158,7 +2124,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
         err = pci_enable_msi(pdev);
         if (err)
                 dev_printk(KERN_ERR, &pdev->dev,
-                        "pci_enable_msi failed(0X%x)", err);
+                           "pci_enable_msi failed(0X%x)", err);
 
         trans->dev = &pdev->dev;
         trans_pcie->irq = pdev->irq;
@@ -2180,8 +2146,25 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
         init_waitqueue_head(&trans->wait_command_queue);
         spin_lock_init(&trans->reg_lock);
 
+        snprintf(cmd_pool_name, sizeof(cmd_pool_name), "iwl_cmd_pool:%s",
+                 dev_name(trans->dev));
+
+        trans->dev_cmd_headroom = 0;
+        trans->dev_cmd_pool =
+                kmem_cache_create(cmd_pool_name,
+                                  sizeof(struct iwl_device_cmd)
+                                  + trans->dev_cmd_headroom,
+                                  sizeof(void *),
+                                  SLAB_HWCACHE_ALIGN,
+                                  NULL);
+
+        if (!trans->dev_cmd_pool)
+                goto out_pci_disable_msi;
+
         return trans;
 
+out_pci_disable_msi:
+        pci_disable_msi(pdev);
 out_pci_release_regions:
         pci_release_regions(pdev);
 out_pci_disable_device:
@@ -2190,4 +2173,3 @@ out_no_pci:
         kfree(trans);
         return NULL;
 }
-
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index a8750238ee09..35e82161ca43 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -34,11 +34,10 @@
 #include "iwl-csr.h"
 #include "iwl-prph.h"
 #include "iwl-io.h"
-#include "iwl-agn-hw.h"
 #include "iwl-op-mode.h"
-#include "iwl-trans-pcie-int.h"
+#include "internal.h"
 /* FIXME: need to abstract out TX command (once we know what it looks like) */
-#include "iwl-commands.h"
+#include "dvm/commands.h"
 
 #define IWL_TX_CRC_SIZE 4
 #define IWL_TX_DELIMITER_SIZE 4
@@ -47,12 +46,11 @@
  * iwl_trans_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array
  */
 void iwl_trans_txq_update_byte_cnt_tbl(struct iwl_trans *trans,
-                                           struct iwl_tx_queue *txq,
-                                           u16 byte_cnt)
+                                       struct iwl_tx_queue *txq,
+                                       u16 byte_cnt)
 {
         struct iwlagn_scd_bc_tbl *scd_bc_tbl;
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int write_ptr = txq->q.write_ptr;
         int txq_id = txq->q.id;
         u8 sec_ctl = 0;
@@ -178,8 +176,8 @@ static inline u8 iwl_tfd_get_num_tbs(struct iwl_tfd *tfd)
         return tfd->num_tbs & 0x1f;
 }
 
-static void iwlagn_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta,
-                     struct iwl_tfd *tfd, enum dma_data_direction dma_dir)
+static void iwl_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta,
+                          struct iwl_tfd *tfd, enum dma_data_direction dma_dir)
 {
         int i;
         int num_tbs;
@@ -209,7 +207,7 @@ static void iwlagn_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta,
 }
 
 /**
- * iwlagn_txq_free_tfd - Free all chunks referenced by TFD [txq->q.read_ptr]
+ * iwl_txq_free_tfd - Free all chunks referenced by TFD [txq->q.read_ptr]
  * @trans - transport private data
  * @txq - tx queue
  * @dma_dir - the direction of the DMA mapping
@@ -217,8 +215,8 @@ static void iwlagn_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta,
  * Does NOT advance any TFD circular buffer read/write indexes
  * Does NOT free the TFD itself (which is within circular buffer)
  */
-void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
-                         enum dma_data_direction dma_dir)
+void iwl_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
+                      enum dma_data_direction dma_dir)
 {
         struct iwl_tfd *tfd_tmp = txq->tfds;
 
@@ -229,8 +227,8 @@ void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
         lockdep_assert_held(&txq->lock);
 
         /* We have only q->n_window txq->entries, but we use q->n_bd tfds */
-        iwlagn_unmap_tfd(trans, &txq->entries[idx].meta,
-                         &tfd_tmp[rd_ptr], dma_dir);
+        iwl_unmap_tfd(trans, &txq->entries[idx].meta, &tfd_tmp[rd_ptr],
+                      dma_dir);
 
         /* free SKB */
         if (txq->entries) {
@@ -270,7 +268,7 @@ int iwlagn_txq_attach_buf_to_tfd(struct iwl_trans *trans,
         /* Each TFD can point to a maximum 20 Tx buffers */
         if (num_tbs >= IWL_NUM_OF_TBS) {
                 IWL_ERR(trans, "Error can not send more than %d chunks\n",
-                          IWL_NUM_OF_TBS);
+                        IWL_NUM_OF_TBS);
                 return -EINVAL;
         }
 
@@ -279,7 +277,7 @@ int iwlagn_txq_attach_buf_to_tfd(struct iwl_trans *trans,
 
         if (unlikely(addr & ~IWL_TX_DMA_MASK))
                 IWL_ERR(trans, "Unaligned address = %llx\n",
-                          (unsigned long long)addr);
+                        (unsigned long long)addr);
 
         iwl_tfd_set_tb(tfd, num_tbs, addr, len);
 
@@ -383,15 +381,13 @@ static void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_trans *trans,
 }
 
 static int iwlagn_tx_queue_set_q2ratid(struct iwl_trans *trans, u16 ra_tid,
-                                        u16 txq_id)
+                                       u16 txq_id)
 {
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         u32 tbl_dw_addr;
         u32 tbl_dw;
         u16 scd_q2ratid;
 
-        struct iwl_trans_pcie *trans_pcie =
-                IWL_TRANS_GET_PCIE_TRANS(trans);
-
         scd_q2ratid = ra_tid & SCD_QUEUE_RA_TID_MAP_RATID_MSK;
 
         tbl_dw_addr = trans_pcie->scd_base_addr +
@@ -419,12 +415,11 @@ static void iwlagn_tx_queue_stop_scheduler(struct iwl_trans *trans, u16 txq_id)
                 (1 << SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN));
 }
 
-void iwl_trans_set_wr_ptrs(struct iwl_trans *trans,
-                                int txq_id, u32 index)
+void iwl_trans_set_wr_ptrs(struct iwl_trans *trans, int txq_id, u32 index)
 {
         IWL_DEBUG_TX_QUEUES(trans, "Q %d  WrPtr: %d\n", txq_id, index & 0xff);
         iwl_write_direct32(trans, HBUS_TARG_WRPTR,
-                        (index & 0xff) | (txq_id << 8));
+                           (index & 0xff) | (txq_id << 8));
         iwl_write_prph(trans, SCD_QUEUE_RDPTR(txq_id), index);
 }
 
@@ -447,29 +442,34 @@ void iwl_trans_tx_queue_set_status(struct iwl_trans *trans,
                 IWL_DEBUG_TX_QUEUES(trans, "Deactivate queue %d\n", txq_id);
 }
 
-void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans, int txq_id, int fifo,
-                                 int sta_id, int tid, int frame_limit, u16 ssn)
+void __iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id,
+                                        int fifo, int sta_id, int tid,
+                                        int frame_limit, u16 ssn)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        unsigned long flags;
-        u16 ra_tid = BUILD_RAxTID(sta_id, tid);
+
+        lockdep_assert_held(&trans_pcie->irq_lock);
 
         if (test_and_set_bit(txq_id, trans_pcie->queue_used))
                 WARN_ONCE(1, "queue %d already used - expect issues", txq_id);
 
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
-
         /* Stop this Tx queue before configuring it */
         iwlagn_tx_queue_stop_scheduler(trans, txq_id);
 
-        /* Map receiver-address / traffic-ID to this queue */
-        iwlagn_tx_queue_set_q2ratid(trans, ra_tid, txq_id);
+        /* Set this queue as a chain-building queue unless it is CMD queue */
+        if (txq_id != trans_pcie->cmd_queue)
+                iwl_set_bits_prph(trans, SCD_QUEUECHAIN_SEL, BIT(txq_id));
+
+        /* If this queue is mapped to a certain station: it is an AGG queue */
+        if (sta_id != IWL_INVALID_STATION) {
+                u16 ra_tid = BUILD_RAxTID(sta_id, tid);
 
-        /* Set this queue as a chain-building queue */
-        iwl_set_bits_prph(trans, SCD_QUEUECHAIN_SEL, BIT(txq_id));
+                /* Map receiver-address / traffic-ID to this queue */
+                iwlagn_tx_queue_set_q2ratid(trans, ra_tid, txq_id);
 
-        /* enable aggregations for the queue */
-        iwl_set_bits_prph(trans, SCD_AGGR_SEL, BIT(txq_id));
+                /* enable aggregations for the queue */
+                iwl_set_bits_prph(trans, SCD_AGGR_SEL, BIT(txq_id));
+        }
 
         /* Place first TFD at index corresponding to start sequence number.
          * Assumes that ssn_idx is valid (!= 0xFFF) */
@@ -479,22 +479,34 @@ void iwl_trans_pcie_tx_agg_setup(struct iwl_trans *trans, int txq_id, int fifo,
 
         /* Set up Tx window size and frame limit for this queue */
         iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +
+                        SCD_CONTEXT_QUEUE_OFFSET(txq_id), 0);
+        iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +
                         SCD_CONTEXT_QUEUE_OFFSET(txq_id) + sizeof(u32),
                         ((frame_limit << SCD_QUEUE_CTX_REG2_WIN_SIZE_POS) &
                                 SCD_QUEUE_CTX_REG2_WIN_SIZE_MSK) |
                         ((frame_limit << SCD_QUEUE_CTX_REG2_FRAME_LIMIT_POS) &
                                 SCD_QUEUE_CTX_REG2_FRAME_LIMIT_MSK));
 
-        iwl_set_bits_prph(trans, SCD_INTERRUPT_MASK, (1 << txq_id));
-
         /* Set up Status area in SRAM, map to Tx DMA/FIFO, activate the queue */
         iwl_trans_tx_queue_set_status(trans, &trans_pcie->txq[txq_id],
                                       fifo, true);
+}
+
+void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,
+                               int sta_id, int tid, int frame_limit, u16 ssn)
+{
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+        unsigned long flags;
+
+        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+
+        __iwl_trans_pcie_txq_enable(trans, txq_id, fifo, sta_id,
+                                    tid, frame_limit, ssn);
 
         spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
 }
 
-void iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, int txq_id)
+void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
@@ -511,8 +523,6 @@ void iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, int txq_id)
         trans_pcie->txq[txq_id].q.write_ptr = 0;
         iwl_trans_set_wr_ptrs(trans, txq_id, 0);
 
-        iwl_clear_bits_prph(trans, SCD_INTERRUPT_MASK, BIT(txq_id));
-
         iwl_trans_tx_queue_set_status(trans, &trans_pcie->txq[txq_id],
                                       0, false);
 }
@@ -615,13 +625,13 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
         }
 
         IWL_DEBUG_HC(trans,
-                "Sending command %s (#%x), seq: 0x%04X, %d bytes at %d[%d]:%d\n",
-                trans_pcie_get_cmd_string(trans_pcie, out_cmd->hdr.cmd),
-                out_cmd->hdr.cmd, le16_to_cpu(out_cmd->hdr.sequence), cmd_size,
-                q->write_ptr, idx, trans_pcie->cmd_queue);
+                     "Sending command %s (#%x), seq: 0x%04X, %d bytes at %d[%d]:%d\n",
+                     trans_pcie_get_cmd_string(trans_pcie, out_cmd->hdr.cmd),
+                     out_cmd->hdr.cmd, le16_to_cpu(out_cmd->hdr.sequence),
+                     cmd_size, q->write_ptr, idx, trans_pcie->cmd_queue);
 
         phys_addr = dma_map_single(trans->dev, &out_cmd->hdr, copy_size,
-                                DMA_BIDIRECTIONAL);
+                                   DMA_BIDIRECTIONAL);
         if (unlikely(dma_mapping_error(trans->dev, phys_addr))) {
                 idx = -ENOMEM;
                 goto out;
@@ -630,8 +640,7 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
         dma_unmap_addr_set(out_meta, mapping, phys_addr);
         dma_unmap_len_set(out_meta, len, copy_size);
 
-        iwlagn_txq_attach_buf_to_tfd(trans, txq,
-                                        phys_addr, copy_size, 1);
+        iwlagn_txq_attach_buf_to_tfd(trans, txq, phys_addr, copy_size, 1);
 #ifdef CONFIG_IWLWIFI_DEVICE_TRACING
         trace_bufs[0] = &out_cmd->hdr;
         trace_lens[0] = copy_size;
@@ -643,13 +652,12 @@ static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
                         continue;
                 if (!(cmd->dataflags[i] & IWL_HCMD_DFL_NOCOPY))
                         continue;
-                phys_addr = dma_map_single(trans->dev,
-                                           (void *)cmd->data[i],
+                phys_addr = dma_map_single(trans->dev, (void *)cmd->data[i],
                                            cmd->len[i], DMA_BIDIRECTIONAL);
                 if (dma_mapping_error(trans->dev, phys_addr)) {
-                        iwlagn_unmap_tfd(trans, out_meta,
-                                         &txq->tfds[q->write_ptr],
-                                         DMA_BIDIRECTIONAL);
+                        iwl_unmap_tfd(trans, out_meta,
+                                      &txq->tfds[q->write_ptr],
+                                      DMA_BIDIRECTIONAL);
                         idx = -ENOMEM;
                         goto out;
                 }
@@ -723,9 +731,10 @@ static void iwl_hcmd_queue_reclaim(struct iwl_trans *trans, int txq_id,
         lockdep_assert_held(&txq->lock);
 
         if ((idx >= q->n_bd) || (iwl_queue_used(q, idx) == 0)) {
-                IWL_ERR(trans, "%s: Read index for DMA queue txq id (%d), "
-                          "index %d is out of range [0-%d] %d %d.\n", __func__,
-                          txq_id, idx, q->n_bd, q->write_ptr, q->read_ptr);
+                IWL_ERR(trans,
+                        "%s: Read index for DMA queue txq id (%d), index %d is out of range [0-%d] %d %d.\n",
+                        __func__, txq_id, idx, q->n_bd,
+                        q->write_ptr, q->read_ptr);
                 return;
         }
 
@@ -733,8 +742,8 @@ static void iwl_hcmd_queue_reclaim(struct iwl_trans *trans, int txq_id,
              q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {
 
                 if (nfreed++ > 0) {
-                        IWL_ERR(trans, "HCMD skipped: index (%d) %d %d\n", idx,
-                                        q->write_ptr, q->read_ptr);
+                        IWL_ERR(trans, "HCMD skipped: index (%d) %d %d\n",
+                                idx, q->write_ptr, q->read_ptr);
                         iwl_op_mode_nic_error(trans->op_mode);
                 }
 
@@ -771,9 +780,9 @@ void iwl_tx_cmd_complete(struct iwl_trans *trans, struct iwl_rx_cmd_buffer *rxb,
          * in the queue management code. */
         if (WARN(txq_id != trans_pcie->cmd_queue,
                  "wrong command queue %d (should be %d), sequence 0x%X readp=%d writep=%d\n",
-                  txq_id, trans_pcie->cmd_queue, sequence,
-                  trans_pcie->txq[trans_pcie->cmd_queue].q.read_ptr,
-                  trans_pcie->txq[trans_pcie->cmd_queue].q.write_ptr)) {
+                 txq_id, trans_pcie->cmd_queue, sequence,
+                 trans_pcie->txq[trans_pcie->cmd_queue].q.read_ptr,
+                 trans_pcie->txq[trans_pcie->cmd_queue].q.write_ptr)) {
                 iwl_print_hex_error(trans, pkt, 32);
                 return;
         }
@@ -784,8 +793,7 @@ void iwl_tx_cmd_complete(struct iwl_trans *trans, struct iwl_rx_cmd_buffer *rxb,
         cmd = txq->entries[cmd_index].cmd;
         meta = &txq->entries[cmd_index].meta;
 
-        iwlagn_unmap_tfd(trans, meta, &txq->tfds[index],
-                         DMA_BIDIRECTIONAL);
+        iwl_unmap_tfd(trans, meta, &txq->tfds[index], DMA_BIDIRECTIONAL);
 
         /* Input error checking is done when commands are added to queue. */
         if (meta->flags & CMD_WANT_SKB) {
@@ -870,8 +878,9 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
         }
 
         ret = wait_event_timeout(trans->wait_command_queue,
-                        !test_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status),
-                        HOST_COMPLETE_TIMEOUT);
+                                 !test_bit(STATUS_HCMD_ACTIVE,
+                                           &trans_pcie->status),
+                                 HOST_COMPLETE_TIMEOUT);
         if (!ret) {
                 if (test_bit(STATUS_HCMD_ACTIVE, &trans_pcie->status)) {
                         struct iwl_tx_queue *txq =
@@ -956,10 +965,10 @@ int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
 
         if ((index >= q->n_bd) ||
            (iwl_queue_used(q, last_to_free) == 0)) {
-                IWL_ERR(trans, "%s: Read index for DMA queue txq id (%d), "
-                          "last_to_free %d is out of range [0-%d] %d %d.\n",
-                          __func__, txq_id, last_to_free, q->n_bd,
-                          q->write_ptr, q->read_ptr);
+                IWL_ERR(trans,
+                        "%s: Read index for DMA queue txq id (%d), last_to_free %d is out of range [0-%d] %d %d.\n",
+                        __func__, txq_id, last_to_free, q->n_bd,
+                        q->write_ptr, q->read_ptr);
                 return 0;
         }
 
@@ -979,7 +988,7 @@ int iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
 
                 iwlagn_txq_inval_byte_cnt_tbl(trans, txq);
 
-                iwlagn_txq_free_tfd(trans, txq, DMA_TO_DEVICE);
+                iwl_txq_free_tfd(trans, txq, DMA_TO_DEVICE);
                 freed++;
         }
 
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 2fa879b015b6..f4a203049fb4 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -435,24 +435,40 @@ static int lbs_add_wpa_tlv(u8 *tlv, const u8 *ie, u8 ie_len)
  * Set Channel
  */
 
-static int lbs_cfg_set_channel(struct wiphy *wiphy,
-        struct net_device *netdev,
-        struct ieee80211_channel *channel,
-        enum nl80211_channel_type channel_type)
+static int lbs_cfg_set_monitor_channel(struct wiphy *wiphy,
+                                       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, "iface %s freq %d, type %d",
-                           netdev_name(netdev), channel->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;
 
-        if (netdev == priv->mesh_dev)
-                ret = lbs_mesh_set_channel(priv, channel->hw_value);
-        else
-                ret = lbs_set_channel(priv, channel->hw_value);
+        ret = lbs_set_channel(priv, channel->hw_value);
+
+ out:
+        lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
+        return ret;
+}
+
+static int lbs_cfg_set_mesh_channel(struct wiphy *wiphy,
+                                    struct net_device *netdev,
+                                    struct ieee80211_channel *channel)
+{
+        struct lbs_private *priv = wiphy_priv(wiphy);
+        int ret = -ENOTSUPP;
+
+        lbs_deb_enter_args(LBS_DEB_CFG80211, "iface %s freq %d",
+                           netdev_name(netdev), channel->center_freq);
+
+        if (netdev != priv->mesh_dev)
+                goto out;
+
+        ret = lbs_mesh_set_channel(priv, channel->hw_value);
 
  out:
         lbs_deb_leave_args(LBS_DEB_CFG80211, "ret %d", ret);
@@ -2029,7 +2045,8 @@ static int lbs_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
  */
 
 static struct cfg80211_ops lbs_cfg80211_ops = {
-        .set_channel = lbs_cfg_set_channel,
+        .set_monitor_channel = lbs_cfg_set_monitor_channel,
+        .libertas_set_mesh_channel = lbs_cfg_set_mesh_channel,
         .scan = lbs_cfg_scan,
         .connect = lbs_cfg_connect,
         .disconnect = lbs_cfg_disconnect,
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index a06cc283e23d..668dd27616a0 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -483,7 +483,7 @@ static ssize_t lbs_rdmac_write(struct file *file,
                 res = -EFAULT;
                 goto out_unlock;
         }
-        priv->mac_offset = simple_strtoul((char *)buf, NULL, 16);
+        priv->mac_offset = simple_strtoul(buf, NULL, 16);
         res = count;
 out_unlock:
         free_page(addr);
@@ -565,7 +565,7 @@ static ssize_t lbs_rdbbp_write(struct file *file,
                 res = -EFAULT;
                 goto out_unlock;
         }
-        priv->bbp_offset = simple_strtoul((char *)buf, NULL, 16);
+        priv->bbp_offset = simple_strtoul(buf, NULL, 16);
         res = count;
 out_unlock:
         free_page(addr);
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 672005430aca..60996ce89f77 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -58,6 +58,7 @@ struct lbs_private {
         uint16_t mesh_tlv;
         u8 mesh_ssid[IEEE80211_MAX_SSID_LEN + 1];
         u8 mesh_ssid_len;
+        u8 mesh_channel;
 #endif
 
         /* Debugfs */
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index cd3b0d400618..64b7dc5de126 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -302,7 +302,7 @@ error:
 static void if_usb_disconnect(struct usb_interface *intf)
 {
         struct if_usb_card *cardp = usb_get_intfdata(intf);
-        struct lbs_private *priv = (struct lbs_private *) cardp->priv;
+        struct lbs_private *priv = cardp->priv;
 
         lbs_deb_enter(LBS_DEB_MAIN);
 
diff --git a/drivers/net/wireless/libertas/mesh.c b/drivers/net/wireless/libertas/mesh.c
index e87c031b298f..97807751ebcf 100644
--- a/drivers/net/wireless/libertas/mesh.c
+++ b/drivers/net/wireless/libertas/mesh.c
@@ -131,16 +131,13 @@ static int lbs_mesh_config(struct lbs_private *priv, uint16_t action,
 
 int lbs_mesh_set_channel(struct lbs_private *priv, u8 channel)
 {
+        priv->mesh_channel = channel;
         return lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_START, channel);
 }
 
 static uint16_t lbs_mesh_get_channel(struct lbs_private *priv)
 {
-        struct wireless_dev *mesh_wdev = priv->mesh_dev->ieee80211_ptr;
-        if (mesh_wdev->channel)
-                return mesh_wdev->channel->hw_value;
-        else
-                return 1;
+        return priv->mesh_channel ?: 1;
 }
 
 /***************************************************************************
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c
index 19a5a92dd779..d576dd6665d3 100644
--- a/drivers/net/wireless/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
@@ -253,7 +253,7 @@ lbtf_deb_leave(LBTF_DEB_MAIN);
 static void if_usb_disconnect(struct usb_interface *intf)
 {
         struct if_usb_card *cardp = usb_get_intfdata(intf);
-        struct lbtf_private *priv = (struct lbtf_private *) cardp->priv;
+        struct lbtf_private *priv = cardp->priv;
 
         lbtf_deb_enter(LBTF_DEB_MAIN);
 
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c
index fe8ebfebcc0e..e535c937628b 100644
--- a/drivers/net/wireless/mwifiex/11n.c
+++ b/drivers/net/wireless/mwifiex/11n.c
@@ -101,8 +101,7 @@ int mwifiex_ret_11n_delba(struct mwifiex_private *priv,
 {
         int tid;
         struct mwifiex_tx_ba_stream_tbl *tx_ba_tbl;
-        struct host_cmd_ds_11n_delba *del_ba =
-                (struct host_cmd_ds_11n_delba *) &resp->params.del_ba;
+        struct host_cmd_ds_11n_delba *del_ba = &resp->params.del_ba;
         uint16_t del_ba_param_set = le16_to_cpu(del_ba->del_ba_param_set);
 
         tid = del_ba_param_set >> DELBA_TID_POS;
@@ -147,8 +146,7 @@ int mwifiex_ret_11n_addba_req(struct mwifiex_private *priv,
                               struct host_cmd_ds_command *resp)
 {
         int tid;
-        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp =
-                (struct host_cmd_ds_11n_addba_rsp *) &resp->params.add_ba_rsp;
+        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = &resp->params.add_ba_rsp;
         struct mwifiex_tx_ba_stream_tbl *tx_ba_tbl;
 
         add_ba_rsp->ssn = cpu_to_le16((le16_to_cpu(add_ba_rsp->ssn))
@@ -412,7 +410,7 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
 
                 memcpy((u8 *) bss_co_2040 +
                        sizeof(struct mwifiex_ie_types_header),
-                       (u8 *) bss_desc->bcn_bss_co_2040 +
+                       bss_desc->bcn_bss_co_2040 +
                        sizeof(struct ieee_types_header),
                        le16_to_cpu(bss_co_2040->header.len));
 
@@ -426,10 +424,8 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
                 ext_cap->header.type = cpu_to_le16(WLAN_EID_EXT_CAPABILITY);
                 ext_cap->header.len = cpu_to_le16(sizeof(ext_cap->ext_cap));
 
-                memcpy((u8 *) ext_cap +
-                       sizeof(struct mwifiex_ie_types_header),
-                       (u8 *) bss_desc->bcn_ext_cap +
-                       sizeof(struct ieee_types_header),
+                memcpy((u8 *)ext_cap + sizeof(struct mwifiex_ie_types_header),
+                       bss_desc->bcn_ext_cap + sizeof(struct ieee_types_header),
                        le16_to_cpu(ext_cap->header.len));
 
                 *buffer += sizeof(struct mwifiex_ie_types_extcap);
diff --git a/drivers/net/wireless/mwifiex/11n.h b/drivers/net/wireless/mwifiex/11n.h
index 77646d777dce..28366e9211fb 100644
--- a/drivers/net/wireless/mwifiex/11n.h
+++ b/drivers/net/wireless/mwifiex/11n.h
@@ -105,8 +105,7 @@ static inline u8 mwifiex_space_avail_for_new_ba_stream(
                 priv = adapter->priv[i];
                 if (priv)
                         ba_stream_num += mwifiex_wmm_list_len(
-                                                (struct list_head *)
-                                                &priv->tx_ba_stream_tbl_ptr);
+                                &priv->tx_ba_stream_tbl_ptr);
         }
 
         return ((ba_stream_num <
diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.c b/drivers/net/wireless/mwifiex/11n_rxreorder.c
index 9c44088054dd..89f7c570cd2e 100644
--- a/drivers/net/wireless/mwifiex/11n_rxreorder.c
+++ b/drivers/net/wireless/mwifiex/11n_rxreorder.c
@@ -296,9 +296,7 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta,
  */
 int mwifiex_cmd_11n_addba_req(struct host_cmd_ds_command *cmd, void *data_buf)
 {
-        struct host_cmd_ds_11n_addba_req *add_ba_req =
-                (struct host_cmd_ds_11n_addba_req *)
-                &cmd->params.add_ba_req;
+        struct host_cmd_ds_11n_addba_req *add_ba_req = &cmd->params.add_ba_req;
 
         cmd->command = cpu_to_le16(HostCmd_CMD_11N_ADDBA_REQ);
         cmd->size = cpu_to_le16(sizeof(*add_ba_req) + S_DS_GEN);
@@ -320,9 +318,7 @@ int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv,
                                   struct host_cmd_ds_11n_addba_req
                                   *cmd_addba_req)
 {
-        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp =
-                (struct host_cmd_ds_11n_addba_rsp *)
-                &cmd->params.add_ba_rsp;
+        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = &cmd->params.add_ba_rsp;
         u8 tid;
         int win_size;
         uint16_t block_ack_param_set;
@@ -367,8 +363,7 @@ int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv,
  */
 int mwifiex_cmd_11n_delba(struct host_cmd_ds_command *cmd, void *data_buf)
 {
-        struct host_cmd_ds_11n_delba *del_ba = (struct host_cmd_ds_11n_delba *)
-                &cmd->params.del_ba;
+        struct host_cmd_ds_11n_delba *del_ba = &cmd->params.del_ba;
 
         cmd->command = cpu_to_le16(HostCmd_CMD_11N_DELBA);
         cmd->size = cpu_to_le16(sizeof(*del_ba) + S_DS_GEN);
@@ -398,8 +393,7 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv,
         int start_win, end_win, win_size;
         u16 pkt_index;
 
-        tbl = mwifiex_11n_get_rx_reorder_tbl((struct mwifiex_private *) priv,
-                                             tid, ta);
+        tbl = mwifiex_11n_get_rx_reorder_tbl(priv, tid, ta);
         if (!tbl) {
                 if (pkt_type != PKT_TYPE_BAR)
                         mwifiex_process_rx_packet(priv->adapter, payload);
@@ -520,9 +514,7 @@ mwifiex_del_ba_tbl(struct mwifiex_private *priv, int tid, u8 *peer_mac,
 int mwifiex_ret_11n_addba_resp(struct mwifiex_private *priv,
                                struct host_cmd_ds_command *resp)
 {
-        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp =
-                (struct host_cmd_ds_11n_addba_rsp *)
-                &resp->params.add_ba_rsp;
+        struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = &resp->params.add_ba_rsp;
         int tid, win_size;
         struct mwifiex_rx_reorder_tbl *tbl;
         uint16_t block_ack_param_set;
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 015fec3371a0..510397b3d4a8 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1716,7 +1716,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
         wdev_priv = wiphy_priv(wiphy);
         *(unsigned long *)wdev_priv = (unsigned long)adapter;
 
-        set_wiphy_dev(wiphy, (struct device *)priv->adapter->dev);
+        set_wiphy_dev(wiphy, priv->adapter->dev);
 
         ret = wiphy_register(wiphy);
         if (ret < 0) {
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index c1cb004db913..0f18ef6a30c8 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -57,6 +57,68 @@ static int mwifiex_add_bss_prio_tbl(struct mwifiex_private *priv)
         return 0;
 }
 
+static void scan_delay_timer_fn(unsigned long data)
+{
+        struct mwifiex_private *priv = (struct mwifiex_private *)data;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct cmd_ctrl_node *cmd_node, *tmp_node;
+        unsigned long flags;
+
+        if (!mwifiex_wmm_lists_empty(adapter)) {
+                if (adapter->scan_delay_cnt == MWIFIEX_MAX_SCAN_DELAY_CNT) {
+                        /*
+                         * Abort scan operation by cancelling all pending scan
+                         * command
+                         */
+                        spin_lock_irqsave(&adapter->scan_pending_q_lock, flags);
+                        list_for_each_entry_safe(cmd_node, tmp_node,
+                                                 &adapter->scan_pending_q,
+                                                 list) {
+                                list_del(&cmd_node->list);
+                                cmd_node->wait_q_enabled = false;
+                                mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+                        }
+                        spin_unlock_irqrestore(&adapter->scan_pending_q_lock,
+                                               flags);
+
+                        spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
+                        adapter->scan_processing = false;
+                        spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock,
+                                               flags);
+
+                        if (priv->user_scan_cfg) {
+                                dev_dbg(priv->adapter->dev,
+                                        "info: %s: scan aborted\n", __func__);
+                                cfg80211_scan_done(priv->scan_request, 1);
+                                priv->scan_request = NULL;
+                                kfree(priv->user_scan_cfg);
+                                priv->user_scan_cfg = NULL;
+                        }
+                } else {
+                        /*
+                         * Tx data queue is still not empty, delay scan
+                         * operation further by 20msec.
+                         */
+                        mod_timer(&priv->scan_delay_timer, jiffies +
+                                  msecs_to_jiffies(MWIFIEX_SCAN_DELAY_MSEC));
+                        adapter->scan_delay_cnt++;
+                }
+        } else {
+                /*
+                 * Tx data queue is empty. Get scan command from scan_pending_q
+                 * and put to cmd_pending_q to resume scan operation
+                 */
+                adapter->scan_delay_cnt = 0;
+                spin_lock_irqsave(&adapter->scan_pending_q_lock, flags);
+                cmd_node = list_first_entry(&adapter->scan_pending_q,
+                                            struct cmd_ctrl_node, list);
+                list_del(&cmd_node->list);
+                spin_unlock_irqrestore(&adapter->scan_pending_q_lock, flags);
+
+                mwifiex_insert_cmd_to_pending_q(adapter, cmd_node, true);
+        }
+}
+
 /*
  * This function initializes the private structure and sets default
  * values to the members.
@@ -136,6 +198,9 @@ static int mwifiex_init_priv(struct mwifiex_private *priv)
 
         priv->scan_block = false;
 
+        setup_timer(&priv->scan_delay_timer, scan_delay_timer_fn,
+                    (unsigned long)priv);
+
         return mwifiex_add_bss_prio_tbl(priv);
 }
 
diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index d6b4fb04011f..82e63cee1e97 100644
--- a/drivers/net/wireless/mwifiex/join.c
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -1349,22 +1349,16 @@ static int mwifiex_deauthenticate_infra(struct mwifiex_private *priv, u8 *mac)
 {
         u8 mac_address[ETH_ALEN];
         int ret;
-        u8 zero_mac[ETH_ALEN] = { 0, 0, 0, 0, 0, 0 };
 
-        if (mac) {
-                if (!memcmp(mac, zero_mac, sizeof(zero_mac)))
-                        memcpy((u8 *) &mac_address,
-                               (u8 *) &priv->curr_bss_params.bss_descriptor.
-                               mac_address, ETH_ALEN);
-                else
-                        memcpy((u8 *) &mac_address, (u8 *) mac, ETH_ALEN);
-        } else {
-                memcpy((u8 *) &mac_address, (u8 *) &priv->curr_bss_params.
-                       bss_descriptor.mac_address, ETH_ALEN);
-        }
+        if (!mac || is_zero_ether_addr(mac))
+                memcpy(mac_address,
+                       priv->curr_bss_params.bss_descriptor.mac_address,
+                       ETH_ALEN);
+        else
+                memcpy(mac_address, mac, ETH_ALEN);
 
         ret = mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_DEAUTHENTICATE,
-                                    HostCmd_ACT_GEN_SET, 0, &mac_address);
+                                    HostCmd_ACT_GEN_SET, 0, mac_address);
 
         return ret;
 }
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 3192855c31c0..0f06f07a70e6 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -244,8 +244,8 @@ process_start:
                         }
                 }
 
-                if (!adapter->scan_processing && !adapter->data_sent &&
-                    !mwifiex_wmm_lists_empty(adapter)) {
+                if ((!adapter->scan_processing || adapter->scan_delay_cnt) &&
+                    !adapter->data_sent && !mwifiex_wmm_lists_empty(adapter)) {
                         mwifiex_wmm_process_tx(adapter);
                         if (adapter->hs_activated) {
                                 adapter->is_hs_configured = false;
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index bd3b0bf94b9e..5b32221077c4 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -79,14 +79,17 @@ enum {
 
 #define SCAN_BEACON_ENTRY_PAD                   6
 
-#define MWIFIEX_PASSIVE_SCAN_CHAN_TIME  200
-#define MWIFIEX_ACTIVE_SCAN_CHAN_TIME   200
-#define MWIFIEX_SPECIFIC_SCAN_CHAN_TIME 110
+#define MWIFIEX_PASSIVE_SCAN_CHAN_TIME  110
+#define MWIFIEX_ACTIVE_SCAN_CHAN_TIME   30
+#define MWIFIEX_SPECIFIC_SCAN_CHAN_TIME 30
 
 #define SCAN_RSSI(RSSI)                                 (0x100 - ((u8)(RSSI)))
 
 #define MWIFIEX_MAX_TOTAL_SCAN_TIME     (MWIFIEX_TIMER_10S - MWIFIEX_TIMER_1S)
 
+#define MWIFIEX_MAX_SCAN_DELAY_CNT                      50
+#define MWIFIEX_SCAN_DELAY_MSEC                         20
+
 #define RSN_GTK_OUI_OFFSET                              2
 
 #define MWIFIEX_OUI_NOT_PRESENT                 0
@@ -482,6 +485,7 @@ struct mwifiex_private {
         u16 proberesp_idx;
         u16 assocresp_idx;
         u16 rsn_idx;
+        struct timer_list scan_delay_timer;
 };
 
 enum mwifiex_ba_status {
@@ -686,6 +690,7 @@ struct mwifiex_adapter {
         struct completion fw_load;
         u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
         u16 max_mgmt_ie_index;
+        u8 scan_delay_cnt;
 };
 
 int mwifiex_init_lock_list(struct mwifiex_adapter *adapter);
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 74f045715723..98c6aabd5a48 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -28,7 +28,10 @@
 /* The maximum number of channels the firmware can scan per command */
 #define MWIFIEX_MAX_CHANNELS_PER_SPECIFIC_SCAN   14
 
-#define MWIFIEX_CHANNELS_PER_SCAN_CMD            4
+#define MWIFIEX_DEF_CHANNELS_PER_SCAN_CMD       4
+#define MWIFIEX_LIMIT_1_CHANNEL_PER_SCAN_CMD    15
+#define MWIFIEX_LIMIT_2_CHANNELS_PER_SCAN_CMD   27
+#define MWIFIEX_LIMIT_3_CHANNELS_PER_SCAN_CMD   35
 
 /* Memory needed to store a max sized Channel List TLV for a firmware scan */
 #define CHAN_TLV_MAX_SIZE  (sizeof(struct mwifiex_ie_types_header)         \
@@ -471,7 +474,7 @@ mwifiex_is_network_compatible(struct mwifiex_private *priv,
  * This routine is used for any scan that is not provided with a
  * specific channel list to scan.
  */
-static void
+static int
 mwifiex_scan_create_channel_list(struct mwifiex_private *priv,
                                  const struct mwifiex_user_scan_cfg
                                                         *user_scan_in,
@@ -528,6 +531,7 @@ mwifiex_scan_create_channel_list(struct mwifiex_private *priv,
                 }
 
         }
+        return chan_idx;
 }
 
 /*
@@ -727,6 +731,7 @@ mwifiex_config_scan(struct mwifiex_private *priv,
         u32 num_probes;
         u32 ssid_len;
         u32 chan_idx;
+        u32 chan_num;
         u32 scan_type;
         u16 scan_dur;
         u8 channel;
@@ -850,7 +855,7 @@ mwifiex_config_scan(struct mwifiex_private *priv,
         if (*filtered_scan)
                 *max_chan_per_scan = MWIFIEX_MAX_CHANNELS_PER_SPECIFIC_SCAN;
         else
-                *max_chan_per_scan = MWIFIEX_CHANNELS_PER_SCAN_CMD;
+                *max_chan_per_scan = MWIFIEX_DEF_CHANNELS_PER_SCAN_CMD;
 
         /* If the input config or adapter has the number of Probes set,
            add tlv */
@@ -962,13 +967,28 @@ mwifiex_config_scan(struct mwifiex_private *priv,
                         dev_dbg(adapter->dev,
                                 "info: Scan: Scanning current channel only\n");
                 }
-
+                chan_num = chan_idx;
         } else {
                 dev_dbg(adapter->dev,
                         "info: Scan: Creating full region channel list\n");
-                mwifiex_scan_create_channel_list(priv, user_scan_in,
-                                                 scan_chan_list,
-                                                 *filtered_scan);
+                chan_num = mwifiex_scan_create_channel_list(priv, user_scan_in,
+                                                            scan_chan_list,
+                                                            *filtered_scan);
+        }
+
+        /*
+         * In associated state we will reduce the number of channels scanned per
+         * scan command to avoid any traffic delay/loss. This number is decided
+         * based on total number of channels to be scanned due to constraints
+         * of command buffers.
+         */
+        if (priv->media_connected) {
+                if (chan_num < MWIFIEX_LIMIT_1_CHANNEL_PER_SCAN_CMD)
+                        *max_chan_per_scan = 1;
+                else if (chan_num < MWIFIEX_LIMIT_2_CHANNELS_PER_SCAN_CMD)
+                        *max_chan_per_scan = 2;
+                else if (chan_num < MWIFIEX_LIMIT_3_CHANNELS_PER_SCAN_CMD)
+                        *max_chan_per_scan = 3;
         }
 }
 
@@ -1014,14 +1034,12 @@ mwifiex_ret_802_11_scan_get_tlv_ptrs(struct mwifiex_adapter *adapter,
                         case TLV_TYPE_TSFTIMESTAMP:
                                 dev_dbg(adapter->dev, "info: SCAN_RESP: TSF "
                                         "timestamp TLV, len = %d\n", tlv_len);
-                                *tlv_data = (struct mwifiex_ie_types_data *)
-                                        current_tlv;
+                                *tlv_data = current_tlv;
                                 break;
                         case TLV_TYPE_CHANNELBANDLIST:
                                 dev_dbg(adapter->dev, "info: SCAN_RESP: channel"
                                         " band list TLV, len = %d\n", tlv_len);
-                                *tlv_data = (struct mwifiex_ie_types_data *)
-                                        current_tlv;
+                                *tlv_data = current_tlv;
                                 break;
                         default:
                                 dev_err(adapter->dev,
@@ -1226,15 +1244,15 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
                                         bss_entry->beacon_buf);
                         break;
                 case WLAN_EID_BSS_COEX_2040:
-                        bss_entry->bcn_bss_co_2040 = (u8 *) (current_ptr +
-                                        sizeof(struct ieee_types_header));
+                        bss_entry->bcn_bss_co_2040 = current_ptr +
+                                sizeof(struct ieee_types_header);
                         bss_entry->bss_co_2040_offset = (u16) (current_ptr +
                                         sizeof(struct ieee_types_header) -
                                                 bss_entry->beacon_buf);
                         break;
                 case WLAN_EID_EXT_CAPABILITY:
-                        bss_entry->bcn_ext_cap = (u8 *) (current_ptr +
-                                        sizeof(struct ieee_types_header));
+                        bss_entry->bcn_ext_cap = current_ptr +
+                                sizeof(struct ieee_types_header);
                         bss_entry->ext_cap_offset = (u16) (current_ptr +
                                         sizeof(struct ieee_types_header) -
                                         bss_entry->beacon_buf);
@@ -1683,8 +1701,7 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
                                 goto done;
                         }
                         if (element_id == WLAN_EID_DS_PARAMS) {
-                                channel = *(u8 *) (current_ptr +
-                                        sizeof(struct ieee_types_header));
+                                channel = *(current_ptr + sizeof(struct ieee_types_header));
                                 break;
                         }
 
@@ -1772,14 +1789,23 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
                         priv->user_scan_cfg = NULL;
                 }
         } else {
-                /* Get scan command from scan_pending_q and put to
-                   cmd_pending_q */
-                cmd_node = list_first_entry(&adapter->scan_pending_q,
-                                            struct cmd_ctrl_node, list);
-                list_del(&cmd_node->list);
-                spin_unlock_irqrestore(&adapter->scan_pending_q_lock, flags);
-
-                mwifiex_insert_cmd_to_pending_q(adapter, cmd_node, true);
+                if (!mwifiex_wmm_lists_empty(adapter)) {
+                        spin_unlock_irqrestore(&adapter->scan_pending_q_lock,
+                                               flags);
+                        adapter->scan_delay_cnt = 1;
+                        mod_timer(&priv->scan_delay_timer, jiffies +
+                                  msecs_to_jiffies(MWIFIEX_SCAN_DELAY_MSEC));
+                } else {
+                        /* Get scan command from scan_pending_q and put to
+                           cmd_pending_q */
+                        cmd_node = list_first_entry(&adapter->scan_pending_q,
+                                                    struct cmd_ctrl_node, list);
+                        list_del(&cmd_node->list);
+                        spin_unlock_irqrestore(&adapter->scan_pending_q_lock,
+                                               flags);
+                        mwifiex_insert_cmd_to_pending_q(adapter, cmd_node,
+                                                        true);
+                }
         }
 
 done:
@@ -2010,12 +2036,11 @@ mwifiex_save_curr_bcn(struct mwifiex_private *priv)
 
         if (curr_bss->bcn_bss_co_2040)
                 curr_bss->bcn_bss_co_2040 =
-                        (u8 *) (curr_bss->beacon_buf +
-                                        curr_bss->bss_co_2040_offset);
+                        (curr_bss->beacon_buf + curr_bss->bss_co_2040_offset);
 
         if (curr_bss->bcn_ext_cap)
-                curr_bss->bcn_ext_cap = (u8 *) (curr_bss->beacon_buf +
-                                curr_bss->ext_cap_offset);
+                curr_bss->bcn_ext_cap = curr_bss->beacon_buf +
+                        curr_bss->ext_cap_offset;
 }
 
 /*
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index 40e025da6bc2..1ff1362d8cdf 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -793,8 +793,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_mac_reg_access *mac_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*mac_reg) + S_DS_GEN);
-                mac_reg = (struct host_cmd_ds_mac_reg_access *) &cmd->
-                                                                params.mac_reg;
+                mac_reg = &cmd->params.mac_reg;
                 mac_reg->action = cpu_to_le16(cmd_action);
                 mac_reg->offset =
                         cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -806,8 +805,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_bbp_reg_access *bbp_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*bbp_reg) + S_DS_GEN);
-                bbp_reg = (struct host_cmd_ds_bbp_reg_access *)
-                                                        &cmd->params.bbp_reg;
+                bbp_reg = &cmd->params.bbp_reg;
                 bbp_reg->action = cpu_to_le16(cmd_action);
                 bbp_reg->offset =
                         cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -819,8 +817,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_rf_reg_access *rf_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*rf_reg) + S_DS_GEN);
-                rf_reg = (struct host_cmd_ds_rf_reg_access *)
-                                                        &cmd->params.rf_reg;
+                rf_reg = &cmd->params.rf_reg;
                 rf_reg->action = cpu_to_le16(cmd_action);
                 rf_reg->offset = cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
                 rf_reg->value = (u8) le32_to_cpu(reg_rw->value);
@@ -831,8 +828,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_pmic_reg_access *pmic_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*pmic_reg) + S_DS_GEN);
-                pmic_reg = (struct host_cmd_ds_pmic_reg_access *) &cmd->
-                                params.pmic_reg;
+                pmic_reg = &cmd->params.pmic_reg;
                 pmic_reg->action = cpu_to_le16(cmd_action);
                 pmic_reg->offset =
                                 cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -844,8 +840,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_rf_reg_access *cau_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*cau_reg) + S_DS_GEN);
-                cau_reg = (struct host_cmd_ds_rf_reg_access *)
-                                                        &cmd->params.rf_reg;
+                cau_reg = &cmd->params.rf_reg;
                 cau_reg->action = cpu_to_le16(cmd_action);
                 cau_reg->offset =
                                 cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -856,7 +851,6 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
         {
                 struct mwifiex_ds_read_eeprom *rd_eeprom = data_buf;
                 struct host_cmd_ds_802_11_eeprom_access *cmd_eeprom =
-                        (struct host_cmd_ds_802_11_eeprom_access *)
                         &cmd->params.eeprom;
 
                 cmd->size = cpu_to_le16(sizeof(*cmd_eeprom) + S_DS_GEN);
diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/mwifiex/sta_cmdresp.c
index a79ed9bd9695..bd40541ebd5a 100644
--- a/drivers/net/wireless/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c
@@ -227,7 +227,7 @@ static int mwifiex_ret_get_log(struct mwifiex_private *priv,
                                struct mwifiex_ds_get_stats *stats)
 {
         struct host_cmd_ds_802_11_get_log *get_log =
-                (struct host_cmd_ds_802_11_get_log *) &resp->params.get_log;
+                &resp->params.get_log;
 
         if (stats) {
                 stats->mcast_tx_frame = le32_to_cpu(get_log->mcast_tx_frame);
@@ -282,7 +282,7 @@ static int mwifiex_ret_tx_rate_cfg(struct mwifiex_private *priv,
         u32 i;
         int ret = 0;
 
-        tlv_buf = (u8 *) ((u8 *) rate_cfg) +
+        tlv_buf = ((u8 *)rate_cfg) +
                         sizeof(struct host_cmd_ds_tx_rate_cfg);
         tlv_buf_len = *(u16 *) (tlv_buf + sizeof(u16));
 
@@ -679,39 +679,33 @@ static int mwifiex_ret_reg_access(u16 type, struct host_cmd_ds_command *resp,
         eeprom = data_buf;
         switch (type) {
         case HostCmd_CMD_MAC_REG_ACCESS:
-                r.mac = (struct host_cmd_ds_mac_reg_access *)
-                        &resp->params.mac_reg;
+                r.mac = &resp->params.mac_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.mac->offset));
                 reg_rw->value = r.mac->value;
                 break;
         case HostCmd_CMD_BBP_REG_ACCESS:
-                r.bbp = (struct host_cmd_ds_bbp_reg_access *)
-                        &resp->params.bbp_reg;
+                r.bbp = &resp->params.bbp_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.bbp->offset));
                 reg_rw->value = cpu_to_le32((u32) r.bbp->value);
                 break;
 
         case HostCmd_CMD_RF_REG_ACCESS:
-                r.rf = (struct host_cmd_ds_rf_reg_access *)
-                       &resp->params.rf_reg;
+                r.rf = &resp->params.rf_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.rf->offset));
                 reg_rw->value = cpu_to_le32((u32) r.bbp->value);
                 break;
         case HostCmd_CMD_PMIC_REG_ACCESS:
-                r.pmic = (struct host_cmd_ds_pmic_reg_access *)
-                         &resp->params.pmic_reg;
+                r.pmic = &resp->params.pmic_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.pmic->offset));
                 reg_rw->value = cpu_to_le32((u32) r.pmic->value);
                 break;
         case HostCmd_CMD_CAU_REG_ACCESS:
-                r.rf = (struct host_cmd_ds_rf_reg_access *)
-                       &resp->params.rf_reg;
+                r.rf = &resp->params.rf_reg;
                 reg_rw->offset = cpu_to_le32((u32) le16_to_cpu(r.rf->offset));
                 reg_rw->value = cpu_to_le32((u32) r.rf->value);
                 break;
         case HostCmd_CMD_802_11_EEPROM_ACCESS:
-                r.eeprom = (struct host_cmd_ds_802_11_eeprom_access *)
-                           &resp->params.eeprom;
+                r.eeprom = &resp->params.eeprom;
                 pr_debug("info: EEPROM read len=%x\n", r.eeprom->byte_count);
                 if (le16_to_cpu(eeprom->byte_count) <
                     le16_to_cpu(r.eeprom->byte_count)) {
@@ -787,7 +781,7 @@ static int mwifiex_ret_subsc_evt(struct mwifiex_private *priv,
                                  struct mwifiex_ds_misc_subsc_evt *sub_event)
 {
         struct host_cmd_ds_802_11_subsc_evt *cmd_sub_event =
-                (struct host_cmd_ds_802_11_subsc_evt *)&resp->params.subsc_evt;
+                &resp->params.subsc_evt;
 
         /* For every subscribe event command (Get/Set/Clear), FW reports the
          * current set of subscribed events*/
diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c
index 4ace5a3dcd23..e8b27c305367 100644
--- a/drivers/net/wireless/mwifiex/sta_event.c
+++ b/drivers/net/wireless/mwifiex/sta_event.c
@@ -422,7 +422,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
 
                         if (len != -1) {
                                 sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
-                                sinfo.assoc_req_ies = (u8 *)&event->data[len];
+                                sinfo.assoc_req_ies = &event->data[len];
                                 len = (u8 *)sinfo.assoc_req_ies -
                                       (u8 *)&event->frame_control;
                                 sinfo.assoc_req_ies_len =
diff --git a/drivers/net/wireless/orinoco/cfg.c b/drivers/net/wireless/orinoco/cfg.c
index f7b15b8934fa..e15675585fb1 100644
--- a/drivers/net/wireless/orinoco/cfg.c
+++ b/drivers/net/wireless/orinoco/cfg.c
@@ -160,10 +160,9 @@ static int orinoco_scan(struct wiphy *wiphy, struct net_device *dev,
         return err;
 }
 
-static int orinoco_set_channel(struct wiphy *wiphy,
-                        struct net_device *netdev,
-                        struct ieee80211_channel *chan,
-                        enum nl80211_channel_type channel_type)
+static int orinoco_set_monitor_channel(struct wiphy *wiphy,
+                                       struct ieee80211_channel *chan,
+                                       enum nl80211_channel_type channel_type)
 {
         struct orinoco_private *priv = wiphy_priv(wiphy);
         int err = 0;
@@ -286,7 +285,7 @@ static int orinoco_set_wiphy_params(struct wiphy *wiphy, u32 changed)
 
 const struct cfg80211_ops orinoco_cfg_ops = {
         .change_virtual_intf = orinoco_change_vif,
-        .set_channel = orinoco_set_channel,
+        .set_monitor_channel = orinoco_set_monitor_channel,
         .scan = orinoco_scan,
         .set_wiphy_params = orinoco_set_wiphy_params,
 };
diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c
index fa8ce5104781..636daf2860cc 100644
--- a/drivers/net/wireless/p54/eeprom.c
+++ b/drivers/net/wireless/p54/eeprom.c
@@ -905,7 +905,7 @@ int p54_read_eeprom(struct ieee80211_hw *dev)
 
         while (eeprom_size) {
                 blocksize = min(eeprom_size, maxblocksize);
-                ret = p54_download_eeprom(priv, (void *) (eeprom + offset),
+                ret = p54_download_eeprom(priv, eeprom + offset,
                                           offset, blocksize);
                 if (unlikely(ret))
                         goto free;
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index 18e82b31afa6..9ba85106eec0 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -478,7 +478,7 @@ int p54_scan(struct p54_common *priv, u16 mode, u16 dwell)
 
                 if (priv->rxhw == PDR_SYNTH_FRONTEND_LONGBOW) {
                         memcpy(&body->longbow.curve_data,
-                                (void *) entry + sizeof(__le16),
+                                entry + sizeof(__le16),
                                 priv->curve_data->entry_size);
                 } else {
                         struct p54_scan_body *chan = &body->normal;
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index 266d45bf86f5..799e148d0370 100644
--- a/drivers/net/wireless/prism54/islpci_eth.c
+++ b/drivers/net/wireless/prism54/islpci_eth.c
@@ -455,7 +455,7 @@ islpci_eth_receive(islpci_private *priv)
                               "Error mapping DMA address\n");
 
                         /* free the skbuf structure before aborting */
-                        dev_kfree_skb_irq((struct sk_buff *) skb);
+                        dev_kfree_skb_irq(skb);
                         skb = NULL;
                         break;
                 }
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 86a738bf591c..598ca1cafb95 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -1849,7 +1849,7 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id)
         pr_debug("ray_cs: interrupt for *dev=%p\n", dev);
 
         local = netdev_priv(dev);
-        link = (struct pcmcia_device *)local->finder;
+        link = local->finder;
         if (!pcmcia_dev_present(link)) {
                 pr_debug(
                         "ray_cs interrupt from device not present or suspended.\n");
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index 9348521e0832..1ca88cdc6ece 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -51,6 +51,7 @@
  * RF3320 2.4G 1T1R(RT3350/RT3370/RT3390)
  * RF3322 2.4G 2T2R(RT3352/RT3371/RT3372/RT3391/RT3392)
  * RF3053 2.4G/5G 3T3R(RT3883/RT3563/RT3573/RT3593/RT3662)
+ * RF5360 2.4G 1T1R
  * RF5370 2.4G 1T1R
  * RF5390 2.4G 1T1R
  */
@@ -67,9 +68,11 @@
 #define RF3320                          0x000b
 #define RF3322                          0x000c
 #define RF3053                          0x000d
+#define RF5360                          0x5360
 #define RF5370                          0x5370
 #define RF5372                          0x5372
 #define RF5390                          0x5390
+#define RF5392                          0x5392
 
 /*
  * Chipset revisions.
@@ -1944,6 +1947,11 @@ struct mac_iveiv_entry {
 #define RFCSR49_TX                      FIELD8(0x3f)
 
 /*
+ * RFCSR 50:
+ */
+#define RFCSR50_TX                      FIELD8(0x3f)
+
+/*
  * RF registers
  */
 
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index dfc90d34be6d..4d3747c3010b 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1958,7 +1958,22 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field8(&rfcsr, RFCSR49_TX, info->default_power1);
         rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
 
+        if (rt2x00_rt(rt2x00dev, RT5392)) {
+                rt2800_rfcsr_read(rt2x00dev, 50, &rfcsr);
+                if (info->default_power1 > RT5390_POWER_BOUND)
+                        rt2x00_set_field8(&rfcsr, RFCSR50_TX,
+                                          RT5390_POWER_BOUND);
+                else
+                        rt2x00_set_field8(&rfcsr, RFCSR50_TX,
+                                          info->default_power2);
+                rt2800_rfcsr_write(rt2x00dev, 50, rfcsr);
+        }
+
         rt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);
+        if (rt2x00_rt(rt2x00dev, RT5392)) {
+                rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 1);
+                rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 1);
+        }
         rt2x00_set_field8(&rfcsr, RFCSR1_RF_BLOCK_EN, 1);
         rt2x00_set_field8(&rfcsr, RFCSR1_PLL_PD, 1);
         rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 1);
@@ -2060,9 +2075,11 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
         case RF3052:
                 rt2800_config_channel_rf3052(rt2x00dev, conf, rf, info);
                 break;
+        case RF5360:
         case RF5370:
         case RF5372:
         case RF5390:
+        case RF5392:
                 rt2800_config_channel_rf53xx(rt2x00dev, conf, rf, info);
                 break;
         default:
@@ -2549,9 +2566,11 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field8(&rfcsr, RFCSR7_RF_TUNING, 1);
                 rt2800_rfcsr_write(rt2x00dev, 7, rfcsr);
                 break;
+        case RF5360:
         case RF5370:
         case RF5372:
         case RF5390:
+        case RF5392:
                 rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);
                 rt2x00_set_field8(&rfcsr, RFCSR30_RF_CALIBRATION, 1);
                 rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
@@ -4263,9 +4282,11 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
         case RF3022:
         case RF3052:
         case RF3320:
+        case RF5360:
         case RF5370:
         case RF5372:
         case RF5390:
+        case RF5392:
                 break;
         default:
                 ERROR(rt2x00dev, "Invalid RF chipset 0x%04x detected.\n",
@@ -4577,9 +4598,11 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                    rt2x00_rf(rt2x00dev, RF3021) ||
                    rt2x00_rf(rt2x00dev, RF3022) ||
                    rt2x00_rf(rt2x00dev, RF3320) ||
+                   rt2x00_rf(rt2x00dev, RF5360) ||
                    rt2x00_rf(rt2x00dev, RF5370) ||
                    rt2x00_rf(rt2x00dev, RF5372) ||
-                   rt2x00_rf(rt2x00dev, RF5390)) {
+                   rt2x00_rf(rt2x00dev, RF5390) ||
+                   rt2x00_rf(rt2x00dev, RF5392)) {
                 spec->num_channels = 14;
                 spec->channels = rf_vals_3x;
         } else if (rt2x00_rf(rt2x00dev, RF3052)) {
@@ -4662,9 +4685,11 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         case RF3022:
         case RF3320:
         case RF3052:
+        case RF5360:
         case RF5370:
         case RF5372:
         case RF5390:
+        case RF5392:
                 __set_bit(CAPABILITY_VCO_RECALIBRATION, &rt2x00dev->cap_flags);
                 break;
         }
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index cad25bfebd7a..206158b67426 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -1188,6 +1188,7 @@ static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = {
         { PCI_DEVICE(0x1814, 0x3593) },
 #endif
 #ifdef CONFIG_RT2800PCI_RT53XX
+        { PCI_DEVICE(0x1814, 0x5360) },
         { PCI_DEVICE(0x1814, 0x5362) },
         { PCI_DEVICE(0x1814, 0x5390) },
         { PCI_DEVICE(0x1814, 0x5392) },
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index bf78317a6adb..20a504072895 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -1137,6 +1137,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
 #ifdef CONFIG_RT2800USB_RT33XX
         /* Belkin */
         { USB_DEVICE(0x050d, 0x945b) },
+        /* D-Link */
+        { USB_DEVICE(0x2001, 0x3c17) },
         /* Panasonic */
         { USB_DEVICE(0x083a, 0xb511) },
         /* Philips */
@@ -1237,7 +1239,6 @@ static struct usb_device_id rt2800usb_device_table[] = {
         /* D-Link */
         { USB_DEVICE(0x07d1, 0x3c0b) },
         { USB_DEVICE(0x07d1, 0x3c17) },
-        { USB_DEVICE(0x2001, 0x3c17) },
         /* Encore */
         { USB_DEVICE(0x203d, 0x14a1) },
         /* Gemtek */
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index e5404e576251..a6b88bd4a1a5 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1161,6 +1161,8 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
                     BIT(NL80211_IFTYPE_MESH_POINT) |
                     BIT(NL80211_IFTYPE_WDS);
 
+        rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+
         /*
          * Initialize work.
          */
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index dd24b2663b5e..4ff26c2159bf 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -506,9 +506,19 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
                 return 0;
-        else if (!test_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags))
+
+        if (!test_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags))
+                return -EOPNOTSUPP;
+
+        /*
+         * To support IBSS RSN, don't program group keys in IBSS, the
+         * hardware will then not attempt to decrypt the frames.
+         */
+        if (vif->type == NL80211_IFTYPE_ADHOC &&
+            !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE))
                 return -EOPNOTSUPP;
-        else if (key->keylen > 32)
+
+        if (key->keylen > 32)
                 return -ENOSPC;
 
         memset(&crypto, 0, sizeof(crypto));
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index f4c852c6749b..58e1f7bb4df1 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -907,7 +907,7 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)
         struct ieee80211_hdr *hdr = rtl_get_hdr(skb);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         __le16 fc = hdr->frame_control;
-        u8 *act = (u8 *) (((u8 *) skb->data + MAC80211_3ADDR_LEN));
+        u8 *act = (u8 *)skb->data + MAC80211_3ADDR_LEN;
         u8 category;
 
         if (!ieee80211_is_action(fc))
diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c
index 3d8cc4a0c86d..2d1a8220d5c0 100644
--- a/drivers/net/wireless/rtlwifi/cam.c
+++ b/drivers/net/wireless/rtlwifi/cam.c
@@ -146,7 +146,7 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
         }
 
         rtl_cam_program_entry(hw, ul_entry_idx, mac_addr,
-                              (u8 *) key_content, us_config);
+                              key_content, us_config);
 
         RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, "<===\n");
 
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index 278e9f957e0d..a18ad2a98938 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -680,7 +680,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
 
                 mac->short_preamble = bss_conf->use_short_preamble;
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACK_PREAMBLE,
-                                              (u8 *) (&mac->short_preamble));
+                                              &mac->short_preamble);
         }
 
         if (changed & BSS_CHANGED_ERP_SLOT) {
@@ -693,7 +693,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                         mac->slot_time = RTL_SLOT_TIME_20;
 
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
-                                              (u8 *) (&mac->slot_time));
+                                              &mac->slot_time);
         }
 
         if (changed & BSS_CHANGED_HT) {
@@ -713,7 +713,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                 rcu_read_unlock();
 
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SHORTGI_DENSITY,
-                                              (u8 *) (&mac->max_mss_density));
+                                              &mac->max_mss_density);
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AMPDU_FACTOR,
                                               &mac->current_ampdu_factor);
                 rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AMPDU_MIN_SPACE,
@@ -801,7 +801,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                                 u8 mstatus = RT_MEDIA_CONNECT;
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                       HW_VAR_H2C_FW_JOINBSSRPT,
-                                                      (u8 *) (&mstatus));
+                                                      &mstatus);
                                 ppsc->report_linked = true;
                         }
                 } else {
@@ -809,7 +809,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,
                                 u8 mstatus = RT_MEDIA_DISCONNECT;
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                       HW_VAR_H2C_FW_JOINBSSRPT,
-                                                      (u8 *)(&mstatus));
+                                                      &mstatus);
                                 ppsc->report_linked = false;
                         }
                 }
@@ -836,7 +836,7 @@ static void rtl_op_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
         u8 bibss = (mac->opmode == NL80211_IFTYPE_ADHOC) ? 1 : 0;
 
         mac->tsf = tsf;
-        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_CORRECT_TSF, (u8 *) (&bibss));
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_CORRECT_TSF, &bibss);
 }
 
 static void rtl_op_reset_tsf(struct ieee80211_hw *hw,
@@ -845,7 +845,7 @@ static void rtl_op_reset_tsf(struct ieee80211_hw *hw,
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         u8 tmp = 0;
 
-        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_DUAL_TSF_RST, (u8 *) (&tmp));
+        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_DUAL_TSF_RST, &tmp);
 }
 
 static void rtl_op_sta_notify(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
index 1f143800a8d7..8e2f9afb125a 100644
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c
@@ -352,7 +352,7 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf)
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_EFUSE_BYTES,
                                       (u8 *)&efuse_utilized);
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_EFUSE_USAGE,
-                                      (u8 *)&efuse_usage);
+                                      &efuse_usage);
 done:
         for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++)
                 kfree(efuse_word[i]);
@@ -409,7 +409,7 @@ void efuse_shadow_read(struct ieee80211_hw *hw, u8 type,
         else if (type == 2)
                 efuse_shadow_read_2byte(hw, offset, (u16 *) value);
         else if (type == 4)
-                efuse_shadow_read_4byte(hw, offset, (u32 *) value);
+                efuse_shadow_read_4byte(hw, offset, value);
 
 }
 
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 2062ea1d7c80..82d3afcfecd1 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -756,10 +756,10 @@ done:
                 if (index == rtlpci->rxringcount - 1)
                         rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false,
                                                     HW_DESC_RXERO,
-                                                    (u8 *)&tmp_one);
+                                                    &tmp_one);
 
                 rtlpriv->cfg->ops->set_desc((u8 *)pdesc, false, HW_DESC_RXOWN,
-                                            (u8 *)&tmp_one);
+                                            &tmp_one);
 
                 index = (index + 1) % rtlpci->rxringcount;
         }
@@ -934,7 +934,7 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)
         __skb_queue_tail(&ring->queue, pskb);
 
         rtlpriv->cfg->ops->set_desc((u8 *) pdesc, true, HW_DESC_OWN,
-                                    (u8 *)&temp_one);
+                                    &temp_one);
 
         return;
 }
@@ -1126,11 +1126,11 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw)
                                                     rxbuffersize);
                         rtlpriv->cfg->ops->set_desc((u8 *) entry, false,
                                                     HW_DESC_RXOWN,
-                                                    (u8 *)&tmp_one);
+                                                    &tmp_one);
                 }
 
                 rtlpriv->cfg->ops->set_desc((u8 *) entry, false,
-                                            HW_DESC_RXERO, (u8 *)&tmp_one);
+                                            HW_DESC_RXERO, &tmp_one);
         }
         return 0;
 }
@@ -1263,7 +1263,7 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw)
                                 rtlpriv->cfg->ops->set_desc((u8 *) entry,
                                                             false,
                                                             HW_DESC_RXOWN,
-                                                            (u8 *)&tmp_one);
+                                                            &tmp_one);
                         }
                         rtlpci->rx_ring[rx_queue_idx].idx = 0;
                 }
@@ -1422,7 +1422,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
         __skb_queue_tail(&ring->queue, skb);
 
         rtlpriv->cfg->ops->set_desc((u8 *)pdesc, true,
-                                    HW_DESC_OWN, (u8 *)&temp_one);
+                                    HW_DESC_OWN, &temp_one);
 
 
         if ((ring->entries - skb_queue_len(&ring->queue)) < 2 &&
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index 5ae26647f340..13ad33e85577 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -333,10 +333,10 @@ static void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode)
                         rpwm_val = 0x0C;        /* RF on */
                         fw_pwrmode = FW_PS_ACTIVE_MODE;
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SET_RPWM,
-                                        (u8 *) (&rpwm_val));
+                                        &rpwm_val);
                         rtlpriv->cfg->ops->set_hw_reg(hw,
                                         HW_VAR_H2C_FW_PWRMODE,
-                                        (u8 *) (&fw_pwrmode));
+                                        &fw_pwrmode);
                         fw_current_inps = false;
 
                         rtlpriv->cfg->ops->set_hw_reg(hw,
@@ -356,11 +356,11 @@ static void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode)
                                                 (u8 *) (&fw_current_inps));
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                 HW_VAR_H2C_FW_PWRMODE,
-                                                (u8 *) (&ppsc->fwctrl_psmode));
+                                                &ppsc->fwctrl_psmode);
 
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                 HW_VAR_SET_RPWM,
-                                                (u8 *) (&rpwm_val));
+                                                &rpwm_val);
                         } else {
                                 /* Reset the power save related parameters. */
                                 ppsc->dot11_psmode = EACTIVE;
@@ -446,7 +446,7 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-        struct ieee80211_hdr *hdr = (void *) data;
+        struct ieee80211_hdr *hdr = data;
         struct ieee80211_tim_ie *tim_ie;
         u8 *tim;
         u8 tim_len;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index f7f48c7ac854..a45afda8259c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -656,9 +656,8 @@ static void rtl92c_dm_check_edca_turbo(struct ieee80211_hw *hw)
         } else {
                 if (rtlpriv->dm.current_turbo_edca) {
                         u8 tmp = AC0_BE;
-                        rtlpriv->cfg->ops->set_hw_reg(hw,
-                                                      HW_VAR_AC_PARAM,
-                                                      (u8 *) (&tmp));
+                        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
+                                                      &tmp);
                         rtlpriv->dm.current_turbo_edca = false;
                 }
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
index 692c8ef5ee89..44febfde9493 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
@@ -168,7 +168,7 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw,
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        u8 *bufferPtr = (u8 *) buffer;
+        u8 *bufferPtr = buffer;
 
         RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE, "FW size is %d bytes\n", size);
 
@@ -262,7 +262,7 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
                 return 1;
 
         pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
-        pfwdata = (u8 *) rtlhal->pfirmware;
+        pfwdata = rtlhal->pfirmware;
         fwsize = rtlhal->fwsize;
 
         if (IS_FW_HEADER_EXIST(pfwheader)) {
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index 5c4d9bc040f1..bd0da7ef290b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -214,13 +214,13 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         for (e_aci = 0; e_aci < AC_MAX; e_aci++) {
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                               HW_VAR_AC_PARAM,
-                                                              (u8 *) (&e_aci));
+                                                              &e_aci);
                         }
                         break;
                 }
         case HW_VAR_ACK_PREAMBLE:{
                         u8 reg_tmp;
-                        u8 short_preamble = (bool) (*(u8 *) val);
+                        u8 short_preamble = (bool)*val;
                         reg_tmp = (mac->cur_40_prime_sc) << 5;
                         if (short_preamble)
                                 reg_tmp |= 0x80;
@@ -232,7 +232,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         u8 min_spacing_to_set;
                         u8 sec_min_space;
 
-                        min_spacing_to_set = *((u8 *) val);
+                        min_spacing_to_set = *val;
                         if (min_spacing_to_set <= 7) {
                                 sec_min_space = 0;
 
@@ -257,7 +257,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         case HW_VAR_SHORTGI_DENSITY:{
                         u8 density_to_set;
 
-                        density_to_set = *((u8 *) val);
+                        density_to_set = *val;
                         mac->min_space_cfg |= (density_to_set << 3);
 
                         RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
@@ -284,7 +284,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         else
                                 p_regtoset = regtoset_normal;
 
-                        factor_toset = *((u8 *) val);
+                        factor_toset = *(val);
                         if (factor_toset <= 3) {
                                 factor_toset = (1 << (factor_toset + 2));
                                 if (factor_toset > 0xf)
@@ -316,17 +316,17 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_AC_PARAM:{
-                        u8 e_aci = *((u8 *) val);
+                        u8 e_aci = *(val);
                         rtl92c_dm_init_edca_turbo(hw);
 
                         if (rtlpci->acm_method != eAcmWay2_SW)
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                               HW_VAR_ACM_CTRL,
-                                                              (u8 *) (&e_aci));
+                                                              (&e_aci));
                         break;
                 }
         case HW_VAR_ACM_CTRL:{
-                        u8 e_aci = *((u8 *) val);
+                        u8 e_aci = *(val);
                         union aci_aifsn *p_aci_aifsn =
                             (union aci_aifsn *)(&(mac->ac[0].aifs));
                         u8 acm = p_aci_aifsn->f.acm;
@@ -382,7 +382,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_RETRY_LIMIT:{
-                        u8 retry_limit = ((u8 *) (val))[0];
+                        u8 retry_limit = val[0];
 
                         rtl_write_word(rtlpriv, REG_RL,
                                        retry_limit << RETRY_LIMIT_SHORT_SHIFT |
@@ -396,13 +396,13 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 rtlefuse->efuse_usedbytes = *((u16 *) val);
                 break;
         case HW_VAR_EFUSE_USAGE:
-                rtlefuse->efuse_usedpercentage = *((u8 *) val);
+                rtlefuse->efuse_usedpercentage = *val;
                 break;
         case HW_VAR_IO_CMD:
                 rtl92c_phy_set_io_cmd(hw, (*(enum io_type *)val));
                 break;
         case HW_VAR_WPA_CONFIG:
-                rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *) val));
+                rtl_write_byte(rtlpriv, REG_SECCFG, *val);
                 break;
         case HW_VAR_SET_RPWM:{
                         u8 rpwm_val;
@@ -411,31 +411,30 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         udelay(1);
 
                         if (rpwm_val & BIT(7)) {
-                                rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,
-                                               (*(u8 *) val));
+                                rtl_write_byte(rtlpriv, REG_PCIE_HRPWM, *val);
                         } else {
                                 rtl_write_byte(rtlpriv, REG_PCIE_HRPWM,
-                                               ((*(u8 *) val) | BIT(7)));
+                                               *val | BIT(7));
                         }
 
                         break;
                 }
         case HW_VAR_H2C_FW_PWRMODE:{
-                        u8 psmode = (*(u8 *) val);
+                        u8 psmode = *val;
 
                         if ((psmode != FW_PS_ACTIVE_MODE) &&
                             (!IS_92C_SERIAL(rtlhal->version))) {
                                 rtl92c_dm_rf_saving(hw, true);
                         }
 
-                        rtl92c_set_fw_pwrmode_cmd(hw, (*(u8 *) val));
+                        rtl92c_set_fw_pwrmode_cmd(hw, *val);
                         break;
                 }
         case HW_VAR_FW_PSMODE_STATUS:
                 ppsc->fw_current_inpsmode = *((bool *) val);
                 break;
         case HW_VAR_H2C_FW_JOINBSSRPT:{
-                        u8 mstatus = (*(u8 *) val);
+                        u8 mstatus = *val;
                         u8 tmp_regcr, tmp_reg422;
                         bool recover = false;
 
@@ -472,7 +471,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 rtl_write_byte(rtlpriv, REG_CR + 1,
                                                (tmp_regcr & ~(BIT(0))));
                         }
-                        rtl92c_set_fw_joinbss_report_cmd(hw, (*(u8 *) val));
+                        rtl92c_set_fw_joinbss_report_cmd(hw, *val);
 
                         break;
                 }
@@ -486,7 +485,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_CORRECT_TSF:{
-                        u8 btype_ibss = ((u8 *) (val))[0];
+                        u8 btype_ibss = val[0];
 
                         if (btype_ibss)
                                 _rtl92ce_stop_tx_beacon(hw);
@@ -1589,10 +1588,10 @@ static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw)
                                                  rtlefuse->autoload_failflag,
                                                  hwinfo);
 
-        rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
+        rtlefuse->eeprom_channelplan = *&hwinfo[EEPROM_CHANNELPLAN];
         rtlefuse->eeprom_version = *(u16 *)&hwinfo[EEPROM_VERSION];
         rtlefuse->txpwr_fromeprom = true;
-        rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
+        rtlefuse->eeprom_oemid = *&hwinfo[EEPROM_CUSTOMER_ID];
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                  "EEPROM Customer ID: 0x%2x\n", rtlefuse->eeprom_oemid);
@@ -1939,7 +1938,7 @@ void rtl92ce_update_channel_access_setting(struct ieee80211_hw *hw)
         u16 sifs_timer;
 
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
-                                      (u8 *)&mac->slot_time);
+                                      &mac->slot_time);
         if (!mac->ht_enable)
                 sifs_timer = 0x0a0a;
         else
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index 3af874e69595..52166640f167 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
@@ -605,7 +605,7 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw,
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         bool defaultadapter = true;
         struct ieee80211_sta *sta;
-        u8 *pdesc = (u8 *) pdesc_tx;
+        u8 *pdesc = pdesc_tx;
         u16 seq_number;
         __le16 fc = hdr->frame_control;
         u8 fw_qsel = _rtl92ce_map_hwqueue_to_fwqueue(skb, hw_queue);
@@ -806,7 +806,7 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw,
 
         SET_TX_DESC_OWN(pdesc, 1);
 
-        SET_TX_DESC_PKT_SIZE((u8 *) pdesc, (u16) (skb->len));
+        SET_TX_DESC_PKT_SIZE(pdesc, (u16) (skb->len));
 
         SET_TX_DESC_FIRST_SEG(pdesc, 1);
         SET_TX_DESC_LAST_SEG(pdesc, 1);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index 0c74d4f2eeb4..4bbb711a36c5 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -381,11 +381,11 @@ static void _rtl92cu_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->eeprom_did = le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_DID]);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, " VID = 0x%02x PID = 0x%02x\n",
                  rtlefuse->eeprom_vid, rtlefuse->eeprom_did);
-        rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
+        rtlefuse->eeprom_channelplan = hwinfo[EEPROM_CHANNELPLAN];
         rtlefuse->eeprom_version =
                          le16_to_cpu(*(__le16 *)&hwinfo[EEPROM_VERSION]);
         rtlefuse->txpwr_fromeprom = true;
-        rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
+        rtlefuse->eeprom_oemid = hwinfo[EEPROM_CUSTOMER_ID];
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x\n",
                  rtlefuse->eeprom_oemid);
         if (rtlhal->oem_id == RT_CID_DEFAULT) {
@@ -1660,7 +1660,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 for (e_aci = 0; e_aci < AC_MAX; e_aci++)
                                         rtlpriv->cfg->ops->set_hw_reg(hw,
                                                                 HW_VAR_AC_PARAM,
-                                                                (u8 *)(&e_aci));
+                                                                &e_aci);
                         } else {
                                 u8 sifstime = 0;
                                 u8      u1bAIFS;
@@ -1685,7 +1685,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 }
         case HW_VAR_ACK_PREAMBLE:{
                         u8 reg_tmp;
-                        u8 short_preamble = (bool) (*(u8 *) val);
+                        u8 short_preamble = (bool)*val;
                         reg_tmp = 0;
                         if (short_preamble)
                                 reg_tmp |= 0x80;
@@ -1696,7 +1696,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         u8 min_spacing_to_set;
                         u8 sec_min_space;
 
-                        min_spacing_to_set = *((u8 *) val);
+                        min_spacing_to_set = *val;
                         if (min_spacing_to_set <= 7) {
                                 switch (rtlpriv->sec.pairwise_enc_algorithm) {
                                 case NO_ENCRYPTION:
@@ -1729,7 +1729,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         case HW_VAR_SHORTGI_DENSITY:{
                         u8 density_to_set;
 
-                        density_to_set = *((u8 *) val);
+                        density_to_set = *val;
                         density_to_set &= 0x1f;
                         mac->min_space_cfg &= 0x07;
                         mac->min_space_cfg |= (density_to_set << 3);
@@ -1747,7 +1747,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         u8 index = 0;
 
                         p_regtoset = regtoset_normal;
-                        factor_toset = *((u8 *) val);
+                        factor_toset = *val;
                         if (factor_toset <= 3) {
                                 factor_toset = (1 << (factor_toset + 2));
                                 if (factor_toset > 0xf)
@@ -1774,7 +1774,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_AC_PARAM:{
-                        u8 e_aci = *((u8 *) val);
+                        u8 e_aci = *val;
                         u32 u4b_ac_param;
                         u16 cw_min = le16_to_cpu(mac->ac[e_aci].cw_min);
                         u16 cw_max = le16_to_cpu(mac->ac[e_aci].cw_max);
@@ -1814,11 +1814,11 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         }
                         if (rtlusb->acm_method != eAcmWay2_SW)
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
-                                         HW_VAR_ACM_CTRL, (u8 *)(&e_aci));
+                                         HW_VAR_ACM_CTRL, &e_aci);
                         break;
                 }
         case HW_VAR_ACM_CTRL:{
-                        u8 e_aci = *((u8 *) val);
+                        u8 e_aci = *val;
                         union aci_aifsn *p_aci_aifsn = (union aci_aifsn *)
                                                         (&(mac->ac[0].aifs));
                         u8 acm = p_aci_aifsn->f.acm;
@@ -1874,7 +1874,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_RETRY_LIMIT:{
-                        u8 retry_limit = ((u8 *) (val))[0];
+                        u8 retry_limit = val[0];
 
                         rtl_write_word(rtlpriv, REG_RL,
                                        retry_limit << RETRY_LIMIT_SHORT_SHIFT |
@@ -1891,39 +1891,38 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 rtlefuse->efuse_usedbytes = *((u16 *) val);
                 break;
         case HW_VAR_EFUSE_USAGE:
-                rtlefuse->efuse_usedpercentage = *((u8 *) val);
+                rtlefuse->efuse_usedpercentage = *val;
                 break;
         case HW_VAR_IO_CMD:
                 rtl92c_phy_set_io_cmd(hw, (*(enum io_type *)val));
                 break;
         case HW_VAR_WPA_CONFIG:
-                rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *) val));
+                rtl_write_byte(rtlpriv, REG_SECCFG, *val);
                 break;
         case HW_VAR_SET_RPWM:{
                         u8 rpwm_val = rtl_read_byte(rtlpriv, REG_USB_HRPWM);
 
                         if (rpwm_val & BIT(7))
-                                rtl_write_byte(rtlpriv, REG_USB_HRPWM,
-                                               (*(u8 *)val));
+                                rtl_write_byte(rtlpriv, REG_USB_HRPWM, *val);
                         else
                                 rtl_write_byte(rtlpriv, REG_USB_HRPWM,
-                                               ((*(u8 *)val) | BIT(7)));
+                                               *val | BIT(7));
                         break;
                 }
         case HW_VAR_H2C_FW_PWRMODE:{
-                        u8 psmode = (*(u8 *) val);
+                        u8 psmode = *val;
 
                         if ((psmode != FW_PS_ACTIVE_MODE) &&
                            (!IS_92C_SERIAL(rtlhal->version)))
                                 rtl92c_dm_rf_saving(hw, true);
-                        rtl92c_set_fw_pwrmode_cmd(hw, (*(u8 *) val));
+                        rtl92c_set_fw_pwrmode_cmd(hw, (*val));
                         break;
                 }
         case HW_VAR_FW_PSMODE_STATUS:
                 ppsc->fw_current_inpsmode = *((bool *) val);
                 break;
         case HW_VAR_H2C_FW_JOINBSSRPT:{
-                        u8 mstatus = (*(u8 *) val);
+                        u8 mstatus = *val;
                         u8 tmp_reg422;
                         bool recover = false;
 
@@ -1948,7 +1947,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                                 tmp_reg422 | BIT(6));
                                 rtl_write_byte(rtlpriv, REG_CR + 1, 0x02);
                         }
-                        rtl92c_set_fw_joinbss_report_cmd(hw, (*(u8 *) val));
+                        rtl92c_set_fw_joinbss_report_cmd(hw, (*val));
                         break;
                 }
         case HW_VAR_AID:{
@@ -1961,7 +1960,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_CORRECT_TSF:{
-                        u8 btype_ibss = ((u8 *) (val))[0];
+                        u8 btype_ibss = val[0];
 
                         if (btype_ibss)
                                 _rtl92cu_stop_tx_beacon(hw);
@@ -2184,7 +2183,7 @@ void rtl92cu_update_channel_access_setting(struct ieee80211_hw *hw)
         u16 sifs_timer;
 
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
-                                      (u8 *)&mac->slot_time);
+                                      &mac->slot_time);
         if (!mac->ht_enable)
                 sifs_timer = 0x0a0a;
         else
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index 21bc827c5fa6..2e6eb356a93e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -668,7 +668,7 @@ void rtl92cu_tx_fill_cmddesc(struct ieee80211_hw *hw,
         SET_TX_DESC_RATE_ID(pdesc, 7);
         SET_TX_DESC_MACID(pdesc, 0);
         SET_TX_DESC_OWN(pdesc, 1);
-        SET_TX_DESC_PKT_SIZE((u8 *) pdesc, (u16) (skb->len));
+        SET_TX_DESC_PKT_SIZE(pdesc, (u16)skb->len);
         SET_TX_DESC_FIRST_SEG(pdesc, 1);
         SET_TX_DESC_LAST_SEG(pdesc, 1);
         SET_TX_DESC_OFFSET(pdesc, 0x20);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
index a7d63a84551a..c0201ed69dd7 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
@@ -696,7 +696,7 @@ static void rtl92d_dm_check_edca_turbo(struct ieee80211_hw *hw)
                 if (rtlpriv->dm.current_turbo_edca) {
                         u8 tmp = AC0_BE;
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
-                                                      (u8 *) (&tmp));
+                                                      &tmp);
                         rtlpriv->dm.current_turbo_edca = false;
                 }
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
index f548a8d0068d..895ae6c1f354 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
@@ -120,7 +120,7 @@ static void _rtl92d_write_fw(struct ieee80211_hw *hw,
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-        u8 *bufferPtr = (u8 *) buffer;
+        u8 *bufferPtr = buffer;
         u32 pagenums, remainSize;
         u32 page, offset;
 
@@ -256,8 +256,8 @@ int rtl92d_download_fw(struct ieee80211_hw *hw)
         if (rtlpriv->max_fw_size == 0 || !rtlhal->pfirmware)
                 return 1;
         fwsize = rtlhal->fwsize;
-        pfwheader = (u8 *) rtlhal->pfirmware;
-        pfwdata = (u8 *) rtlhal->pfirmware;
+        pfwheader = rtlhal->pfirmware;
+        pfwdata = rtlhal->pfirmware;
         rtlhal->fw_version = (u16) GET_FIRMWARE_HDR_VERSION(pfwheader);
         rtlhal->fw_subversion = (u16) GET_FIRMWARE_HDR_SUB_VER(pfwheader);
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
index b338d526c422..f4051f4f0390 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
@@ -235,12 +235,12 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 for (e_aci = 0; e_aci < AC_MAX; e_aci++)
                         rtlpriv->cfg->ops->set_hw_reg(hw,
                                                       HW_VAR_AC_PARAM,
-                                                      (u8 *) (&e_aci));
+                                                      (&e_aci));
                 break;
         }
         case HW_VAR_ACK_PREAMBLE: {
                 u8 reg_tmp;
-                u8 short_preamble = (bool) (*(u8 *) val);
+                u8 short_preamble = (bool) (*val);
 
                 reg_tmp = (mac->cur_40_prime_sc) << 5;
                 if (short_preamble)
@@ -252,7 +252,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 u8 min_spacing_to_set;
                 u8 sec_min_space;
 
-                min_spacing_to_set = *((u8 *) val);
+                min_spacing_to_set = *val;
                 if (min_spacing_to_set <= 7) {
                         sec_min_space = 0;
                         if (min_spacing_to_set < sec_min_space)
@@ -271,7 +271,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         case HW_VAR_SHORTGI_DENSITY: {
                 u8 density_to_set;
 
-                density_to_set = *((u8 *) val);
+                density_to_set = *val;
                 mac->min_space_cfg = rtlpriv->rtlhal.minspace_cfg;
                 mac->min_space_cfg |= (density_to_set << 3);
                 RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
@@ -293,7 +293,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         regtoSet = 0x66626641;
                 else
                         regtoSet = 0xb972a841;
-                factor_toset = *((u8 *) val);
+                factor_toset = *val;
                 if (factor_toset <= 3) {
                         factor_toset = (1 << (factor_toset + 2));
                         if (factor_toset > 0xf)
@@ -316,15 +316,15 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 break;
         }
         case HW_VAR_AC_PARAM: {
-                u8 e_aci = *((u8 *) val);
+                u8 e_aci = *val;
                 rtl92d_dm_init_edca_turbo(hw);
                 if (rtlpci->acm_method != eAcmWay2_SW)
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_ACM_CTRL,
-                                                      (u8 *) (&e_aci));
+                                                      &e_aci);
                 break;
         }
         case HW_VAR_ACM_CTRL: {
-                u8 e_aci = *((u8 *) val);
+                u8 e_aci = *val;
                 union aci_aifsn *p_aci_aifsn =
                     (union aci_aifsn *)(&(mac->ac[0].aifs));
                 u8 acm = p_aci_aifsn->f.acm;
@@ -376,7 +376,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 rtlpci->receive_config = ((u32 *) (val))[0];
                 break;
         case HW_VAR_RETRY_LIMIT: {
-                u8 retry_limit = ((u8 *) (val))[0];
+                u8 retry_limit = val[0];
 
                 rtl_write_word(rtlpriv, REG_RL,
                                retry_limit << RETRY_LIMIT_SHORT_SHIFT |
@@ -390,16 +390,16 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 rtlefuse->efuse_usedbytes = *((u16 *) val);
                 break;
         case HW_VAR_EFUSE_USAGE:
-                rtlefuse->efuse_usedpercentage = *((u8 *) val);
+                rtlefuse->efuse_usedpercentage = *val;
                 break;
         case HW_VAR_IO_CMD:
                 rtl92d_phy_set_io_cmd(hw, (*(enum io_type *)val));
                 break;
         case HW_VAR_WPA_CONFIG:
-                rtl_write_byte(rtlpriv, REG_SECCFG, *((u8 *) val));
+                rtl_write_byte(rtlpriv, REG_SECCFG, *val);
                 break;
         case HW_VAR_SET_RPWM:
-                rtl92d_fill_h2c_cmd(hw, H2C_PWRM, 1, (u8 *) (val));
+                rtl92d_fill_h2c_cmd(hw, H2C_PWRM, 1, (val));
                 break;
         case HW_VAR_H2C_FW_PWRMODE:
                 break;
@@ -407,7 +407,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 ppsc->fw_current_inpsmode = *((bool *) val);
                 break;
         case HW_VAR_H2C_FW_JOINBSSRPT: {
-                u8 mstatus = (*(u8 *) val);
+                u8 mstatus = (*val);
                 u8 tmp_regcr, tmp_reg422;
                 bool recover = false;
 
@@ -435,7 +435,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         rtl_write_byte(rtlpriv, REG_CR + 1,
                                        (tmp_regcr & ~(BIT(0))));
                 }
-                rtl92d_set_fw_joinbss_report_cmd(hw, (*(u8 *) val));
+                rtl92d_set_fw_joinbss_report_cmd(hw, (*val));
                 break;
         }
         case HW_VAR_AID: {
@@ -447,7 +447,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                 break;
         }
         case HW_VAR_CORRECT_TSF: {
-                u8 btype_ibss = ((u8 *) (val))[0];
+                u8 btype_ibss = val[0];
 
                 if (btype_ibss)
                         _rtl92de_stop_tx_beacon(hw);
@@ -1794,7 +1794,7 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw)
                          "RTL819X Not boot from eeprom, check it !!\n");
                 return;
         }
-        rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID];
+        rtlefuse->eeprom_oemid = hwinfo[EEPROM_CUSTOMER_ID];
         _rtl92de_read_macphymode_and_bandtype(hw, hwinfo);
 
         /* VID, DID  SE     0xA-D */
@@ -2115,7 +2115,7 @@ void rtl92de_update_channel_access_setting(struct ieee80211_hw *hw)
         u16 sifs_timer;
 
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
-                                      (u8 *)&mac->slot_time);
+                                      &mac->slot_time);
         if (!mac->ht_enable)
                 sifs_timer = 0x0a0a;
         else
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
index 1666ef7fd87b..f80690d82c11 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
@@ -560,7 +560,7 @@ void rtl92de_tx_fill_desc(struct ieee80211_hw *hw,
         struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         struct ieee80211_sta *sta = info->control.sta;
-        u8 *pdesc = (u8 *) pdesc_tx;
+        u8 *pdesc = pdesc_tx;
         u16 seq_number;
         __le16 fc = hdr->frame_control;
         unsigned int buf_len = 0;
@@ -761,11 +761,11 @@ void rtl92de_tx_fill_cmddesc(struct ieee80211_hw *hw,
         SET_TX_DESC_QUEUE_SEL(pdesc, fw_queue);
         SET_TX_DESC_FIRST_SEG(pdesc, 1);
         SET_TX_DESC_LAST_SEG(pdesc, 1);
-        SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16) (skb->len));
+        SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16)skb->len);
         SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
         SET_TX_DESC_RATE_ID(pdesc, 7);
         SET_TX_DESC_MACID(pdesc, 0);
-        SET_TX_DESC_PKT_SIZE((u8 *) pdesc, (u16) (skb->len));
+        SET_TX_DESC_PKT_SIZE(pdesc, (u16) (skb->len));
         SET_TX_DESC_FIRST_SEG(pdesc, 1);
         SET_TX_DESC_LAST_SEG(pdesc, 1);
         SET_TX_DESC_OFFSET(pdesc, 0x20);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
index 2e1158026fb7..465f58157101 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/dm.c
@@ -146,7 +146,7 @@ static void _rtl92s_dm_check_edca_turbo(struct ieee80211_hw *hw)
                 if (rtlpriv->dm.current_turbo_edca) {
                         u8 tmp = AC0_BE;
                         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM,
-                                                      (u8 *)(&tmp));
+                                                      &tmp);
                         rtlpriv->dm.current_turbo_edca = false;
                 }
         }
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index b141c35bf926..4542e6952b97 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -145,13 +145,13 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         for (e_aci = 0; e_aci < AC_MAX; e_aci++) {
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                 HW_VAR_AC_PARAM,
-                                                (u8 *)(&e_aci));
+                                                (&e_aci));
                         }
                         break;
                 }
         case HW_VAR_ACK_PREAMBLE:{
                         u8 reg_tmp;
-                        u8 short_preamble = (bool) (*(u8 *) val);
+                        u8 short_preamble = (bool) (*val);
                         reg_tmp = (mac->cur_40_prime_sc) << 5;
                         if (short_preamble)
                                 reg_tmp |= 0x80;
@@ -163,7 +163,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         u8 min_spacing_to_set;
                         u8 sec_min_space;
 
-                        min_spacing_to_set = *((u8 *)val);
+                        min_spacing_to_set = *val;
                         if (min_spacing_to_set <= 7) {
                                 if (rtlpriv->sec.pairwise_enc_algorithm ==
                                     NO_ENCRYPTION)
@@ -194,7 +194,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
         case HW_VAR_SHORTGI_DENSITY:{
                         u8 density_to_set;
 
-                        density_to_set = *((u8 *) val);
+                        density_to_set = *val;
                         mac->min_space_cfg = rtlpriv->rtlhal.minspace_cfg;
                         mac->min_space_cfg |= (density_to_set << 3);
 
@@ -216,7 +216,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                                 15, 15, 15, 15, 0};
                         u8 index = 0;
 
-                        factor_toset = *((u8 *) val);
+                        factor_toset = *val;
                         if (factor_toset <= 3) {
                                 factor_toset = (1 << (factor_toset + 2));
                                 if (factor_toset > 0xf)
@@ -248,17 +248,17 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_AC_PARAM:{
-                        u8 e_aci = *((u8 *) val);
+                        u8 e_aci = *val;
                         rtl92s_dm_init_edca_turbo(hw);
 
                         if (rtlpci->acm_method != eAcmWay2_SW)
                                 rtlpriv->cfg->ops->set_hw_reg(hw,
                                                  HW_VAR_ACM_CTRL,
-                                                 (u8 *)(&e_aci));
+                                                 &e_aci);
                         break;
                 }
         case HW_VAR_ACM_CTRL:{
-                        u8 e_aci = *((u8 *) val);
+                        u8 e_aci = *val;
                         union aci_aifsn *p_aci_aifsn = (union aci_aifsn *)(&(
                                                         mac->ac[0].aifs));
                         u8 acm = p_aci_aifsn->f.acm;
@@ -313,7 +313,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_RETRY_LIMIT:{
-                        u8 retry_limit = ((u8 *) (val))[0];
+                        u8 retry_limit = val[0];
 
                         rtl_write_word(rtlpriv, RETRY_LIMIT,
                                        retry_limit << RETRY_LIMIT_SHORT_SHIFT |
@@ -328,14 +328,14 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                         break;
                 }
         case HW_VAR_EFUSE_USAGE: {
-                        rtlefuse->efuse_usedpercentage = *((u8 *) val);
+                        rtlefuse->efuse_usedpercentage = *val;
                         break;
                 }
         case HW_VAR_IO_CMD: {
                         break;
                 }
         case HW_VAR_WPA_CONFIG: {
-                        rtl_write_byte(rtlpriv, REG_SECR, *((u8 *) val));
+                        rtl_write_byte(rtlpriv, REG_SECR, *val);
                         break;
                 }
         case HW_VAR_SET_RPWM:{
@@ -1813,8 +1813,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                 else
                         index = 2;
 
-                tempval = (*(u8 *)&hwinfo[EEPROM_TX_PWR_HT20_DIFF +
-                           index]) & 0xff;
+                tempval = hwinfo[EEPROM_TX_PWR_HT20_DIFF + index] & 0xff;
                 rtlefuse->txpwr_ht20diff[RF90_PATH_A][i] = (tempval & 0xF);
                 rtlefuse->txpwr_ht20diff[RF90_PATH_B][i] =
                                                  ((tempval >> 4) & 0xF);
@@ -1830,14 +1829,13 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                 else
                         index = 1;
 
-                tempval = (*(u8 *)&hwinfo[EEPROM_TX_PWR_OFDM_DIFF + index])
-                                  & 0xff;
+                tempval = hwinfo[EEPROM_TX_PWR_OFDM_DIFF + index] & 0xff;
                 rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i] =
                                  (tempval & 0xF);
                 rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i] =
                                  ((tempval >> 4) & 0xF);
 
-                tempval = (*(u8 *)&hwinfo[TX_PWR_SAFETY_CHK]);
+                tempval = hwinfo[TX_PWR_SAFETY_CHK];
                 rtlefuse->txpwr_safetyflag = (tempval & 0x01);
         }
 
@@ -1876,7 +1874,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
 
         /* Read RF-indication and Tx Power gain
          * index diff of legacy to HT OFDM rate. */
-        tempval = (*(u8 *)&hwinfo[EEPROM_RFIND_POWERDIFF]) & 0xff;
+        tempval = hwinfo[EEPROM_RFIND_POWERDIFF] & 0xff;
         rtlefuse->eeprom_txpowerdiff = tempval;
         rtlefuse->legacy_httxpowerdiff =
                 rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][0];
@@ -1887,7 +1885,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         /* Get TSSI value for each path. */
         usvalue = *(u16 *)&hwinfo[EEPROM_TSSI_A];
         rtlefuse->eeprom_tssi[RF90_PATH_A] = (u8)((usvalue & 0xff00) >> 8);
-        usvalue = *(u8 *)&hwinfo[EEPROM_TSSI_B];
+        usvalue = hwinfo[EEPROM_TSSI_B];
         rtlefuse->eeprom_tssi[RF90_PATH_B] = (u8)(usvalue & 0xff);
 
         RTPRINT(rtlpriv, FINIT, INIT_TxPower, "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
@@ -1896,7 +1894,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
 
         /* Read antenna tx power offset of B/C/D to A  from EEPROM */
         /* and read ThermalMeter from EEPROM */
-        tempval = *(u8 *)&hwinfo[EEPROM_THERMALMETER];
+        tempval = hwinfo[EEPROM_THERMALMETER];
         rtlefuse->eeprom_thermalmeter = tempval;
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
                 "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
@@ -1906,20 +1904,20 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
         rtlefuse->tssi_13dbm = rtlefuse->eeprom_thermalmeter * 100;
 
         /* Read CrystalCap from EEPROM */
-        tempval = (*(u8 *)&hwinfo[EEPROM_CRYSTALCAP]) >> 4;
+        tempval = hwinfo[EEPROM_CRYSTALCAP] >> 4;
         rtlefuse->eeprom_crystalcap = tempval;
         /* CrystalCap, BIT(12)~15 */
         rtlefuse->crystalcap = rtlefuse->eeprom_crystalcap;
 
         /* Read IC Version && Channel Plan */
         /* Version ID, Channel plan */
-        rtlefuse->eeprom_channelplan = *(u8 *)&hwinfo[EEPROM_CHANNELPLAN];
+        rtlefuse->eeprom_channelplan = hwinfo[EEPROM_CHANNELPLAN];
         rtlefuse->txpwr_fromeprom = true;
         RTPRINT(rtlpriv, FINIT, INIT_TxPower,
                 "EEPROM ChannelPlan = 0x%4x\n", rtlefuse->eeprom_channelplan);
 
         /* Read Customer ID or Board Type!!! */
-        tempval = *(u8 *)&hwinfo[EEPROM_BOARDTYPE];
+        tempval = hwinfo[EEPROM_BOARDTYPE];
         /* Change RF type definition */
         if (tempval == 0)
                 rtlphy->rf_type = RF_2T2R;
@@ -1941,7 +1939,7 @@ static void _rtl92se_read_adapter_info(struct ieee80211_hw *hw)
                 }
         }
         rtlefuse->b1ss_support = rtlefuse->b1x1_recvcombine;
-        rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMID];
+        rtlefuse->eeprom_oemid = *&hwinfo[EEPROM_CUSTOMID];
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, "EEPROM Customer ID: 0x%2x",
                  rtlefuse->eeprom_oemid);
@@ -2251,7 +2249,7 @@ void rtl92se_update_channel_access_setting(struct ieee80211_hw *hw)
         u16 sifs_timer;
 
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
-                                      (u8 *)&mac->slot_time);
+                                      &mac->slot_time);
         sifs_timer = 0x0e0e;
         rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SIFS, (u8 *)&sifs_timer);
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index 812b5858f14a..36d1cb3aef8a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@ -599,7 +599,7 @@ void rtl92se_tx_fill_desc(struct ieee80211_hw *hw,
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
         struct ieee80211_sta *sta = info->control.sta;
-        u8 *pdesc = (u8 *) pdesc_tx;
+        u8 *pdesc = pdesc_tx;
         u16 seq_number;
         __le16 fc = hdr->frame_control;
         u8 reserved_macid = 0;
diff --git a/drivers/net/wireless/ti/Kconfig b/drivers/net/wireless/ti/Kconfig
index 1a72932e2213..be800119d0a3 100644
--- a/drivers/net/wireless/ti/Kconfig
+++ b/drivers/net/wireless/ti/Kconfig
@@ -8,6 +8,7 @@ menuconfig WL_TI
 if WL_TI
 source "drivers/net/wireless/ti/wl1251/Kconfig"
 source "drivers/net/wireless/ti/wl12xx/Kconfig"
+source "drivers/net/wireless/ti/wl18xx/Kconfig"
 
 # keep last for automatic dependencies
 source "drivers/net/wireless/ti/wlcore/Kconfig"
diff --git a/drivers/net/wireless/ti/Makefile b/drivers/net/wireless/ti/Makefile
index 0a565622d4a4..4d6823983c04 100644
--- a/drivers/net/wireless/ti/Makefile
+++ b/drivers/net/wireless/ti/Makefile
@@ -2,3 +2,4 @@ obj-$(CONFIG_WLCORE)			+= wlcore/
 obj-$(CONFIG_WL12XX)                    += wl12xx/
 obj-$(CONFIG_WL12XX_PLATFORM_DATA)      += wlcore/
 obj-$(CONFIG_WL1251)                    += wl1251/
+obj-$(CONFIG_WL18XX)                    += wl18xx/
diff --git a/drivers/net/wireless/ti/wl12xx/Makefile b/drivers/net/wireless/ti/wl12xx/Makefile
index 87f64b14db35..da509aa7d009 100644
--- a/drivers/net/wireless/ti/wl12xx/Makefile
+++ b/drivers/net/wireless/ti/wl12xx/Makefile
@@ -1,3 +1,3 @@
-wl12xx-objs     = main.o cmd.o acx.o
+wl12xx-objs     = main.o cmd.o acx.o debugfs.o
 
 obj-$(CONFIG_WL12XX)            += wl12xx.o
diff --git a/drivers/net/wireless/ti/wl12xx/acx.h b/drivers/net/wireless/ti/wl12xx/acx.h
index d1f5aba0afce..2a26868b837d 100644
--- a/drivers/net/wireless/ti/wl12xx/acx.h
+++ b/drivers/net/wireless/ti/wl12xx/acx.h
@@ -24,6 +24,21 @@
 #define __WL12XX_ACX_H__
 
 #include "../wlcore/wlcore.h"
+#include "../wlcore/acx.h"
+
+#define WL12XX_ACX_ALL_EVENTS_VECTOR    (WL1271_ACX_INTR_WATCHDOG      | \
+                                        WL1271_ACX_INTR_INIT_COMPLETE | \
+                                        WL1271_ACX_INTR_EVENT_A       | \
+                                        WL1271_ACX_INTR_EVENT_B       | \
+                                        WL1271_ACX_INTR_CMD_COMPLETE  | \
+                                        WL1271_ACX_INTR_HW_AVAILABLE  | \
+                                        WL1271_ACX_INTR_DATA)
+
+#define WL12XX_INTR_MASK                (WL1271_ACX_INTR_WATCHDOG      | \
+                                        WL1271_ACX_INTR_EVENT_A       | \
+                                        WL1271_ACX_INTR_EVENT_B       | \
+                                        WL1271_ACX_INTR_HW_AVAILABLE  | \
+                                        WL1271_ACX_INTR_DATA)
 
 struct wl1271_acx_host_config_bitmap {
         struct acx_header header;
@@ -31,6 +46,228 @@ struct wl1271_acx_host_config_bitmap {
         __le32 host_cfg_bitmap;
 } __packed;
 
+struct wl12xx_acx_tx_statistics {
+        __le32 internal_desc_overflow;
+}  __packed;
+
+struct wl12xx_acx_rx_statistics {
+        __le32 out_of_mem;
+        __le32 hdr_overflow;
+        __le32 hw_stuck;
+        __le32 dropped;
+        __le32 fcs_err;
+        __le32 xfr_hint_trig;
+        __le32 path_reset;
+        __le32 reset_counter;
+} __packed;
+
+struct wl12xx_acx_dma_statistics {
+        __le32 rx_requested;
+        __le32 rx_errors;
+        __le32 tx_requested;
+        __le32 tx_errors;
+}  __packed;
+
+struct wl12xx_acx_isr_statistics {
+        /* host command complete */
+        __le32 cmd_cmplt;
+
+        /* fiqisr() */
+        __le32 fiqs;
+
+        /* (INT_STS_ND & INT_TRIG_RX_HEADER) */
+        __le32 rx_headers;
+
+        /* (INT_STS_ND & INT_TRIG_RX_CMPLT) */
+        __le32 rx_completes;
+
+        /* (INT_STS_ND & INT_TRIG_NO_RX_BUF) */
+        __le32 rx_mem_overflow;
+
+        /* (INT_STS_ND & INT_TRIG_S_RX_RDY) */
+        __le32 rx_rdys;
+
+        /* irqisr() */
+        __le32 irqs;
+
+        /* (INT_STS_ND & INT_TRIG_TX_PROC) */
+        __le32 tx_procs;
+
+        /* (INT_STS_ND & INT_TRIG_DECRYPT_DONE) */
+        __le32 decrypt_done;
+
+        /* (INT_STS_ND & INT_TRIG_DMA0) */
+        __le32 dma0_done;
+
+        /* (INT_STS_ND & INT_TRIG_DMA1) */
+        __le32 dma1_done;
+
+        /* (INT_STS_ND & INT_TRIG_TX_EXC_CMPLT) */
+        __le32 tx_exch_complete;
+
+        /* (INT_STS_ND & INT_TRIG_COMMAND) */
+        __le32 commands;
+
+        /* (INT_STS_ND & INT_TRIG_RX_PROC) */
+        __le32 rx_procs;
+
+        /* (INT_STS_ND & INT_TRIG_PM_802) */
+        __le32 hw_pm_mode_changes;
+
+        /* (INT_STS_ND & INT_TRIG_ACKNOWLEDGE) */
+        __le32 host_acknowledges;
+
+        /* (INT_STS_ND & INT_TRIG_PM_PCI) */
+        __le32 pci_pm;
+
+        /* (INT_STS_ND & INT_TRIG_ACM_WAKEUP) */
+        __le32 wakeups;
+
+        /* (INT_STS_ND & INT_TRIG_LOW_RSSI) */
+        __le32 low_rssi;
+} __packed;
+
+struct wl12xx_acx_wep_statistics {
+        /* WEP address keys configured */
+        __le32 addr_key_count;
+
+        /* default keys configured */
+        __le32 default_key_count;
+
+        __le32 reserved;
+
+        /* number of times that WEP key not found on lookup */
+        __le32 key_not_found;
+
+        /* number of times that WEP key decryption failed */
+        __le32 decrypt_fail;
+
+        /* WEP packets decrypted */
+        __le32 packets;
+
+        /* WEP decrypt interrupts */
+        __le32 interrupt;
+} __packed;
+
+#define ACX_MISSED_BEACONS_SPREAD 10
+
+struct wl12xx_acx_pwr_statistics {
+        /* the amount of enters into power save mode (both PD & ELP) */
+        __le32 ps_enter;
+
+        /* the amount of enters into ELP mode */
+        __le32 elp_enter;
+
+        /* the amount of missing beacon interrupts to the host */
+        __le32 missing_bcns;
+
+        /* the amount of wake on host-access times */
+        __le32 wake_on_host;
+
+        /* the amount of wake on timer-expire */
+        __le32 wake_on_timer_exp;
+
+        /* the number of packets that were transmitted with PS bit set */
+        __le32 tx_with_ps;
+
+        /* the number of packets that were transmitted with PS bit clear */
+        __le32 tx_without_ps;
+
+        /* the number of received beacons */
+        __le32 rcvd_beacons;
+
+        /* the number of entering into PowerOn (power save off) */
+        __le32 power_save_off;
+
+        /* the number of entries into power save mode */
+        __le16 enable_ps;
+
+        /*
+         * the number of exits from power save, not including failed PS
+         * transitions
+         */
+        __le16 disable_ps;
+
+        /*
+         * the number of times the TSF counter was adjusted because
+         * of drift
+         */
+        __le32 fix_tsf_ps;
+
+        /* Gives statistics about the spread continuous missed beacons.
+         * The 16 LSB are dedicated for the PS mode.
+         * The 16 MSB are dedicated for the PS mode.
+         * cont_miss_bcns_spread[0] - single missed beacon.
+         * cont_miss_bcns_spread[1] - two continuous missed beacons.
+         * cont_miss_bcns_spread[2] - three continuous missed beacons.
+         * ...
+         * cont_miss_bcns_spread[9] - ten and more continuous missed beacons.
+        */
+        __le32 cont_miss_bcns_spread[ACX_MISSED_BEACONS_SPREAD];
+
+        /* the number of beacons in awake mode */
+        __le32 rcvd_awake_beacons;
+} __packed;
+
+struct wl12xx_acx_mic_statistics {
+        __le32 rx_pkts;
+        __le32 calc_failure;
+} __packed;
+
+struct wl12xx_acx_aes_statistics {
+        __le32 encrypt_fail;
+        __le32 decrypt_fail;
+        __le32 encrypt_packets;
+        __le32 decrypt_packets;
+        __le32 encrypt_interrupt;
+        __le32 decrypt_interrupt;
+} __packed;
+
+struct wl12xx_acx_event_statistics {
+        __le32 heart_beat;
+        __le32 calibration;
+        __le32 rx_mismatch;
+        __le32 rx_mem_empty;
+        __le32 rx_pool;
+        __le32 oom_late;
+        __le32 phy_transmit_error;
+        __le32 tx_stuck;
+} __packed;
+
+struct wl12xx_acx_ps_statistics {
+        __le32 pspoll_timeouts;
+        __le32 upsd_timeouts;
+        __le32 upsd_max_sptime;
+        __le32 upsd_max_apturn;
+        __le32 pspoll_max_apturn;
+        __le32 pspoll_utilization;
+        __le32 upsd_utilization;
+} __packed;
+
+struct wl12xx_acx_rxpipe_statistics {
+        __le32 rx_prep_beacon_drop;
+        __le32 descr_host_int_trig_rx_data;
+        __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;
+} __packed;
+
+struct wl12xx_acx_statistics {
+        struct acx_header header;
+
+        struct wl12xx_acx_tx_statistics tx;
+        struct wl12xx_acx_rx_statistics rx;
+        struct wl12xx_acx_dma_statistics dma;
+        struct wl12xx_acx_isr_statistics isr;
+        struct wl12xx_acx_wep_statistics wep;
+        struct wl12xx_acx_pwr_statistics pwr;
+        struct wl12xx_acx_aes_statistics aes;
+        struct wl12xx_acx_mic_statistics mic;
+        struct wl12xx_acx_event_statistics event;
+        struct wl12xx_acx_ps_statistics ps;
+        struct wl12xx_acx_rxpipe_statistics rxpipe;
+} __packed;
+
 int wl1271_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap);
 
 #endif /* __WL12XX_ACX_H__ */
diff --git a/drivers/net/wireless/ti/wl12xx/cmd.c b/drivers/net/wireless/ti/wl12xx/cmd.c
index 8ffaeb5f2147..50ba7480b790 100644
--- a/drivers/net/wireless/ti/wl12xx/cmd.c
+++ b/drivers/net/wireless/ti/wl12xx/cmd.c
@@ -65,6 +65,7 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
         struct wl1271_general_parms_cmd *gen_parms;
         struct wl1271_ini_general_params *gp =
                 &((struct wl1271_nvs_file *)wl->nvs)->general_params;
+        struct wl12xx_priv *priv = wl->priv;
         bool answer = false;
         int ret;
 
@@ -88,7 +89,7 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
                 answer = true;
 
         /* Override the REF CLK from the NVS with the one from platform data */
-        gen_parms->general_params.ref_clock = wl->ref_clock;
+        gen_parms->general_params.ref_clock = priv->ref_clock;
 
         ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);
         if (ret < 0) {
@@ -118,6 +119,7 @@ int wl128x_cmd_general_parms(struct wl1271 *wl)
         struct wl128x_general_parms_cmd *gen_parms;
         struct wl128x_ini_general_params *gp =
                 &((struct wl128x_nvs_file *)wl->nvs)->general_params;
+        struct wl12xx_priv *priv = wl->priv;
         bool answer = false;
         int ret;
 
@@ -141,8 +143,8 @@ int wl128x_cmd_general_parms(struct wl1271 *wl)
                 answer = true;
 
         /* Replace REF and TCXO CLKs with the ones from platform data */
-        gen_parms->general_params.ref_clock = wl->ref_clock;
-        gen_parms->general_params.tcxo_ref_clock = wl->tcxo_clock;
+        gen_parms->general_params.ref_clock = priv->ref_clock;
+        gen_parms->general_params.tcxo_ref_clock = priv->tcxo_clock;
 
         ret = wl1271_cmd_test(wl, gen_parms, sizeof(*gen_parms), answer);
         if (ret < 0) {
diff --git a/drivers/net/wireless/ti/wl12xx/debugfs.c b/drivers/net/wireless/ti/wl12xx/debugfs.c
new file mode 100644
index 000000000000..0521cbf858cf
--- /dev/null
+++ b/drivers/net/wireless/ti/wl12xx/debugfs.c
@@ -0,0 +1,243 @@
+/*
+ * This file is part of wl12xx
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Copyright (C) 2011-2012 Texas Instruments
+ *
+ * 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 "../wlcore/debugfs.h"
+#include "../wlcore/wlcore.h"
+
+#include "wl12xx.h"
+#include "acx.h"
+#include "debugfs.h"
+
+#define WL12XX_DEBUGFS_FWSTATS_FILE(a, b, c) \
+        DEBUGFS_FWSTATS_FILE(a, b, c, wl12xx_acx_statistics)
+
+WL12XX_DEBUGFS_FWSTATS_FILE(tx, internal_desc_overflow, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, out_of_mem, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, hdr_overflow, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, hw_stuck, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, dropped, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, fcs_err, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, xfr_hint_trig, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, path_reset, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rx, reset_counter, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(dma, rx_requested, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(dma, rx_errors, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(dma, tx_requested, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(dma, tx_errors, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, cmd_cmplt, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, fiqs, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, rx_headers, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, rx_mem_overflow, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, rx_rdys, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, irqs, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, tx_procs, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, decrypt_done, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, dma0_done, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, dma1_done, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, tx_exch_complete, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, commands, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, rx_procs, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, hw_pm_mode_changes, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, host_acknowledges, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, pci_pm, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, wakeups, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(isr, low_rssi, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(wep, addr_key_count, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(wep, default_key_count, "%u");
+/* skipping wep.reserved */
+WL12XX_DEBUGFS_FWSTATS_FILE(wep, key_not_found, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(wep, decrypt_fail, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(wep, packets, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(wep, interrupt, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, ps_enter, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, elp_enter, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, missing_bcns, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, wake_on_host, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, wake_on_timer_exp, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, tx_with_ps, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, tx_without_ps, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, rcvd_beacons, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, power_save_off, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, enable_ps, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, disable_ps, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, fix_tsf_ps, "%u");
+/* skipping cont_miss_bcns_spread for now */
+WL12XX_DEBUGFS_FWSTATS_FILE(pwr, rcvd_awake_beacons, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(mic, rx_pkts, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(mic, calc_failure, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(aes, encrypt_fail, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(aes, decrypt_fail, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(aes, encrypt_packets, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(aes, decrypt_packets, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(aes, encrypt_interrupt, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(aes, decrypt_interrupt, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(event, heart_beat, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(event, calibration, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(event, rx_mismatch, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(event, rx_mem_empty, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(event, rx_pool, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(event, oom_late, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(event, phy_transmit_error, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(event, tx_stuck, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(ps, pspoll_timeouts, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(ps, upsd_timeouts, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(ps, upsd_max_sptime, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(ps, upsd_max_apturn, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(ps, pspoll_max_apturn, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(ps, pspoll_utilization, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(ps, upsd_utilization, "%u");
+
+WL12XX_DEBUGFS_FWSTATS_FILE(rxpipe, rx_prep_beacon_drop, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rxpipe, descr_host_int_trig_rx_data, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rxpipe, beacon_buffer_thres_host_int_trig_rx_data,
+                            "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rxpipe, missed_beacon_host_int_trig_rx_data, "%u");
+WL12XX_DEBUGFS_FWSTATS_FILE(rxpipe, tx_xfr_host_int_trig_rx_data, "%u");
+
+int wl12xx_debugfs_add_files(struct wl1271 *wl,
+                             struct dentry *rootdir)
+{
+        int ret = 0;
+        struct dentry *entry, *stats, *moddir;
+
+        moddir = debugfs_create_dir(KBUILD_MODNAME, rootdir);
+        if (!moddir || IS_ERR(moddir)) {
+                entry = moddir;
+                goto err;
+        }
+
+        stats = debugfs_create_dir("fw_stats", moddir);
+        if (!stats || IS_ERR(stats)) {
+                entry = stats;
+                goto err;
+        }
+
+        DEBUGFS_FWSTATS_ADD(tx, internal_desc_overflow);
+
+        DEBUGFS_FWSTATS_ADD(rx, out_of_mem);
+        DEBUGFS_FWSTATS_ADD(rx, hdr_overflow);
+        DEBUGFS_FWSTATS_ADD(rx, hw_stuck);
+        DEBUGFS_FWSTATS_ADD(rx, dropped);
+        DEBUGFS_FWSTATS_ADD(rx, fcs_err);
+        DEBUGFS_FWSTATS_ADD(rx, xfr_hint_trig);
+        DEBUGFS_FWSTATS_ADD(rx, path_reset);
+        DEBUGFS_FWSTATS_ADD(rx, reset_counter);
+
+        DEBUGFS_FWSTATS_ADD(dma, rx_requested);
+        DEBUGFS_FWSTATS_ADD(dma, rx_errors);
+        DEBUGFS_FWSTATS_ADD(dma, tx_requested);
+        DEBUGFS_FWSTATS_ADD(dma, tx_errors);
+
+        DEBUGFS_FWSTATS_ADD(isr, cmd_cmplt);
+        DEBUGFS_FWSTATS_ADD(isr, fiqs);
+        DEBUGFS_FWSTATS_ADD(isr, rx_headers);
+        DEBUGFS_FWSTATS_ADD(isr, rx_mem_overflow);
+        DEBUGFS_FWSTATS_ADD(isr, rx_rdys);
+        DEBUGFS_FWSTATS_ADD(isr, irqs);
+        DEBUGFS_FWSTATS_ADD(isr, tx_procs);
+        DEBUGFS_FWSTATS_ADD(isr, decrypt_done);
+        DEBUGFS_FWSTATS_ADD(isr, dma0_done);
+        DEBUGFS_FWSTATS_ADD(isr, dma1_done);
+        DEBUGFS_FWSTATS_ADD(isr, tx_exch_complete);
+        DEBUGFS_FWSTATS_ADD(isr, commands);
+        DEBUGFS_FWSTATS_ADD(isr, rx_procs);
+        DEBUGFS_FWSTATS_ADD(isr, hw_pm_mode_changes);
+        DEBUGFS_FWSTATS_ADD(isr, host_acknowledges);
+        DEBUGFS_FWSTATS_ADD(isr, pci_pm);
+        DEBUGFS_FWSTATS_ADD(isr, wakeups);
+        DEBUGFS_FWSTATS_ADD(isr, low_rssi);
+
+        DEBUGFS_FWSTATS_ADD(wep, addr_key_count);
+        DEBUGFS_FWSTATS_ADD(wep, default_key_count);
+        /* skipping wep.reserved */
+        DEBUGFS_FWSTATS_ADD(wep, key_not_found);
+        DEBUGFS_FWSTATS_ADD(wep, decrypt_fail);
+        DEBUGFS_FWSTATS_ADD(wep, packets);
+        DEBUGFS_FWSTATS_ADD(wep, interrupt);
+
+        DEBUGFS_FWSTATS_ADD(pwr, ps_enter);
+        DEBUGFS_FWSTATS_ADD(pwr, elp_enter);
+        DEBUGFS_FWSTATS_ADD(pwr, missing_bcns);
+        DEBUGFS_FWSTATS_ADD(pwr, wake_on_host);
+        DEBUGFS_FWSTATS_ADD(pwr, wake_on_timer_exp);
+        DEBUGFS_FWSTATS_ADD(pwr, tx_with_ps);
+        DEBUGFS_FWSTATS_ADD(pwr, tx_without_ps);
+        DEBUGFS_FWSTATS_ADD(pwr, rcvd_beacons);
+        DEBUGFS_FWSTATS_ADD(pwr, power_save_off);
+        DEBUGFS_FWSTATS_ADD(pwr, enable_ps);
+        DEBUGFS_FWSTATS_ADD(pwr, disable_ps);
+        DEBUGFS_FWSTATS_ADD(pwr, fix_tsf_ps);
+        /* skipping cont_miss_bcns_spread for now */
+        DEBUGFS_FWSTATS_ADD(pwr, rcvd_awake_beacons);
+
+        DEBUGFS_FWSTATS_ADD(mic, rx_pkts);
+        DEBUGFS_FWSTATS_ADD(mic, calc_failure);
+
+        DEBUGFS_FWSTATS_ADD(aes, encrypt_fail);
+        DEBUGFS_FWSTATS_ADD(aes, decrypt_fail);
+        DEBUGFS_FWSTATS_ADD(aes, encrypt_packets);
+        DEBUGFS_FWSTATS_ADD(aes, decrypt_packets);
+        DEBUGFS_FWSTATS_ADD(aes, encrypt_interrupt);
+        DEBUGFS_FWSTATS_ADD(aes, decrypt_interrupt);
+
+        DEBUGFS_FWSTATS_ADD(event, heart_beat);
+        DEBUGFS_FWSTATS_ADD(event, calibration);
+        DEBUGFS_FWSTATS_ADD(event, rx_mismatch);
+        DEBUGFS_FWSTATS_ADD(event, rx_mem_empty);
+        DEBUGFS_FWSTATS_ADD(event, rx_pool);
+        DEBUGFS_FWSTATS_ADD(event, oom_late);
+        DEBUGFS_FWSTATS_ADD(event, phy_transmit_error);
+        DEBUGFS_FWSTATS_ADD(event, tx_stuck);
+
+        DEBUGFS_FWSTATS_ADD(ps, pspoll_timeouts);
+        DEBUGFS_FWSTATS_ADD(ps, upsd_timeouts);
+        DEBUGFS_FWSTATS_ADD(ps, upsd_max_sptime);
+        DEBUGFS_FWSTATS_ADD(ps, upsd_max_apturn);
+        DEBUGFS_FWSTATS_ADD(ps, pspoll_max_apturn);
+        DEBUGFS_FWSTATS_ADD(ps, pspoll_utilization);
+        DEBUGFS_FWSTATS_ADD(ps, upsd_utilization);
+
+        DEBUGFS_FWSTATS_ADD(rxpipe, rx_prep_beacon_drop);
+        DEBUGFS_FWSTATS_ADD(rxpipe, descr_host_int_trig_rx_data);
+        DEBUGFS_FWSTATS_ADD(rxpipe, beacon_buffer_thres_host_int_trig_rx_data);
+        DEBUGFS_FWSTATS_ADD(rxpipe, missed_beacon_host_int_trig_rx_data);
+        DEBUGFS_FWSTATS_ADD(rxpipe, tx_xfr_host_int_trig_rx_data);
+
+        return 0;
+
+err:
+        if (IS_ERR(entry))
+                ret = PTR_ERR(entry);
+        else
+                ret = -ENOMEM;
+
+        return ret;
+}
diff --git a/drivers/net/wireless/ti/wl12xx/debugfs.h b/drivers/net/wireless/ti/wl12xx/debugfs.h
new file mode 100644
index 000000000000..96898e291b78
--- /dev/null
+++ b/drivers/net/wireless/ti/wl12xx/debugfs.h
@@ -0,0 +1,28 @@
+/*
+ * This file is part of wl12xx
+ *
+ * Copyright (C) 2012 Texas Instruments. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * 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 __WL12XX_DEBUGFS_H__
+#define __WL12XX_DEBUGFS_H__
+
+int wl12xx_debugfs_add_files(struct wl1271 *wl,
+                             struct dentry *rootdir);
+
+#endif /* __WL12XX_DEBUGFS_H__ */
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
index d7dd3def07b5..85d1600ee340 100644
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -39,6 +39,10 @@
 #include "reg.h"
 #include "cmd.h"
 #include "acx.h"
+#include "debugfs.h"
+
+static char *fref_param;
+static char *tcxo_param;
 
 static struct wlcore_conf wl12xx_conf = {
         .sg = {
@@ -212,7 +216,7 @@ static struct wlcore_conf wl12xx_conf = {
                 .suspend_wake_up_event       = CONF_WAKE_UP_EVENT_N_DTIM,
                 .suspend_listen_interval     = 3,
                 .bcn_filt_mode               = CONF_BCN_FILT_MODE_ENABLED,
-                .bcn_filt_ie_count           = 2,
+                .bcn_filt_ie_count           = 3,
                 .bcn_filt_ie = {
                         [0] = {
                                 .ie          = WLAN_EID_CHANNEL_SWITCH,
@@ -222,9 +226,13 @@ static struct wlcore_conf wl12xx_conf = {
                                 .ie          = WLAN_EID_HT_OPERATION,
                                 .rule        = CONF_BCN_RULE_PASS_ON_CHANGE,
                         },
+                        [2] = {
+                                .ie          = WLAN_EID_ERP_INFO,
+                                .rule        = CONF_BCN_RULE_PASS_ON_CHANGE,
+                        },
                 },
-                .synch_fail_thold            = 10,
-                .bss_lose_timeout            = 100,
+                .synch_fail_thold            = 12,
+                .bss_lose_timeout            = 400,
                 .beacon_rx_timeout           = 10000,
                 .broadcast_timeout           = 20000,
                 .rx_broadcast_in_ps          = 1,
@@ -234,7 +242,7 @@ static struct wlcore_conf wl12xx_conf = {
                 .psm_entry_retries           = 8,
                 .psm_exit_retries            = 16,
                 .psm_entry_nullfunc_retries  = 3,
-                .dynamic_ps_timeout          = 40,
+                .dynamic_ps_timeout          = 200,
                 .forced_ps                   = false,
                 .keep_alive_interval         = 55000,
                 .max_listen_interval         = 20,
@@ -245,7 +253,7 @@ static struct wlcore_conf wl12xx_conf = {
         },
         .pm_config = {
                 .host_clk_settling_time = 5000,
-                .host_fast_wakeup_support = false
+                .host_fast_wakeup_support = CONF_FAST_WAKEUP_DISABLE,
         },
         .roam_trigger = {
                 .trigger_pacing               = 1,
@@ -305,8 +313,8 @@ static struct wlcore_conf wl12xx_conf = {
                 .swallow_period               = 5,
                 .n_divider_fref_set_1         = 0xff,       /* default */
                 .n_divider_fref_set_2         = 12,
-                .m_divider_fref_set_1         = 148,
-                .m_divider_fref_set_2         = 0xffff,     /* default */
+                .m_divider_fref_set_1         = 0xffff,
+                .m_divider_fref_set_2         = 148,        /* default */
                 .coex_pll_stabilization_time  = 0xffffffff, /* default */
                 .ldo_stabilization_time       = 0xffff,     /* default */
                 .fm_disturbed_band_margin     = 0xff,       /* default */
@@ -593,7 +601,7 @@ static void wl127x_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)
 {
         if (wl->chip.id != CHIP_ID_1283_PG20) {
                 struct wl1271_acx_mem_map *wl_mem_map = wl->target_mem_map;
-                struct wl1271_rx_mem_pool_addr rx_mem_addr;
+                struct wl127x_rx_mem_pool_addr rx_mem_addr;
 
                 /*
                  * Choose the block we want to read
@@ -621,10 +629,8 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
                 wl1271_warning("chip id 0x%x (1271 PG10) support is obsolete",
                                wl->chip.id);
 
-                /* clear the alignment quirk, since we don't support it */
-                wl->quirks &= ~WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
-
-                wl->quirks |= WLCORE_QUIRK_LEGACY_NVS;
+                wl->quirks |= WLCORE_QUIRK_LEGACY_NVS |
+                              WLCORE_QUIRK_TKIP_HEADER_SPACE;
                 wl->sr_fw_name = WL127X_FW_NAME_SINGLE;
                 wl->mr_fw_name = WL127X_FW_NAME_MULTI;
                 memcpy(&wl->conf.mem, &wl12xx_default_priv_conf.mem_wl127x,
@@ -639,10 +645,8 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
                 wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1271 PG20)",
                              wl->chip.id);
 
-                /* clear the alignment quirk, since we don't support it */
-                wl->quirks &= ~WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
-
-                wl->quirks |= WLCORE_QUIRK_LEGACY_NVS;
+                wl->quirks |= WLCORE_QUIRK_LEGACY_NVS |
+                              WLCORE_QUIRK_TKIP_HEADER_SPACE;
                 wl->plt_fw_name = WL127X_PLT_FW_NAME;
                 wl->sr_fw_name = WL127X_FW_NAME_SINGLE;
                 wl->mr_fw_name = WL127X_FW_NAME_MULTI;
@@ -660,6 +664,11 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
                 wl->plt_fw_name = WL128X_PLT_FW_NAME;
                 wl->sr_fw_name = WL128X_FW_NAME_SINGLE;
                 wl->mr_fw_name = WL128X_FW_NAME_MULTI;
+
+                /* wl128x requires TX blocksize alignment */
+                wl->quirks |= WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN |
+                              WLCORE_QUIRK_TKIP_HEADER_SPACE;
+
                 break;
         case CHIP_ID_1283_PG10:
         default:
@@ -773,6 +782,7 @@ static int wl128x_configure_mcs_pll(struct wl1271 *wl, int clk)
         u16 spare_reg;
         u16 pll_config;
         u8 input_freq;
+        struct wl12xx_priv *priv = wl->priv;
 
         /* Mask bits [3:1] in the sys_clk_cfg register */
         spare_reg = wl12xx_top_reg_read(wl, WL_SPARE_REG);
@@ -782,8 +792,8 @@ static int wl128x_configure_mcs_pll(struct wl1271 *wl, int clk)
         wl12xx_top_reg_write(wl, WL_SPARE_REG, spare_reg);
 
         /* Handle special cases of the TCXO clock */
-        if (wl->tcxo_clock == WL12XX_TCXOCLOCK_16_8 ||
-            wl->tcxo_clock == WL12XX_TCXOCLOCK_33_6)
+        if (priv->tcxo_clock == WL12XX_TCXOCLOCK_16_8 ||
+            priv->tcxo_clock == WL12XX_TCXOCLOCK_33_6)
                 return wl128x_manually_configure_mcs_pll(wl);
 
         /* Set the input frequency according to the selected clock source */
@@ -808,11 +818,12 @@ static int wl128x_configure_mcs_pll(struct wl1271 *wl, int clk)
  */
 static int wl128x_boot_clk(struct wl1271 *wl, int *selected_clock)
 {
+        struct wl12xx_priv *priv = wl->priv;
         u16 sys_clk_cfg;
 
         /* For XTAL-only modes, FREF will be used after switching from TCXO */
-        if (wl->ref_clock == WL12XX_REFCLOCK_26_XTAL ||
-            wl->ref_clock == WL12XX_REFCLOCK_38_XTAL) {
+        if (priv->ref_clock == WL12XX_REFCLOCK_26_XTAL ||
+            priv->ref_clock == WL12XX_REFCLOCK_38_XTAL) {
                 if (!wl128x_switch_tcxo_to_fref(wl))
                         return -EINVAL;
                 goto fref_clk;
@@ -826,8 +837,8 @@ static int wl128x_boot_clk(struct wl1271 *wl, int *selected_clock)
                 goto fref_clk;
 
         /* If TCXO is either 32.736MHz or 16.368MHz, switch to FREF */
-        if (wl->tcxo_clock == WL12XX_TCXOCLOCK_16_368 ||
-            wl->tcxo_clock == WL12XX_TCXOCLOCK_32_736) {
+        if (priv->tcxo_clock == WL12XX_TCXOCLOCK_16_368 ||
+            priv->tcxo_clock == WL12XX_TCXOCLOCK_32_736) {
                 if (!wl128x_switch_tcxo_to_fref(wl))
                         return -EINVAL;
                 goto fref_clk;
@@ -836,14 +847,14 @@ static int wl128x_boot_clk(struct wl1271 *wl, int *selected_clock)
         /* TCXO clock is selected */
         if (!wl128x_is_tcxo_valid(wl))
                 return -EINVAL;
-        *selected_clock = wl->tcxo_clock;
+        *selected_clock = priv->tcxo_clock;
         goto config_mcs_pll;
 
 fref_clk:
         /* FREF clock is selected */
         if (!wl128x_is_fref_valid(wl))
                 return -EINVAL;
-        *selected_clock = wl->ref_clock;
+        *selected_clock = priv->ref_clock;
 
 config_mcs_pll:
         return wl128x_configure_mcs_pll(wl, *selected_clock);
@@ -851,25 +862,27 @@ config_mcs_pll:
 
 static int wl127x_boot_clk(struct wl1271 *wl)
 {
+        struct wl12xx_priv *priv = wl->priv;
         u32 pause;
         u32 clk;
 
         if (WL127X_PG_GET_MAJOR(wl->hw_pg_ver) < 3)
                 wl->quirks |= WLCORE_QUIRK_END_OF_TRANSACTION;
 
-        if (wl->ref_clock == CONF_REF_CLK_19_2_E ||
-            wl->ref_clock == CONF_REF_CLK_38_4_E ||
-            wl->ref_clock == CONF_REF_CLK_38_4_M_XTAL)
+        if (priv->ref_clock == CONF_REF_CLK_19_2_E ||
+            priv->ref_clock == CONF_REF_CLK_38_4_E ||
+            priv->ref_clock == CONF_REF_CLK_38_4_M_XTAL)
                 /* ref clk: 19.2/38.4/38.4-XTAL */
                 clk = 0x3;
-        else if (wl->ref_clock == CONF_REF_CLK_26_E ||
-                 wl->ref_clock == CONF_REF_CLK_52_E)
+        else if (priv->ref_clock == CONF_REF_CLK_26_E ||
+                 priv->ref_clock == CONF_REF_CLK_26_M_XTAL ||
+                 priv->ref_clock == CONF_REF_CLK_52_E)
                 /* ref clk: 26/52 */
                 clk = 0x5;
         else
                 return -EINVAL;
 
-        if (wl->ref_clock != CONF_REF_CLK_19_2_E) {
+        if (priv->ref_clock != CONF_REF_CLK_19_2_E) {
                 u16 val;
                 /* Set clock type (open drain) */
                 val = wl12xx_top_reg_read(wl, OCP_REG_CLK_TYPE);
@@ -939,6 +952,7 @@ static int wl1271_boot_soft_reset(struct wl1271 *wl)
 
 static int wl12xx_pre_boot(struct wl1271 *wl)
 {
+        struct wl12xx_priv *priv = wl->priv;
         int ret = 0;
         u32 clk;
         int selected_clock = -1;
@@ -970,7 +984,7 @@ static int wl12xx_pre_boot(struct wl1271 *wl)
         if (wl->chip.id == CHIP_ID_1283_PG20)
                 clk |= ((selected_clock & 0x3) << 1) << 4;
         else
-                clk |= (wl->ref_clock << 1) << 4;
+                clk |= (priv->ref_clock << 1) << 4;
 
         wl1271_write32(wl, WL12XX_DRPW_SCRATCH_START, clk);
 
@@ -989,7 +1003,7 @@ out:
 
 static void wl12xx_pre_upload(struct wl1271 *wl)
 {
-        u32 tmp;
+        u32 tmp, polarity;
 
         /* write firmware's last address (ie. it's length) to
          * ACX_EEPROMLESS_IND_REG */
@@ -1009,23 +1023,23 @@ static void wl12xx_pre_upload(struct wl1271 *wl)
 
         if (wl->chip.id == CHIP_ID_1283_PG20)
                 wl12xx_top_reg_write(wl, SDIO_IO_DS, HCI_IO_DS_6MA);
-}
-
-static void wl12xx_enable_interrupts(struct wl1271 *wl)
-{
-        u32 polarity;
 
+        /* polarity must be set before the firmware is loaded */
         polarity = wl12xx_top_reg_read(wl, OCP_REG_POLARITY);
 
         /* We use HIGH polarity, so unset the LOW bit */
         polarity &= ~POLARITY_LOW;
         wl12xx_top_reg_write(wl, OCP_REG_POLARITY, polarity);
 
-        wlcore_write_reg(wl, REG_INTERRUPT_MASK, WL1271_ACX_ALL_EVENTS_VECTOR);
+}
+
+static void wl12xx_enable_interrupts(struct wl1271 *wl)
+{
+        wlcore_write_reg(wl, REG_INTERRUPT_MASK, WL12XX_ACX_ALL_EVENTS_VECTOR);
 
         wlcore_enable_interrupts(wl);
         wlcore_write_reg(wl, REG_INTERRUPT_MASK,
-                         WL1271_ACX_INTR_ALL & ~(WL1271_INTR_MASK));
+                         WL1271_ACX_INTR_ALL & ~(WL12XX_INTR_MASK));
 
         wl1271_write32(wl, WL12XX_HI_CFG, HI_CFG_DEF_VAL);
 }
@@ -1149,7 +1163,8 @@ static u32 wl12xx_get_rx_packet_len(struct wl1271 *wl, void *rx_data,
 
 static void wl12xx_tx_delayed_compl(struct wl1271 *wl)
 {
-        if (wl->fw_status->tx_results_counter == (wl->tx_results_count & 0xff))
+        if (wl->fw_status_1->tx_results_counter ==
+            (wl->tx_results_count & 0xff))
                 return;
 
         wl1271_tx_complete(wl);
@@ -1288,10 +1303,90 @@ static void wl12xx_get_mac(struct wl1271 *wl)
                 wl12xx_get_fuse_mac(wl);
 }
 
+static void wl12xx_set_tx_desc_csum(struct wl1271 *wl,
+                                    struct wl1271_tx_hw_descr *desc,
+                                    struct sk_buff *skb)
+{
+        desc->wl12xx_reserved = 0;
+}
+
+static int wl12xx_plt_init(struct wl1271 *wl)
+{
+        int ret;
+
+        ret = wl->ops->boot(wl);
+        if (ret < 0)
+                goto out;
+
+        ret = wl->ops->hw_init(wl);
+        if (ret < 0)
+                goto out_irq_disable;
+
+        ret = wl1271_acx_init_mem_config(wl);
+        if (ret < 0)
+                goto out_irq_disable;
+
+        ret = wl12xx_acx_mem_cfg(wl);
+        if (ret < 0)
+                goto out_free_memmap;
+
+        /* Enable data path */
+        ret = wl1271_cmd_data_path(wl, 1);
+        if (ret < 0)
+                goto out_free_memmap;
+
+        /* Configure for CAM power saving (ie. always active) */
+        ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
+        if (ret < 0)
+                goto out_free_memmap;
+
+        /* configure PM */
+        ret = wl1271_acx_pm_config(wl);
+        if (ret < 0)
+                goto out_free_memmap;
+
+        goto out;
+
+out_free_memmap:
+        kfree(wl->target_mem_map);
+        wl->target_mem_map = NULL;
+
+out_irq_disable:
+        mutex_unlock(&wl->mutex);
+        /* Unlocking the mutex in the middle of handling is
+           inherently unsafe. In this case we deem it safe to do,
+           because we need to let any possibly pending IRQ out of
+           the system (and while we are WL1271_STATE_OFF the IRQ
+           work function will not do anything.) Also, any other
+           possible concurrent operations will fail due to the
+           current state, hence the wl1271 struct should be safe. */
+        wlcore_disable_interrupts(wl);
+        mutex_lock(&wl->mutex);
+out:
+        return ret;
+}
+
+static int wl12xx_get_spare_blocks(struct wl1271 *wl, bool is_gem)
+{
+        if (is_gem)
+                return WL12XX_TX_HW_BLOCK_GEM_SPARE;
+
+        return WL12XX_TX_HW_BLOCK_SPARE_DEFAULT;
+}
+
+static int wl12xx_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
+                          struct ieee80211_vif *vif,
+                          struct ieee80211_sta *sta,
+                          struct ieee80211_key_conf *key_conf)
+{
+        return wlcore_set_key(wl, cmd, vif, sta, key_conf);
+}
+
 static struct wlcore_ops wl12xx_ops = {
         .identify_chip          = wl12xx_identify_chip,
         .identify_fw            = wl12xx_identify_fw,
         .boot                   = wl12xx_boot,
+        .plt_init               = wl12xx_plt_init,
         .trigger_cmd            = wl12xx_trigger_cmd,
         .ack_event              = wl12xx_ack_event,
         .calc_tx_blocks         = wl12xx_calc_tx_blocks,
@@ -1306,6 +1401,13 @@ static struct wlcore_ops wl12xx_ops = {
         .sta_get_ap_rate_mask   = wl12xx_sta_get_ap_rate_mask,
         .get_pg_ver             = wl12xx_get_pg_ver,
         .get_mac                = wl12xx_get_mac,
+        .set_tx_desc_csum       = wl12xx_set_tx_desc_csum,
+        .set_rx_csum            = NULL,
+        .ap_get_mimo_wide_rate_mask = NULL,
+        .debugfs_init           = wl12xx_debugfs_add_files,
+        .get_spare_blocks       = wl12xx_get_spare_blocks,
+        .set_key                = wl12xx_set_key,
+        .pre_pkt_send           = NULL,
 };
 
 static struct ieee80211_sta_ht_cap wl12xx_ht_cap = {
@@ -1323,6 +1425,7 @@ static struct ieee80211_sta_ht_cap wl12xx_ht_cap = {
 
 static int __devinit wl12xx_probe(struct platform_device *pdev)
 {
+        struct wl12xx_platform_data *pdata = pdev->dev.platform_data;
         struct wl1271 *wl;
         struct ieee80211_hw *hw;
         struct wl12xx_priv *priv;
@@ -1334,19 +1437,65 @@ static int __devinit wl12xx_probe(struct platform_device *pdev)
         }
 
         wl = hw->priv;
+        priv = wl->priv;
         wl->ops = &wl12xx_ops;
         wl->ptable = wl12xx_ptable;
         wl->rtable = wl12xx_rtable;
         wl->num_tx_desc = 16;
-        wl->normal_tx_spare = WL12XX_TX_HW_BLOCK_SPARE_DEFAULT;
-        wl->gem_tx_spare = WL12XX_TX_HW_BLOCK_GEM_SPARE;
+        wl->num_rx_desc = 8;
         wl->band_rate_to_idx = wl12xx_band_rate_to_idx;
         wl->hw_tx_rate_tbl_size = WL12XX_CONF_HW_RXTX_RATE_MAX;
         wl->hw_min_ht_rate = WL12XX_CONF_HW_RXTX_RATE_MCS0;
         wl->fw_status_priv_len = 0;
-        memcpy(&wl->ht_cap, &wl12xx_ht_cap, sizeof(wl12xx_ht_cap));
+        wl->stats.fw_stats_len = sizeof(struct wl12xx_acx_statistics);
+        memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ], &wl12xx_ht_cap,
+               sizeof(wl12xx_ht_cap));
+        memcpy(&wl->ht_cap[IEEE80211_BAND_5GHZ], &wl12xx_ht_cap,
+               sizeof(wl12xx_ht_cap));
         wl12xx_conf_init(wl);
 
+        if (!fref_param) {
+                priv->ref_clock = pdata->board_ref_clock;
+        } else {
+                if (!strcmp(fref_param, "19.2"))
+                        priv->ref_clock = WL12XX_REFCLOCK_19;
+                else if (!strcmp(fref_param, "26"))
+                        priv->ref_clock = WL12XX_REFCLOCK_26;
+                else if (!strcmp(fref_param, "26x"))
+                        priv->ref_clock = WL12XX_REFCLOCK_26_XTAL;
+                else if (!strcmp(fref_param, "38.4"))
+                        priv->ref_clock = WL12XX_REFCLOCK_38;
+                else if (!strcmp(fref_param, "38.4x"))
+                        priv->ref_clock = WL12XX_REFCLOCK_38_XTAL;
+                else if (!strcmp(fref_param, "52"))
+                        priv->ref_clock = WL12XX_REFCLOCK_52;
+                else
+                        wl1271_error("Invalid fref parameter %s", fref_param);
+        }
+
+        if (!tcxo_param) {
+                priv->tcxo_clock = pdata->board_tcxo_clock;
+        } else {
+                if (!strcmp(tcxo_param, "19.2"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_19_2;
+                else if (!strcmp(tcxo_param, "26"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_26;
+                else if (!strcmp(tcxo_param, "38.4"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_38_4;
+                else if (!strcmp(tcxo_param, "52"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_52;
+                else if (!strcmp(tcxo_param, "16.368"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_16_368;
+                else if (!strcmp(tcxo_param, "32.736"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_32_736;
+                else if (!strcmp(tcxo_param, "16.8"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_16_8;
+                else if (!strcmp(tcxo_param, "33.6"))
+                        priv->tcxo_clock = WL12XX_TCXOCLOCK_33_6;
+                else
+                        wl1271_error("Invalid tcxo parameter %s", tcxo_param);
+        }
+
         return wlcore_probe(wl, pdev);
 }
 
@@ -1378,6 +1527,13 @@ static void __exit wl12xx_exit(void)
 }
 module_exit(wl12xx_exit);
 
+module_param_named(fref, fref_param, charp, 0);
+MODULE_PARM_DESC(fref, "FREF clock: 19.2, 26, 26x, 38.4, 38.4x, 52");
+
+module_param_named(tcxo, tcxo_param, charp, 0);
+MODULE_PARM_DESC(tcxo,
+                 "TCXO clock: 19.2, 26, 38.4, 52, 16.368, 32.736, 16.8, 33.6");
+
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>");
 MODULE_FIRMWARE(WL127X_FW_NAME_SINGLE);
diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wl12xx/wl12xx.h
index 74cd332e23ef..de1132410876 100644
--- a/drivers/net/wireless/ti/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/ti/wl12xx/wl12xx.h
@@ -24,8 +24,16 @@
 
 #include "conf.h"
 
+struct wl127x_rx_mem_pool_addr {
+        u32 addr;
+        u32 addr_extra;
+};
+
 struct wl12xx_priv {
         struct wl12xx_priv_conf conf;
+
+        int ref_clock;
+        int tcxo_clock;
 };
 
 #endif /* __WL12XX_PRIV_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/Kconfig b/drivers/net/wireless/ti/wl18xx/Kconfig
new file mode 100644
index 000000000000..1cfdb2548821
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/Kconfig
@@ -0,0 +1,7 @@
+config WL18XX
+        tristate "TI wl18xx support"
+        depends on MAC80211
+        select WLCORE
+        ---help---
+          This module adds support for wireless adapters based on TI
+          WiLink 8 chipsets.
diff --git a/drivers/net/wireless/ti/wl18xx/Makefile b/drivers/net/wireless/ti/wl18xx/Makefile
new file mode 100644
index 000000000000..67c098734c7f
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/Makefile
@@ -0,0 +1,3 @@
+wl18xx-objs     = main.o acx.o tx.o io.o debugfs.o
+
+obj-$(CONFIG_WL18XX)            += wl18xx.o
diff --git a/drivers/net/wireless/ti/wl18xx/acx.c b/drivers/net/wireless/ti/wl18xx/acx.c
new file mode 100644
index 000000000000..72840e23bf59
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/acx.c
@@ -0,0 +1,111 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * 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 "../wlcore/cmd.h"
+#include "../wlcore/debug.h"
+#include "../wlcore/acx.h"
+
+#include "acx.h"
+
+int wl18xx_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap,
+                                  u32 sdio_blk_size, u32 extra_mem_blks,
+                                  u32 len_field_size)
+{
+        struct wl18xx_acx_host_config_bitmap *bitmap_conf;
+        int ret;
+
+        wl1271_debug(DEBUG_ACX, "acx cfg bitmap %d blk %d spare %d field %d",
+                     host_cfg_bitmap, sdio_blk_size, extra_mem_blks,
+                     len_field_size);
+
+        bitmap_conf = kzalloc(sizeof(*bitmap_conf), GFP_KERNEL);
+        if (!bitmap_conf) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        bitmap_conf->host_cfg_bitmap = cpu_to_le32(host_cfg_bitmap);
+        bitmap_conf->host_sdio_block_size = cpu_to_le32(sdio_blk_size);
+        bitmap_conf->extra_mem_blocks = cpu_to_le32(extra_mem_blks);
+        bitmap_conf->length_field_size = cpu_to_le32(len_field_size);
+
+        ret = wl1271_cmd_configure(wl, ACX_HOST_IF_CFG_BITMAP,
+                                   bitmap_conf, sizeof(*bitmap_conf));
+        if (ret < 0) {
+                wl1271_warning("wl1271 bitmap config opt failed: %d", ret);
+                goto out;
+        }
+
+out:
+        kfree(bitmap_conf);
+
+        return ret;
+}
+
+int wl18xx_acx_set_checksum_state(struct wl1271 *wl)
+{
+        struct wl18xx_acx_checksum_state *acx;
+        int ret;
+
+        wl1271_debug(DEBUG_ACX, "acx checksum state");
+
+        acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+        if (!acx) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        acx->checksum_state = CHECKSUM_OFFLOAD_ENABLED;
+
+        ret = wl1271_cmd_configure(wl, ACX_CHECKSUM_CONFIG, acx, sizeof(*acx));
+        if (ret < 0) {
+                wl1271_warning("failed to set Tx checksum state: %d", ret);
+                goto out;
+        }
+
+out:
+        kfree(acx);
+        return ret;
+}
+
+int wl18xx_acx_clear_statistics(struct wl1271 *wl)
+{
+        struct wl18xx_acx_clear_statistics *acx;
+        int ret = 0;
+
+        wl1271_debug(DEBUG_ACX, "acx clear statistics");
+
+        acx = kzalloc(sizeof(*acx), GFP_KERNEL);
+        if (!acx) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        ret = wl1271_cmd_configure(wl, ACX_CLEAR_STATISTICS, acx, sizeof(*acx));
+        if (ret < 0) {
+                wl1271_warning("failed to clear firmware statistics: %d", ret);
+                goto out;
+        }
+
+out:
+        kfree(acx);
+        return ret;
+}
diff --git a/drivers/net/wireless/ti/wl18xx/acx.h b/drivers/net/wireless/ti/wl18xx/acx.h
new file mode 100644
index 000000000000..ebbaf611e97b
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/acx.h
@@ -0,0 +1,291 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * 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 __WL18XX_ACX_H__
+#define __WL18XX_ACX_H__
+
+#include "../wlcore/wlcore.h"
+#include "../wlcore/acx.h"
+
+enum {
+        ACX_CLEAR_STATISTICS             = 0x0047,
+};
+
+/* numbers of bits the length field takes (add 1 for the actual number) */
+#define WL18XX_HOST_IF_LEN_SIZE_FIELD 15
+
+#define WL18XX_ACX_EVENTS_VECTOR_PG1    (WL1271_ACX_INTR_WATCHDOG      | \
+                                        WL1271_ACX_INTR_INIT_COMPLETE | \
+                                        WL1271_ACX_INTR_EVENT_A       | \
+                                        WL1271_ACX_INTR_EVENT_B       | \
+                                        WL1271_ACX_INTR_CMD_COMPLETE  | \
+                                        WL1271_ACX_INTR_HW_AVAILABLE  | \
+                                        WL1271_ACX_INTR_DATA)
+
+#define WL18XX_ACX_EVENTS_VECTOR_PG2    (WL18XX_ACX_EVENTS_VECTOR_PG1 | \
+                                        WL1271_ACX_SW_INTR_WATCHDOG)
+
+#define WL18XX_INTR_MASK_PG1            (WL1271_ACX_INTR_WATCHDOG      | \
+                                        WL1271_ACX_INTR_EVENT_A       | \
+                                        WL1271_ACX_INTR_EVENT_B       | \
+                                        WL1271_ACX_INTR_HW_AVAILABLE  | \
+                                        WL1271_ACX_INTR_DATA)
+
+#define WL18XX_INTR_MASK_PG2            (WL18XX_INTR_MASK_PG1         | \
+                                        WL1271_ACX_SW_INTR_WATCHDOG)
+
+struct wl18xx_acx_host_config_bitmap {
+        struct acx_header header;
+
+        __le32 host_cfg_bitmap;
+
+        __le32 host_sdio_block_size;
+
+        /* extra mem blocks per frame in TX. */
+        __le32 extra_mem_blocks;
+
+        /*
+         * number of bits of the length field in the first TX word
+         * (up to 15 - for using the entire 16 bits).
+         */
+        __le32 length_field_size;
+
+} __packed;
+
+enum {
+        CHECKSUM_OFFLOAD_DISABLED = 0,
+        CHECKSUM_OFFLOAD_ENABLED  = 1,
+        CHECKSUM_OFFLOAD_FAKE_RX  = 2,
+        CHECKSUM_OFFLOAD_INVALID  = 0xFF
+};
+
+struct wl18xx_acx_checksum_state {
+        struct acx_header header;
+
+         /* enum acx_checksum_state */
+        u8 checksum_state;
+        u8 pad[3];
+} __packed;
+
+
+struct wl18xx_acx_error_stats {
+        u32 error_frame;
+        u32 error_null_Frame_tx_start;
+        u32 error_numll_frame_cts_start;
+        u32 error_bar_retry;
+        u32 error_frame_cts_nul_flid;
+} __packed;
+
+struct wl18xx_acx_debug_stats {
+        u32 debug1;
+        u32 debug2;
+        u32 debug3;
+        u32 debug4;
+        u32 debug5;
+        u32 debug6;
+} __packed;
+
+struct wl18xx_acx_ring_stats {
+        u32 prepared_descs;
+        u32 tx_cmplt;
+} __packed;
+
+struct wl18xx_acx_tx_stats {
+        u32 tx_prepared_descs;
+        u32 tx_cmplt;
+        u32 tx_template_prepared;
+        u32 tx_data_prepared;
+        u32 tx_template_programmed;
+        u32 tx_data_programmed;
+        u32 tx_burst_programmed;
+        u32 tx_starts;
+        u32 tx_imm_resp;
+        u32 tx_start_templates;
+        u32 tx_start_int_templates;
+        u32 tx_start_fw_gen;
+        u32 tx_start_data;
+        u32 tx_start_null_frame;
+        u32 tx_exch;
+        u32 tx_retry_template;
+        u32 tx_retry_data;
+        u32 tx_exch_pending;
+        u32 tx_exch_expiry;
+        u32 tx_done_template;
+        u32 tx_done_data;
+        u32 tx_done_int_template;
+        u32 tx_frame_checksum;
+        u32 tx_checksum_result;
+        u32 frag_called;
+        u32 frag_mpdu_alloc_failed;
+        u32 frag_init_called;
+        u32 frag_in_process_called;
+        u32 frag_tkip_called;
+        u32 frag_key_not_found;
+        u32 frag_need_fragmentation;
+        u32 frag_bad_mblk_num;
+        u32 frag_failed;
+        u32 frag_cache_hit;
+        u32 frag_cache_miss;
+} __packed;
+
+struct wl18xx_acx_rx_stats {
+        u32 rx_beacon_early_term;
+        u32 rx_out_of_mpdu_nodes;
+        u32 rx_hdr_overflow;
+        u32 rx_dropped_frame;
+        u32 rx_done_stage;
+        u32 rx_done;
+        u32 rx_defrag;
+        u32 rx_defrag_end;
+        u32 rx_cmplt;
+        u32 rx_pre_complt;
+        u32 rx_cmplt_task;
+        u32 rx_phy_hdr;
+        u32 rx_timeout;
+        u32 rx_timeout_wa;
+        u32 rx_wa_density_dropped_frame;
+        u32 rx_wa_ba_not_expected;
+        u32 rx_frame_checksum;
+        u32 rx_checksum_result;
+        u32 defrag_called;
+        u32 defrag_init_called;
+        u32 defrag_in_process_called;
+        u32 defrag_tkip_called;
+        u32 defrag_need_defrag;
+        u32 defrag_decrypt_failed;
+        u32 decrypt_key_not_found;
+        u32 defrag_need_decrypt;
+        u32 rx_tkip_replays;
+} __packed;
+
+struct wl18xx_acx_isr_stats {
+        u32 irqs;
+} __packed;
+
+#define PWR_STAT_MAX_CONT_MISSED_BCNS_SPREAD 10
+
+struct wl18xx_acx_pwr_stats {
+        u32 missing_bcns_cnt;
+        u32 rcvd_bcns_cnt;
+        u32 connection_out_of_sync;
+        u32 cont_miss_bcns_spread[PWR_STAT_MAX_CONT_MISSED_BCNS_SPREAD];
+        u32 rcvd_awake_bcns_cnt;
+} __packed;
+
+struct wl18xx_acx_event_stats {
+        u32 calibration;
+        u32 rx_mismatch;
+        u32 rx_mem_empty;
+} __packed;
+
+struct wl18xx_acx_ps_poll_stats {
+        u32 ps_poll_timeouts;
+        u32 upsd_timeouts;
+        u32 upsd_max_ap_turn;
+        u32 ps_poll_max_ap_turn;
+        u32 ps_poll_utilization;
+        u32 upsd_utilization;
+} __packed;
+
+struct wl18xx_acx_rx_filter_stats {
+        u32 beacon_filter;
+        u32 arp_filter;
+        u32 mc_filter;
+        u32 dup_filter;
+        u32 data_filter;
+        u32 ibss_filter;
+        u32 protection_filter;
+        u32 accum_arp_pend_requests;
+        u32 max_arp_queue_dep;
+} __packed;
+
+struct wl18xx_acx_rx_rate_stats {
+        u32 rx_frames_per_rates[50];
+} __packed;
+
+#define AGGR_STATS_TX_AGG       16
+#define AGGR_STATS_TX_RATE      16
+#define AGGR_STATS_RX_SIZE_LEN  16
+
+struct wl18xx_acx_aggr_stats {
+        u32 tx_agg_vs_rate[AGGR_STATS_TX_AGG * AGGR_STATS_TX_RATE];
+        u32 rx_size[AGGR_STATS_RX_SIZE_LEN];
+} __packed;
+
+#define PIPE_STATS_HW_FIFO      11
+
+struct wl18xx_acx_pipeline_stats {
+        u32 hs_tx_stat_fifo_int;
+        u32 hs_rx_stat_fifo_int;
+        u32 tcp_tx_stat_fifo_int;
+        u32 tcp_rx_stat_fifo_int;
+        u32 enc_tx_stat_fifo_int;
+        u32 enc_rx_stat_fifo_int;
+        u32 rx_complete_stat_fifo_int;
+        u32 pre_proc_swi;
+        u32 post_proc_swi;
+        u32 sec_frag_swi;
+        u32 pre_to_defrag_swi;
+        u32 defrag_to_csum_swi;
+        u32 csum_to_rx_xfer_swi;
+        u32 dec_packet_in;
+        u32 dec_packet_in_fifo_full;
+        u32 dec_packet_out;
+        u32 cs_rx_packet_in;
+        u32 cs_rx_packet_out;
+        u16 pipeline_fifo_full[PIPE_STATS_HW_FIFO];
+} __packed;
+
+struct wl18xx_acx_mem_stats {
+        u32 rx_free_mem_blks;
+        u32 tx_free_mem_blks;
+        u32 fwlog_free_mem_blks;
+        u32 fw_gen_free_mem_blks;
+} __packed;
+
+struct wl18xx_acx_statistics {
+        struct acx_header header;
+
+        struct wl18xx_acx_error_stats           error;
+        struct wl18xx_acx_debug_stats           debug;
+        struct wl18xx_acx_tx_stats              tx;
+        struct wl18xx_acx_rx_stats              rx;
+        struct wl18xx_acx_isr_stats             isr;
+        struct wl18xx_acx_pwr_stats             pwr;
+        struct wl18xx_acx_ps_poll_stats         ps_poll;
+        struct wl18xx_acx_rx_filter_stats       rx_filter;
+        struct wl18xx_acx_rx_rate_stats         rx_rate;
+        struct wl18xx_acx_aggr_stats            aggr_size;
+        struct wl18xx_acx_pipeline_stats        pipeline;
+        struct wl18xx_acx_mem_stats             mem;
+} __packed;
+
+struct wl18xx_acx_clear_statistics {
+        struct acx_header header;
+};
+
+int wl18xx_acx_host_if_cfg_bitmap(struct wl1271 *wl, u32 host_cfg_bitmap,
+                                  u32 sdio_blk_size, u32 extra_mem_blks,
+                                  u32 len_field_size);
+int wl18xx_acx_set_checksum_state(struct wl1271 *wl);
+int wl18xx_acx_clear_statistics(struct wl1271 *wl);
+
+#endif /* __WL18XX_ACX_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/conf.h b/drivers/net/wireless/ti/wl18xx/conf.h
new file mode 100644
index 000000000000..fac0b7e87e75
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/conf.h
@@ -0,0 +1,92 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * 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 __WL18XX_CONF_H__
+#define __WL18XX_CONF_H__
+
+#define WL18XX_CONF_MAGIC       0x10e100ca
+#define WL18XX_CONF_VERSION     (WLCORE_CONF_VERSION | 0x0002)
+#define WL18XX_CONF_MASK        0x0000ffff
+#define WL18XX_CONF_SIZE        (WLCORE_CONF_SIZE + \
+                                 sizeof(struct wl18xx_priv_conf))
+
+#define NUM_OF_CHANNELS_11_ABG 150
+#define NUM_OF_CHANNELS_11_P 7
+#define WL18XX_NUM_OF_SUB_BANDS 9
+#define SRF_TABLE_LEN 16
+#define PIN_MUXING_SIZE 2
+
+struct wl18xx_mac_and_phy_params {
+        u8 phy_standalone;
+        u8 rdl;
+        u8 enable_clpc;
+        u8 enable_tx_low_pwr_on_siso_rdl;
+        u8 auto_detect;
+        u8 dedicated_fem;
+
+        u8 low_band_component;
+
+        /* Bit 0: One Hot, Bit 1: Control Enable, Bit 2: 1.8V, Bit 3: 3V */
+        u8 low_band_component_type;
+
+        u8 high_band_component;
+
+        /* Bit 0: One Hot, Bit 1: Control Enable, Bit 2: 1.8V, Bit 3: 3V */
+        u8 high_band_component_type;
+        u8 number_of_assembled_ant2_4;
+        u8 number_of_assembled_ant5;
+        u8 pin_muxing_platform_options[PIN_MUXING_SIZE];
+        u8 external_pa_dc2dc;
+        u8 tcxo_ldo_voltage;
+        u8 xtal_itrim_val;
+        u8 srf_state;
+        u8 srf1[SRF_TABLE_LEN];
+        u8 srf2[SRF_TABLE_LEN];
+        u8 srf3[SRF_TABLE_LEN];
+        u8 io_configuration;
+        u8 sdio_configuration;
+        u8 settings;
+        u8 rx_profile;
+        u8 per_chan_pwr_limit_arr_11abg[NUM_OF_CHANNELS_11_ABG];
+        u8 pwr_limit_reference_11_abg;
+        u8 per_chan_pwr_limit_arr_11p[NUM_OF_CHANNELS_11_P];
+        u8 pwr_limit_reference_11p;
+        u8 per_sub_band_tx_trace_loss[WL18XX_NUM_OF_SUB_BANDS];
+        u8 per_sub_band_rx_trace_loss[WL18XX_NUM_OF_SUB_BANDS];
+        u8 primary_clock_setting_time;
+        u8 clock_valid_on_wake_up;
+        u8 secondary_clock_setting_time;
+        u8 board_type;
+        /* enable point saturation */
+        u8 psat;
+        /* low/medium/high Tx power in dBm */
+        s8 low_power_val;
+        s8 med_power_val;
+        s8 high_power_val;
+        u8 padding[1];
+} __packed;
+
+struct wl18xx_priv_conf {
+        /* this structure is copied wholesale to FW */
+        struct wl18xx_mac_and_phy_params phy;
+} __packed;
+
+#endif /* __WL18XX_CONF_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/debugfs.c b/drivers/net/wireless/ti/wl18xx/debugfs.c
new file mode 100644
index 000000000000..3ce6f1039af3
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/debugfs.c
@@ -0,0 +1,403 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2009 Nokia Corporation
+ * Copyright (C) 2011-2012 Texas Instruments
+ *
+ * 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 "../wlcore/debugfs.h"
+#include "../wlcore/wlcore.h"
+
+#include "wl18xx.h"
+#include "acx.h"
+#include "debugfs.h"
+
+#define WL18XX_DEBUGFS_FWSTATS_FILE(a, b, c) \
+        DEBUGFS_FWSTATS_FILE(a, b, c, wl18xx_acx_statistics)
+#define WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(a, b, c) \
+        DEBUGFS_FWSTATS_FILE_ARRAY(a, b, c, wl18xx_acx_statistics)
+
+
+WL18XX_DEBUGFS_FWSTATS_FILE(debug, debug1, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(debug, debug2, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(debug, debug3, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(debug, debug4, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(debug, debug5, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(debug, debug6, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE(error, error_frame, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(error, error_null_Frame_tx_start, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(error, error_numll_frame_cts_start, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(error, error_bar_retry, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(error, error_frame_cts_nul_flid, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_prepared_descs, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_cmplt, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_template_prepared, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_data_prepared, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_template_programmed, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_data_programmed, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_burst_programmed, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_starts, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_imm_resp, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_start_templates, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_start_int_templates, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_start_fw_gen, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_start_data, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_start_null_frame, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_exch, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_retry_template, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_retry_data, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_exch_pending, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_exch_expiry, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_done_template, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_done_data, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_done_int_template, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_frame_checksum, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, tx_checksum_result, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_mpdu_alloc_failed, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_init_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_in_process_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_tkip_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_key_not_found, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_need_fragmentation, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_bad_mblk_num, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_failed, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_cache_hit, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(tx, frag_cache_miss, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_beacon_early_term, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_out_of_mpdu_nodes, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_hdr_overflow, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_dropped_frame, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_done, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_defrag, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_defrag_end, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_cmplt, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_pre_complt, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_cmplt_task, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_phy_hdr, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_timeout, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_timeout_wa, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_wa_density_dropped_frame, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_wa_ba_not_expected, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_frame_checksum, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_checksum_result, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, defrag_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, defrag_init_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, defrag_in_process_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, defrag_tkip_called, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, defrag_need_defrag, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, defrag_decrypt_failed, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, decrypt_key_not_found, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, defrag_need_decrypt, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx, rx_tkip_replays, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE(isr, irqs, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE(pwr, missing_bcns_cnt, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pwr, rcvd_bcns_cnt, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pwr, connection_out_of_sync, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(pwr, cont_miss_bcns_spread,
+                                  PWR_STAT_MAX_CONT_MISSED_BCNS_SPREAD);
+WL18XX_DEBUGFS_FWSTATS_FILE(pwr, rcvd_awake_bcns_cnt, "%u");
+
+
+WL18XX_DEBUGFS_FWSTATS_FILE(ps_poll, ps_poll_timeouts, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(ps_poll, upsd_timeouts, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(ps_poll, upsd_max_ap_turn, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(ps_poll, ps_poll_max_ap_turn, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(ps_poll, ps_poll_utilization, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(ps_poll, upsd_utilization, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, beacon_filter, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, arp_filter, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, mc_filter, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, dup_filter, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, data_filter, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, ibss_filter, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, protection_filter, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, accum_arp_pend_requests, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_filter, max_arp_queue_dep, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE(rx_rate, rx_frames_per_rates, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(aggr_size, tx_agg_vs_rate,
+                                  AGGR_STATS_TX_AGG*AGGR_STATS_TX_RATE);
+WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(aggr_size, rx_size,
+                                  AGGR_STATS_RX_SIZE_LEN);
+
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, hs_tx_stat_fifo_int, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, tcp_tx_stat_fifo_int, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, tcp_rx_stat_fifo_int, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, enc_tx_stat_fifo_int, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, enc_rx_stat_fifo_int, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, rx_complete_stat_fifo_int, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, pre_proc_swi, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, post_proc_swi, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, sec_frag_swi, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, pre_to_defrag_swi, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, defrag_to_csum_swi, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, csum_to_rx_xfer_swi, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, dec_packet_in, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, dec_packet_in_fifo_full, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, dec_packet_out, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, cs_rx_packet_in, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(pipeline, cs_rx_packet_out, "%u");
+
+WL18XX_DEBUGFS_FWSTATS_FILE_ARRAY(pipeline, pipeline_fifo_full,
+                                  PIPE_STATS_HW_FIFO);
+
+WL18XX_DEBUGFS_FWSTATS_FILE(mem, rx_free_mem_blks, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(mem, tx_free_mem_blks, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(mem, fwlog_free_mem_blks, "%u");
+WL18XX_DEBUGFS_FWSTATS_FILE(mem, fw_gen_free_mem_blks, "%u");
+
+static ssize_t conf_read(struct file *file, char __user *user_buf,
+                         size_t count, loff_t *ppos)
+{
+        struct wl1271 *wl = file->private_data;
+        struct wl18xx_priv *priv = wl->priv;
+        struct wlcore_conf_header header;
+        char *buf, *pos;
+        size_t len;
+        int ret;
+
+        len = WL18XX_CONF_SIZE;
+        buf = kmalloc(len, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        header.magic    = cpu_to_le32(WL18XX_CONF_MAGIC);
+        header.version  = cpu_to_le32(WL18XX_CONF_VERSION);
+        header.checksum = 0;
+
+        mutex_lock(&wl->mutex);
+
+        pos = buf;
+        memcpy(pos, &header, sizeof(header));
+        pos += sizeof(header);
+        memcpy(pos, &wl->conf, sizeof(wl->conf));
+        pos += sizeof(wl->conf);
+        memcpy(pos, &priv->conf, sizeof(priv->conf));
+
+        mutex_unlock(&wl->mutex);
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, len);
+
+        kfree(buf);
+        return ret;
+}
+
+static const struct file_operations conf_ops = {
+        .read = conf_read,
+        .open = simple_open,
+        .llseek = default_llseek,
+};
+
+static ssize_t clear_fw_stats_write(struct file *file,
+                              const char __user *user_buf,
+                              size_t count, loff_t *ppos)
+{
+        struct wl1271 *wl = file->private_data;
+        int ret;
+
+        mutex_lock(&wl->mutex);
+
+        if (wl->state == WL1271_STATE_OFF)
+                goto out;
+
+        ret = wl18xx_acx_clear_statistics(wl);
+        if (ret < 0) {
+                count = ret;
+                goto out;
+        }
+out:
+        mutex_unlock(&wl->mutex);
+        return count;
+}
+
+static const struct file_operations clear_fw_stats_ops = {
+        .write = clear_fw_stats_write,
+        .open = simple_open,
+        .llseek = default_llseek,
+};
+
+int wl18xx_debugfs_add_files(struct wl1271 *wl,
+                             struct dentry *rootdir)
+{
+        int ret = 0;
+        struct dentry *entry, *stats, *moddir;
+
+        moddir = debugfs_create_dir(KBUILD_MODNAME, rootdir);
+        if (!moddir || IS_ERR(moddir)) {
+                entry = moddir;
+                goto err;
+        }
+
+        stats = debugfs_create_dir("fw_stats", moddir);
+        if (!stats || IS_ERR(stats)) {
+                entry = stats;
+                goto err;
+        }
+
+        DEBUGFS_ADD(clear_fw_stats, stats);
+
+        DEBUGFS_FWSTATS_ADD(debug, debug1);
+        DEBUGFS_FWSTATS_ADD(debug, debug2);
+        DEBUGFS_FWSTATS_ADD(debug, debug3);
+        DEBUGFS_FWSTATS_ADD(debug, debug4);
+        DEBUGFS_FWSTATS_ADD(debug, debug5);
+        DEBUGFS_FWSTATS_ADD(debug, debug6);
+
+        DEBUGFS_FWSTATS_ADD(error, error_frame);
+        DEBUGFS_FWSTATS_ADD(error, error_null_Frame_tx_start);
+        DEBUGFS_FWSTATS_ADD(error, error_numll_frame_cts_start);
+        DEBUGFS_FWSTATS_ADD(error, error_bar_retry);
+        DEBUGFS_FWSTATS_ADD(error, error_frame_cts_nul_flid);
+
+        DEBUGFS_FWSTATS_ADD(tx, tx_prepared_descs);
+        DEBUGFS_FWSTATS_ADD(tx, tx_cmplt);
+        DEBUGFS_FWSTATS_ADD(tx, tx_template_prepared);
+        DEBUGFS_FWSTATS_ADD(tx, tx_data_prepared);
+        DEBUGFS_FWSTATS_ADD(tx, tx_template_programmed);
+        DEBUGFS_FWSTATS_ADD(tx, tx_data_programmed);
+        DEBUGFS_FWSTATS_ADD(tx, tx_burst_programmed);
+        DEBUGFS_FWSTATS_ADD(tx, tx_starts);
+        DEBUGFS_FWSTATS_ADD(tx, tx_imm_resp);
+        DEBUGFS_FWSTATS_ADD(tx, tx_start_templates);
+        DEBUGFS_FWSTATS_ADD(tx, tx_start_int_templates);
+        DEBUGFS_FWSTATS_ADD(tx, tx_start_fw_gen);
+        DEBUGFS_FWSTATS_ADD(tx, tx_start_data);
+        DEBUGFS_FWSTATS_ADD(tx, tx_start_null_frame);
+        DEBUGFS_FWSTATS_ADD(tx, tx_exch);
+        DEBUGFS_FWSTATS_ADD(tx, tx_retry_template);
+        DEBUGFS_FWSTATS_ADD(tx, tx_retry_data);
+        DEBUGFS_FWSTATS_ADD(tx, tx_exch_pending);
+        DEBUGFS_FWSTATS_ADD(tx, tx_exch_expiry);
+        DEBUGFS_FWSTATS_ADD(tx, tx_done_template);
+        DEBUGFS_FWSTATS_ADD(tx, tx_done_data);
+        DEBUGFS_FWSTATS_ADD(tx, tx_done_int_template);
+        DEBUGFS_FWSTATS_ADD(tx, tx_frame_checksum);
+        DEBUGFS_FWSTATS_ADD(tx, tx_checksum_result);
+        DEBUGFS_FWSTATS_ADD(tx, frag_called);
+        DEBUGFS_FWSTATS_ADD(tx, frag_mpdu_alloc_failed);
+        DEBUGFS_FWSTATS_ADD(tx, frag_init_called);
+        DEBUGFS_FWSTATS_ADD(tx, frag_in_process_called);
+        DEBUGFS_FWSTATS_ADD(tx, frag_tkip_called);
+        DEBUGFS_FWSTATS_ADD(tx, frag_key_not_found);
+        DEBUGFS_FWSTATS_ADD(tx, frag_need_fragmentation);
+        DEBUGFS_FWSTATS_ADD(tx, frag_bad_mblk_num);
+        DEBUGFS_FWSTATS_ADD(tx, frag_failed);
+        DEBUGFS_FWSTATS_ADD(tx, frag_cache_hit);
+        DEBUGFS_FWSTATS_ADD(tx, frag_cache_miss);
+
+        DEBUGFS_FWSTATS_ADD(rx, rx_beacon_early_term);
+        DEBUGFS_FWSTATS_ADD(rx, rx_out_of_mpdu_nodes);
+        DEBUGFS_FWSTATS_ADD(rx, rx_hdr_overflow);
+        DEBUGFS_FWSTATS_ADD(rx, rx_dropped_frame);
+        DEBUGFS_FWSTATS_ADD(rx, rx_done);
+        DEBUGFS_FWSTATS_ADD(rx, rx_defrag);
+        DEBUGFS_FWSTATS_ADD(rx, rx_defrag_end);
+        DEBUGFS_FWSTATS_ADD(rx, rx_cmplt);
+        DEBUGFS_FWSTATS_ADD(rx, rx_pre_complt);
+        DEBUGFS_FWSTATS_ADD(rx, rx_cmplt_task);
+        DEBUGFS_FWSTATS_ADD(rx, rx_phy_hdr);
+        DEBUGFS_FWSTATS_ADD(rx, rx_timeout);
+        DEBUGFS_FWSTATS_ADD(rx, rx_timeout_wa);
+        DEBUGFS_FWSTATS_ADD(rx, rx_wa_density_dropped_frame);
+        DEBUGFS_FWSTATS_ADD(rx, rx_wa_ba_not_expected);
+        DEBUGFS_FWSTATS_ADD(rx, rx_frame_checksum);
+        DEBUGFS_FWSTATS_ADD(rx, rx_checksum_result);
+        DEBUGFS_FWSTATS_ADD(rx, defrag_called);
+        DEBUGFS_FWSTATS_ADD(rx, defrag_init_called);
+        DEBUGFS_FWSTATS_ADD(rx, defrag_in_process_called);
+        DEBUGFS_FWSTATS_ADD(rx, defrag_tkip_called);
+        DEBUGFS_FWSTATS_ADD(rx, defrag_need_defrag);
+        DEBUGFS_FWSTATS_ADD(rx, defrag_decrypt_failed);
+        DEBUGFS_FWSTATS_ADD(rx, decrypt_key_not_found);
+        DEBUGFS_FWSTATS_ADD(rx, defrag_need_decrypt);
+        DEBUGFS_FWSTATS_ADD(rx, rx_tkip_replays);
+
+        DEBUGFS_FWSTATS_ADD(isr, irqs);
+
+        DEBUGFS_FWSTATS_ADD(pwr, missing_bcns_cnt);
+        DEBUGFS_FWSTATS_ADD(pwr, rcvd_bcns_cnt);
+        DEBUGFS_FWSTATS_ADD(pwr, connection_out_of_sync);
+        DEBUGFS_FWSTATS_ADD(pwr, cont_miss_bcns_spread);
+        DEBUGFS_FWSTATS_ADD(pwr, rcvd_awake_bcns_cnt);
+
+        DEBUGFS_FWSTATS_ADD(ps_poll, ps_poll_timeouts);
+        DEBUGFS_FWSTATS_ADD(ps_poll, upsd_timeouts);
+        DEBUGFS_FWSTATS_ADD(ps_poll, upsd_max_ap_turn);
+        DEBUGFS_FWSTATS_ADD(ps_poll, ps_poll_max_ap_turn);
+        DEBUGFS_FWSTATS_ADD(ps_poll, ps_poll_utilization);
+        DEBUGFS_FWSTATS_ADD(ps_poll, upsd_utilization);
+
+        DEBUGFS_FWSTATS_ADD(rx_filter, beacon_filter);
+        DEBUGFS_FWSTATS_ADD(rx_filter, arp_filter);
+        DEBUGFS_FWSTATS_ADD(rx_filter, mc_filter);
+        DEBUGFS_FWSTATS_ADD(rx_filter, dup_filter);
+        DEBUGFS_FWSTATS_ADD(rx_filter, data_filter);
+        DEBUGFS_FWSTATS_ADD(rx_filter, ibss_filter);
+        DEBUGFS_FWSTATS_ADD(rx_filter, protection_filter);
+        DEBUGFS_FWSTATS_ADD(rx_filter, accum_arp_pend_requests);
+        DEBUGFS_FWSTATS_ADD(rx_filter, max_arp_queue_dep);
+
+        DEBUGFS_FWSTATS_ADD(rx_rate, rx_frames_per_rates);
+
+        DEBUGFS_FWSTATS_ADD(aggr_size, tx_agg_vs_rate);
+        DEBUGFS_FWSTATS_ADD(aggr_size, rx_size);
+
+        DEBUGFS_FWSTATS_ADD(pipeline, hs_tx_stat_fifo_int);
+        DEBUGFS_FWSTATS_ADD(pipeline, tcp_tx_stat_fifo_int);
+        DEBUGFS_FWSTATS_ADD(pipeline, tcp_rx_stat_fifo_int);
+        DEBUGFS_FWSTATS_ADD(pipeline, enc_tx_stat_fifo_int);
+        DEBUGFS_FWSTATS_ADD(pipeline, enc_rx_stat_fifo_int);
+        DEBUGFS_FWSTATS_ADD(pipeline, rx_complete_stat_fifo_int);
+        DEBUGFS_FWSTATS_ADD(pipeline, pre_proc_swi);
+        DEBUGFS_FWSTATS_ADD(pipeline, post_proc_swi);
+        DEBUGFS_FWSTATS_ADD(pipeline, sec_frag_swi);
+        DEBUGFS_FWSTATS_ADD(pipeline, pre_to_defrag_swi);
+        DEBUGFS_FWSTATS_ADD(pipeline, defrag_to_csum_swi);
+        DEBUGFS_FWSTATS_ADD(pipeline, csum_to_rx_xfer_swi);
+        DEBUGFS_FWSTATS_ADD(pipeline, dec_packet_in);
+        DEBUGFS_FWSTATS_ADD(pipeline, dec_packet_in_fifo_full);
+        DEBUGFS_FWSTATS_ADD(pipeline, dec_packet_out);
+        DEBUGFS_FWSTATS_ADD(pipeline, cs_rx_packet_in);
+        DEBUGFS_FWSTATS_ADD(pipeline, cs_rx_packet_out);
+        DEBUGFS_FWSTATS_ADD(pipeline, pipeline_fifo_full);
+
+        DEBUGFS_FWSTATS_ADD(mem, rx_free_mem_blks);
+        DEBUGFS_FWSTATS_ADD(mem, tx_free_mem_blks);
+        DEBUGFS_FWSTATS_ADD(mem, fwlog_free_mem_blks);
+        DEBUGFS_FWSTATS_ADD(mem, fw_gen_free_mem_blks);
+
+        DEBUGFS_ADD(conf, moddir);
+
+        return 0;
+
+err:
+        if (IS_ERR(entry))
+                ret = PTR_ERR(entry);
+        else
+                ret = -ENOMEM;
+
+        return ret;
+}
diff --git a/drivers/net/wireless/ti/wl18xx/debugfs.h b/drivers/net/wireless/ti/wl18xx/debugfs.h
new file mode 100644
index 000000000000..ed679bebf620
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/debugfs.h
@@ -0,0 +1,28 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2012 Texas Instruments. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * 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 __WL18XX_DEBUGFS_H__
+#define __WL18XX_DEBUGFS_H__
+
+int wl18xx_debugfs_add_files(struct wl1271 *wl,
+                             struct dentry *rootdir);
+
+#endif /* __WL18XX_DEBUGFS_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/io.c b/drivers/net/wireless/ti/wl18xx/io.c
new file mode 100644
index 000000000000..598c057e722b
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/io.c
@@ -0,0 +1,60 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments
+ *
+ * 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 "../wlcore/wlcore.h"
+#include "../wlcore/io.h"
+
+#include "io.h"
+
+void wl18xx_top_reg_write(struct wl1271 *wl, int addr, u16 val)
+{
+        u32 tmp;
+
+        if (WARN_ON(addr % 2))
+                return;
+
+        if ((addr % 4) == 0) {
+                tmp = wl1271_read32(wl, addr);
+                tmp = (tmp & 0xffff0000) | val;
+                wl1271_write32(wl, addr, tmp);
+        } else {
+                tmp = wl1271_read32(wl, addr - 2);
+                tmp = (tmp & 0xffff) | (val << 16);
+                wl1271_write32(wl, addr - 2, tmp);
+        }
+}
+
+u16 wl18xx_top_reg_read(struct wl1271 *wl, int addr)
+{
+        u32 val;
+
+        if (WARN_ON(addr % 2))
+                return 0;
+
+        if ((addr % 4) == 0) {
+                /* address is 4-bytes aligned */
+                val = wl1271_read32(wl, addr);
+                return val & 0xffff;
+        } else {
+                val = wl1271_read32(wl, addr - 2);
+                return (val & 0xffff0000) >> 16;
+        }
+}
diff --git a/drivers/net/wireless/ti/wl18xx/io.h b/drivers/net/wireless/ti/wl18xx/io.h
new file mode 100644
index 000000000000..be4e126ff617
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/io.h
@@ -0,0 +1,28 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments
+ *
+ * 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 __WL18XX_IO_H__
+#define __WL18XX_IO_H__
+
+void wl18xx_top_reg_write(struct wl1271 *wl, int addr, u16 val);
+u16 wl18xx_top_reg_read(struct wl1271 *wl, int addr);
+
+#endif /* __WL18XX_IO_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
new file mode 100644
index 000000000000..ed9c3650e08a
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -0,0 +1,1463 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments
+ *
+ * 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/module.h>
+#include <linux/platform_device.h>
+#include <linux/ip.h>
+#include <linux/firmware.h>
+
+#include "../wlcore/wlcore.h"
+#include "../wlcore/debug.h"
+#include "../wlcore/io.h"
+#include "../wlcore/acx.h"
+#include "../wlcore/tx.h"
+#include "../wlcore/rx.h"
+#include "../wlcore/io.h"
+#include "../wlcore/boot.h"
+
+#include "reg.h"
+#include "conf.h"
+#include "acx.h"
+#include "tx.h"
+#include "wl18xx.h"
+#include "io.h"
+#include "debugfs.h"
+
+#define WL18XX_RX_CHECKSUM_MASK      0x40
+
+static char *ht_mode_param = "wide";
+static char *board_type_param = "hdk";
+static bool checksum_param = false;
+static bool enable_11a_param = true;
+
+/* phy paramters */
+static int dc2dc_param = -1;
+static int n_antennas_2_param = -1;
+static int n_antennas_5_param = -1;
+static int low_band_component_param = -1;
+static int low_band_component_type_param = -1;
+static int high_band_component_param = -1;
+static int high_band_component_type_param = -1;
+static int pwr_limit_reference_11_abg_param = -1;
+
+static const u8 wl18xx_rate_to_idx_2ghz[] = {
+        /* MCS rates are used only with 11n */
+        15,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS15 */
+        14,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS14 */
+        13,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS13 */
+        12,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS12 */
+        11,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS11 */
+        10,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS10 */
+        9,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS9 */
+        8,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS8 */
+        7,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS7 */
+        6,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS6 */
+        5,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS5 */
+        4,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS4 */
+        3,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS3 */
+        2,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS2 */
+        1,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS1 */
+        0,                             /* WL18XX_CONF_HW_RXTX_RATE_MCS0 */
+
+        11,                            /* WL18XX_CONF_HW_RXTX_RATE_54   */
+        10,                            /* WL18XX_CONF_HW_RXTX_RATE_48   */
+        9,                             /* WL18XX_CONF_HW_RXTX_RATE_36   */
+        8,                             /* WL18XX_CONF_HW_RXTX_RATE_24   */
+
+        /* TI-specific rate */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL18XX_CONF_HW_RXTX_RATE_22   */
+
+        7,                             /* WL18XX_CONF_HW_RXTX_RATE_18   */
+        6,                             /* WL18XX_CONF_HW_RXTX_RATE_12   */
+        3,                             /* WL18XX_CONF_HW_RXTX_RATE_11   */
+        5,                             /* WL18XX_CONF_HW_RXTX_RATE_9    */
+        4,                             /* WL18XX_CONF_HW_RXTX_RATE_6    */
+        2,                             /* WL18XX_CONF_HW_RXTX_RATE_5_5  */
+        1,                             /* WL18XX_CONF_HW_RXTX_RATE_2    */
+        0                              /* WL18XX_CONF_HW_RXTX_RATE_1    */
+};
+
+static const u8 wl18xx_rate_to_idx_5ghz[] = {
+        /* MCS rates are used only with 11n */
+        15,                           /* WL18XX_CONF_HW_RXTX_RATE_MCS15 */
+        14,                           /* WL18XX_CONF_HW_RXTX_RATE_MCS14 */
+        13,                           /* WL18XX_CONF_HW_RXTX_RATE_MCS13 */
+        12,                           /* WL18XX_CONF_HW_RXTX_RATE_MCS12 */
+        11,                           /* WL18XX_CONF_HW_RXTX_RATE_MCS11 */
+        10,                           /* WL18XX_CONF_HW_RXTX_RATE_MCS10 */
+        9,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS9 */
+        8,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS8 */
+        7,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS7 */
+        6,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS6 */
+        5,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS5 */
+        4,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS4 */
+        3,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS3 */
+        2,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS2 */
+        1,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS1 */
+        0,                            /* WL18XX_CONF_HW_RXTX_RATE_MCS0 */
+
+        7,                             /* WL18XX_CONF_HW_RXTX_RATE_54   */
+        6,                             /* WL18XX_CONF_HW_RXTX_RATE_48   */
+        5,                             /* WL18XX_CONF_HW_RXTX_RATE_36   */
+        4,                             /* WL18XX_CONF_HW_RXTX_RATE_24   */
+
+        /* TI-specific rate */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL18XX_CONF_HW_RXTX_RATE_22   */
+
+        3,                             /* WL18XX_CONF_HW_RXTX_RATE_18   */
+        2,                             /* WL18XX_CONF_HW_RXTX_RATE_12   */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL18XX_CONF_HW_RXTX_RATE_11   */
+        1,                             /* WL18XX_CONF_HW_RXTX_RATE_9    */
+        0,                             /* WL18XX_CONF_HW_RXTX_RATE_6    */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL18XX_CONF_HW_RXTX_RATE_5_5  */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL18XX_CONF_HW_RXTX_RATE_2    */
+        CONF_HW_RXTX_RATE_UNSUPPORTED, /* WL18XX_CONF_HW_RXTX_RATE_1    */
+};
+
+static const u8 *wl18xx_band_rate_to_idx[] = {
+        [IEEE80211_BAND_2GHZ] = wl18xx_rate_to_idx_2ghz,
+        [IEEE80211_BAND_5GHZ] = wl18xx_rate_to_idx_5ghz
+};
+
+enum wl18xx_hw_rates {
+        WL18XX_CONF_HW_RXTX_RATE_MCS15 = 0,
+        WL18XX_CONF_HW_RXTX_RATE_MCS14,
+        WL18XX_CONF_HW_RXTX_RATE_MCS13,
+        WL18XX_CONF_HW_RXTX_RATE_MCS12,
+        WL18XX_CONF_HW_RXTX_RATE_MCS11,
+        WL18XX_CONF_HW_RXTX_RATE_MCS10,
+        WL18XX_CONF_HW_RXTX_RATE_MCS9,
+        WL18XX_CONF_HW_RXTX_RATE_MCS8,
+        WL18XX_CONF_HW_RXTX_RATE_MCS7,
+        WL18XX_CONF_HW_RXTX_RATE_MCS6,
+        WL18XX_CONF_HW_RXTX_RATE_MCS5,
+        WL18XX_CONF_HW_RXTX_RATE_MCS4,
+        WL18XX_CONF_HW_RXTX_RATE_MCS3,
+        WL18XX_CONF_HW_RXTX_RATE_MCS2,
+        WL18XX_CONF_HW_RXTX_RATE_MCS1,
+        WL18XX_CONF_HW_RXTX_RATE_MCS0,
+        WL18XX_CONF_HW_RXTX_RATE_54,
+        WL18XX_CONF_HW_RXTX_RATE_48,
+        WL18XX_CONF_HW_RXTX_RATE_36,
+        WL18XX_CONF_HW_RXTX_RATE_24,
+        WL18XX_CONF_HW_RXTX_RATE_22,
+        WL18XX_CONF_HW_RXTX_RATE_18,
+        WL18XX_CONF_HW_RXTX_RATE_12,
+        WL18XX_CONF_HW_RXTX_RATE_11,
+        WL18XX_CONF_HW_RXTX_RATE_9,
+        WL18XX_CONF_HW_RXTX_RATE_6,
+        WL18XX_CONF_HW_RXTX_RATE_5_5,
+        WL18XX_CONF_HW_RXTX_RATE_2,
+        WL18XX_CONF_HW_RXTX_RATE_1,
+        WL18XX_CONF_HW_RXTX_RATE_MAX,
+};
+
+static struct wlcore_conf wl18xx_conf = {
+        .sg = {
+                .params = {
+                        [CONF_SG_ACL_BT_MASTER_MIN_BR] = 10,
+                        [CONF_SG_ACL_BT_MASTER_MAX_BR] = 180,
+                        [CONF_SG_ACL_BT_SLAVE_MIN_BR] = 10,
+                        [CONF_SG_ACL_BT_SLAVE_MAX_BR] = 180,
+                        [CONF_SG_ACL_BT_MASTER_MIN_EDR] = 10,
+                        [CONF_SG_ACL_BT_MASTER_MAX_EDR] = 80,
+                        [CONF_SG_ACL_BT_SLAVE_MIN_EDR] = 10,
+                        [CONF_SG_ACL_BT_SLAVE_MAX_EDR] = 80,
+                        [CONF_SG_ACL_WLAN_PS_MASTER_BR] = 8,
+                        [CONF_SG_ACL_WLAN_PS_SLAVE_BR] = 8,
+                        [CONF_SG_ACL_WLAN_PS_MASTER_EDR] = 20,
+                        [CONF_SG_ACL_WLAN_PS_SLAVE_EDR] = 20,
+                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MIN_BR] = 20,
+                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MAX_BR] = 35,
+                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MIN_BR] = 16,
+                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MAX_BR] = 35,
+                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MIN_EDR] = 32,
+                        [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MAX_EDR] = 50,
+                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MIN_EDR] = 28,
+                        [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MAX_EDR] = 50,
+                        [CONF_SG_ACL_ACTIVE_SCAN_WLAN_BR] = 10,
+                        [CONF_SG_ACL_ACTIVE_SCAN_WLAN_EDR] = 20,
+                        [CONF_SG_ACL_PASSIVE_SCAN_BT_BR] = 75,
+                        [CONF_SG_ACL_PASSIVE_SCAN_WLAN_BR] = 15,
+                        [CONF_SG_ACL_PASSIVE_SCAN_BT_EDR] = 27,
+                        [CONF_SG_ACL_PASSIVE_SCAN_WLAN_EDR] = 17,
+                        /* active scan params */
+                        [CONF_SG_AUTO_SCAN_PROBE_REQ] = 170,
+                        [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_HV3] = 50,
+                        [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_A2DP] = 100,
+                        /* passive scan params */
+                        [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP_BR] = 800,
+                        [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP_EDR] = 200,
+                        [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_HV3] = 200,
+                        /* passive scan in dual antenna params */
+                        [CONF_SG_CONSECUTIVE_HV3_IN_PASSIVE_SCAN] = 0,
+                        [CONF_SG_BCN_HV3_COLLISION_THRESH_IN_PASSIVE_SCAN] = 0,
+                        [CONF_SG_TX_RX_PROTECTION_BWIDTH_IN_PASSIVE_SCAN] = 0,
+                        /* general params */
+                        [CONF_SG_STA_FORCE_PS_IN_BT_SCO] = 1,
+                        [CONF_SG_ANTENNA_CONFIGURATION] = 0,
+                        [CONF_SG_BEACON_MISS_PERCENT] = 60,
+                        [CONF_SG_DHCP_TIME] = 5000,
+                        [CONF_SG_RXT] = 1200,
+                        [CONF_SG_TXT] = 1000,
+                        [CONF_SG_ADAPTIVE_RXT_TXT] = 1,
+                        [CONF_SG_GENERAL_USAGE_BIT_MAP] = 3,
+                        [CONF_SG_HV3_MAX_SERVED] = 6,
+                        [CONF_SG_PS_POLL_TIMEOUT] = 10,
+                        [CONF_SG_UPSD_TIMEOUT] = 10,
+                        [CONF_SG_CONSECUTIVE_CTS_THRESHOLD] = 2,
+                        [CONF_SG_STA_RX_WINDOW_AFTER_DTIM] = 5,
+                        [CONF_SG_STA_CONNECTION_PROTECTION_TIME] = 30,
+                        /* AP params */
+                        [CONF_AP_BEACON_MISS_TX] = 3,
+                        [CONF_AP_RX_WINDOW_AFTER_BEACON] = 10,
+                        [CONF_AP_BEACON_WINDOW_INTERVAL] = 2,
+                        [CONF_AP_CONNECTION_PROTECTION_TIME] = 0,
+                        [CONF_AP_BT_ACL_VAL_BT_SERVE_TIME] = 25,
+                        [CONF_AP_BT_ACL_VAL_WL_SERVE_TIME] = 25,
+                        /* CTS Diluting params */
+                        [CONF_SG_CTS_DILUTED_BAD_RX_PACKETS_TH] = 0,
+                        [CONF_SG_CTS_CHOP_IN_DUAL_ANT_SCO_MASTER] = 0,
+                },
+                .state = CONF_SG_PROTECTIVE,
+        },
+        .rx = {
+                .rx_msdu_life_time           = 512000,
+                .packet_detection_threshold  = 0,
+                .ps_poll_timeout             = 15,
+                .upsd_timeout                = 15,
+                .rts_threshold               = IEEE80211_MAX_RTS_THRESHOLD,
+                .rx_cca_threshold            = 0,
+                .irq_blk_threshold           = 0xFFFF,
+                .irq_pkt_threshold           = 0,
+                .irq_timeout                 = 600,
+                .queue_type                  = CONF_RX_QUEUE_TYPE_LOW_PRIORITY,
+        },
+        .tx = {
+                .tx_energy_detection         = 0,
+                .sta_rc_conf                 = {
+                        .enabled_rates       = 0,
+                        .short_retry_limit   = 10,
+                        .long_retry_limit    = 10,
+                        .aflags              = 0,
+                },
+                .ac_conf_count               = 4,
+                .ac_conf                     = {
+                        [CONF_TX_AC_BE] = {
+                                .ac          = CONF_TX_AC_BE,
+                                .cw_min      = 15,
+                                .cw_max      = 63,
+                                .aifsn       = 3,
+                                .tx_op_limit = 0,
+                        },
+                        [CONF_TX_AC_BK] = {
+                                .ac          = CONF_TX_AC_BK,
+                                .cw_min      = 15,
+                                .cw_max      = 63,
+                                .aifsn       = 7,
+                                .tx_op_limit = 0,
+                        },
+                        [CONF_TX_AC_VI] = {
+                                .ac          = CONF_TX_AC_VI,
+                                .cw_min      = 15,
+                                .cw_max      = 63,
+                                .aifsn       = CONF_TX_AIFS_PIFS,
+                                .tx_op_limit = 3008,
+                        },
+                        [CONF_TX_AC_VO] = {
+                                .ac          = CONF_TX_AC_VO,
+                                .cw_min      = 15,
+                                .cw_max      = 63,
+                                .aifsn       = CONF_TX_AIFS_PIFS,
+                                .tx_op_limit = 1504,
+                        },
+                },
+                .max_tx_retries = 100,
+                .ap_aging_period = 300,
+                .tid_conf_count = 4,
+                .tid_conf = {
+                        [CONF_TX_AC_BE] = {
+                                .queue_id    = CONF_TX_AC_BE,
+                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
+                                .tsid        = CONF_TX_AC_BE,
+                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
+                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
+                                .apsd_conf   = {0, 0},
+                        },
+                        [CONF_TX_AC_BK] = {
+                                .queue_id    = CONF_TX_AC_BK,
+                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
+                                .tsid        = CONF_TX_AC_BK,
+                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
+                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
+                                .apsd_conf   = {0, 0},
+                        },
+                        [CONF_TX_AC_VI] = {
+                                .queue_id    = CONF_TX_AC_VI,
+                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
+                                .tsid        = CONF_TX_AC_VI,
+                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
+                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
+                                .apsd_conf   = {0, 0},
+                        },
+                        [CONF_TX_AC_VO] = {
+                                .queue_id    = CONF_TX_AC_VO,
+                                .channel_type = CONF_CHANNEL_TYPE_EDCF,
+                                .tsid        = CONF_TX_AC_VO,
+                                .ps_scheme   = CONF_PS_SCHEME_LEGACY,
+                                .ack_policy  = CONF_ACK_POLICY_LEGACY,
+                                .apsd_conf   = {0, 0},
+                        },
+                },
+                .frag_threshold              = IEEE80211_MAX_FRAG_THRESHOLD,
+                .tx_compl_timeout            = 350,
+                .tx_compl_threshold          = 10,
+                .basic_rate                  = CONF_HW_BIT_RATE_1MBPS,
+                .basic_rate_5                = CONF_HW_BIT_RATE_6MBPS,
+                .tmpl_short_retry_limit      = 10,
+                .tmpl_long_retry_limit       = 10,
+                .tx_watchdog_timeout         = 5000,
+        },
+        .conn = {
+                .wake_up_event               = CONF_WAKE_UP_EVENT_DTIM,
+                .listen_interval             = 1,
+                .suspend_wake_up_event       = CONF_WAKE_UP_EVENT_N_DTIM,
+                .suspend_listen_interval     = 3,
+                .bcn_filt_mode               = CONF_BCN_FILT_MODE_ENABLED,
+                .bcn_filt_ie_count           = 3,
+                .bcn_filt_ie = {
+                        [0] = {
+                                .ie          = WLAN_EID_CHANNEL_SWITCH,
+                                .rule        = CONF_BCN_RULE_PASS_ON_APPEARANCE,
+                        },
+                        [1] = {
+                                .ie          = WLAN_EID_HT_OPERATION,
+                                .rule        = CONF_BCN_RULE_PASS_ON_CHANGE,
+                        },
+                        [2] = {
+                                .ie          = WLAN_EID_ERP_INFO,
+                                .rule        = CONF_BCN_RULE_PASS_ON_CHANGE,
+                        },
+                },
+                .synch_fail_thold            = 12,
+                .bss_lose_timeout            = 400,
+                .beacon_rx_timeout           = 10000,
+                .broadcast_timeout           = 20000,
+                .rx_broadcast_in_ps          = 1,
+                .ps_poll_threshold           = 10,
+                .bet_enable                  = CONF_BET_MODE_ENABLE,
+                .bet_max_consecutive         = 50,
+                .psm_entry_retries           = 8,
+                .psm_exit_retries            = 16,
+                .psm_entry_nullfunc_retries  = 3,
+                .dynamic_ps_timeout          = 200,
+                .forced_ps                   = false,
+                .keep_alive_interval         = 55000,
+                .max_listen_interval         = 20,
+        },
+        .itrim = {
+                .enable = false,
+                .timeout = 50000,
+        },
+        .pm_config = {
+                .host_clk_settling_time = 5000,
+                .host_fast_wakeup_support = CONF_FAST_WAKEUP_DISABLE,
+        },
+        .roam_trigger = {
+                .trigger_pacing               = 1,
+                .avg_weight_rssi_beacon       = 20,
+                .avg_weight_rssi_data         = 10,
+                .avg_weight_snr_beacon        = 20,
+                .avg_weight_snr_data          = 10,
+        },
+        .scan = {
+                .min_dwell_time_active        = 7500,
+                .max_dwell_time_active        = 30000,
+                .min_dwell_time_passive       = 100000,
+                .max_dwell_time_passive       = 100000,
+                .num_probe_reqs               = 2,
+                .split_scan_timeout           = 50000,
+        },
+        .sched_scan = {
+                /*
+                 * Values are in TU/1000 but since sched scan FW command
+                 * params are in TUs rounding up may occur.
+                 */
+                .base_dwell_time                = 7500,
+                .max_dwell_time_delta           = 22500,
+                /* based on 250bits per probe @1Mbps */
+                .dwell_time_delta_per_probe     = 2000,
+                /* based on 250bits per probe @6Mbps (plus a bit more) */
+                .dwell_time_delta_per_probe_5   = 350,
+                .dwell_time_passive             = 100000,
+                .dwell_time_dfs                 = 150000,
+                .num_probe_reqs                 = 2,
+                .rssi_threshold                 = -90,
+                .snr_threshold                  = 0,
+        },
+        .ht = {
+                .rx_ba_win_size = 10,
+                .tx_ba_win_size = 64,
+                .inactivity_timeout = 10000,
+                .tx_ba_tid_bitmap = CONF_TX_BA_ENABLED_TID_BITMAP,
+        },
+        .mem = {
+                .num_stations                 = 1,
+                .ssid_profiles                = 1,
+                .rx_block_num                 = 40,
+                .tx_min_block_num             = 40,
+                .dynamic_memory               = 1,
+                .min_req_tx_blocks            = 45,
+                .min_req_rx_blocks            = 22,
+                .tx_min                       = 27,
+        },
+        .fm_coex = {
+                .enable                       = true,
+                .swallow_period               = 5,
+                .n_divider_fref_set_1         = 0xff,       /* default */
+                .n_divider_fref_set_2         = 12,
+                .m_divider_fref_set_1         = 0xffff,
+                .m_divider_fref_set_2         = 148,        /* default */
+                .coex_pll_stabilization_time  = 0xffffffff, /* default */
+                .ldo_stabilization_time       = 0xffff,     /* default */
+                .fm_disturbed_band_margin     = 0xff,       /* default */
+                .swallow_clk_diff             = 0xff,       /* default */
+        },
+        .rx_streaming = {
+                .duration                      = 150,
+                .queues                        = 0x1,
+                .interval                      = 20,
+                .always                        = 0,
+        },
+        .fwlog = {
+                .mode                         = WL12XX_FWLOG_ON_DEMAND,
+                .mem_blocks                   = 2,
+                .severity                     = 0,
+                .timestamp                    = WL12XX_FWLOG_TIMESTAMP_DISABLED,
+                .output                       = WL12XX_FWLOG_OUTPUT_HOST,
+                .threshold                    = 0,
+        },
+        .rate = {
+                .rate_retry_score = 32000,
+                .per_add = 8192,
+                .per_th1 = 2048,
+                .per_th2 = 4096,
+                .max_per = 8100,
+                .inverse_curiosity_factor = 5,
+                .tx_fail_low_th = 4,
+                .tx_fail_high_th = 10,
+                .per_alpha_shift = 4,
+                .per_add_shift = 13,
+                .per_beta1_shift = 10,
+                .per_beta2_shift = 8,
+                .rate_check_up = 2,
+                .rate_check_down = 12,
+                .rate_retry_policy = {
+                        0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00,
+                },
+        },
+        .hangover = {
+                .recover_time               = 0,
+                .hangover_period            = 20,
+                .dynamic_mode               = 1,
+                .early_termination_mode     = 1,
+                .max_period                 = 20,
+                .min_period                 = 1,
+                .increase_delta             = 1,
+                .decrease_delta             = 2,
+                .quiet_time                 = 4,
+                .increase_time              = 1,
+                .window_size                = 16,
+        },
+};
+
+static struct wl18xx_priv_conf wl18xx_default_priv_conf = {
+        .phy = {
+                .phy_standalone                 = 0x00,
+                .primary_clock_setting_time     = 0x05,
+                .clock_valid_on_wake_up         = 0x00,
+                .secondary_clock_setting_time   = 0x05,
+                .rdl                            = 0x01,
+                .auto_detect                    = 0x00,
+                .dedicated_fem                  = FEM_NONE,
+                .low_band_component             = COMPONENT_2_WAY_SWITCH,
+                .low_band_component_type        = 0x05,
+                .high_band_component            = COMPONENT_2_WAY_SWITCH,
+                .high_band_component_type       = 0x09,
+                .tcxo_ldo_voltage               = 0x00,
+                .xtal_itrim_val                 = 0x04,
+                .srf_state                      = 0x00,
+                .io_configuration               = 0x01,
+                .sdio_configuration             = 0x00,
+                .settings                       = 0x00,
+                .enable_clpc                    = 0x00,
+                .enable_tx_low_pwr_on_siso_rdl  = 0x00,
+                .rx_profile                     = 0x00,
+                .pwr_limit_reference_11_abg     = 0xc8,
+                .psat                           = 0,
+                .low_power_val                  = 0x00,
+                .med_power_val                  = 0x0a,
+                .high_power_val                 = 0x1e,
+                .external_pa_dc2dc              = 0,
+                .number_of_assembled_ant2_4     = 1,
+                .number_of_assembled_ant5       = 1,
+        },
+};
+
+static const struct wlcore_partition_set wl18xx_ptable[PART_TABLE_LEN] = {
+        [PART_TOP_PRCM_ELP_SOC] = {
+                .mem  = { .start = 0x00A02000, .size  = 0x00010000 },
+                .reg  = { .start = 0x00807000, .size  = 0x00005000 },
+                .mem2 = { .start = 0x00800000, .size  = 0x0000B000 },
+                .mem3 = { .start = 0x00000000, .size  = 0x00000000 },
+        },
+        [PART_DOWN] = {
+                .mem  = { .start = 0x00000000, .size  = 0x00014000 },
+                .reg  = { .start = 0x00810000, .size  = 0x0000BFFF },
+                .mem2 = { .start = 0x00000000, .size  = 0x00000000 },
+                .mem3 = { .start = 0x00000000, .size  = 0x00000000 },
+        },
+        [PART_BOOT] = {
+                .mem  = { .start = 0x00700000, .size = 0x0000030c },
+                .reg  = { .start = 0x00802000, .size = 0x00014578 },
+                .mem2 = { .start = 0x00B00404, .size = 0x00001000 },
+                .mem3 = { .start = 0x00C00000, .size = 0x00000400 },
+        },
+        [PART_WORK] = {
+                .mem  = { .start = 0x00800000, .size  = 0x000050FC },
+                .reg  = { .start = 0x00B00404, .size  = 0x00001000 },
+                .mem2 = { .start = 0x00C00000, .size  = 0x00000400 },
+                .mem3 = { .start = 0x00000000, .size  = 0x00000000 },
+        },
+        [PART_PHY_INIT] = {
+                .mem  = { .start = 0x80926000,
+                          .size = sizeof(struct wl18xx_mac_and_phy_params) },
+                .reg  = { .start = 0x00000000, .size = 0x00000000 },
+                .mem2 = { .start = 0x00000000, .size = 0x00000000 },
+                .mem3 = { .start = 0x00000000, .size = 0x00000000 },
+        },
+};
+
+static const int wl18xx_rtable[REG_TABLE_LEN] = {
+        [REG_ECPU_CONTROL]              = WL18XX_REG_ECPU_CONTROL,
+        [REG_INTERRUPT_NO_CLEAR]        = WL18XX_REG_INTERRUPT_NO_CLEAR,
+        [REG_INTERRUPT_ACK]             = WL18XX_REG_INTERRUPT_ACK,
+        [REG_COMMAND_MAILBOX_PTR]       = WL18XX_REG_COMMAND_MAILBOX_PTR,
+        [REG_EVENT_MAILBOX_PTR]         = WL18XX_REG_EVENT_MAILBOX_PTR,
+        [REG_INTERRUPT_TRIG]            = WL18XX_REG_INTERRUPT_TRIG_H,
+        [REG_INTERRUPT_MASK]            = WL18XX_REG_INTERRUPT_MASK,
+        [REG_PC_ON_RECOVERY]            = WL18XX_SCR_PAD4,
+        [REG_CHIP_ID_B]                 = WL18XX_REG_CHIP_ID_B,
+        [REG_CMD_MBOX_ADDRESS]          = WL18XX_CMD_MBOX_ADDRESS,
+
+        /* data access memory addresses, used with partition translation */
+        [REG_SLV_MEM_DATA]              = WL18XX_SLV_MEM_DATA,
+        [REG_SLV_REG_DATA]              = WL18XX_SLV_REG_DATA,
+
+        /* raw data access memory addresses */
+        [REG_RAW_FW_STATUS_ADDR]        = WL18XX_FW_STATUS_ADDR,
+};
+
+static const struct wl18xx_clk_cfg wl18xx_clk_table[NUM_CLOCK_CONFIGS] = {
+        [CLOCK_CONFIG_16_2_M]   = { 7,  104,  801, 4,  true },
+        [CLOCK_CONFIG_16_368_M] = { 9,  132, 3751, 4,  true },
+        [CLOCK_CONFIG_16_8_M]   = { 7,  100,    0, 0, false },
+        [CLOCK_CONFIG_19_2_M]   = { 8,  100,    0, 0, false },
+        [CLOCK_CONFIG_26_M]     = { 13, 120,    0, 0, false },
+        [CLOCK_CONFIG_32_736_M] = { 9,  132, 3751, 4,  true },
+        [CLOCK_CONFIG_33_6_M]   = { 7,  100,    0, 0, false },
+        [CLOCK_CONFIG_38_468_M] = { 8,  100,    0, 0, false },
+        [CLOCK_CONFIG_52_M]     = { 13, 120,    0, 0, false },
+};
+
+/* TODO: maybe move to a new header file? */
+#define WL18XX_FW_NAME "ti-connectivity/wl18xx-fw.bin"
+
+static int wl18xx_identify_chip(struct wl1271 *wl)
+{
+        int ret = 0;
+
+        switch (wl->chip.id) {
+        case CHIP_ID_185x_PG20:
+                wl1271_debug(DEBUG_BOOT, "chip id 0x%x (185x PG20)",
+                                 wl->chip.id);
+                wl->sr_fw_name = WL18XX_FW_NAME;
+                /* wl18xx uses the same firmware for PLT */
+                wl->plt_fw_name = WL18XX_FW_NAME;
+                wl->quirks |= WLCORE_QUIRK_NO_ELP |
+                              WLCORE_QUIRK_RX_BLOCKSIZE_ALIGN |
+                              WLCORE_QUIRK_TX_PAD_LAST_FRAME;
+
+                break;
+        case CHIP_ID_185x_PG10:
+                wl1271_debug(DEBUG_BOOT, "chip id 0x%x (185x PG10)",
+                             wl->chip.id);
+                wl->sr_fw_name = WL18XX_FW_NAME;
+                /* wl18xx uses the same firmware for PLT */
+                wl->plt_fw_name = WL18XX_FW_NAME;
+                wl->quirks |= WLCORE_QUIRK_NO_ELP |
+                        WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED |
+                        WLCORE_QUIRK_RX_BLOCKSIZE_ALIGN |
+                        WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
+
+                /* PG 1.0 has some problems with MCS_13, so disable it */
+                wl->ht_cap[IEEE80211_BAND_2GHZ].mcs.rx_mask[1] &= ~BIT(5);
+
+                break;
+        default:
+                wl1271_warning("unsupported chip id: 0x%x", wl->chip.id);
+                ret = -ENODEV;
+                goto out;
+        }
+
+out:
+        return ret;
+}
+
+static void wl18xx_set_clk(struct wl1271 *wl)
+{
+        u32 clk_freq;
+
+        wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+
+        /* TODO: PG2: apparently we need to read the clk type */
+
+        clk_freq = wl18xx_top_reg_read(wl, PRIMARY_CLK_DETECT);
+        wl1271_debug(DEBUG_BOOT, "clock freq %d (%d, %d, %d, %d, %s)", clk_freq,
+                     wl18xx_clk_table[clk_freq].n, wl18xx_clk_table[clk_freq].m,
+                     wl18xx_clk_table[clk_freq].p, wl18xx_clk_table[clk_freq].q,
+                     wl18xx_clk_table[clk_freq].swallow ? "swallow" : "spit");
+
+        wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_N, wl18xx_clk_table[clk_freq].n);
+        wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_M, wl18xx_clk_table[clk_freq].m);
+
+        if (wl18xx_clk_table[clk_freq].swallow) {
+                /* first the 16 lower bits */
+                wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_Q_FACTOR_CFG_1,
+                                     wl18xx_clk_table[clk_freq].q &
+                                     PLLSH_WCS_PLL_Q_FACTOR_CFG_1_MASK);
+                /* then the 16 higher bits, masked out */
+                wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_Q_FACTOR_CFG_2,
+                                     (wl18xx_clk_table[clk_freq].q >> 16) &
+                                     PLLSH_WCS_PLL_Q_FACTOR_CFG_2_MASK);
+
+                /* first the 16 lower bits */
+                wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_P_FACTOR_CFG_1,
+                                     wl18xx_clk_table[clk_freq].p &
+                                     PLLSH_WCS_PLL_P_FACTOR_CFG_1_MASK);
+                /* then the 16 higher bits, masked out */
+                wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_P_FACTOR_CFG_2,
+                                     (wl18xx_clk_table[clk_freq].p >> 16) &
+                                     PLLSH_WCS_PLL_P_FACTOR_CFG_2_MASK);
+        } else {
+                wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_SWALLOW_EN,
+                                     PLLSH_WCS_PLL_SWALLOW_EN_VAL2);
+        }
+}
+
+static void wl18xx_boot_soft_reset(struct wl1271 *wl)
+{
+        /* disable Rx/Tx */
+        wl1271_write32(wl, WL18XX_ENABLE, 0x0);
+
+        /* disable auto calibration on start*/
+        wl1271_write32(wl, WL18XX_SPARE_A2, 0xffff);
+}
+
+static int wl18xx_pre_boot(struct wl1271 *wl)
+{
+        wl18xx_set_clk(wl);
+
+        /* Continue the ELP wake up sequence */
+        wl1271_write32(wl, WL18XX_WELP_ARM_COMMAND, WELP_ARM_COMMAND_VAL);
+        udelay(500);
+
+        wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+
+        /* Disable interrupts */
+        wlcore_write_reg(wl, REG_INTERRUPT_MASK, WL1271_ACX_INTR_ALL);
+
+        wl18xx_boot_soft_reset(wl);
+
+        return 0;
+}
+
+static void wl18xx_pre_upload(struct wl1271 *wl)
+{
+        u32 tmp;
+
+        wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+
+        /* TODO: check if this is all needed */
+        wl1271_write32(wl, WL18XX_EEPROMLESS_IND, WL18XX_EEPROMLESS_IND);
+
+        tmp = wlcore_read_reg(wl, REG_CHIP_ID_B);
+
+        wl1271_debug(DEBUG_BOOT, "chip id 0x%x", tmp);
+
+        tmp = wl1271_read32(wl, WL18XX_SCR_PAD2);
+}
+
+static void wl18xx_set_mac_and_phy(struct wl1271 *wl)
+{
+        struct wl18xx_priv *priv = wl->priv;
+        size_t len;
+
+        /* the parameters struct is smaller for PG1 */
+        if (wl->chip.id == CHIP_ID_185x_PG10)
+                len = offsetof(struct wl18xx_mac_and_phy_params, psat) + 1;
+        else
+                len = sizeof(struct wl18xx_mac_and_phy_params);
+
+        wlcore_set_partition(wl, &wl->ptable[PART_PHY_INIT]);
+        wl1271_write(wl, WL18XX_PHY_INIT_MEM_ADDR, (u8 *)&priv->conf.phy, len,
+                     false);
+}
+
+static void wl18xx_enable_interrupts(struct wl1271 *wl)
+{
+        u32 event_mask, intr_mask;
+
+        if (wl->chip.id == CHIP_ID_185x_PG10) {
+                event_mask = WL18XX_ACX_EVENTS_VECTOR_PG1;
+                intr_mask = WL18XX_INTR_MASK_PG1;
+        } else {
+                event_mask = WL18XX_ACX_EVENTS_VECTOR_PG2;
+                intr_mask = WL18XX_INTR_MASK_PG2;
+        }
+
+        wlcore_write_reg(wl, REG_INTERRUPT_MASK, event_mask);
+
+        wlcore_enable_interrupts(wl);
+        wlcore_write_reg(wl, REG_INTERRUPT_MASK,
+                         WL1271_ACX_INTR_ALL & ~intr_mask);
+}
+
+static int wl18xx_boot(struct wl1271 *wl)
+{
+        int ret;
+
+        ret = wl18xx_pre_boot(wl);
+        if (ret < 0)
+                goto out;
+
+        wl18xx_pre_upload(wl);
+
+        ret = wlcore_boot_upload_firmware(wl);
+        if (ret < 0)
+                goto out;
+
+        wl18xx_set_mac_and_phy(wl);
+
+        ret = wlcore_boot_run_firmware(wl);
+        if (ret < 0)
+                goto out;
+
+        wl18xx_enable_interrupts(wl);
+
+out:
+        return ret;
+}
+
+static void wl18xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,
+                               void *buf, size_t len)
+{
+        struct wl18xx_priv *priv = wl->priv;
+
+        memcpy(priv->cmd_buf, buf, len);
+        memset(priv->cmd_buf + len, 0, WL18XX_CMD_MAX_SIZE - len);
+
+        wl1271_write(wl, cmd_box_addr, priv->cmd_buf, WL18XX_CMD_MAX_SIZE,
+                     false);
+}
+
+static void wl18xx_ack_event(struct wl1271 *wl)
+{
+        wlcore_write_reg(wl, REG_INTERRUPT_TRIG, WL18XX_INTR_TRIG_EVENT_ACK);
+}
+
+static u32 wl18xx_calc_tx_blocks(struct wl1271 *wl, u32 len, u32 spare_blks)
+{
+        u32 blk_size = WL18XX_TX_HW_BLOCK_SIZE;
+        return (len + blk_size - 1) / blk_size + spare_blks;
+}
+
+static void
+wl18xx_set_tx_desc_blocks(struct wl1271 *wl, struct wl1271_tx_hw_descr *desc,
+                          u32 blks, u32 spare_blks)
+{
+        desc->wl18xx_mem.total_mem_blocks = blks;
+}
+
+static void
+wl18xx_set_tx_desc_data_len(struct wl1271 *wl, struct wl1271_tx_hw_descr *desc,
+                            struct sk_buff *skb)
+{
+        desc->length = cpu_to_le16(skb->len);
+
+        /* if only the last frame is to be padded, we unset this bit on Tx */
+        if (wl->quirks & WLCORE_QUIRK_TX_PAD_LAST_FRAME)
+                desc->wl18xx_mem.ctrl = WL18XX_TX_CTRL_NOT_PADDED;
+        else
+                desc->wl18xx_mem.ctrl = 0;
+
+        wl1271_debug(DEBUG_TX, "tx_fill_hdr: hlid: %d "
+                     "len: %d life: %d mem: %d", desc->hlid,
+                     le16_to_cpu(desc->length),
+                     le16_to_cpu(desc->life_time),
+                     desc->wl18xx_mem.total_mem_blocks);
+}
+
+static enum wl_rx_buf_align
+wl18xx_get_rx_buf_align(struct wl1271 *wl, u32 rx_desc)
+{
+        if (rx_desc & RX_BUF_PADDED_PAYLOAD)
+                return WLCORE_RX_BUF_PADDED;
+
+        return WLCORE_RX_BUF_ALIGNED;
+}
+
+static u32 wl18xx_get_rx_packet_len(struct wl1271 *wl, void *rx_data,
+                                    u32 data_len)
+{
+        struct wl1271_rx_descriptor *desc = rx_data;
+
+        /* invalid packet */
+        if (data_len < sizeof(*desc))
+                return 0;
+
+        return data_len - sizeof(*desc);
+}
+
+static void wl18xx_tx_immediate_completion(struct wl1271 *wl)
+{
+        wl18xx_tx_immediate_complete(wl);
+}
+
+static int wl18xx_set_host_cfg_bitmap(struct wl1271 *wl, u32 extra_mem_blk)
+{
+        int ret;
+        u32 sdio_align_size = 0;
+        u32 host_cfg_bitmap = HOST_IF_CFG_RX_FIFO_ENABLE |
+                              HOST_IF_CFG_ADD_RX_ALIGNMENT;
+
+        /* Enable Tx SDIO padding */
+        if (wl->quirks & WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN) {
+                host_cfg_bitmap |= HOST_IF_CFG_TX_PAD_TO_SDIO_BLK;
+                sdio_align_size = WL12XX_BUS_BLOCK_SIZE;
+        }
+
+        /* Enable Rx SDIO padding */
+        if (wl->quirks & WLCORE_QUIRK_RX_BLOCKSIZE_ALIGN) {
+                host_cfg_bitmap |= HOST_IF_CFG_RX_PAD_TO_SDIO_BLK;
+                sdio_align_size = WL12XX_BUS_BLOCK_SIZE;
+        }
+
+        ret = wl18xx_acx_host_if_cfg_bitmap(wl, host_cfg_bitmap,
+                                            sdio_align_size, extra_mem_blk,
+                                            WL18XX_HOST_IF_LEN_SIZE_FIELD);
+        if (ret < 0)
+                return ret;
+
+        return 0;
+}
+
+static int wl18xx_hw_init(struct wl1271 *wl)
+{
+        int ret;
+        struct wl18xx_priv *priv = wl->priv;
+
+        /* (re)init private structures. Relevant on recovery as well. */
+        priv->last_fw_rls_idx = 0;
+        priv->extra_spare_vif_count = 0;
+
+        /* set the default amount of spare blocks in the bitmap */
+        ret = wl18xx_set_host_cfg_bitmap(wl, WL18XX_TX_HW_BLOCK_SPARE);
+        if (ret < 0)
+                return ret;
+
+        if (checksum_param) {
+                ret = wl18xx_acx_set_checksum_state(wl);
+                if (ret != 0)
+                        return ret;
+        }
+
+        return ret;
+}
+
+static void wl18xx_set_tx_desc_csum(struct wl1271 *wl,
+                                    struct wl1271_tx_hw_descr *desc,
+                                    struct sk_buff *skb)
+{
+        u32 ip_hdr_offset;
+        struct iphdr *ip_hdr;
+
+        if (!checksum_param) {
+                desc->wl18xx_checksum_data = 0;
+                return;
+        }
+
+        if (skb->ip_summed != CHECKSUM_PARTIAL) {
+                desc->wl18xx_checksum_data = 0;
+                return;
+        }
+
+        ip_hdr_offset = skb_network_header(skb) - skb_mac_header(skb);
+        if (WARN_ON(ip_hdr_offset >= (1<<7))) {
+                desc->wl18xx_checksum_data = 0;
+                return;
+        }
+
+        desc->wl18xx_checksum_data = ip_hdr_offset << 1;
+
+        /* FW is interested only in the LSB of the protocol  TCP=0 UDP=1 */
+        ip_hdr = (void *)skb_network_header(skb);
+        desc->wl18xx_checksum_data |= (ip_hdr->protocol & 0x01);
+}
+
+static void wl18xx_set_rx_csum(struct wl1271 *wl,
+                               struct wl1271_rx_descriptor *desc,
+                               struct sk_buff *skb)
+{
+        if (desc->status & WL18XX_RX_CHECKSUM_MASK)
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
+}
+
+/*
+ * TODO: instead of having these two functions to get the rate mask,
+ * we should modify the wlvif->rate_set instead
+ */
+static u32 wl18xx_sta_get_ap_rate_mask(struct wl1271 *wl,
+                                       struct wl12xx_vif *wlvif)
+{
+        u32 hw_rate_set = wlvif->rate_set;
+
+        if (wlvif->channel_type == NL80211_CHAN_HT40MINUS ||
+            wlvif->channel_type == NL80211_CHAN_HT40PLUS) {
+                wl1271_debug(DEBUG_ACX, "using wide channel rate mask");
+                hw_rate_set |= CONF_TX_RATE_USE_WIDE_CHAN;
+
+                /* we don't support MIMO in wide-channel mode */
+                hw_rate_set &= ~CONF_TX_MIMO_RATES;
+        }
+
+        return hw_rate_set;
+}
+
+static u32 wl18xx_ap_get_mimo_wide_rate_mask(struct wl1271 *wl,
+                                             struct wl12xx_vif *wlvif)
+{
+        if ((wlvif->channel_type == NL80211_CHAN_HT40MINUS ||
+             wlvif->channel_type == NL80211_CHAN_HT40PLUS) &&
+            !strcmp(ht_mode_param, "wide")) {
+                wl1271_debug(DEBUG_ACX, "using wide channel rate mask");
+                return CONF_TX_RATE_USE_WIDE_CHAN;
+        } else if (!strcmp(ht_mode_param, "mimo")) {
+                wl1271_debug(DEBUG_ACX, "using MIMO rate mask");
+
+                /*
+                 * PG 1.0 has some problems with MCS_13, so disable it
+                 *
+                 * TODO: instead of hacking this in here, we should
+                 * make it more general and change a bit in the
+                 * wlvif->rate_set instead.
+                 */
+                if (wl->chip.id == CHIP_ID_185x_PG10)
+                        return CONF_TX_MIMO_RATES & ~CONF_HW_BIT_RATE_MCS_13;
+
+                return CONF_TX_MIMO_RATES;
+        } else {
+                return 0;
+        }
+}
+
+static s8 wl18xx_get_pg_ver(struct wl1271 *wl)
+{
+        u32 fuse;
+
+        wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+
+        fuse = wl1271_read32(wl, WL18XX_REG_FUSE_DATA_1_3);
+        fuse = (fuse & WL18XX_PG_VER_MASK) >> WL18XX_PG_VER_OFFSET;
+
+        wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+
+        return (s8)fuse;
+}
+
+#define WL18XX_CONF_FILE_NAME "ti-connectivity/wl18xx-conf.bin"
+static int wl18xx_conf_init(struct wl1271 *wl, struct device *dev)
+{
+        struct wl18xx_priv *priv = wl->priv;
+        struct wlcore_conf_file *conf_file;
+        const struct firmware *fw;
+        int ret;
+
+        ret = request_firmware(&fw, WL18XX_CONF_FILE_NAME, dev);
+        if (ret < 0) {
+                wl1271_error("could not get configuration binary %s: %d",
+                             WL18XX_CONF_FILE_NAME, ret);
+                goto out_fallback;
+        }
+
+        if (fw->size != WL18XX_CONF_SIZE) {
+                wl1271_error("configuration binary file size is wrong, "
+                             "expected %ld got %zd",
+                             WL18XX_CONF_SIZE, fw->size);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        conf_file = (struct wlcore_conf_file *) fw->data;
+
+        if (conf_file->header.magic != cpu_to_le32(WL18XX_CONF_MAGIC)) {
+                wl1271_error("configuration binary file magic number mismatch, "
+                             "expected 0x%0x got 0x%0x", WL18XX_CONF_MAGIC,
+                             conf_file->header.magic);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if (conf_file->header.version != cpu_to_le32(WL18XX_CONF_VERSION)) {
+                wl1271_error("configuration binary file version not supported, "
+                             "expected 0x%08x got 0x%08x",
+                             WL18XX_CONF_VERSION, conf_file->header.version);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        memcpy(&wl->conf, &conf_file->core, sizeof(wl18xx_conf));
+        memcpy(&priv->conf, &conf_file->priv, sizeof(priv->conf));
+
+        goto out;
+
+out_fallback:
+        wl1271_warning("falling back to default config");
+
+        /* apply driver default configuration */
+        memcpy(&wl->conf, &wl18xx_conf, sizeof(wl18xx_conf));
+        /* apply default private configuration */
+        memcpy(&priv->conf, &wl18xx_default_priv_conf, sizeof(priv->conf));
+
+        /* For now we just fallback */
+        return 0;
+
+out:
+        release_firmware(fw);
+        return ret;
+}
+
+static int wl18xx_plt_init(struct wl1271 *wl)
+{
+        wl1271_write32(wl, WL18XX_SCR_PAD8, WL18XX_SCR_PAD8_PLT);
+
+        return wl->ops->boot(wl);
+}
+
+static void wl18xx_get_mac(struct wl1271 *wl)
+{
+        u32 mac1, mac2;
+
+        wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+
+        mac1 = wl1271_read32(wl, WL18XX_REG_FUSE_BD_ADDR_1);
+        mac2 = wl1271_read32(wl, WL18XX_REG_FUSE_BD_ADDR_2);
+
+        /* these are the two parts of the BD_ADDR */
+        wl->fuse_oui_addr = ((mac2 & 0xffff) << 8) +
+                ((mac1 & 0xff000000) >> 24);
+        wl->fuse_nic_addr = (mac1 & 0xffffff);
+
+        wlcore_set_partition(wl, &wl->ptable[PART_DOWN]);
+}
+
+static int wl18xx_handle_static_data(struct wl1271 *wl,
+                                     struct wl1271_static_data *static_data)
+{
+        struct wl18xx_static_data_priv *static_data_priv =
+                (struct wl18xx_static_data_priv *) static_data->priv;
+
+        wl1271_info("PHY firmware version: %s", static_data_priv->phy_version);
+
+        return 0;
+}
+
+static int wl18xx_get_spare_blocks(struct wl1271 *wl, bool is_gem)
+{
+        struct wl18xx_priv *priv = wl->priv;
+
+        /* If we have VIFs requiring extra spare, indulge them */
+        if (priv->extra_spare_vif_count)
+                return WL18XX_TX_HW_EXTRA_BLOCK_SPARE;
+
+        return WL18XX_TX_HW_BLOCK_SPARE;
+}
+
+static int wl18xx_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
+                          struct ieee80211_vif *vif,
+                          struct ieee80211_sta *sta,
+                          struct ieee80211_key_conf *key_conf)
+{
+        struct wl18xx_priv *priv = wl->priv;
+        bool change_spare = false;
+        int ret;
+
+        /*
+         * when adding the first or removing the last GEM/TKIP interface,
+         * we have to adjust the number of spare blocks.
+         */
+        change_spare = (key_conf->cipher == WL1271_CIPHER_SUITE_GEM ||
+                key_conf->cipher == WLAN_CIPHER_SUITE_TKIP) &&
+                ((priv->extra_spare_vif_count == 0 && cmd == SET_KEY) ||
+                 (priv->extra_spare_vif_count == 1 && cmd == DISABLE_KEY));
+
+        /* no need to change spare - just regular set_key */
+        if (!change_spare)
+                return wlcore_set_key(wl, cmd, vif, sta, key_conf);
+
+        /*
+         * stop the queues and flush to ensure the next packets are
+         * in sync with FW spare block accounting
+         */
+        wlcore_stop_queues(wl, WLCORE_QUEUE_STOP_REASON_SPARE_BLK);
+        wl1271_tx_flush(wl);
+
+        ret = wlcore_set_key(wl, cmd, vif, sta, key_conf);
+        if (ret < 0)
+                goto out;
+
+        /* key is now set, change the spare blocks */
+        if (cmd == SET_KEY) {
+                ret = wl18xx_set_host_cfg_bitmap(wl,
+                                        WL18XX_TX_HW_EXTRA_BLOCK_SPARE);
+                if (ret < 0)
+                        goto out;
+
+                priv->extra_spare_vif_count++;
+        } else {
+                ret = wl18xx_set_host_cfg_bitmap(wl,
+                                        WL18XX_TX_HW_BLOCK_SPARE);
+                if (ret < 0)
+                        goto out;
+
+                priv->extra_spare_vif_count--;
+        }
+
+out:
+        wlcore_wake_queues(wl, WLCORE_QUEUE_STOP_REASON_SPARE_BLK);
+        return ret;
+}
+
+static u32 wl18xx_pre_pkt_send(struct wl1271 *wl,
+                               u32 buf_offset, u32 last_len)
+{
+        if (wl->quirks & WLCORE_QUIRK_TX_PAD_LAST_FRAME) {
+                struct wl1271_tx_hw_descr *last_desc;
+
+                /* get the last TX HW descriptor written to the aggr buf */
+                last_desc = (struct wl1271_tx_hw_descr *)(wl->aggr_buf +
+                                                        buf_offset - last_len);
+
+                /* the last frame is padded up to an SDIO block */
+                last_desc->wl18xx_mem.ctrl &= ~WL18XX_TX_CTRL_NOT_PADDED;
+                return ALIGN(buf_offset, WL12XX_BUS_BLOCK_SIZE);
+        }
+
+        /* no modifications */
+        return buf_offset;
+}
+
+static struct wlcore_ops wl18xx_ops = {
+        .identify_chip  = wl18xx_identify_chip,
+        .boot           = wl18xx_boot,
+        .plt_init       = wl18xx_plt_init,
+        .trigger_cmd    = wl18xx_trigger_cmd,
+        .ack_event      = wl18xx_ack_event,
+        .calc_tx_blocks = wl18xx_calc_tx_blocks,
+        .set_tx_desc_blocks = wl18xx_set_tx_desc_blocks,
+        .set_tx_desc_data_len = wl18xx_set_tx_desc_data_len,
+        .get_rx_buf_align = wl18xx_get_rx_buf_align,
+        .get_rx_packet_len = wl18xx_get_rx_packet_len,
+        .tx_immediate_compl = wl18xx_tx_immediate_completion,
+        .tx_delayed_compl = NULL,
+        .hw_init        = wl18xx_hw_init,
+        .set_tx_desc_csum = wl18xx_set_tx_desc_csum,
+        .get_pg_ver     = wl18xx_get_pg_ver,
+        .set_rx_csum = wl18xx_set_rx_csum,
+        .sta_get_ap_rate_mask = wl18xx_sta_get_ap_rate_mask,
+        .ap_get_mimo_wide_rate_mask = wl18xx_ap_get_mimo_wide_rate_mask,
+        .get_mac        = wl18xx_get_mac,
+        .debugfs_init   = wl18xx_debugfs_add_files,
+        .handle_static_data     = wl18xx_handle_static_data,
+        .get_spare_blocks = wl18xx_get_spare_blocks,
+        .set_key        = wl18xx_set_key,
+        .pre_pkt_send   = wl18xx_pre_pkt_send,
+};
+
+/* HT cap appropriate for wide channels */
+static struct ieee80211_sta_ht_cap wl18xx_siso40_ht_cap = {
+        .cap = IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40 |
+               IEEE80211_HT_CAP_SUP_WIDTH_20_40 | IEEE80211_HT_CAP_DSSSCCK40,
+        .ht_supported = true,
+        .ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K,
+        .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
+        .mcs = {
+                .rx_mask = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
+                .rx_highest = cpu_to_le16(150),
+                .tx_params = IEEE80211_HT_MCS_TX_DEFINED,
+                },
+};
+
+/* HT cap appropriate for SISO 20 */
+static struct ieee80211_sta_ht_cap wl18xx_siso20_ht_cap = {
+        .cap = IEEE80211_HT_CAP_SGI_20,
+        .ht_supported = true,
+        .ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K,
+        .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
+        .mcs = {
+                .rx_mask = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
+                .rx_highest = cpu_to_le16(72),
+                .tx_params = IEEE80211_HT_MCS_TX_DEFINED,
+                },
+};
+
+/* HT cap appropriate for MIMO rates in 20mhz channel */
+static struct ieee80211_sta_ht_cap wl18xx_mimo_ht_cap_2ghz = {
+        .cap = IEEE80211_HT_CAP_SGI_20,
+        .ht_supported = true,
+        .ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K,
+        .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
+        .mcs = {
+                .rx_mask = { 0xff, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, },
+                .rx_highest = cpu_to_le16(144),
+                .tx_params = IEEE80211_HT_MCS_TX_DEFINED,
+                },
+};
+
+static struct ieee80211_sta_ht_cap wl18xx_mimo_ht_cap_5ghz = {
+        .cap = IEEE80211_HT_CAP_SGI_20,
+        .ht_supported = true,
+        .ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K,
+        .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
+        .mcs = {
+                .rx_mask = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
+                .rx_highest = cpu_to_le16(72),
+                .tx_params = IEEE80211_HT_MCS_TX_DEFINED,
+                },
+};
+
+static int __devinit wl18xx_probe(struct platform_device *pdev)
+{
+        struct wl1271 *wl;
+        struct ieee80211_hw *hw;
+        struct wl18xx_priv *priv;
+        int ret;
+
+        hw = wlcore_alloc_hw(sizeof(*priv));
+        if (IS_ERR(hw)) {
+                wl1271_error("can't allocate hw");
+                ret = PTR_ERR(hw);
+                goto out;
+        }
+
+        wl = hw->priv;
+        priv = wl->priv;
+        wl->ops = &wl18xx_ops;
+        wl->ptable = wl18xx_ptable;
+        wl->rtable = wl18xx_rtable;
+        wl->num_tx_desc = 32;
+        wl->num_rx_desc = 16;
+        wl->band_rate_to_idx = wl18xx_band_rate_to_idx;
+        wl->hw_tx_rate_tbl_size = WL18XX_CONF_HW_RXTX_RATE_MAX;
+        wl->hw_min_ht_rate = WL18XX_CONF_HW_RXTX_RATE_MCS0;
+        wl->fw_status_priv_len = sizeof(struct wl18xx_fw_status_priv);
+        wl->stats.fw_stats_len = sizeof(struct wl18xx_acx_statistics);
+        wl->static_data_priv_len = sizeof(struct wl18xx_static_data_priv);
+
+        if (!strcmp(ht_mode_param, "wide")) {
+                memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ],
+                       &wl18xx_siso40_ht_cap,
+                       sizeof(wl18xx_siso40_ht_cap));
+                memcpy(&wl->ht_cap[IEEE80211_BAND_5GHZ],
+                       &wl18xx_siso40_ht_cap,
+                       sizeof(wl18xx_siso40_ht_cap));
+        } else if (!strcmp(ht_mode_param, "mimo")) {
+                memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ],
+                       &wl18xx_mimo_ht_cap_2ghz,
+                       sizeof(wl18xx_mimo_ht_cap_2ghz));
+                memcpy(&wl->ht_cap[IEEE80211_BAND_5GHZ],
+                       &wl18xx_mimo_ht_cap_5ghz,
+                       sizeof(wl18xx_mimo_ht_cap_5ghz));
+        } else if (!strcmp(ht_mode_param, "siso20")) {
+                memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ],
+                       &wl18xx_siso20_ht_cap,
+                       sizeof(wl18xx_siso20_ht_cap));
+                memcpy(&wl->ht_cap[IEEE80211_BAND_5GHZ],
+                       &wl18xx_siso20_ht_cap,
+                       sizeof(wl18xx_siso20_ht_cap));
+        } else {
+                wl1271_error("invalid ht_mode '%s'", ht_mode_param);
+                ret = -EINVAL;
+                goto out_free;
+        }
+
+        ret = wl18xx_conf_init(wl, &pdev->dev);
+        if (ret < 0)
+                goto out_free;
+
+        if (!strcmp(board_type_param, "fpga")) {
+                priv->conf.phy.board_type = BOARD_TYPE_FPGA_18XX;
+        } else if (!strcmp(board_type_param, "hdk")) {
+                priv->conf.phy.board_type = BOARD_TYPE_HDK_18XX;
+                /* HACK! Just for now we hardcode HDK to 0x06 */
+                priv->conf.phy.low_band_component_type = 0x06;
+        } else if (!strcmp(board_type_param, "dvp")) {
+                priv->conf.phy.board_type = BOARD_TYPE_DVP_18XX;
+        } else if (!strcmp(board_type_param, "evb")) {
+                priv->conf.phy.board_type = BOARD_TYPE_EVB_18XX;
+        } else if (!strcmp(board_type_param, "com8")) {
+                priv->conf.phy.board_type = BOARD_TYPE_COM8_18XX;
+                /* HACK! Just for now we hardcode COM8 to 0x06 */
+                priv->conf.phy.low_band_component_type = 0x06;
+        } else {
+                wl1271_error("invalid board type '%s'", board_type_param);
+                ret = -EINVAL;
+                goto out_free;
+        }
+
+        /* If the module param is set, update it in conf */
+        if (low_band_component_param != -1)
+                priv->conf.phy.low_band_component = low_band_component_param;
+        if (low_band_component_type_param != -1)
+                priv->conf.phy.low_band_component_type =
+                        low_band_component_type_param;
+        if (high_band_component_param != -1)
+                priv->conf.phy.high_band_component = high_band_component_param;
+        if (high_band_component_type_param != -1)
+                priv->conf.phy.high_band_component_type =
+                        high_band_component_type_param;
+        if (pwr_limit_reference_11_abg_param != -1)
+                priv->conf.phy.pwr_limit_reference_11_abg =
+                        pwr_limit_reference_11_abg_param;
+        if (n_antennas_2_param != -1)
+                priv->conf.phy.number_of_assembled_ant2_4 = n_antennas_2_param;
+        if (n_antennas_5_param != -1)
+                priv->conf.phy.number_of_assembled_ant5 = n_antennas_5_param;
+        if (dc2dc_param != -1)
+                priv->conf.phy.external_pa_dc2dc = dc2dc_param;
+
+        if (!checksum_param) {
+                wl18xx_ops.set_rx_csum = NULL;
+                wl18xx_ops.init_vif = NULL;
+        }
+
+        wl->enable_11a = enable_11a_param;
+
+        return wlcore_probe(wl, pdev);
+
+out_free:
+        wlcore_free_hw(wl);
+out:
+        return ret;
+}
+
+static const struct platform_device_id wl18xx_id_table[] __devinitconst = {
+        { "wl18xx", 0 },
+        {  } /* Terminating Entry */
+};
+MODULE_DEVICE_TABLE(platform, wl18xx_id_table);
+
+static struct platform_driver wl18xx_driver = {
+        .probe          = wl18xx_probe,
+        .remove         = __devexit_p(wlcore_remove),
+        .id_table       = wl18xx_id_table,
+        .driver = {
+                .name   = "wl18xx_driver",
+                .owner  = THIS_MODULE,
+        }
+};
+
+static int __init wl18xx_init(void)
+{
+        return platform_driver_register(&wl18xx_driver);
+}
+module_init(wl18xx_init);
+
+static void __exit wl18xx_exit(void)
+{
+        platform_driver_unregister(&wl18xx_driver);
+}
+module_exit(wl18xx_exit);
+
+module_param_named(ht_mode, ht_mode_param, charp, S_IRUSR);
+MODULE_PARM_DESC(ht_mode, "Force HT mode: wide (default), mimo or siso20");
+
+module_param_named(board_type, board_type_param, charp, S_IRUSR);
+MODULE_PARM_DESC(board_type, "Board type: fpga, hdk (default), evb, com8 or "
+                 "dvp");
+
+module_param_named(checksum, checksum_param, bool, S_IRUSR);
+MODULE_PARM_DESC(checksum, "Enable TCP checksum: boolean (defaults to false)");
+
+module_param_named(enable_11a, enable_11a_param, bool, S_IRUSR);
+MODULE_PARM_DESC(enable_11a, "Enable 11a (5GHz): boolean (defaults to true)");
+
+module_param_named(dc2dc, dc2dc_param, int, S_IRUSR);
+MODULE_PARM_DESC(dc2dc, "External DC2DC: u8 (defaults to 0)");
+
+module_param_named(n_antennas_2, n_antennas_2_param, int, S_IRUSR);
+MODULE_PARM_DESC(n_antennas_2,
+                 "Number of installed 2.4GHz antennas: 1 (default) or 2");
+
+module_param_named(n_antennas_5, n_antennas_5_param, int, S_IRUSR);
+MODULE_PARM_DESC(n_antennas_5,
+                 "Number of installed 5GHz antennas: 1 (default) or 2");
+
+module_param_named(low_band_component, low_band_component_param, int,
+                   S_IRUSR);
+MODULE_PARM_DESC(low_band_component, "Low band component: u8 "
+                 "(default is 0x01)");
+
+module_param_named(low_band_component_type, low_band_component_type_param,
+                   int, S_IRUSR);
+MODULE_PARM_DESC(low_band_component_type, "Low band component type: u8 "
+                 "(default is 0x05 or 0x06 depending on the board_type)");
+
+module_param_named(high_band_component, high_band_component_param, int,
+                   S_IRUSR);
+MODULE_PARM_DESC(high_band_component, "High band component: u8, "
+                 "(default is 0x01)");
+
+module_param_named(high_band_component_type, high_band_component_type_param,
+                   int, S_IRUSR);
+MODULE_PARM_DESC(high_band_component_type, "High band component type: u8 "
+                 "(default is 0x09)");
+
+module_param_named(pwr_limit_reference_11_abg,
+                   pwr_limit_reference_11_abg_param, int, S_IRUSR);
+MODULE_PARM_DESC(pwr_limit_reference_11_abg, "Power limit reference: u8 "
+                 "(default is 0xc8)");
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>");
+MODULE_FIRMWARE(WL18XX_FW_NAME);
diff --git a/drivers/net/wireless/ti/wl18xx/reg.h b/drivers/net/wireless/ti/wl18xx/reg.h
new file mode 100644
index 000000000000..937b71d8783f
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/reg.h
@@ -0,0 +1,191 @@
+/*
+ * This file is part of wlcore
+ *
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * 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 __REG_H__
+#define __REG_H__
+
+#define WL18XX_REGISTERS_BASE      0x00800000
+#define WL18XX_CODE_BASE           0x00000000
+#define WL18XX_DATA_BASE           0x00400000
+#define WL18XX_DOUBLE_BUFFER_BASE  0x00600000
+#define WL18XX_MCU_KEY_SEARCH_BASE 0x00700000
+#define WL18XX_PHY_BASE            0x00900000
+#define WL18XX_TOP_OCP_BASE        0x00A00000
+#define WL18XX_PACKET_RAM_BASE     0x00B00000
+#define WL18XX_HOST_BASE           0x00C00000
+
+#define WL18XX_REGISTERS_DOWN_SIZE 0x0000B000
+
+#define WL18XX_REG_BOOT_PART_START 0x00802000
+#define WL18XX_REG_BOOT_PART_SIZE  0x00014578
+
+#define WL18XX_PHY_INIT_MEM_ADDR   0x80926000
+
+#define WL18XX_SDIO_WSPI_BASE           (WL18XX_REGISTERS_BASE)
+#define WL18XX_REG_CONFIG_BASE          (WL18XX_REGISTERS_BASE + 0x02000)
+#define WL18XX_WGCM_REGS_BASE           (WL18XX_REGISTERS_BASE + 0x03000)
+#define WL18XX_ENC_BASE                 (WL18XX_REGISTERS_BASE + 0x04000)
+#define WL18XX_INTERRUPT_BASE           (WL18XX_REGISTERS_BASE + 0x05000)
+#define WL18XX_UART_BASE                (WL18XX_REGISTERS_BASE + 0x06000)
+#define WL18XX_WELP_BASE                (WL18XX_REGISTERS_BASE + 0x07000)
+#define WL18XX_TCP_CKSM_BASE            (WL18XX_REGISTERS_BASE + 0x08000)
+#define WL18XX_FIFO_BASE                (WL18XX_REGISTERS_BASE + 0x09000)
+#define WL18XX_OCP_BRIDGE_BASE          (WL18XX_REGISTERS_BASE + 0x0A000)
+#define WL18XX_PMAC_RX_BASE             (WL18XX_REGISTERS_BASE + 0x14800)
+#define WL18XX_PMAC_ACM_BASE            (WL18XX_REGISTERS_BASE + 0x14C00)
+#define WL18XX_PMAC_TX_BASE             (WL18XX_REGISTERS_BASE + 0x15000)
+#define WL18XX_PMAC_CSR_BASE            (WL18XX_REGISTERS_BASE + 0x15400)
+
+#define WL18XX_REG_ECPU_CONTROL         (WL18XX_REGISTERS_BASE + 0x02004)
+#define WL18XX_REG_INTERRUPT_NO_CLEAR   (WL18XX_REGISTERS_BASE + 0x050E8)
+#define WL18XX_REG_INTERRUPT_ACK        (WL18XX_REGISTERS_BASE + 0x050F0)
+#define WL18XX_REG_INTERRUPT_TRIG       (WL18XX_REGISTERS_BASE + 0x5074)
+#define WL18XX_REG_INTERRUPT_TRIG_H     (WL18XX_REGISTERS_BASE + 0x5078)
+#define WL18XX_REG_INTERRUPT_MASK       (WL18XX_REGISTERS_BASE + 0x0050DC)
+
+#define WL18XX_REG_CHIP_ID_B            (WL18XX_REGISTERS_BASE + 0x01542C)
+
+#define WL18XX_SLV_MEM_DATA             (WL18XX_HOST_BASE + 0x0018)
+#define WL18XX_SLV_REG_DATA             (WL18XX_HOST_BASE + 0x0008)
+
+/* Scratch Pad registers*/
+#define WL18XX_SCR_PAD0                 (WL18XX_REGISTERS_BASE + 0x0154EC)
+#define WL18XX_SCR_PAD1                 (WL18XX_REGISTERS_BASE + 0x0154F0)
+#define WL18XX_SCR_PAD2                 (WL18XX_REGISTERS_BASE + 0x0154F4)
+#define WL18XX_SCR_PAD3                 (WL18XX_REGISTERS_BASE + 0x0154F8)
+#define WL18XX_SCR_PAD4                 (WL18XX_REGISTERS_BASE + 0x0154FC)
+#define WL18XX_SCR_PAD4_SET             (WL18XX_REGISTERS_BASE + 0x015504)
+#define WL18XX_SCR_PAD4_CLR             (WL18XX_REGISTERS_BASE + 0x015500)
+#define WL18XX_SCR_PAD5                 (WL18XX_REGISTERS_BASE + 0x015508)
+#define WL18XX_SCR_PAD5_SET             (WL18XX_REGISTERS_BASE + 0x015510)
+#define WL18XX_SCR_PAD5_CLR             (WL18XX_REGISTERS_BASE + 0x01550C)
+#define WL18XX_SCR_PAD6                 (WL18XX_REGISTERS_BASE + 0x015514)
+#define WL18XX_SCR_PAD7                 (WL18XX_REGISTERS_BASE + 0x015518)
+#define WL18XX_SCR_PAD8                 (WL18XX_REGISTERS_BASE + 0x01551C)
+#define WL18XX_SCR_PAD9                 (WL18XX_REGISTERS_BASE + 0x015520)
+
+/* Spare registers*/
+#define WL18XX_SPARE_A1                 (WL18XX_REGISTERS_BASE + 0x002194)
+#define WL18XX_SPARE_A2                 (WL18XX_REGISTERS_BASE + 0x002198)
+#define WL18XX_SPARE_A3                 (WL18XX_REGISTERS_BASE + 0x00219C)
+#define WL18XX_SPARE_A4                 (WL18XX_REGISTERS_BASE + 0x0021A0)
+#define WL18XX_SPARE_A5                 (WL18XX_REGISTERS_BASE + 0x0021A4)
+#define WL18XX_SPARE_A6                 (WL18XX_REGISTERS_BASE + 0x0021A8)
+#define WL18XX_SPARE_A7                 (WL18XX_REGISTERS_BASE + 0x0021AC)
+#define WL18XX_SPARE_A8                 (WL18XX_REGISTERS_BASE + 0x0021B0)
+#define WL18XX_SPARE_B1                 (WL18XX_REGISTERS_BASE + 0x015524)
+#define WL18XX_SPARE_B2                 (WL18XX_REGISTERS_BASE + 0x015528)
+#define WL18XX_SPARE_B3                 (WL18XX_REGISTERS_BASE + 0x01552C)
+#define WL18XX_SPARE_B4                 (WL18XX_REGISTERS_BASE + 0x015530)
+#define WL18XX_SPARE_B5                 (WL18XX_REGISTERS_BASE + 0x015534)
+#define WL18XX_SPARE_B6                 (WL18XX_REGISTERS_BASE + 0x015538)
+#define WL18XX_SPARE_B7                 (WL18XX_REGISTERS_BASE + 0x01553C)
+#define WL18XX_SPARE_B8                 (WL18XX_REGISTERS_BASE + 0x015540)
+
+#define WL18XX_REG_COMMAND_MAILBOX_PTR  (WL18XX_SCR_PAD0)
+#define WL18XX_REG_EVENT_MAILBOX_PTR    (WL18XX_SCR_PAD1)
+#define WL18XX_EEPROMLESS_IND           (WL18XX_SCR_PAD4)
+
+#define WL18XX_WELP_ARM_COMMAND         (WL18XX_REGISTERS_BASE + 0x7100)
+#define WL18XX_ENABLE                   (WL18XX_REGISTERS_BASE + 0x01543C)
+
+/* PRCM registers */
+#define PLATFORM_DETECTION              0xA0E3E0
+#define OCS_EN                          0xA02080
+#define PRIMARY_CLK_DETECT              0xA020A6
+#define PLLSH_WCS_PLL_N                 0xA02362
+#define PLLSH_WCS_PLL_M                 0xA02360
+#define PLLSH_WCS_PLL_Q_FACTOR_CFG_1    0xA02364
+#define PLLSH_WCS_PLL_Q_FACTOR_CFG_2    0xA02366
+#define PLLSH_WCS_PLL_P_FACTOR_CFG_1    0xA02368
+#define PLLSH_WCS_PLL_P_FACTOR_CFG_2    0xA0236A
+#define PLLSH_WCS_PLL_SWALLOW_EN        0xA0236C
+#define PLLSH_WL_PLL_EN                 0xA02392
+
+#define PLLSH_WCS_PLL_Q_FACTOR_CFG_1_MASK       0xFFFF
+#define PLLSH_WCS_PLL_Q_FACTOR_CFG_2_MASK       0x007F
+#define PLLSH_WCS_PLL_P_FACTOR_CFG_1_MASK       0xFFFF
+#define PLLSH_WCS_PLL_P_FACTOR_CFG_2_MASK       0x000F
+
+#define PLLSH_WCS_PLL_SWALLOW_EN_VAL1   0x1
+#define PLLSH_WCS_PLL_SWALLOW_EN_VAL2   0x12
+
+#define WL18XX_REG_FUSE_DATA_1_3        0xA0260C
+#define WL18XX_PG_VER_MASK              0x70
+#define WL18XX_PG_VER_OFFSET            4
+
+#define WL18XX_REG_FUSE_BD_ADDR_1       0xA02602
+#define WL18XX_REG_FUSE_BD_ADDR_2       0xA02606
+
+#define WL18XX_CMD_MBOX_ADDRESS         0xB007B4
+
+#define WL18XX_FW_STATUS_ADDR           0x50F8
+
+#define CHIP_ID_185x_PG10              (0x06030101)
+#define CHIP_ID_185x_PG20              (0x06030111)
+
+/*
+ * Host Command Interrupt. Setting this bit masks
+ * the interrupt that the host issues to inform
+ * the FW that it has sent a command
+ * to the Wlan hardware Command Mailbox.
+ */
+#define WL18XX_INTR_TRIG_CMD       BIT(28)
+
+/*
+ * Host Event Acknowlegde Interrupt. The host
+ * sets this bit to acknowledge that it received
+ * the unsolicited information from the event
+ * mailbox.
+ */
+#define WL18XX_INTR_TRIG_EVENT_ACK BIT(29)
+
+/*
+ * To boot the firmware in PLT mode we need to write this value in
+ * SCR_PAD8 before starting.
+ */
+#define WL18XX_SCR_PAD8_PLT     0xBABABEBE
+
+enum {
+        COMPONENT_NO_SWITCH     = 0x0,
+        COMPONENT_2_WAY_SWITCH  = 0x1,
+        COMPONENT_3_WAY_SWITCH  = 0x2,
+        COMPONENT_MATCHING      = 0x3,
+};
+
+enum {
+        FEM_NONE        = 0x0,
+        FEM_VENDOR_1    = 0x1,
+        FEM_VENDOR_2    = 0x2,
+        FEM_VENDOR_3    = 0x3,
+};
+
+enum {
+        BOARD_TYPE_EVB_18XX     = 0,
+        BOARD_TYPE_DVP_18XX     = 1,
+        BOARD_TYPE_HDK_18XX     = 2,
+        BOARD_TYPE_FPGA_18XX    = 3,
+        BOARD_TYPE_COM8_18XX    = 4,
+
+        NUM_BOARD_TYPES,
+};
+
+#endif /* __REG_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/tx.c b/drivers/net/wireless/ti/wl18xx/tx.c
new file mode 100644
index 000000000000..5b1fb10d9fd7
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/tx.c
@@ -0,0 +1,127 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * 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 "../wlcore/wlcore.h"
+#include "../wlcore/cmd.h"
+#include "../wlcore/debug.h"
+#include "../wlcore/acx.h"
+#include "../wlcore/tx.h"
+
+#include "wl18xx.h"
+#include "tx.h"
+
+static void wl18xx_tx_complete_packet(struct wl1271 *wl, u8 tx_stat_byte)
+{
+        struct ieee80211_tx_info *info;
+        struct sk_buff *skb;
+        int id = tx_stat_byte & WL18XX_TX_STATUS_DESC_ID_MASK;
+        bool tx_success;
+
+        /* check for id legality */
+        if (unlikely(id >= wl->num_tx_desc || wl->tx_frames[id] == NULL)) {
+                wl1271_warning("illegal id in tx completion: %d", id);
+                return;
+        }
+
+        /* a zero bit indicates Tx success */
+        tx_success = !(tx_stat_byte & BIT(WL18XX_TX_STATUS_STAT_BIT_IDX));
+
+
+        skb = wl->tx_frames[id];
+        info = IEEE80211_SKB_CB(skb);
+
+        if (wl12xx_is_dummy_packet(wl, skb)) {
+                wl1271_free_tx_id(wl, id);
+                return;
+        }
+
+        /* update the TX status info */
+        if (tx_success && !(info->flags & IEEE80211_TX_CTL_NO_ACK))
+                info->flags |= IEEE80211_TX_STAT_ACK;
+
+        /* no real data about Tx completion */
+        info->status.rates[0].idx = -1;
+        info->status.rates[0].count = 0;
+        info->status.rates[0].flags = 0;
+        info->status.ack_signal = -1;
+
+        if (!tx_success)
+                wl->stats.retry_count++;
+
+        /*
+         * TODO: update sequence number for encryption? seems to be
+         * unsupported for now. needed for recovery with encryption.
+         */
+
+        /* remove private header from packet */
+        skb_pull(skb, sizeof(struct wl1271_tx_hw_descr));
+
+        /* remove TKIP header space if present */
+        if ((wl->quirks & WLCORE_QUIRK_TKIP_HEADER_SPACE) &&
+            info->control.hw_key &&
+            info->control.hw_key->cipher == WLAN_CIPHER_SUITE_TKIP) {
+                int hdrlen = ieee80211_get_hdrlen_from_skb(skb);
+                memmove(skb->data + WL1271_EXTRA_SPACE_TKIP, skb->data, hdrlen);
+                skb_pull(skb, WL1271_EXTRA_SPACE_TKIP);
+        }
+
+        wl1271_debug(DEBUG_TX, "tx status id %u skb 0x%p success %d",
+                     id, skb, tx_success);
+
+        /* return the packet to the stack */
+        skb_queue_tail(&wl->deferred_tx_queue, skb);
+        queue_work(wl->freezable_wq, &wl->netstack_work);
+        wl1271_free_tx_id(wl, id);
+}
+
+void wl18xx_tx_immediate_complete(struct wl1271 *wl)
+{
+        struct wl18xx_fw_status_priv *status_priv =
+                (struct wl18xx_fw_status_priv *)wl->fw_status_2->priv;
+        struct wl18xx_priv *priv = wl->priv;
+        u8 i;
+
+        /* nothing to do here */
+        if (priv->last_fw_rls_idx == status_priv->fw_release_idx)
+                return;
+
+        /* freed Tx descriptors */
+        wl1271_debug(DEBUG_TX, "last released desc = %d, current idx = %d",
+                     priv->last_fw_rls_idx, status_priv->fw_release_idx);
+
+        if (status_priv->fw_release_idx >= WL18XX_FW_MAX_TX_STATUS_DESC) {
+                wl1271_error("invalid desc release index %d",
+                             status_priv->fw_release_idx);
+                WARN_ON(1);
+                return;
+        }
+
+        for (i = priv->last_fw_rls_idx;
+             i != status_priv->fw_release_idx;
+             i = (i + 1) % WL18XX_FW_MAX_TX_STATUS_DESC) {
+                wl18xx_tx_complete_packet(wl,
+                        status_priv->released_tx_desc[i]);
+
+                wl->tx_results_count++;
+        }
+
+        priv->last_fw_rls_idx = status_priv->fw_release_idx;
+}
diff --git a/drivers/net/wireless/ti/wl18xx/tx.h b/drivers/net/wireless/ti/wl18xx/tx.h
new file mode 100644
index 000000000000..ccddc548e44a
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/tx.h
@@ -0,0 +1,46 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * 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 __WL18XX_TX_H__
+#define __WL18XX_TX_H__
+
+#include "../wlcore/wlcore.h"
+
+#define WL18XX_TX_HW_BLOCK_SPARE        1
+/* for special cases - namely, TKIP and GEM */
+#define WL18XX_TX_HW_EXTRA_BLOCK_SPARE  2
+#define WL18XX_TX_HW_BLOCK_SIZE         268
+
+#define WL18XX_TX_STATUS_DESC_ID_MASK    0x7F
+#define WL18XX_TX_STATUS_STAT_BIT_IDX    7
+
+/* Indicates this TX HW frame is not padded to SDIO block size */
+#define WL18XX_TX_CTRL_NOT_PADDED       BIT(7)
+
+/*
+ * The FW uses a special bit to indicate a wide channel should be used in
+ * the rate policy.
+ */
+#define CONF_TX_RATE_USE_WIDE_CHAN BIT(31)
+
+void wl18xx_tx_immediate_complete(struct wl1271 *wl);
+
+#endif /* __WL12XX_TX_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/wl18xx.h b/drivers/net/wireless/ti/wl18xx/wl18xx.h
new file mode 100644
index 000000000000..bc67a4750615
--- /dev/null
+++ b/drivers/net/wireless/ti/wl18xx/wl18xx.h
@@ -0,0 +1,88 @@
+/*
+ * This file is part of wl18xx
+ *
+ * Copyright (C) 2011 Texas Instruments Inc.
+ *
+ * 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 __WL18XX_PRIV_H__
+#define __WL18XX_PRIV_H__
+
+#include "conf.h"
+
+#define WL18XX_CMD_MAX_SIZE          740
+
+struct wl18xx_priv {
+        /* buffer for sending commands to FW */
+        u8 cmd_buf[WL18XX_CMD_MAX_SIZE];
+
+        struct wl18xx_priv_conf conf;
+
+        /* Index of last released Tx desc in FW */
+        u8 last_fw_rls_idx;
+
+        /* number of VIFs requiring extra spare mem-blocks */
+        int extra_spare_vif_count;
+};
+
+#define WL18XX_FW_MAX_TX_STATUS_DESC 33
+
+struct wl18xx_fw_status_priv {
+        /*
+         * Index in released_tx_desc for first byte that holds
+         * released tx host desc
+         */
+        u8 fw_release_idx;
+
+        /*
+         * Array of host Tx descriptors, where fw_release_idx
+         * indicated the first released idx.
+         */
+        u8 released_tx_desc[WL18XX_FW_MAX_TX_STATUS_DESC];
+
+        u8 padding[2];
+};
+
+#define WL18XX_PHY_VERSION_MAX_LEN 20
+
+struct wl18xx_static_data_priv {
+        char phy_version[WL18XX_PHY_VERSION_MAX_LEN];
+};
+
+struct wl18xx_clk_cfg {
+        u32 n;
+        u32 m;
+        u32 p;
+        u32 q;
+        bool swallow;
+};
+
+enum {
+        CLOCK_CONFIG_16_2_M     = 1,
+        CLOCK_CONFIG_16_368_M,
+        CLOCK_CONFIG_16_8_M,
+        CLOCK_CONFIG_19_2_M,
+        CLOCK_CONFIG_26_M,
+        CLOCK_CONFIG_32_736_M,
+        CLOCK_CONFIG_33_6_M,
+        CLOCK_CONFIG_38_468_M,
+        CLOCK_CONFIG_52_M,
+
+        NUM_CLOCK_CONFIGS,
+};
+
+#endif /* __WL18XX_PRIV_H__ */
diff --git a/drivers/net/wireless/ti/wlcore/acx.c b/drivers/net/wireless/ti/wlcore/acx.c
index f3d6fa508269..b9ec42c83757 100644
--- a/drivers/net/wireless/ti/wlcore/acx.c
+++ b/drivers/net/wireless/ti/wlcore/acx.c
@@ -86,6 +86,7 @@ out:
         kfree(auth);
         return ret;
 }
+EXPORT_SYMBOL_GPL(wl1271_acx_sleep_auth);
 
 int wl1271_acx_tx_power(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                         int power)
@@ -708,14 +709,14 @@ out:
         return ret;
 }
 
-int wl1271_acx_statistics(struct wl1271 *wl, struct acx_statistics *stats)
+int wl1271_acx_statistics(struct wl1271 *wl, void *stats)
 {
         int ret;
 
         wl1271_debug(DEBUG_ACX, "acx statistics");
 
         ret = wl1271_cmd_interrogate(wl, ACX_STATISTICS, stats,
-                                     sizeof(*stats));
+                                     wl->stats.fw_stats_len);
         if (ret < 0) {
                 wl1271_warning("acx statistics failed: %d", ret);
                 return -ENOMEM;
@@ -997,6 +998,7 @@ out:
         kfree(mem_conf);
         return ret;
 }
+EXPORT_SYMBOL_GPL(wl12xx_acx_mem_cfg);
 
 int wl1271_acx_init_mem_config(struct wl1271 *wl)
 {
@@ -1027,6 +1029,7 @@ int wl1271_acx_init_mem_config(struct wl1271 *wl)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(wl1271_acx_init_mem_config);
 
 int wl1271_acx_init_rx_interrupt(struct wl1271 *wl)
 {
@@ -1150,6 +1153,7 @@ out:
         kfree(acx);
         return ret;
 }
+EXPORT_SYMBOL_GPL(wl1271_acx_pm_config);
 
 int wl1271_acx_keep_alive_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                                bool enable)
diff --git a/drivers/net/wireless/ti/wlcore/acx.h b/drivers/net/wireless/ti/wlcore/acx.h
index e6a74869a5ff..c0181258b722 100644
--- a/drivers/net/wireless/ti/wlcore/acx.h
+++ b/drivers/net/wireless/ti/wlcore/acx.h
@@ -51,21 +51,18 @@
 #define WL1271_ACX_INTR_TRACE_A            BIT(7)
 /* Trace message on MBOX #B */
 #define WL1271_ACX_INTR_TRACE_B            BIT(8)
+/* SW FW Initiated interrupt Watchdog timer expiration */
+#define WL1271_ACX_SW_INTR_WATCHDOG        BIT(9)
 
-#define WL1271_ACX_INTR_ALL                0xFFFFFFFF
-#define WL1271_ACX_ALL_EVENTS_VECTOR       (WL1271_ACX_INTR_WATCHDOG      | \
-                                            WL1271_ACX_INTR_INIT_COMPLETE | \
-                                            WL1271_ACX_INTR_EVENT_A       | \
-                                            WL1271_ACX_INTR_EVENT_B       | \
-                                            WL1271_ACX_INTR_CMD_COMPLETE  | \
-                                            WL1271_ACX_INTR_HW_AVAILABLE  | \
-                                            WL1271_ACX_INTR_DATA)
-
-#define WL1271_INTR_MASK                   (WL1271_ACX_INTR_WATCHDOG     | \
-                                            WL1271_ACX_INTR_EVENT_A      | \
-                                            WL1271_ACX_INTR_EVENT_B      | \
-                                            WL1271_ACX_INTR_HW_AVAILABLE | \
-                                            WL1271_ACX_INTR_DATA)
+#define WL1271_ACX_INTR_ALL             0xFFFFFFFF
+
+/* all possible interrupts - only appropriate ones will be masked in */
+#define WLCORE_ALL_INTR_MASK            (WL1271_ACX_INTR_WATCHDOG     | \
+                                        WL1271_ACX_INTR_EVENT_A       | \
+                                        WL1271_ACX_INTR_EVENT_B       | \
+                                        WL1271_ACX_INTR_HW_AVAILABLE  | \
+                                        WL1271_ACX_INTR_DATA          | \
+                                        WL1271_ACX_SW_INTR_WATCHDOG)
 
 /* Target's information element */
 struct acx_header {
@@ -417,228 +414,6 @@ struct acx_ctsprotect {
         u8 padding[2];
 } __packed;
 
-struct acx_tx_statistics {
-        __le32 internal_desc_overflow;
-}  __packed;
-
-struct acx_rx_statistics {
-        __le32 out_of_mem;
-        __le32 hdr_overflow;
-        __le32 hw_stuck;
-        __le32 dropped;
-        __le32 fcs_err;
-        __le32 xfr_hint_trig;
-        __le32 path_reset;
-        __le32 reset_counter;
-} __packed;
-
-struct acx_dma_statistics {
-        __le32 rx_requested;
-        __le32 rx_errors;
-        __le32 tx_requested;
-        __le32 tx_errors;
-}  __packed;
-
-struct acx_isr_statistics {
-        /* host command complete */
-        __le32 cmd_cmplt;
-
-        /* fiqisr() */
-        __le32 fiqs;
-
-        /* (INT_STS_ND & INT_TRIG_RX_HEADER) */
-        __le32 rx_headers;
-
-        /* (INT_STS_ND & INT_TRIG_RX_CMPLT) */
-        __le32 rx_completes;
-
-        /* (INT_STS_ND & INT_TRIG_NO_RX_BUF) */
-        __le32 rx_mem_overflow;
-
-        /* (INT_STS_ND & INT_TRIG_S_RX_RDY) */
-        __le32 rx_rdys;
-
-        /* irqisr() */
-        __le32 irqs;
-
-        /* (INT_STS_ND & INT_TRIG_TX_PROC) */
-        __le32 tx_procs;
-
-        /* (INT_STS_ND & INT_TRIG_DECRYPT_DONE) */
-        __le32 decrypt_done;
-
-        /* (INT_STS_ND & INT_TRIG_DMA0) */
-        __le32 dma0_done;
-
-        /* (INT_STS_ND & INT_TRIG_DMA1) */
-        __le32 dma1_done;
-
-        /* (INT_STS_ND & INT_TRIG_TX_EXC_CMPLT) */
-        __le32 tx_exch_complete;
-
-        /* (INT_STS_ND & INT_TRIG_COMMAND) */
-        __le32 commands;
-
-        /* (INT_STS_ND & INT_TRIG_RX_PROC) */
-        __le32 rx_procs;
-
-        /* (INT_STS_ND & INT_TRIG_PM_802) */
-        __le32 hw_pm_mode_changes;
-
-        /* (INT_STS_ND & INT_TRIG_ACKNOWLEDGE) */
-        __le32 host_acknowledges;
-
-        /* (INT_STS_ND & INT_TRIG_PM_PCI) */
-        __le32 pci_pm;
-
-        /* (INT_STS_ND & INT_TRIG_ACM_WAKEUP) */
-        __le32 wakeups;
-
-        /* (INT_STS_ND & INT_TRIG_LOW_RSSI) */
-        __le32 low_rssi;
-} __packed;
-
-struct acx_wep_statistics {
-        /* WEP address keys configured */
-        __le32 addr_key_count;
-
-        /* default keys configured */
-        __le32 default_key_count;
-
-        __le32 reserved;
-
-        /* number of times that WEP key not found on lookup */
-        __le32 key_not_found;
-
-        /* number of times that WEP key decryption failed */
-        __le32 decrypt_fail;
-
-        /* WEP packets decrypted */
-        __le32 packets;
-
-        /* WEP decrypt interrupts */
-        __le32 interrupt;
-} __packed;
-
-#define ACX_MISSED_BEACONS_SPREAD 10
-
-struct acx_pwr_statistics {
-        /* the amount of enters into power save mode (both PD & ELP) */
-        __le32 ps_enter;
-
-        /* the amount of enters into ELP mode */
-        __le32 elp_enter;
-
-        /* the amount of missing beacon interrupts to the host */
-        __le32 missing_bcns;
-
-        /* the amount of wake on host-access times */
-        __le32 wake_on_host;
-
-        /* the amount of wake on timer-expire */
-        __le32 wake_on_timer_exp;
-
-        /* the number of packets that were transmitted with PS bit set */
-        __le32 tx_with_ps;
-
-        /* the number of packets that were transmitted with PS bit clear */
-        __le32 tx_without_ps;
-
-        /* the number of received beacons */
-        __le32 rcvd_beacons;
-
-        /* the number of entering into PowerOn (power save off) */
-        __le32 power_save_off;
-
-        /* the number of entries into power save mode */
-        __le16 enable_ps;
-
-        /*
-         * the number of exits from power save, not including failed PS
-         * transitions
-         */
-        __le16 disable_ps;
-
-        /*
-         * the number of times the TSF counter was adjusted because
-         * of drift
-         */
-        __le32 fix_tsf_ps;
-
-        /* Gives statistics about the spread continuous missed beacons.
-         * The 16 LSB are dedicated for the PS mode.
-         * The 16 MSB are dedicated for the PS mode.
-         * cont_miss_bcns_spread[0] - single missed beacon.
-         * cont_miss_bcns_spread[1] - two continuous missed beacons.
-         * cont_miss_bcns_spread[2] - three continuous missed beacons.
-         * ...
-         * cont_miss_bcns_spread[9] - ten and more continuous missed beacons.
-        */
-        __le32 cont_miss_bcns_spread[ACX_MISSED_BEACONS_SPREAD];
-
-        /* the number of beacons in awake mode */
-        __le32 rcvd_awake_beacons;
-} __packed;
-
-struct acx_mic_statistics {
-        __le32 rx_pkts;
-        __le32 calc_failure;
-} __packed;
-
-struct acx_aes_statistics {
-        __le32 encrypt_fail;
-        __le32 decrypt_fail;
-        __le32 encrypt_packets;
-        __le32 decrypt_packets;
-        __le32 encrypt_interrupt;
-        __le32 decrypt_interrupt;
-} __packed;
-
-struct acx_event_statistics {
-        __le32 heart_beat;
-        __le32 calibration;
-        __le32 rx_mismatch;
-        __le32 rx_mem_empty;
-        __le32 rx_pool;
-        __le32 oom_late;
-        __le32 phy_transmit_error;
-        __le32 tx_stuck;
-} __packed;
-
-struct acx_ps_statistics {
-        __le32 pspoll_timeouts;
-        __le32 upsd_timeouts;
-        __le32 upsd_max_sptime;
-        __le32 upsd_max_apturn;
-        __le32 pspoll_max_apturn;
-        __le32 pspoll_utilization;
-        __le32 upsd_utilization;
-} __packed;
-
-struct acx_rxpipe_statistics {
-        __le32 rx_prep_beacon_drop;
-        __le32 descr_host_int_trig_rx_data;
-        __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;
-} __packed;
-
-struct acx_statistics {
-        struct acx_header header;
-
-        struct acx_tx_statistics tx;
-        struct acx_rx_statistics rx;
-        struct acx_dma_statistics dma;
-        struct acx_isr_statistics isr;
-        struct acx_wep_statistics wep;
-        struct acx_pwr_statistics pwr;
-        struct acx_aes_statistics aes;
-        struct acx_mic_statistics mic;
-        struct acx_event_statistics event;
-        struct acx_ps_statistics ps;
-        struct acx_rxpipe_statistics rxpipe;
-} __packed;
-
 struct acx_rate_class {
         __le32 enabled_rates;
         u8 short_retry_limit;
@@ -828,6 +603,8 @@ struct wl1271_acx_keep_alive_config {
 #define HOST_IF_CFG_RX_FIFO_ENABLE     BIT(0)
 #define HOST_IF_CFG_TX_EXTRA_BLKS_SWAP BIT(1)
 #define HOST_IF_CFG_TX_PAD_TO_SDIO_BLK BIT(3)
+#define HOST_IF_CFG_RX_PAD_TO_SDIO_BLK BIT(4)
+#define HOST_IF_CFG_ADD_RX_ALIGNMENT   BIT(6)
 
 enum {
         WL1271_ACX_TRIG_TYPE_LEVEL = 0,
@@ -946,7 +723,7 @@ struct wl1271_acx_ht_information {
         u8 padding[2];
 } __packed;
 
-#define RX_BA_MAX_SESSIONS 2
+#define RX_BA_MAX_SESSIONS 3
 
 struct wl1271_acx_ba_initiator_policy {
         struct acx_header header;
@@ -1243,6 +1020,7 @@ enum {
         ACX_CONFIG_HANGOVER              = 0x0042,
         ACX_FEATURE_CFG                  = 0x0043,
         ACX_PROTECTION_CFG               = 0x0044,
+        ACX_CHECKSUM_CONFIG              = 0x0045,
 };
 
 
@@ -1281,7 +1059,7 @@ int wl1271_acx_set_preamble(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                             enum acx_preamble_type preamble);
 int wl1271_acx_cts_protect(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                            enum acx_ctsprotect_type ctsprotect);
-int wl1271_acx_statistics(struct wl1271 *wl, struct acx_statistics *stats);
+int wl1271_acx_statistics(struct wl1271 *wl, void *stats);
 int wl1271_acx_sta_rate_policies(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 int wl1271_acx_ap_rate_policy(struct wl1271 *wl, struct conf_tx_rate_class *c,
                       u8 idx);
diff --git a/drivers/net/wireless/ti/wlcore/boot.c b/drivers/net/wireless/ti/wlcore/boot.c
index 9b98230f84ce..0fda500c01c9 100644
--- a/drivers/net/wireless/ti/wlcore/boot.c
+++ b/drivers/net/wireless/ti/wlcore/boot.c
@@ -45,10 +45,17 @@ static void wl1271_boot_set_ecpu_ctrl(struct wl1271 *wl, u32 flag)
         wlcore_write_reg(wl, REG_ECPU_CONTROL, cpu_ctrl);
 }
 
-static int wlcore_parse_fw_ver(struct wl1271 *wl)
+static int wlcore_boot_parse_fw_ver(struct wl1271 *wl,
+                                    struct wl1271_static_data *static_data)
 {
         int ret;
 
+        strncpy(wl->chip.fw_ver_str, static_data->fw_version,
+                sizeof(wl->chip.fw_ver_str));
+
+        /* make sure the string is NULL-terminated */
+        wl->chip.fw_ver_str[sizeof(wl->chip.fw_ver_str) - 1] = '\0';
+
         ret = sscanf(wl->chip.fw_ver_str + 4, "%u.%u.%u.%u.%u",
                      &wl->chip.fw_ver[0], &wl->chip.fw_ver[1],
                      &wl->chip.fw_ver[2], &wl->chip.fw_ver[3],
@@ -57,43 +64,43 @@ static int wlcore_parse_fw_ver(struct wl1271 *wl)
         if (ret != 5) {
                 wl1271_warning("fw version incorrect value");
                 memset(wl->chip.fw_ver, 0, sizeof(wl->chip.fw_ver));
-                return -EINVAL;
+                ret = -EINVAL;
+                goto out;
         }
 
         ret = wlcore_identify_fw(wl);
         if (ret < 0)
-                return ret;
-
-        return 0;
+                goto out;
+out:
+        return ret;
 }
 
-static int wlcore_boot_fw_version(struct wl1271 *wl)
+static int wlcore_boot_static_data(struct wl1271 *wl)
 {
         struct wl1271_static_data *static_data;
+        size_t len = sizeof(*static_data) + wl->static_data_priv_len;
         int ret;
 
-        static_data = kmalloc(sizeof(*static_data), GFP_KERNEL | GFP_DMA);
+        static_data = kmalloc(len, GFP_KERNEL);
         if (!static_data) {
-                wl1271_error("Couldn't allocate memory for static data!");
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out;
         }
 
-        wl1271_read(wl, wl->cmd_box_addr, static_data, sizeof(*static_data),
-                    false);
-
-        strncpy(wl->chip.fw_ver_str, static_data->fw_version,
-                sizeof(wl->chip.fw_ver_str));
-
-        kfree(static_data);
+        wl1271_read(wl, wl->cmd_box_addr, static_data, len, false);
 
-        /* make sure the string is NULL-terminated */
-        wl->chip.fw_ver_str[sizeof(wl->chip.fw_ver_str) - 1] = '\0';
+        ret = wlcore_boot_parse_fw_ver(wl, static_data);
+        if (ret < 0)
+                goto out_free;
 
-        ret = wlcore_parse_fw_ver(wl);
+        ret = wlcore_handle_static_data(wl, static_data);
         if (ret < 0)
-                return ret;
+                goto out_free;
 
-        return 0;
+out_free:
+        kfree(static_data);
+out:
+        return ret;
 }
 
 static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
@@ -204,8 +211,10 @@ int wlcore_boot_upload_nvs(struct wl1271 *wl)
         u32 dest_addr, val;
         u8 *nvs_ptr, *nvs_aligned;
 
-        if (wl->nvs == NULL)
+        if (wl->nvs == NULL) {
+                wl1271_error("NVS file is needed during boot");
                 return -ENODEV;
+        }
 
         if (wl->quirks & WLCORE_QUIRK_LEGACY_NVS) {
                 struct wl1271_nvs_file *nvs =
@@ -400,9 +409,9 @@ int wlcore_boot_run_firmware(struct wl1271 *wl)
         wl1271_debug(DEBUG_MAILBOX, "MBOX ptrs: 0x%x 0x%x",
                      wl->mbox_ptr[0], wl->mbox_ptr[1]);
 
-        ret = wlcore_boot_fw_version(wl);
+        ret = wlcore_boot_static_data(wl);
         if (ret < 0) {
-                wl1271_error("couldn't boot firmware");
+                wl1271_error("error getting static data");
                 return ret;
         }
 
diff --git a/drivers/net/wireless/ti/wlcore/boot.h b/drivers/net/wireless/ti/wlcore/boot.h
index 094981dd2227..a525225f990c 100644
--- a/drivers/net/wireless/ti/wlcore/boot.h
+++ b/drivers/net/wireless/ti/wlcore/boot.h
@@ -40,6 +40,7 @@ struct wl1271_static_data {
         u8 fw_version[WL1271_FW_VERSION_MAX_LEN];
         u32 hw_version;
         u8 tx_power_table[WL1271_NO_SUBBANDS][WL1271_NO_POWER_LEVELS];
+        u8 priv[0];
 };
 
 /* number of times we try to read the INIT interrupt */
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index 5b128a971449..885364ca4344 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -36,6 +36,7 @@
 #include "cmd.h"
 #include "event.h"
 #include "tx.h"
+#include "hw_ops.h"
 
 #define WL1271_CMD_FAST_POLL_COUNT       50
 
@@ -291,6 +292,23 @@ static int wl12xx_get_new_session_id(struct wl1271 *wl,
         return wlvif->session_counter;
 }
 
+static u8 wlcore_get_native_channel_type(u8 nl_channel_type)
+{
+        switch (nl_channel_type) {
+        case NL80211_CHAN_NO_HT:
+                return WLCORE_CHAN_NO_HT;
+        case NL80211_CHAN_HT20:
+                return WLCORE_CHAN_HT20;
+        case NL80211_CHAN_HT40MINUS:
+                return WLCORE_CHAN_HT40MINUS;
+        case NL80211_CHAN_HT40PLUS:
+                return WLCORE_CHAN_HT40PLUS;
+        default:
+                WARN_ON(1);
+                return WLCORE_CHAN_NO_HT;
+        }
+}
+
 static int wl12xx_cmd_role_start_dev(struct wl1271 *wl,
                                      struct wl12xx_vif *wlvif)
 {
@@ -407,6 +425,7 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         memcpy(cmd->sta.ssid, wlvif->ssid, wlvif->ssid_len);
         memcpy(cmd->sta.bssid, vif->bss_conf.bssid, ETH_ALEN);
         cmd->sta.local_rates = cpu_to_le32(wlvif->rate_set);
+        cmd->channel_type = wlcore_get_native_channel_type(wlvif->channel_type);
 
         if (wlvif->sta.hlid == WL12XX_INVALID_LINK_ID) {
                 ret = wl12xx_allocate_link(wl, wlvif, &wlvif->sta.hlid);
@@ -482,6 +501,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         struct wl12xx_cmd_role_start *cmd;
         struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
         struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
+        u32 supported_rates;
         int ret;
 
         wl1271_debug(DEBUG_CMD, "cmd role start ap %d", wlvif->role_id);
@@ -519,6 +539,7 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         /* FIXME: Change when adding DFS */
         cmd->ap.reset_tsf = 1;  /* By default reset AP TSF */
         cmd->channel = wlvif->channel;
+        cmd->channel_type = wlcore_get_native_channel_type(wlvif->channel_type);
 
         if (!bss_conf->hidden_ssid) {
                 /* take the SSID from the beacon for backward compatibility */
@@ -531,7 +552,13 @@ int wl12xx_cmd_role_start_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif)
                 memcpy(cmd->ap.ssid, bss_conf->ssid, bss_conf->ssid_len);
         }
 
-        cmd->ap.local_rates = cpu_to_le32(0xffffffff);
+        supported_rates = CONF_TX_AP_ENABLED_RATES | CONF_TX_MCS_RATES |
+                wlcore_hw_ap_get_mimo_wide_rate_mask(wl, wlvif);
+
+        wl1271_debug(DEBUG_CMD, "cmd role start ap with supported_rates 0x%08x",
+                     supported_rates);
+
+        cmd->ap.local_rates = cpu_to_le32(supported_rates);
 
         switch (wlvif->band) {
         case IEEE80211_BAND_2GHZ:
@@ -797,6 +824,7 @@ out:
         kfree(cmd);
         return ret;
 }
+EXPORT_SYMBOL_GPL(wl1271_cmd_data_path);
 
 int wl1271_cmd_ps_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                        u8 ps_mode, u16 auto_ps_timeout)
@@ -1018,7 +1046,7 @@ out:
 
 int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 {
-        int ret, extra;
+        int ret, extra = 0;
         u16 fc;
         struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
         struct sk_buff *skb;
@@ -1057,7 +1085,8 @@ int wl1271_cmd_build_arp_rsp(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         /* encryption space */
         switch (wlvif->encryption_type) {
         case KEY_TKIP:
-                extra = WL1271_EXTRA_SPACE_TKIP;
+                if (wl->quirks & WLCORE_QUIRK_TKIP_HEADER_SPACE)
+                        extra = WL1271_EXTRA_SPACE_TKIP;
                 break;
         case KEY_AES:
                 extra = WL1271_EXTRA_SPACE_AES;
@@ -1346,13 +1375,18 @@ int wl12xx_cmd_add_peer(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 
         for (i = 0; i < NUM_ACCESS_CATEGORIES_COPY; i++)
                 if (sta->wme && (sta->uapsd_queues & BIT(i)))
-                        cmd->psd_type[i] = WL1271_PSD_UPSD_TRIGGER;
+                        cmd->psd_type[NUM_ACCESS_CATEGORIES_COPY-1-i] =
+                                        WL1271_PSD_UPSD_TRIGGER;
                 else
-                        cmd->psd_type[i] = WL1271_PSD_LEGACY;
+                        cmd->psd_type[NUM_ACCESS_CATEGORIES_COPY-1-i] =
+                                        WL1271_PSD_LEGACY;
+
 
         sta_rates = sta->supp_rates[wlvif->band];
         if (sta->ht_cap.ht_supported)
-                sta_rates |= sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET;
+                sta_rates |=
+                        (sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET) |
+                        (sta->ht_cap.mcs.rx_mask[1] << HW_MIMO_RATES_OFFSET);
 
         cmd->supported_rates =
                 cpu_to_le32(wl1271_tx_enabled_rates_get(wl, sta_rates,
@@ -1573,19 +1607,25 @@ out:
 int wl12xx_roc(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 role_id)
 {
         int ret = 0;
+        bool is_first_roc;
 
         if (WARN_ON(test_bit(role_id, wl->roc_map)))
                 return 0;
 
+        is_first_roc = (find_first_bit(wl->roc_map, WL12XX_MAX_ROLES) >=
+                        WL12XX_MAX_ROLES);
+
         ret = wl12xx_cmd_roc(wl, wlvif, role_id);
         if (ret < 0)
                 goto out;
 
-        ret = wl1271_cmd_wait_for_event(wl,
-                                        REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID);
-        if (ret < 0) {
-                wl1271_error("cmd roc event completion error");
-                goto out;
+        if (is_first_roc) {
+                ret = wl1271_cmd_wait_for_event(wl,
+                                           REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID);
+                if (ret < 0) {
+                        wl1271_error("cmd roc event completion error");
+                        goto out;
+                }
         }
 
         __set_bit(role_id, wl->roc_map);
diff --git a/drivers/net/wireless/ti/wlcore/cmd.h b/drivers/net/wireless/ti/wlcore/cmd.h
index a46ae07cb77e..85171f2bf68e 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.h
+++ b/drivers/net/wireless/ti/wlcore/cmd.h
@@ -192,7 +192,7 @@ enum cmd_templ {
 #define WL1271_COMMAND_TIMEOUT     2000
 #define WL1271_CMD_TEMPL_DFLT_SIZE 252
 #define WL1271_CMD_TEMPL_MAX_SIZE  512
-#define WL1271_EVENT_TIMEOUT       750
+#define WL1271_EVENT_TIMEOUT       1000
 
 struct wl1271_cmd_header {
         __le16 id;
@@ -266,13 +266,22 @@ enum wlcore_band {
         WLCORE_BAND_MAX_RADIO           = 0x7F,
 };
 
+enum wlcore_channel_type {
+        WLCORE_CHAN_NO_HT,
+        WLCORE_CHAN_HT20,
+        WLCORE_CHAN_HT40MINUS,
+        WLCORE_CHAN_HT40PLUS
+};
+
 struct wl12xx_cmd_role_start {
         struct wl1271_cmd_header header;
 
         u8 role_id;
         u8 band;
         u8 channel;
-        u8 padding;
+
+        /* enum wlcore_channel_type */
+        u8 channel_type;
 
         union {
                 struct {
diff --git a/drivers/net/wireless/ti/wlcore/conf.h b/drivers/net/wireless/ti/wlcore/conf.h
index fef0db4213bc..03c635872335 100644
--- a/drivers/net/wireless/ti/wlcore/conf.h
+++ b/drivers/net/wireless/ti/wlcore/conf.h
@@ -45,7 +45,15 @@ enum {
         CONF_HW_BIT_RATE_MCS_4   = BIT(17),
         CONF_HW_BIT_RATE_MCS_5   = BIT(18),
         CONF_HW_BIT_RATE_MCS_6   = BIT(19),
-        CONF_HW_BIT_RATE_MCS_7   = BIT(20)
+        CONF_HW_BIT_RATE_MCS_7   = BIT(20),
+        CONF_HW_BIT_RATE_MCS_8   = BIT(21),
+        CONF_HW_BIT_RATE_MCS_9   = BIT(22),
+        CONF_HW_BIT_RATE_MCS_10  = BIT(23),
+        CONF_HW_BIT_RATE_MCS_11  = BIT(24),
+        CONF_HW_BIT_RATE_MCS_12  = BIT(25),
+        CONF_HW_BIT_RATE_MCS_13  = BIT(26),
+        CONF_HW_BIT_RATE_MCS_14  = BIT(27),
+        CONF_HW_BIT_RATE_MCS_15  = BIT(28),
 };
 
 enum {
@@ -310,7 +318,7 @@ enum {
 struct conf_sg_settings {
         u32 params[CONF_SG_PARAMS_MAX];
         u8 state;
-};
+} __packed;
 
 enum conf_rx_queue_type {
         CONF_RX_QUEUE_TYPE_LOW_PRIORITY,  /* All except the high priority */
@@ -394,7 +402,7 @@ struct conf_rx_settings {
          * Range: RX_QUEUE_TYPE_RX_LOW_PRIORITY, RX_QUEUE_TYPE_RX_HIGH_PRIORITY,
          */
         u8 queue_type;
-};
+} __packed;
 
 #define CONF_TX_MAX_RATE_CLASSES       10
 
@@ -435,6 +443,12 @@ struct conf_rx_settings {
         CONF_HW_BIT_RATE_MCS_5 | CONF_HW_BIT_RATE_MCS_6 |        \
         CONF_HW_BIT_RATE_MCS_7)
 
+#define CONF_TX_MIMO_RATES (CONF_HW_BIT_RATE_MCS_8 |             \
+        CONF_HW_BIT_RATE_MCS_9 | CONF_HW_BIT_RATE_MCS_10 |       \
+        CONF_HW_BIT_RATE_MCS_11 | CONF_HW_BIT_RATE_MCS_12 |      \
+        CONF_HW_BIT_RATE_MCS_13 | CONF_HW_BIT_RATE_MCS_14 |      \
+        CONF_HW_BIT_RATE_MCS_15)
+
 /*
  * Default rates for management traffic when operating in AP mode. This
  * should be configured according to the basic rate set of the AP
@@ -487,7 +501,7 @@ struct conf_tx_rate_class {
          *               the policy (0 - long preamble, 1 - short preamble.
          */
         u8 aflags;
-};
+} __packed;
 
 #define CONF_TX_MAX_AC_COUNT 4
 
@@ -504,7 +518,7 @@ enum conf_tx_ac {
         CONF_TX_AC_VI = 2,         /* video */
         CONF_TX_AC_VO = 3,         /* voice */
         CONF_TX_AC_CTS2SELF = 4,   /* fictitious AC, follows AC_VO */
-        CONF_TX_AC_ANY_TID = 0x1f
+        CONF_TX_AC_ANY_TID = 0xff
 };
 
 struct conf_tx_ac_category {
@@ -544,7 +558,7 @@ struct conf_tx_ac_category {
          * Range: u16
          */
         u16 tx_op_limit;
-};
+} __packed;
 
 #define CONF_TX_MAX_TID_COUNT 8
 
@@ -578,7 +592,7 @@ struct conf_tx_tid {
         u8 ps_scheme;
         u8 ack_policy;
         u32 apsd_conf[2];
-};
+} __packed;
 
 struct conf_tx_settings {
         /*
@@ -664,7 +678,7 @@ struct conf_tx_settings {
 
         /* Time in ms for Tx watchdog timer to expire */
         u32 tx_watchdog_timeout;
-};
+} __packed;
 
 enum {
         CONF_WAKE_UP_EVENT_BEACON    = 0x01, /* Wake on every Beacon*/
@@ -711,7 +725,7 @@ struct conf_bcn_filt_rule {
          * Version for the vendor specifie IE (221)
          */
         u8 version[CONF_BCN_IE_VER_LEN];
-};
+} __packed;
 
 #define CONF_MAX_RSSI_SNR_TRIGGERS 8
 
@@ -762,7 +776,7 @@ struct conf_sig_weights {
          * Range: u8
          */
         u8 snr_pkt_avg_weight;
-};
+} __packed;
 
 enum conf_bcn_filt_mode {
         CONF_BCN_FILT_MODE_DISABLED = 0,
@@ -810,7 +824,7 @@ struct conf_conn_settings {
          *
          * Range: CONF_BCN_FILT_MODE_*
          */
-        enum conf_bcn_filt_mode bcn_filt_mode;
+        u8 bcn_filt_mode;
 
         /*
          * Configure Beacon filter pass-thru rules.
@@ -937,7 +951,7 @@ struct conf_conn_settings {
          * Range: u16
          */
         u8 max_listen_interval;
-};
+} __packed;
 
 enum {
         CONF_REF_CLK_19_2_E,
@@ -965,6 +979,11 @@ struct conf_itrim_settings {
 
         /* moderation timeout in microsecs from the last TX */
         u32 timeout;
+} __packed;
+
+enum conf_fast_wakeup {
+        CONF_FAST_WAKEUP_ENABLE,
+        CONF_FAST_WAKEUP_DISABLE,
 };
 
 struct conf_pm_config_settings {
@@ -978,10 +997,10 @@ struct conf_pm_config_settings {
         /*
          * Host fast wakeup support
          *
-         * Range: true, false
+         * Range: enum conf_fast_wakeup
          */
-        bool host_fast_wakeup_support;
-};
+        u8 host_fast_wakeup_support;
+} __packed;
 
 struct conf_roam_trigger_settings {
         /*
@@ -1018,7 +1037,7 @@ struct conf_roam_trigger_settings {
          * Range: 0 - 255
          */
         u8 avg_weight_snr_data;
-};
+} __packed;
 
 struct conf_scan_settings {
         /*
@@ -1064,7 +1083,7 @@ struct conf_scan_settings {
          * Range: u32 Microsecs
          */
         u32 split_scan_timeout;
-};
+} __packed;
 
 struct conf_sched_scan_settings {
         /*
@@ -1102,7 +1121,7 @@ struct conf_sched_scan_settings {
 
         /* SNR threshold to be used for filtering */
         s8 snr_threshold;
-};
+} __packed;
 
 struct conf_ht_setting {
         u8 rx_ba_win_size;
@@ -1111,7 +1130,7 @@ struct conf_ht_setting {
 
         /* bitmap of enabled TIDs for TX BA sessions */
         u8 tx_ba_tid_bitmap;
-};
+} __packed;
 
 struct conf_memory_settings {
         /* Number of stations supported in IBSS mode */
@@ -1151,7 +1170,7 @@ struct conf_memory_settings {
          * Range: 0-120
          */
         u8 tx_min;
-};
+} __packed;
 
 struct conf_fm_coex {
         u8 enable;
@@ -1164,7 +1183,7 @@ struct conf_fm_coex {
         u16 ldo_stabilization_time;
         u8 fm_disturbed_band_margin;
         u8 swallow_clk_diff;
-};
+} __packed;
 
 struct conf_rx_streaming_settings {
         /*
@@ -1193,7 +1212,7 @@ struct conf_rx_streaming_settings {
          * enable rx streaming also when there is no coex activity
          */
         u8 always;
-};
+} __packed;
 
 struct conf_fwlog {
         /* Continuous or on-demand */
@@ -1217,7 +1236,7 @@ struct conf_fwlog {
 
         /* Regulates the frequency of log messages */
         u8 threshold;
-};
+} __packed;
 
 #define ACX_RATE_MGMT_NUM_OF_RATES 13
 struct conf_rate_policy_settings {
@@ -1236,7 +1255,7 @@ struct conf_rate_policy_settings {
         u8 rate_check_up;
         u8 rate_check_down;
         u8 rate_retry_policy[ACX_RATE_MGMT_NUM_OF_RATES];
-};
+} __packed;
 
 struct conf_hangover_settings {
         u32 recover_time;
@@ -1250,7 +1269,23 @@ struct conf_hangover_settings {
         u8 quiet_time;
         u8 increase_time;
         u8 window_size;
-};
+} __packed;
+
+/*
+ * The conf version consists of 4 bytes.  The two MSB are the wlcore
+ * version, the two LSB are the lower driver's private conf
+ * version.
+ */
+#define WLCORE_CONF_VERSION     (0x0001 << 16)
+#define WLCORE_CONF_MASK        0xffff0000
+#define WLCORE_CONF_SIZE        (sizeof(struct wlcore_conf_header) +    \
+                                 sizeof(struct wlcore_conf))
+
+struct wlcore_conf_header {
+        __le32 magic;
+        __le32 version;
+        __le32 checksum;
+} __packed;
 
 struct wlcore_conf {
         struct conf_sg_settings sg;
@@ -1269,6 +1304,12 @@ struct wlcore_conf {
         struct conf_fwlog fwlog;
         struct conf_rate_policy_settings rate;
         struct conf_hangover_settings hangover;
-};
+} __packed;
+
+struct wlcore_conf_file {
+        struct wlcore_conf_header header;
+        struct wlcore_conf core;
+        u8 priv[0];
+} __packed;
 
 #endif
diff --git a/drivers/net/wireless/ti/wlcore/debugfs.c b/drivers/net/wireless/ti/wlcore/debugfs.c
index d5aea1ff5ad1..689a847005c9 100644
--- a/drivers/net/wireless/ti/wlcore/debugfs.c
+++ b/drivers/net/wireless/ti/wlcore/debugfs.c
@@ -25,6 +25,7 @@
 
 #include <linux/skbuff.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 
 #include "wlcore.h"
 #include "debug.h"
@@ -32,14 +33,14 @@
 #include "ps.h"
 #include "io.h"
 #include "tx.h"
+#include "hw_ops.h"
 
 /* ms */
 #define WL1271_DEBUGFS_STATS_LIFETIME 1000
 
 /* debugfs macros idea from mac80211 */
-#define DEBUGFS_FORMAT_BUFFER_SIZE 100
-static int wl1271_format_buffer(char __user *userbuf, size_t count,
-                                    loff_t *ppos, char *fmt, ...)
+int wl1271_format_buffer(char __user *userbuf, size_t count,
+                         loff_t *ppos, char *fmt, ...)
 {
         va_list args;
         char buf[DEBUGFS_FORMAT_BUFFER_SIZE];
@@ -51,59 +52,9 @@ static int wl1271_format_buffer(char __user *userbuf, size_t count,
 
         return simple_read_from_buffer(userbuf, count, ppos, buf, res);
 }
+EXPORT_SYMBOL_GPL(wl1271_format_buffer);
 
-#define DEBUGFS_READONLY_FILE(name, fmt, value...)                      \
-static ssize_t name## _read(struct file *file, char __user *userbuf,    \
-                            size_t count, loff_t *ppos)                 \
-{                                                                       \
-        struct wl1271 *wl = file->private_data;                         \
-        return wl1271_format_buffer(userbuf, count, ppos,               \
-                                    fmt "\n", ##value);                 \
-}                                                                       \
-                                                                        \
-static const struct file_operations name## _ops = {                     \
-        .read = name## _read,                                           \
-        .open = simple_open,                                            \
-        .llseek = generic_file_llseek,                                  \
-};
-
-#define DEBUGFS_ADD(name, parent)                                       \
-        entry = debugfs_create_file(#name, 0400, parent,                \
-                                    wl, &name## _ops);                  \
-        if (!entry || IS_ERR(entry))                                    \
-                goto err;                                               \
-
-#define DEBUGFS_ADD_PREFIX(prefix, name, parent)                        \
-        do {                                                            \
-                entry = debugfs_create_file(#name, 0400, parent,        \
-                                    wl, &prefix## _## name## _ops);     \
-                if (!entry || IS_ERR(entry))                            \
-                        goto err;                                       \
-        } while (0);
-
-#define DEBUGFS_FWSTATS_FILE(sub, name, fmt)                            \
-static ssize_t sub## _ ##name## _read(struct file *file,                \
-                                      char __user *userbuf,             \
-                                      size_t count, loff_t *ppos)       \
-{                                                                       \
-        struct wl1271 *wl = file->private_data;                         \
-                                                                        \
-        wl1271_debugfs_update_stats(wl);                                \
-                                                                        \
-        return wl1271_format_buffer(userbuf, count, ppos, fmt "\n",     \
-                                    wl->stats.fw_stats->sub.name);      \
-}                                                                       \
-                                                                        \
-static const struct file_operations sub## _ ##name## _ops = {           \
-        .read = sub## _ ##name## _read,                                 \
-        .open = simple_open,                                            \
-        .llseek = generic_file_llseek,                                  \
-};
-
-#define DEBUGFS_FWSTATS_ADD(sub, name)                          \
-        DEBUGFS_ADD(sub## _ ##name, stats)
-
-static void wl1271_debugfs_update_stats(struct wl1271 *wl)
+void wl1271_debugfs_update_stats(struct wl1271 *wl)
 {
         int ret;
 
@@ -125,97 +76,7 @@ static void wl1271_debugfs_update_stats(struct wl1271 *wl)
 out:
         mutex_unlock(&wl->mutex);
 }
-
-DEBUGFS_FWSTATS_FILE(tx, internal_desc_overflow, "%u");
-
-DEBUGFS_FWSTATS_FILE(rx, out_of_mem, "%u");
-DEBUGFS_FWSTATS_FILE(rx, hdr_overflow, "%u");
-DEBUGFS_FWSTATS_FILE(rx, hw_stuck, "%u");
-DEBUGFS_FWSTATS_FILE(rx, dropped, "%u");
-DEBUGFS_FWSTATS_FILE(rx, fcs_err, "%u");
-DEBUGFS_FWSTATS_FILE(rx, xfr_hint_trig, "%u");
-DEBUGFS_FWSTATS_FILE(rx, path_reset, "%u");
-DEBUGFS_FWSTATS_FILE(rx, reset_counter, "%u");
-
-DEBUGFS_FWSTATS_FILE(dma, rx_requested, "%u");
-DEBUGFS_FWSTATS_FILE(dma, rx_errors, "%u");
-DEBUGFS_FWSTATS_FILE(dma, tx_requested, "%u");
-DEBUGFS_FWSTATS_FILE(dma, tx_errors, "%u");
-
-DEBUGFS_FWSTATS_FILE(isr, cmd_cmplt, "%u");
-DEBUGFS_FWSTATS_FILE(isr, fiqs, "%u");
-DEBUGFS_FWSTATS_FILE(isr, rx_headers, "%u");
-DEBUGFS_FWSTATS_FILE(isr, rx_mem_overflow, "%u");
-DEBUGFS_FWSTATS_FILE(isr, rx_rdys, "%u");
-DEBUGFS_FWSTATS_FILE(isr, irqs, "%u");
-DEBUGFS_FWSTATS_FILE(isr, tx_procs, "%u");
-DEBUGFS_FWSTATS_FILE(isr, decrypt_done, "%u");
-DEBUGFS_FWSTATS_FILE(isr, dma0_done, "%u");
-DEBUGFS_FWSTATS_FILE(isr, dma1_done, "%u");
-DEBUGFS_FWSTATS_FILE(isr, tx_exch_complete, "%u");
-DEBUGFS_FWSTATS_FILE(isr, commands, "%u");
-DEBUGFS_FWSTATS_FILE(isr, rx_procs, "%u");
-DEBUGFS_FWSTATS_FILE(isr, hw_pm_mode_changes, "%u");
-DEBUGFS_FWSTATS_FILE(isr, host_acknowledges, "%u");
-DEBUGFS_FWSTATS_FILE(isr, pci_pm, "%u");
-DEBUGFS_FWSTATS_FILE(isr, wakeups, "%u");
-DEBUGFS_FWSTATS_FILE(isr, low_rssi, "%u");
-
-DEBUGFS_FWSTATS_FILE(wep, addr_key_count, "%u");
-DEBUGFS_FWSTATS_FILE(wep, default_key_count, "%u");
-/* skipping wep.reserved */
-DEBUGFS_FWSTATS_FILE(wep, key_not_found, "%u");
-DEBUGFS_FWSTATS_FILE(wep, decrypt_fail, "%u");
-DEBUGFS_FWSTATS_FILE(wep, packets, "%u");
-DEBUGFS_FWSTATS_FILE(wep, interrupt, "%u");
-
-DEBUGFS_FWSTATS_FILE(pwr, ps_enter, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, elp_enter, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, missing_bcns, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, wake_on_host, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, wake_on_timer_exp, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, tx_with_ps, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, tx_without_ps, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, rcvd_beacons, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, power_save_off, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, enable_ps, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, disable_ps, "%u");
-DEBUGFS_FWSTATS_FILE(pwr, fix_tsf_ps, "%u");
-/* skipping cont_miss_bcns_spread for now */
-DEBUGFS_FWSTATS_FILE(pwr, rcvd_awake_beacons, "%u");
-
-DEBUGFS_FWSTATS_FILE(mic, rx_pkts, "%u");
-DEBUGFS_FWSTATS_FILE(mic, calc_failure, "%u");
-
-DEBUGFS_FWSTATS_FILE(aes, encrypt_fail, "%u");
-DEBUGFS_FWSTATS_FILE(aes, decrypt_fail, "%u");
-DEBUGFS_FWSTATS_FILE(aes, encrypt_packets, "%u");
-DEBUGFS_FWSTATS_FILE(aes, decrypt_packets, "%u");
-DEBUGFS_FWSTATS_FILE(aes, encrypt_interrupt, "%u");
-DEBUGFS_FWSTATS_FILE(aes, decrypt_interrupt, "%u");
-
-DEBUGFS_FWSTATS_FILE(event, heart_beat, "%u");
-DEBUGFS_FWSTATS_FILE(event, calibration, "%u");
-DEBUGFS_FWSTATS_FILE(event, rx_mismatch, "%u");
-DEBUGFS_FWSTATS_FILE(event, rx_mem_empty, "%u");
-DEBUGFS_FWSTATS_FILE(event, rx_pool, "%u");
-DEBUGFS_FWSTATS_FILE(event, oom_late, "%u");
-DEBUGFS_FWSTATS_FILE(event, phy_transmit_error, "%u");
-DEBUGFS_FWSTATS_FILE(event, tx_stuck, "%u");
-
-DEBUGFS_FWSTATS_FILE(ps, pspoll_timeouts, "%u");
-DEBUGFS_FWSTATS_FILE(ps, upsd_timeouts, "%u");
-DEBUGFS_FWSTATS_FILE(ps, upsd_max_sptime, "%u");
-DEBUGFS_FWSTATS_FILE(ps, upsd_max_apturn, "%u");
-DEBUGFS_FWSTATS_FILE(ps, pspoll_max_apturn, "%u");
-DEBUGFS_FWSTATS_FILE(ps, pspoll_utilization, "%u");
-DEBUGFS_FWSTATS_FILE(ps, upsd_utilization, "%u");
-
-DEBUGFS_FWSTATS_FILE(rxpipe, rx_prep_beacon_drop, "%u");
-DEBUGFS_FWSTATS_FILE(rxpipe, descr_host_int_trig_rx_data, "%u");
-DEBUGFS_FWSTATS_FILE(rxpipe, beacon_buffer_thres_host_int_trig_rx_data, "%u");
-DEBUGFS_FWSTATS_FILE(rxpipe, missed_beacon_host_int_trig_rx_data, "%u");
-DEBUGFS_FWSTATS_FILE(rxpipe, tx_xfr_host_int_trig_rx_data, "%u");
+EXPORT_SYMBOL_GPL(wl1271_debugfs_update_stats);
 
 DEBUGFS_READONLY_FILE(retry_count, "%u", wl->stats.retry_count);
 DEBUGFS_READONLY_FILE(excessive_retries, "%u",
@@ -241,6 +102,89 @@ static const struct file_operations tx_queue_len_ops = {
         .llseek = default_llseek,
 };
 
+static void chip_op_handler(struct wl1271 *wl, unsigned long value,
+                            void *arg)
+{
+        int ret;
+        int (*chip_op) (struct wl1271 *wl);
+
+        if (!arg) {
+                wl1271_warning("debugfs chip_op_handler with no callback");
+                return;
+        }
+
+        ret = wl1271_ps_elp_wakeup(wl);
+        if (ret < 0)
+                return;
+
+        chip_op = arg;
+        chip_op(wl);
+
+        wl1271_ps_elp_sleep(wl);
+}
+
+
+static inline void no_write_handler(struct wl1271 *wl,
+                                    unsigned long value,
+                                    unsigned long param)
+{
+}
+
+#define WL12XX_CONF_DEBUGFS(param, conf_sub_struct,                     \
+                            min_val, max_val, write_handler_locked,     \
+                            write_handler_arg)                          \
+        static ssize_t param##_read(struct file *file,                  \
+                                      char __user *user_buf,            \
+                                      size_t count, loff_t *ppos)       \
+        {                                                               \
+        struct wl1271 *wl = file->private_data;                         \
+        return wl1271_format_buffer(user_buf, count,                    \
+                                    ppos, "%d\n",                       \
+                                    wl->conf.conf_sub_struct.param);    \
+        }                                                               \
+                                                                        \
+        static ssize_t param##_write(struct file *file,                 \
+                                     const char __user *user_buf,       \
+                                     size_t count, loff_t *ppos)        \
+        {                                                               \
+        struct wl1271 *wl = file->private_data;                         \
+        unsigned long value;                                            \
+        int ret;                                                        \
+                                                                        \
+        ret = kstrtoul_from_user(user_buf, count, 10, &value);          \
+        if (ret < 0) {                                                  \
+                wl1271_warning("illegal value for " #param);            \
+                return -EINVAL;                                         \
+        }                                                               \
+                                                                        \
+        if (value < min_val || value > max_val) {                       \
+                wl1271_warning(#param " is not in valid range");        \
+                return -ERANGE;                                         \
+        }                                                               \
+                                                                        \
+        mutex_lock(&wl->mutex);                                         \
+        wl->conf.conf_sub_struct.param = value;                         \
+                                                                        \
+        write_handler_locked(wl, value, write_handler_arg);             \
+                                                                        \
+        mutex_unlock(&wl->mutex);                                       \
+        return count;                                                   \
+        }                                                               \
+                                                                        \
+        static const struct file_operations param##_ops = {             \
+                .read = param##_read,                                   \
+                .write = param##_write,                                 \
+                .open = simple_open,                                    \
+                .llseek = default_llseek,                               \
+        };
+
+WL12XX_CONF_DEBUGFS(irq_pkt_threshold, rx, 0, 65535,
+                    chip_op_handler, wl1271_acx_init_rx_interrupt)
+WL12XX_CONF_DEBUGFS(irq_blk_threshold, rx, 0, 65535,
+                    chip_op_handler, wl1271_acx_init_rx_interrupt)
+WL12XX_CONF_DEBUGFS(irq_timeout, rx, 0, 100,
+                    chip_op_handler, wl1271_acx_init_rx_interrupt)
+
 static ssize_t gpio_power_read(struct file *file, char __user *user_buf,
                           size_t count, loff_t *ppos)
 {
@@ -535,8 +479,7 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf,
         DRIVER_STATE_PRINT_LHEX(ap_ps_map);
         DRIVER_STATE_PRINT_HEX(quirks);
         DRIVER_STATE_PRINT_HEX(irq);
-        DRIVER_STATE_PRINT_HEX(ref_clock);
-        DRIVER_STATE_PRINT_HEX(tcxo_clock);
+        /* TODO: ref_clock and tcxo_clock were moved to wl12xx priv */
         DRIVER_STATE_PRINT_HEX(hw_pg_ver);
         DRIVER_STATE_PRINT_HEX(platform_quirks);
         DRIVER_STATE_PRINT_HEX(chip.id);
@@ -647,7 +590,6 @@ static ssize_t vifs_state_read(struct file *file, char __user *user_buf,
                 VIF_STATE_PRINT_INT(last_rssi_event);
                 VIF_STATE_PRINT_INT(ba_support);
                 VIF_STATE_PRINT_INT(ba_allowed);
-                VIF_STATE_PRINT_INT(is_gem);
                 VIF_STATE_PRINT_LLHEX(tx_security_seq);
                 VIF_STATE_PRINT_INT(tx_security_last_seq_lsb);
         }
@@ -1002,108 +944,30 @@ static const struct file_operations beacon_filtering_ops = {
         .llseek = default_llseek,
 };
 
-static int wl1271_debugfs_add_files(struct wl1271 *wl,
-                                     struct dentry *rootdir)
+static ssize_t fw_stats_raw_read(struct file *file,
+                                 char __user *userbuf,
+                                 size_t count, loff_t *ppos)
 {
-        int ret = 0;
-        struct dentry *entry, *stats, *streaming;
+        struct wl1271 *wl = file->private_data;
 
-        stats = debugfs_create_dir("fw-statistics", rootdir);
-        if (!stats || IS_ERR(stats)) {
-                entry = stats;
-                goto err;
-        }
+        wl1271_debugfs_update_stats(wl);
 
-        DEBUGFS_FWSTATS_ADD(tx, internal_desc_overflow);
-
-        DEBUGFS_FWSTATS_ADD(rx, out_of_mem);
-        DEBUGFS_FWSTATS_ADD(rx, hdr_overflow);
-        DEBUGFS_FWSTATS_ADD(rx, hw_stuck);
-        DEBUGFS_FWSTATS_ADD(rx, dropped);
-        DEBUGFS_FWSTATS_ADD(rx, fcs_err);
-        DEBUGFS_FWSTATS_ADD(rx, xfr_hint_trig);
-        DEBUGFS_FWSTATS_ADD(rx, path_reset);
-        DEBUGFS_FWSTATS_ADD(rx, reset_counter);
-
-        DEBUGFS_FWSTATS_ADD(dma, rx_requested);
-        DEBUGFS_FWSTATS_ADD(dma, rx_errors);
-        DEBUGFS_FWSTATS_ADD(dma, tx_requested);
-        DEBUGFS_FWSTATS_ADD(dma, tx_errors);
-
-        DEBUGFS_FWSTATS_ADD(isr, cmd_cmplt);
-        DEBUGFS_FWSTATS_ADD(isr, fiqs);
-        DEBUGFS_FWSTATS_ADD(isr, rx_headers);
-        DEBUGFS_FWSTATS_ADD(isr, rx_mem_overflow);
-        DEBUGFS_FWSTATS_ADD(isr, rx_rdys);
-        DEBUGFS_FWSTATS_ADD(isr, irqs);
-        DEBUGFS_FWSTATS_ADD(isr, tx_procs);
-        DEBUGFS_FWSTATS_ADD(isr, decrypt_done);
-        DEBUGFS_FWSTATS_ADD(isr, dma0_done);
-        DEBUGFS_FWSTATS_ADD(isr, dma1_done);
-        DEBUGFS_FWSTATS_ADD(isr, tx_exch_complete);
-        DEBUGFS_FWSTATS_ADD(isr, commands);
-        DEBUGFS_FWSTATS_ADD(isr, rx_procs);
-        DEBUGFS_FWSTATS_ADD(isr, hw_pm_mode_changes);
-        DEBUGFS_FWSTATS_ADD(isr, host_acknowledges);
-        DEBUGFS_FWSTATS_ADD(isr, pci_pm);
-        DEBUGFS_FWSTATS_ADD(isr, wakeups);
-        DEBUGFS_FWSTATS_ADD(isr, low_rssi);
-
-        DEBUGFS_FWSTATS_ADD(wep, addr_key_count);
-        DEBUGFS_FWSTATS_ADD(wep, default_key_count);
-        /* skipping wep.reserved */
-        DEBUGFS_FWSTATS_ADD(wep, key_not_found);
-        DEBUGFS_FWSTATS_ADD(wep, decrypt_fail);
-        DEBUGFS_FWSTATS_ADD(wep, packets);
-        DEBUGFS_FWSTATS_ADD(wep, interrupt);
-
-        DEBUGFS_FWSTATS_ADD(pwr, ps_enter);
-        DEBUGFS_FWSTATS_ADD(pwr, elp_enter);
-        DEBUGFS_FWSTATS_ADD(pwr, missing_bcns);
-        DEBUGFS_FWSTATS_ADD(pwr, wake_on_host);
-        DEBUGFS_FWSTATS_ADD(pwr, wake_on_timer_exp);
-        DEBUGFS_FWSTATS_ADD(pwr, tx_with_ps);
-        DEBUGFS_FWSTATS_ADD(pwr, tx_without_ps);
-        DEBUGFS_FWSTATS_ADD(pwr, rcvd_beacons);
-        DEBUGFS_FWSTATS_ADD(pwr, power_save_off);
-        DEBUGFS_FWSTATS_ADD(pwr, enable_ps);
-        DEBUGFS_FWSTATS_ADD(pwr, disable_ps);
-        DEBUGFS_FWSTATS_ADD(pwr, fix_tsf_ps);
-        /* skipping cont_miss_bcns_spread for now */
-        DEBUGFS_FWSTATS_ADD(pwr, rcvd_awake_beacons);
-
-        DEBUGFS_FWSTATS_ADD(mic, rx_pkts);
-        DEBUGFS_FWSTATS_ADD(mic, calc_failure);
-
-        DEBUGFS_FWSTATS_ADD(aes, encrypt_fail);
-        DEBUGFS_FWSTATS_ADD(aes, decrypt_fail);
-        DEBUGFS_FWSTATS_ADD(aes, encrypt_packets);
-        DEBUGFS_FWSTATS_ADD(aes, decrypt_packets);
-        DEBUGFS_FWSTATS_ADD(aes, encrypt_interrupt);
-        DEBUGFS_FWSTATS_ADD(aes, decrypt_interrupt);
-
-        DEBUGFS_FWSTATS_ADD(event, heart_beat);
-        DEBUGFS_FWSTATS_ADD(event, calibration);
-        DEBUGFS_FWSTATS_ADD(event, rx_mismatch);
-        DEBUGFS_FWSTATS_ADD(event, rx_mem_empty);
-        DEBUGFS_FWSTATS_ADD(event, rx_pool);
-        DEBUGFS_FWSTATS_ADD(event, oom_late);
-        DEBUGFS_FWSTATS_ADD(event, phy_transmit_error);
-        DEBUGFS_FWSTATS_ADD(event, tx_stuck);
-
-        DEBUGFS_FWSTATS_ADD(ps, pspoll_timeouts);
-        DEBUGFS_FWSTATS_ADD(ps, upsd_timeouts);
-        DEBUGFS_FWSTATS_ADD(ps, upsd_max_sptime);
-        DEBUGFS_FWSTATS_ADD(ps, upsd_max_apturn);
-        DEBUGFS_FWSTATS_ADD(ps, pspoll_max_apturn);
-        DEBUGFS_FWSTATS_ADD(ps, pspoll_utilization);
-        DEBUGFS_FWSTATS_ADD(ps, upsd_utilization);
-
-        DEBUGFS_FWSTATS_ADD(rxpipe, rx_prep_beacon_drop);
-        DEBUGFS_FWSTATS_ADD(rxpipe, descr_host_int_trig_rx_data);
-        DEBUGFS_FWSTATS_ADD(rxpipe, beacon_buffer_thres_host_int_trig_rx_data);
-        DEBUGFS_FWSTATS_ADD(rxpipe, missed_beacon_host_int_trig_rx_data);
-        DEBUGFS_FWSTATS_ADD(rxpipe, tx_xfr_host_int_trig_rx_data);
+        return simple_read_from_buffer(userbuf, count, ppos,
+                                       wl->stats.fw_stats,
+                                       wl->stats.fw_stats_len);
+}
+
+static const struct file_operations fw_stats_raw_ops = {
+        .read = fw_stats_raw_read,
+        .open = simple_open,
+        .llseek = default_llseek,
+};
+
+static int wl1271_debugfs_add_files(struct wl1271 *wl,
+                                    struct dentry *rootdir)
+{
+        int ret = 0;
+        struct dentry *entry, *streaming;
 
         DEBUGFS_ADD(tx_queue_len, rootdir);
         DEBUGFS_ADD(retry_count, rootdir);
@@ -1120,6 +984,10 @@ static int wl1271_debugfs_add_files(struct wl1271 *wl,
         DEBUGFS_ADD(dynamic_ps_timeout, rootdir);
         DEBUGFS_ADD(forced_ps, rootdir);
         DEBUGFS_ADD(split_scan_timeout, rootdir);
+        DEBUGFS_ADD(irq_pkt_threshold, rootdir);
+        DEBUGFS_ADD(irq_blk_threshold, rootdir);
+        DEBUGFS_ADD(irq_timeout, rootdir);
+        DEBUGFS_ADD(fw_stats_raw, rootdir);
 
         streaming = debugfs_create_dir("rx_streaming", rootdir);
         if (!streaming || IS_ERR(streaming))
@@ -1145,7 +1013,7 @@ void wl1271_debugfs_reset(struct wl1271 *wl)
         if (!wl->stats.fw_stats)
                 return;
 
-        memset(wl->stats.fw_stats, 0, sizeof(*wl->stats.fw_stats));
+        memset(wl->stats.fw_stats, 0, wl->stats.fw_stats_len);
         wl->stats.retry_count = 0;
         wl->stats.excessive_retries = 0;
 }
@@ -1160,34 +1028,34 @@ int wl1271_debugfs_init(struct wl1271 *wl)
 
         if (IS_ERR(rootdir)) {
                 ret = PTR_ERR(rootdir);
-                goto err;
+                goto out;
         }
 
-        wl->stats.fw_stats = kzalloc(sizeof(*wl->stats.fw_stats),
-                                      GFP_KERNEL);
-
+        wl->stats.fw_stats = kzalloc(wl->stats.fw_stats_len, GFP_KERNEL);
         if (!wl->stats.fw_stats) {
                 ret = -ENOMEM;
-                goto err_fw;
+                goto out_remove;
         }
 
         wl->stats.fw_stats_update = jiffies;
 
         ret = wl1271_debugfs_add_files(wl, rootdir);
+        if (ret < 0)
+                goto out_exit;
 
+        ret = wlcore_debugfs_init(wl, rootdir);
         if (ret < 0)
-                goto err_file;
+                goto out_exit;
 
-        return 0;
+        goto out;
 
-err_file:
-        kfree(wl->stats.fw_stats);
-        wl->stats.fw_stats = NULL;
+out_exit:
+        wl1271_debugfs_exit(wl);
 
-err_fw:
+out_remove:
         debugfs_remove_recursive(rootdir);
 
-err:
+out:
         return ret;
 }
 
diff --git a/drivers/net/wireless/ti/wlcore/debugfs.h b/drivers/net/wireless/ti/wlcore/debugfs.h
index a8d3aef011ff..f7381dd69009 100644
--- a/drivers/net/wireless/ti/wlcore/debugfs.h
+++ b/drivers/net/wireless/ti/wlcore/debugfs.h
@@ -26,8 +26,95 @@
 
 #include "wlcore.h"
 
+int wl1271_format_buffer(char __user *userbuf, size_t count,
+                         loff_t *ppos, char *fmt, ...);
+
 int wl1271_debugfs_init(struct wl1271 *wl);
 void wl1271_debugfs_exit(struct wl1271 *wl);
 void wl1271_debugfs_reset(struct wl1271 *wl);
+void wl1271_debugfs_update_stats(struct wl1271 *wl);
+
+#define DEBUGFS_FORMAT_BUFFER_SIZE 256
+
+#define DEBUGFS_READONLY_FILE(name, fmt, value...)                      \
+static ssize_t name## _read(struct file *file, char __user *userbuf,    \
+                            size_t count, loff_t *ppos)                 \
+{                                                                       \
+        struct wl1271 *wl = file->private_data;                         \
+        return wl1271_format_buffer(userbuf, count, ppos,               \
+                                    fmt "\n", ##value);                 \
+}                                                                       \
+                                                                        \
+static const struct file_operations name## _ops = {                     \
+        .read = name## _read,                                           \
+        .open = simple_open,                                            \
+        .llseek = generic_file_llseek,                                  \
+};
+
+#define DEBUGFS_ADD(name, parent)                                       \
+        do {                                                            \
+                entry = debugfs_create_file(#name, 0400, parent,        \
+                                            wl, &name## _ops);          \
+                if (!entry || IS_ERR(entry))                            \
+                        goto err;                                       \
+        } while (0);
+
+
+#define DEBUGFS_ADD_PREFIX(prefix, name, parent)                        \
+        do {                                                            \
+                entry = debugfs_create_file(#name, 0400, parent,        \
+                                    wl, &prefix## _## name## _ops);     \
+                if (!entry || IS_ERR(entry))                            \
+                        goto err;                                       \
+        } while (0);
+
+#define DEBUGFS_FWSTATS_FILE(sub, name, fmt, struct_type)               \
+static ssize_t sub## _ ##name## _read(struct file *file,                \
+                                      char __user *userbuf,             \
+                                      size_t count, loff_t *ppos)       \
+{                                                                       \
+        struct wl1271 *wl = file->private_data;                         \
+        struct struct_type *stats = wl->stats.fw_stats;                 \
+                                                                        \
+        wl1271_debugfs_update_stats(wl);                                \
+                                                                        \
+        return wl1271_format_buffer(userbuf, count, ppos, fmt "\n",     \
+                                    stats->sub.name);                   \
+}                                                                       \
+                                                                        \
+static const struct file_operations sub## _ ##name## _ops = {           \
+        .read = sub## _ ##name## _read,                                 \
+        .open = simple_open,                                            \
+        .llseek = generic_file_llseek,                                  \
+};
+
+#define DEBUGFS_FWSTATS_FILE_ARRAY(sub, name, len, struct_type)         \
+static ssize_t sub## _ ##name## _read(struct file *file,                \
+                                      char __user *userbuf,             \
+                                      size_t count, loff_t *ppos)       \
+{                                                                       \
+        struct wl1271 *wl = file->private_data;                         \
+        struct struct_type *stats = wl->stats.fw_stats;                 \
+        char buf[DEBUGFS_FORMAT_BUFFER_SIZE] = "";                      \
+        int res, i;                                                     \
+                                                                        \
+        wl1271_debugfs_update_stats(wl);                                \
+                                                                        \
+        for (i = 0; i < len; i++)                                       \
+                res = snprintf(buf, sizeof(buf), "%s[%d] = %d\n",       \
+                               buf, i, stats->sub.name[i]);             \
+                                                                        \
+        return wl1271_format_buffer(userbuf, count, ppos, "%s", buf);   \
+}                                                                       \
+                                                                        \
+static const struct file_operations sub## _ ##name## _ops = {           \
+        .read = sub## _ ##name## _read,                                 \
+        .open = simple_open,                                            \
+        .llseek = generic_file_llseek,                                  \
+};
+
+#define DEBUGFS_FWSTATS_ADD(sub, name)                                  \
+        DEBUGFS_ADD(sub## _ ##name, stats)
+
 
 #endif /* WL1271_DEBUGFS_H */
diff --git a/drivers/net/wireless/ti/wlcore/event.c b/drivers/net/wireless/ti/wlcore/event.c
index 28e2a633c3be..c976f0409865 100644
--- a/drivers/net/wireless/ti/wlcore/event.c
+++ b/drivers/net/wireless/ti/wlcore/event.c
@@ -148,15 +148,33 @@ static int wl1271_event_process(struct wl1271 *wl)
                 int delay = wl->conf.conn.synch_fail_thold *
                                         wl->conf.conn.bss_lose_timeout;
                 wl1271_info("Beacon loss detected.");
-                cancel_delayed_work_sync(&wl->connection_loss_work);
+
+                /*
+                 * if the work is already queued, it should take place. We
+                 * don't want to delay the connection loss indication
+                 * any more.
+                 */
                 ieee80211_queue_delayed_work(wl->hw, &wl->connection_loss_work,
-                      msecs_to_jiffies(delay));
+                                             msecs_to_jiffies(delay));
+
+                wl12xx_for_each_wlvif_sta(wl, wlvif) {
+                        vif = wl12xx_wlvif_to_vif(wlvif);
+
+                        ieee80211_cqm_rssi_notify(
+                                        vif,
+                                        NL80211_CQM_RSSI_BEACON_LOSS_EVENT,
+                                        GFP_KERNEL);
+                }
         }
 
         if (vector & REGAINED_BSS_EVENT_ID) {
                 /* TODO: check for multi-role */
                 wl1271_info("Beacon regained.");
-                cancel_delayed_work_sync(&wl->connection_loss_work);
+                cancel_delayed_work(&wl->connection_loss_work);
+
+                /* sanity check - we can't lose and gain the beacon together */
+                WARN(vector & BSS_LOSE_EVENT_ID,
+                     "Concurrent beacon loss and gain from FW");
         }
 
         if (vector & RSSI_SNR_TRIGGER_0_EVENT_ID) {
diff --git a/drivers/net/wireless/ti/wlcore/hw_ops.h b/drivers/net/wireless/ti/wlcore/hw_ops.h
index 9384b4d56c24..9e7787ba9610 100644
--- a/drivers/net/wireless/ti/wlcore/hw_ops.h
+++ b/drivers/net/wireless/ti/wlcore/hw_ops.h
@@ -119,4 +119,82 @@ static inline int wlcore_identify_fw(struct wl1271 *wl)
         return 0;
 }
 
+static inline void
+wlcore_hw_set_tx_desc_csum(struct wl1271 *wl,
+                           struct wl1271_tx_hw_descr *desc,
+                           struct sk_buff *skb)
+{
+        if (!wl->ops->set_tx_desc_csum)
+                BUG_ON(1);
+
+        wl->ops->set_tx_desc_csum(wl, desc, skb);
+}
+
+static inline void
+wlcore_hw_set_rx_csum(struct wl1271 *wl,
+                      struct wl1271_rx_descriptor *desc,
+                      struct sk_buff *skb)
+{
+        if (wl->ops->set_rx_csum)
+                wl->ops->set_rx_csum(wl, desc, skb);
+}
+
+static inline u32
+wlcore_hw_ap_get_mimo_wide_rate_mask(struct wl1271 *wl,
+                                     struct wl12xx_vif *wlvif)
+{
+        if (wl->ops->ap_get_mimo_wide_rate_mask)
+                return wl->ops->ap_get_mimo_wide_rate_mask(wl, wlvif);
+
+        return 0;
+}
+
+static inline int
+wlcore_debugfs_init(struct wl1271 *wl, struct dentry *rootdir)
+{
+        if (wl->ops->debugfs_init)
+                return wl->ops->debugfs_init(wl, rootdir);
+
+        return 0;
+}
+
+static inline int
+wlcore_handle_static_data(struct wl1271 *wl, void *static_data)
+{
+        if (wl->ops->handle_static_data)
+                return wl->ops->handle_static_data(wl, static_data);
+
+        return 0;
+}
+
+static inline int
+wlcore_hw_get_spare_blocks(struct wl1271 *wl, bool is_gem)
+{
+        if (!wl->ops->get_spare_blocks)
+                BUG_ON(1);
+
+        return wl->ops->get_spare_blocks(wl, is_gem);
+}
+
+static inline int
+wlcore_hw_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
+                  struct ieee80211_vif *vif,
+                  struct ieee80211_sta *sta,
+                  struct ieee80211_key_conf *key_conf)
+{
+        if (!wl->ops->set_key)
+                BUG_ON(1);
+
+        return wl->ops->set_key(wl, cmd, vif, sta, key_conf);
+}
+
+static inline u32
+wlcore_hw_pre_pkt_send(struct wl1271 *wl, u32 buf_offset, u32 last_len)
+{
+        if (wl->ops->pre_pkt_send)
+                return wl->ops->pre_pkt_send(wl, buf_offset, last_len);
+
+        return buf_offset;
+}
+
 #endif
diff --git a/drivers/net/wireless/ti/wlcore/init.c b/drivers/net/wireless/ti/wlcore/init.c
index 9f89255eb6e6..645abd4b660d 100644
--- a/drivers/net/wireless/ti/wlcore/init.c
+++ b/drivers/net/wireless/ti/wlcore/init.c
@@ -460,6 +460,9 @@ int wl1271_init_ap_rates(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         /* unconditionally enable HT rates */
         supported_rates |= CONF_TX_MCS_RATES;
 
+        /* get extra MIMO or wide-chan rates where the HW supports it */
+        supported_rates |= wlcore_hw_ap_get_mimo_wide_rate_mask(wl, wlvif);
+
         /* configure unicast TX rate classes */
         for (i = 0; i < wl->conf.tx.ac_conf_count; i++) {
                 rc.enabled_rates = supported_rates;
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index acef93390d3d..1156e3f578c1 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -320,46 +320,6 @@ static void wlcore_adjust_conf(struct wl1271 *wl)
         }
 }
 
-static int wl1271_plt_init(struct wl1271 *wl)
-{
-        int ret;
-
-        ret = wl->ops->hw_init(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_acx_init_mem_config(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl12xx_acx_mem_cfg(wl);
-        if (ret < 0)
-                goto out_free_memmap;
-
-        /* Enable data path */
-        ret = wl1271_cmd_data_path(wl, 1);
-        if (ret < 0)
-                goto out_free_memmap;
-
-        /* Configure for CAM power saving (ie. always active) */
-        ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
-        if (ret < 0)
-                goto out_free_memmap;
-
-        /* configure PM */
-        ret = wl1271_acx_pm_config(wl);
-        if (ret < 0)
-                goto out_free_memmap;
-
-        return 0;
-
- out_free_memmap:
-        kfree(wl->target_mem_map);
-        wl->target_mem_map = NULL;
-
-        return ret;
-}
-
 static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl,
                                         struct wl12xx_vif *wlvif,
                                         u8 hlid, u8 tx_pkts)
@@ -387,7 +347,7 @@ static void wl12xx_irq_ps_regulate_link(struct wl1271 *wl,
 
 static void wl12xx_irq_update_links_status(struct wl1271 *wl,
                                            struct wl12xx_vif *wlvif,
-                                           struct wl_fw_status *status)
+                                           struct wl_fw_status_2 *status)
 {
         struct wl1271_link *lnk;
         u32 cur_fw_ps_map;
@@ -419,7 +379,8 @@ static void wl12xx_irq_update_links_status(struct wl1271 *wl,
 }
 
 static void wl12xx_fw_status(struct wl1271 *wl,
-                             struct wl_fw_status *status)
+                             struct wl_fw_status_1 *status_1,
+                             struct wl_fw_status_2 *status_2)
 {
         struct wl12xx_vif *wlvif;
         struct timespec ts;
@@ -428,37 +389,38 @@ static void wl12xx_fw_status(struct wl1271 *wl,
         int i;
         size_t status_len;
 
-        status_len = sizeof(*status) + wl->fw_status_priv_len;
+        status_len = WLCORE_FW_STATUS_1_LEN(wl->num_rx_desc) +
+                sizeof(*status_2) + wl->fw_status_priv_len;
 
-        wlcore_raw_read_data(wl, REG_RAW_FW_STATUS_ADDR, status,
+        wlcore_raw_read_data(wl, REG_RAW_FW_STATUS_ADDR, status_1,
                              status_len, false);
 
         wl1271_debug(DEBUG_IRQ, "intr: 0x%x (fw_rx_counter = %d, "
                      "drv_rx_counter = %d, tx_results_counter = %d)",
-                     status->intr,
-                     status->fw_rx_counter,
-                     status->drv_rx_counter,
-                     status->tx_results_counter);
+                     status_1->intr,
+                     status_1->fw_rx_counter,
+                     status_1->drv_rx_counter,
+                     status_1->tx_results_counter);
 
         for (i = 0; i < NUM_TX_QUEUES; i++) {
                 /* prevent wrap-around in freed-packets counter */
                 wl->tx_allocated_pkts[i] -=
-                                (status->counters.tx_released_pkts[i] -
+                                (status_2->counters.tx_released_pkts[i] -
                                 wl->tx_pkts_freed[i]) & 0xff;
 
-                wl->tx_pkts_freed[i] = status->counters.tx_released_pkts[i];
+                wl->tx_pkts_freed[i] = status_2->counters.tx_released_pkts[i];
         }
 
         /* prevent wrap-around in total blocks counter */
         if (likely(wl->tx_blocks_freed <=
-                   le32_to_cpu(status->total_released_blks)))
-                freed_blocks = le32_to_cpu(status->total_released_blks) -
+                   le32_to_cpu(status_2->total_released_blks)))
+                freed_blocks = le32_to_cpu(status_2->total_released_blks) -
                                wl->tx_blocks_freed;
         else
                 freed_blocks = 0x100000000LL - wl->tx_blocks_freed +
-                               le32_to_cpu(status->total_released_blks);
+                               le32_to_cpu(status_2->total_released_blks);
 
-        wl->tx_blocks_freed = le32_to_cpu(status->total_released_blks);
+        wl->tx_blocks_freed = le32_to_cpu(status_2->total_released_blks);
 
         wl->tx_allocated_blocks -= freed_blocks;
 
@@ -474,7 +436,7 @@ static void wl12xx_fw_status(struct wl1271 *wl,
                         cancel_delayed_work(&wl->tx_watchdog_work);
         }
 
-        avail = le32_to_cpu(status->tx_total) - wl->tx_allocated_blocks;
+        avail = le32_to_cpu(status_2->tx_total) - wl->tx_allocated_blocks;
 
         /*
          * The FW might change the total number of TX memblocks before
@@ -493,13 +455,13 @@ static void wl12xx_fw_status(struct wl1271 *wl,
 
         /* for AP update num of allocated TX blocks per link and ps status */
         wl12xx_for_each_wlvif_ap(wl, wlvif) {
-                wl12xx_irq_update_links_status(wl, wlvif, status);
+                wl12xx_irq_update_links_status(wl, wlvif, status_2);
         }
 
         /* update the host-chipset time offset */
         getnstimeofday(&ts);
         wl->time_offset = (timespec_to_ns(&ts) >> 10) -
-                (s64)le32_to_cpu(status->fw_localtime);
+                (s64)le32_to_cpu(status_2->fw_localtime);
 }
 
 static void wl1271_flush_deferred_work(struct wl1271 *wl)
@@ -568,20 +530,30 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
                 clear_bit(WL1271_FLAG_IRQ_RUNNING, &wl->flags);
                 smp_mb__after_clear_bit();
 
-                wl12xx_fw_status(wl, wl->fw_status);
+                wl12xx_fw_status(wl, wl->fw_status_1, wl->fw_status_2);
 
                 wlcore_hw_tx_immediate_compl(wl);
 
-                intr = le32_to_cpu(wl->fw_status->intr);
-                intr &= WL1271_INTR_MASK;
+                intr = le32_to_cpu(wl->fw_status_1->intr);
+                intr &= WLCORE_ALL_INTR_MASK;
                 if (!intr) {
                         done = true;
                         continue;
                 }
 
                 if (unlikely(intr & WL1271_ACX_INTR_WATCHDOG)) {
-                        wl1271_error("watchdog interrupt received! "
+                        wl1271_error("HW watchdog interrupt received! starting recovery.");
+                        wl->watchdog_recovery = true;
+                        wl12xx_queue_recovery_work(wl);
+
+                        /* restarting the chip. ignore any other interrupt. */
+                        goto out;
+                }
+
+                if (unlikely(intr & WL1271_ACX_SW_INTR_WATCHDOG)) {
+                        wl1271_error("SW watchdog interrupt received! "
                                      "starting recovery.");
+                        wl->watchdog_recovery = true;
                         wl12xx_queue_recovery_work(wl);
 
                         /* restarting the chip. ignore any other interrupt. */
@@ -591,7 +563,7 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
                 if (likely(intr & WL1271_ACX_INTR_DATA)) {
                         wl1271_debug(DEBUG_IRQ, "WL1271_ACX_INTR_DATA");
 
-                        wl12xx_rx(wl, wl->fw_status);
+                        wl12xx_rx(wl, wl->fw_status_1);
 
                         /* Check if any tx blocks were freed */
                         spin_lock_irqsave(&wl->wl_lock, flags);
@@ -743,7 +715,7 @@ out:
         return ret;
 }
 
-static int wl1271_fetch_nvs(struct wl1271 *wl)
+static void wl1271_fetch_nvs(struct wl1271 *wl)
 {
         const struct firmware *fw;
         int ret;
@@ -751,16 +723,15 @@ static int wl1271_fetch_nvs(struct wl1271 *wl)
         ret = request_firmware(&fw, WL12XX_NVS_NAME, wl->dev);
 
         if (ret < 0) {
-                wl1271_error("could not get nvs file %s: %d", WL12XX_NVS_NAME,
-                             ret);
-                return ret;
+                wl1271_debug(DEBUG_BOOT, "could not get nvs file %s: %d",
+                             WL12XX_NVS_NAME, ret);
+                return;
         }
 
         wl->nvs = kmemdup(fw->data, fw->size, GFP_KERNEL);
 
         if (!wl->nvs) {
                 wl1271_error("could not allocate memory for the nvs file");
-                ret = -ENOMEM;
                 goto out;
         }
 
@@ -768,8 +739,6 @@ static int wl1271_fetch_nvs(struct wl1271 *wl)
 
 out:
         release_firmware(fw);
-
-        return ret;
 }
 
 void wl12xx_queue_recovery_work(struct wl1271 *wl)
@@ -820,14 +789,16 @@ static void wl12xx_read_fwlog_panic(struct wl1271 *wl)
 
         /*
          * Make sure the chip is awake and the logger isn't active.
-         * This might fail if the firmware hanged.
+         * Do not send a stop fwlog command if the fw is hanged.
          */
-        if (!wl1271_ps_elp_wakeup(wl))
+        if (!wl1271_ps_elp_wakeup(wl) && !wl->watchdog_recovery)
                 wl12xx_cmd_stop_fwlog(wl);
+        else
+                goto out;
 
         /* Read the first memory block address */
-        wl12xx_fw_status(wl, wl->fw_status);
-        first_addr = le32_to_cpu(wl->fw_status->log_start_addr);
+        wl12xx_fw_status(wl, wl->fw_status_1, wl->fw_status_2);
+        first_addr = le32_to_cpu(wl->fw_status_2->log_start_addr);
         if (!first_addr)
                 goto out;
 
@@ -872,9 +843,14 @@ static void wl1271_recovery_work(struct work_struct *work)
 
         wl12xx_read_fwlog_panic(wl);
 
-        wl1271_info("Hardware recovery in progress. FW ver: %s pc: 0x%x",
+        /* change partitions momentarily so we can read the FW pc */
+        wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        wl1271_info("Hardware recovery in progress. FW ver: %s pc: 0x%x "
+                    "hint_sts: 0x%08x",
                     wl->chip.fw_ver_str,
-                    wlcore_read_reg(wl, REG_PC_ON_RECOVERY));
+                    wlcore_read_reg(wl, REG_PC_ON_RECOVERY),
+                    wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR));
+        wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
 
         BUG_ON(bug_on_recovery &&
                !test_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags));
@@ -885,8 +861,6 @@ static void wl1271_recovery_work(struct work_struct *work)
                 goto out_unlock;
         }
 
-        BUG_ON(bug_on_recovery);
-
         /*
          * Advance security sequence number to overcome potential progress
          * in the firmware during recovery. This doens't hurt if the network is
@@ -900,7 +874,7 @@ static void wl1271_recovery_work(struct work_struct *work)
         }
 
         /* Prevent spurious TX during FW restart */
-        ieee80211_stop_queues(wl->hw);
+        wlcore_stop_queues(wl, WLCORE_QUEUE_STOP_REASON_FW_RESTART);
 
         if (wl->sched_scanning) {
                 ieee80211_sched_scan_stopped(wl->hw);
@@ -914,6 +888,7 @@ static void wl1271_recovery_work(struct work_struct *work)
                 vif = wl12xx_wlvif_to_vif(wlvif);
                 __wl1271_op_remove_interface(wl, vif, false);
         }
+        wl->watchdog_recovery = false;
         mutex_unlock(&wl->mutex);
         wl1271_op_stop(wl->hw);
 
@@ -925,9 +900,10 @@ static void wl1271_recovery_work(struct work_struct *work)
          * Its safe to enable TX now - the queues are stopped after a request
          * to restart the HW.
          */
-        ieee80211_wake_queues(wl->hw);
+        wlcore_wake_queues(wl, WLCORE_QUEUE_STOP_REASON_FW_RESTART);
         return;
 out_unlock:
+        wl->watchdog_recovery = false;
         mutex_unlock(&wl->mutex);
 }
 
@@ -938,13 +914,19 @@ static void wl1271_fw_wakeup(struct wl1271 *wl)
 
 static int wl1271_setup(struct wl1271 *wl)
 {
-        wl->fw_status = kmalloc(sizeof(*wl->fw_status), GFP_KERNEL);
-        if (!wl->fw_status)
+        wl->fw_status_1 = kmalloc(WLCORE_FW_STATUS_1_LEN(wl->num_rx_desc) +
+                                  sizeof(*wl->fw_status_2) +
+                                  wl->fw_status_priv_len, GFP_KERNEL);
+        if (!wl->fw_status_1)
                 return -ENOMEM;
 
+        wl->fw_status_2 = (struct wl_fw_status_2 *)
+                                (((u8 *) wl->fw_status_1) +
+                                WLCORE_FW_STATUS_1_LEN(wl->num_rx_desc));
+
         wl->tx_res_if = kmalloc(sizeof(*wl->tx_res_if), GFP_KERNEL);
         if (!wl->tx_res_if) {
-                kfree(wl->fw_status);
+                kfree(wl->fw_status_1);
                 return -ENOMEM;
         }
 
@@ -987,13 +969,12 @@ static int wl12xx_chip_wakeup(struct wl1271 *wl, bool plt)
          * simplify the code and since the performance impact is
          * negligible, we use the same block size for all different
          * chip types.
+         *
+         * Check if the bus supports blocksize alignment and, if it
+         * doesn't, make sure we don't have the quirk.
          */
-        if (wl1271_set_block_size(wl))
-                wl->quirks |= WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
-
-        ret = wl->ops->identify_chip(wl);
-        if (ret < 0)
-                goto out;
+        if (!wl1271_set_block_size(wl))
+                wl->quirks &= ~WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
 
         /* TODO: make sure the lower driver has set things up correctly */
 
@@ -1005,13 +986,6 @@ static int wl12xx_chip_wakeup(struct wl1271 *wl, bool plt)
         if (ret < 0)
                 goto out;
 
-        /* No NVS from netlink, try to get it from the filesystem */
-        if (wl->nvs == NULL) {
-                ret = wl1271_fetch_nvs(wl);
-                if (ret < 0)
-                        goto out;
-        }
-
 out:
         return ret;
 }
@@ -1039,14 +1013,10 @@ int wl1271_plt_start(struct wl1271 *wl)
                 if (ret < 0)
                         goto power_off;
 
-                ret = wl->ops->boot(wl);
+                ret = wl->ops->plt_init(wl);
                 if (ret < 0)
                         goto power_off;
 
-                ret = wl1271_plt_init(wl);
-                if (ret < 0)
-                        goto irq_disable;
-
                 wl->plt = true;
                 wl->state = WL1271_STATE_ON;
                 wl1271_notice("firmware booted in PLT mode (%s)",
@@ -1059,19 +1029,6 @@ int wl1271_plt_start(struct wl1271 *wl)
 
                 goto out;
 
-irq_disable:
-                mutex_unlock(&wl->mutex);
-                /* Unlocking the mutex in the middle of handling is
-                   inherently unsafe. In this case we deem it safe to do,
-                   because we need to let any possibly pending IRQ out of
-                   the system (and while we are WL1271_STATE_OFF the IRQ
-                   work function will not do anything.) Also, any other
-                   possible concurrent operations will fail due to the
-                   current state, hence the wl1271 struct should be safe. */
-                wlcore_disable_interrupts(wl);
-                wl1271_flush_deferred_work(wl);
-                cancel_work_sync(&wl->netstack_work);
-                mutex_lock(&wl->mutex);
 power_off:
                 wl1271_power_off(wl);
         }
@@ -1154,9 +1111,16 @@ static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 
         spin_lock_irqsave(&wl->wl_lock, flags);
 
-        /* queue the packet */
+        /*
+         * drop the packet if the link is invalid or the queue is stopped
+         * for any reason but watermark. Watermark is a "soft"-stop so we
+         * allow these packets through.
+         */
         if (hlid == WL12XX_INVALID_LINK_ID ||
-            (wlvif && !test_bit(hlid, wlvif->links_map))) {
+            (wlvif && !test_bit(hlid, wlvif->links_map)) ||
+             (wlcore_is_queue_stopped(wl, q) &&
+              !wlcore_is_queue_stopped_by_reason(wl, q,
+                        WLCORE_QUEUE_STOP_REASON_WATERMARK))) {
                 wl1271_debug(DEBUG_TX, "DROP skb hlid %d q %d", hlid, q);
                 ieee80211_free_txskb(hw, skb);
                 goto out;
@@ -1174,8 +1138,8 @@ static void wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
          */
         if (wl->tx_queue_count[q] >= WL1271_TX_QUEUE_HIGH_WATERMARK) {
                 wl1271_debug(DEBUG_TX, "op_tx: stopping queues for q %d", q);
-                ieee80211_stop_queue(wl->hw, mapping);
-                set_bit(q, &wl->stopped_queues_map);
+                wlcore_stop_queue_locked(wl, q,
+                                         WLCORE_QUEUE_STOP_REASON_WATERMARK);
         }
 
         /*
@@ -1758,7 +1722,7 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
         cancel_delayed_work_sync(&wl->connection_loss_work);
 
         /* let's notify MAC80211 about the remaining pending TX frames */
-        wl12xx_tx_reset(wl, true);
+        wl12xx_tx_reset(wl);
         mutex_lock(&wl->mutex);
 
         wl1271_power_off(wl);
@@ -1767,6 +1731,7 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
 
         wl->rx_counter = 0;
         wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
+        wl->channel_type = NL80211_CHAN_NO_HT;
         wl->tx_blocks_available = 0;
         wl->tx_allocated_blocks = 0;
         wl->tx_results_count = 0;
@@ -1799,8 +1764,9 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
 
         wl1271_debugfs_reset(wl);
 
-        kfree(wl->fw_status);
-        wl->fw_status = NULL;
+        kfree(wl->fw_status_1);
+        wl->fw_status_1 = NULL;
+        wl->fw_status_2 = NULL;
         kfree(wl->tx_res_if);
         wl->tx_res_if = NULL;
         kfree(wl->target_mem_map);
@@ -1894,6 +1860,9 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)
                 wl12xx_allocate_rate_policy(wl, &wlvif->sta.basic_rate_idx);
                 wl12xx_allocate_rate_policy(wl, &wlvif->sta.ap_rate_idx);
                 wl12xx_allocate_rate_policy(wl, &wlvif->sta.p2p_rate_idx);
+                wlvif->basic_rate_set = CONF_TX_RATE_MASK_BASIC;
+                wlvif->basic_rate = CONF_TX_RATE_MASK_BASIC;
+                wlvif->rate_set = CONF_TX_RATE_MASK_BASIC;
         } else {
                 /* init ap data */
                 wlvif->ap.bcast_hlid = WL12XX_INVALID_LINK_ID;
@@ -1903,13 +1872,19 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)
                 for (i = 0; i < CONF_TX_MAX_AC_COUNT; i++)
                         wl12xx_allocate_rate_policy(wl,
                                                 &wlvif->ap.ucast_rate_idx[i]);
+                wlvif->basic_rate_set = CONF_TX_AP_ENABLED_RATES;
+                /*
+                 * TODO: check if basic_rate shouldn't be
+                 * wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
+                 * instead (the same thing for STA above).
+                */
+                wlvif->basic_rate = CONF_TX_AP_ENABLED_RATES;
+                /* TODO: this seems to be used only for STA, check it */
+                wlvif->rate_set = CONF_TX_AP_ENABLED_RATES;
         }
 
         wlvif->bitrate_masks[IEEE80211_BAND_2GHZ] = wl->conf.tx.basic_rate;
         wlvif->bitrate_masks[IEEE80211_BAND_5GHZ] = wl->conf.tx.basic_rate_5;
-        wlvif->basic_rate_set = CONF_TX_RATE_MASK_BASIC;
-        wlvif->basic_rate = CONF_TX_RATE_MASK_BASIC;
-        wlvif->rate_set = CONF_TX_RATE_MASK_BASIC;
         wlvif->beacon_int = WL1271_DEFAULT_BEACON_INT;
 
         /*
@@ -1919,6 +1894,7 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)
         wlvif->band = wl->band;
         wlvif->channel = wl->channel;
         wlvif->power_level = wl->power_level;
+        wlvif->channel_type = wl->channel_type;
 
         INIT_WORK(&wlvif->rx_streaming_enable_work,
                   wl1271_rx_streaming_enable_work);
@@ -2444,7 +2420,7 @@ static int wl1271_sta_handle_idle(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         } else {
                 /* The current firmware only supports sched_scan in idle */
                 if (wl->sched_scanning) {
-                        wl1271_scan_sched_scan_stop(wl);
+                        wl1271_scan_sched_scan_stop(wl, wlvif);
                         ieee80211_sched_scan_stopped(wl->hw);
                 }
 
@@ -2469,13 +2445,20 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         /* if the channel changes while joined, join again */
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL &&
             ((wlvif->band != conf->channel->band) ||
-             (wlvif->channel != channel))) {
+             (wlvif->channel != channel) ||
+             (wlvif->channel_type != conf->channel_type))) {
                 /* send all pending packets */
                 wl1271_tx_work_locked(wl);
                 wlvif->band = conf->channel->band;
                 wlvif->channel = channel;
+                wlvif->channel_type = conf->channel_type;
 
-                if (!is_ap) {
+                if (is_ap) {
+                        ret = wl1271_init_ap_rates(wl, wlvif);
+                        if (ret < 0)
+                                wl1271_error("AP rate policy change failed %d",
+                                             ret);
+                } else {
                         /*
                          * FIXME: the mac80211 should really provide a fixed
                          * rate to use here. for now, just use the smallest
@@ -2583,8 +2566,9 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
          * 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))
+        if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) ||
+            ((changed & IEEE80211_CONF_CHANGE_IDLE) &&
+             (conf->flags & IEEE80211_CONF_IDLE)))
                 wl1271_tx_flush(wl);
 
         mutex_lock(&wl->mutex);
@@ -2593,6 +2577,7 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
                 wl->band = conf->channel->band;
                 wl->channel = channel;
+                wl->channel_type = conf->channel_type;
         }
 
         if (changed & IEEE80211_CONF_CHANGE_POWER)
@@ -2825,17 +2810,6 @@ static int wl1271_set_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         int ret;
         bool is_ap = (wlvif->bss_type == BSS_TYPE_AP_BSS);
 
-        /*
-         * A role set to GEM cipher requires different Tx settings (namely
-         * spare blocks). Note when we are in this mode so the HW can adjust.
-         */
-        if (key_type == KEY_GEM) {
-                if (action == KEY_ADD_OR_REPLACE)
-                        wlvif->is_gem = true;
-                else if (action == KEY_REMOVE)
-                        wlvif->is_gem = false;
-        }
-
         if (is_ap) {
                 struct wl1271_station *wl_sta;
                 u8 hlid;
@@ -2913,12 +2887,21 @@ static int wl1271_set_key(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         return 0;
 }
 
-static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
+static int wlcore_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                              struct ieee80211_vif *vif,
                              struct ieee80211_sta *sta,
                              struct ieee80211_key_conf *key_conf)
 {
         struct wl1271 *wl = hw->priv;
+
+        return wlcore_hw_set_key(wl, cmd, vif, sta, key_conf);
+}
+
+int wlcore_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
+                   struct ieee80211_vif *vif,
+                   struct ieee80211_sta *sta,
+                   struct ieee80211_key_conf *key_conf)
+{
         struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int ret;
         u32 tx_seq_32 = 0;
@@ -3029,6 +3012,7 @@ out_unlock:
 
         return ret;
 }
+EXPORT_SYMBOL_GPL(wlcore_set_key);
 
 static int wl1271_op_hw_scan(struct ieee80211_hw *hw,
                              struct ieee80211_vif *vif,
@@ -3167,6 +3151,7 @@ static void wl1271_op_sched_scan_stop(struct ieee80211_hw *hw,
                                       struct ieee80211_vif *vif)
 {
         struct wl1271 *wl = hw->priv;
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int ret;
 
         wl1271_debug(DEBUG_MAC80211, "wl1271_op_sched_scan_stop");
@@ -3180,7 +3165,7 @@ static void wl1271_op_sched_scan_stop(struct ieee80211_hw *hw,
         if (ret < 0)
                 goto out;
 
-        wl1271_scan_sched_scan_stop(wl);
+        wl1271_scan_sched_scan_stop(wl, wlvif);
 
         wl1271_ps_elp_sleep(wl);
 out:
@@ -3316,8 +3301,15 @@ static int wl1271_ap_set_probe_resp_tmpl(struct wl1271 *wl, u32 rates,
                                       skb->data,
                                       skb->len, 0,
                                       rates);
-
         dev_kfree_skb(skb);
+
+        if (ret < 0)
+                goto out;
+
+        wl1271_debug(DEBUG_AP, "probe response updated");
+        set_bit(WLVIF_FLAG_AP_PROBE_RESP_SET, &wlvif->flags);
+
+out:
         return ret;
 }
 
@@ -3422,6 +3414,87 @@ out:
         return ret;
 }
 
+static int wlcore_set_beacon_template(struct wl1271 *wl,
+                                      struct ieee80211_vif *vif,
+                                      bool is_ap)
+{
+        struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
+        struct ieee80211_hdr *hdr;
+        u32 min_rate;
+        int ret;
+        int ieoffset = offsetof(struct ieee80211_mgmt,
+                                u.beacon.variable);
+        struct sk_buff *beacon = ieee80211_beacon_get(wl->hw, vif);
+        u16 tmpl_id;
+
+        if (!beacon) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        wl1271_debug(DEBUG_MASTER, "beacon updated");
+
+        ret = wl1271_ssid_set(vif, beacon, ieoffset);
+        if (ret < 0) {
+                dev_kfree_skb(beacon);
+                goto out;
+        }
+        min_rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
+        tmpl_id = is_ap ? CMD_TEMPL_AP_BEACON :
+                CMD_TEMPL_BEACON;
+        ret = wl1271_cmd_template_set(wl, wlvif->role_id, tmpl_id,
+                                      beacon->data,
+                                      beacon->len, 0,
+                                      min_rate);
+        if (ret < 0) {
+                dev_kfree_skb(beacon);
+                goto out;
+        }
+
+        /*
+         * In case we already have a probe-resp beacon set explicitly
+         * by usermode, don't use the beacon data.
+         */
+        if (test_bit(WLVIF_FLAG_AP_PROBE_RESP_SET, &wlvif->flags))
+                goto end_bcn;
+
+        /* remove TIM ie from probe response */
+        wl12xx_remove_ie(beacon, WLAN_EID_TIM, ieoffset);
+
+        /*
+         * remove p2p ie from probe response.
+         * the fw reponds to probe requests that don't include
+         * the p2p ie. probe requests with p2p ie will be passed,
+         * and will be responded by the supplicant (the spec
+         * forbids including the p2p ie when responding to probe
+         * requests that didn't include it).
+         */
+        wl12xx_remove_vendor_ie(beacon, WLAN_OUI_WFA,
+                                WLAN_OUI_TYPE_WFA_P2P, ieoffset);
+
+        hdr = (struct ieee80211_hdr *) beacon->data;
+        hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
+                                         IEEE80211_STYPE_PROBE_RESP);
+        if (is_ap)
+                ret = wl1271_ap_set_probe_resp_tmpl_legacy(wl, vif,
+                                                           beacon->data,
+                                                           beacon->len,
+                                                           min_rate);
+        else
+                ret = wl1271_cmd_template_set(wl, wlvif->role_id,
+                                              CMD_TEMPL_PROBE_RESPONSE,
+                                              beacon->data,
+                                              beacon->len, 0,
+                                              min_rate);
+end_bcn:
+        dev_kfree_skb(beacon);
+        if (ret < 0)
+                goto out;
+
+out:
+        return ret;
+}
+
 static int wl1271_bss_beacon_info_changed(struct wl1271 *wl,
                                           struct ieee80211_vif *vif,
                                           struct ieee80211_bss_conf *bss_conf,
@@ -3440,81 +3513,12 @@ static int wl1271_bss_beacon_info_changed(struct wl1271 *wl,
 
         if ((changed & BSS_CHANGED_AP_PROBE_RESP) && is_ap) {
                 u32 rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
-                if (!wl1271_ap_set_probe_resp_tmpl(wl, rate, vif)) {
-                        wl1271_debug(DEBUG_AP, "probe response updated");
-                        set_bit(WLVIF_FLAG_AP_PROBE_RESP_SET, &wlvif->flags);
-                }
+
+                wl1271_ap_set_probe_resp_tmpl(wl, rate, vif);
         }
 
         if ((changed & BSS_CHANGED_BEACON)) {
-                struct ieee80211_hdr *hdr;
-                u32 min_rate;
-                int ieoffset = offsetof(struct ieee80211_mgmt,
-                                        u.beacon.variable);
-                struct sk_buff *beacon = ieee80211_beacon_get(wl->hw, vif);
-                u16 tmpl_id;
-
-                if (!beacon) {
-                        ret = -EINVAL;
-                        goto out;
-                }
-
-                wl1271_debug(DEBUG_MASTER, "beacon updated");
-
-                ret = wl1271_ssid_set(vif, beacon, ieoffset);
-                if (ret < 0) {
-                        dev_kfree_skb(beacon);
-                        goto out;
-                }
-                min_rate = wl1271_tx_min_rate_get(wl, wlvif->basic_rate_set);
-                tmpl_id = is_ap ? CMD_TEMPL_AP_BEACON :
-                                  CMD_TEMPL_BEACON;
-                ret = wl1271_cmd_template_set(wl, wlvif->role_id, tmpl_id,
-                                              beacon->data,
-                                              beacon->len, 0,
-                                              min_rate);
-                if (ret < 0) {
-                        dev_kfree_skb(beacon);
-                        goto out;
-                }
-
-                /*
-                 * In case we already have a probe-resp beacon set explicitly
-                 * by usermode, don't use the beacon data.
-                 */
-                if (test_bit(WLVIF_FLAG_AP_PROBE_RESP_SET, &wlvif->flags))
-                        goto end_bcn;
-
-                /* remove TIM ie from probe response */
-                wl12xx_remove_ie(beacon, WLAN_EID_TIM, ieoffset);
-
-                /*
-                 * remove p2p ie from probe response.
-                 * the fw reponds to probe requests that don't include
-                 * the p2p ie. probe requests with p2p ie will be passed,
-                 * and will be responded by the supplicant (the spec
-                 * forbids including the p2p ie when responding to probe
-                 * requests that didn't include it).
-                 */
-                wl12xx_remove_vendor_ie(beacon, WLAN_OUI_WFA,
-                                        WLAN_OUI_TYPE_WFA_P2P, ieoffset);
-
-                hdr = (struct ieee80211_hdr *) beacon->data;
-                hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                                                 IEEE80211_STYPE_PROBE_RESP);
-                if (is_ap)
-                        ret = wl1271_ap_set_probe_resp_tmpl_legacy(wl, vif,
-                                                beacon->data,
-                                                beacon->len,
-                                                min_rate);
-                else
-                        ret = wl1271_cmd_template_set(wl, wlvif->role_id,
-                                                CMD_TEMPL_PROBE_RESPONSE,
-                                                beacon->data,
-                                                beacon->len, 0,
-                                                min_rate);
-end_bcn:
-                dev_kfree_skb(beacon);
+                ret = wlcore_set_beacon_template(wl, vif, is_ap);
                 if (ret < 0)
                         goto out;
         }
@@ -3551,6 +3555,14 @@ static void wl1271_bss_info_changed_ap(struct wl1271 *wl,
                 ret = wl1271_ap_init_templates(wl, vif);
                 if (ret < 0)
                         goto out;
+
+                ret = wl1271_ap_set_probe_resp_tmpl(wl, wlvif->basic_rate, vif);
+                if (ret < 0)
+                        goto out;
+
+                ret = wlcore_set_beacon_template(wl, vif, true);
+                if (ret < 0)
+                        goto out;
         }
 
         ret = wl1271_bss_beacon_info_changed(wl, vif, bss_conf, changed);
@@ -3691,7 +3703,8 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
                 sta_rate_set = sta->supp_rates[wl->hw->conf.channel->band];
                 if (sta->ht_cap.ht_supported)
                         sta_rate_set |=
-                            (sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET);
+                          (sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET) |
+                          (sta->ht_cap.mcs.rx_mask[1] << HW_MIMO_RATES_OFFSET);
                 sta_ht_cap = sta->ht_cap;
                 sta_exists = true;
 
@@ -3704,13 +3717,11 @@ sta_not_found:
                         u32 rates;
                         int ieoffset;
                         wlvif->aid = bss_conf->aid;
+                        wlvif->channel_type = bss_conf->channel_type;
                         wlvif->beacon_int = bss_conf->beacon_int;
                         do_join = true;
                         set_assoc = true;
 
-                        /* Cancel connection_loss_work */
-                        cancel_delayed_work_sync(&wl->connection_loss_work);
-
                         /*
                          * use basic rates from AP, and determine lowest rate
                          * to use with control frames.
@@ -3960,6 +3971,17 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
         wl1271_debug(DEBUG_MAC80211, "mac80211 bss info changed 0x%x",
                      (int)changed);
 
+        /*
+         * make sure to cancel pending disconnections if our association
+         * state changed
+         */
+        if (!is_ap && (changed & BSS_CHANGED_ASSOC))
+                cancel_delayed_work_sync(&wl->connection_loss_work);
+
+        if (is_ap && (changed & BSS_CHANGED_BEACON_ENABLED) &&
+            !bss_conf->enable_beacon)
+                wl1271_tx_flush(wl);
+
         mutex_lock(&wl->mutex);
 
         if (unlikely(wl->state == WL1271_STATE_OFF))
@@ -4636,7 +4658,7 @@ static const struct ieee80211_ops wl1271_ops = {
         .prepare_multicast = wl1271_op_prepare_multicast,
         .configure_filter = wl1271_op_configure_filter,
         .tx = wl1271_op_tx,
-        .set_key = wl1271_op_set_key,
+        .set_key = wlcore_op_set_key,
         .hw_scan = wl1271_op_hw_scan,
         .cancel_hw_scan = wl1271_op_cancel_hw_scan,
         .sched_scan_start = wl1271_op_sched_scan_start,
@@ -4905,14 +4927,8 @@ static int wl1271_register_hw(struct wl1271 *wl)
         if (wl->mac80211_registered)
                 return 0;
 
-        ret = wl12xx_get_hw_info(wl);
-        if (ret < 0) {
-                wl1271_error("couldn't get hw info");
-                goto out;
-        }
-
-        ret = wl1271_fetch_nvs(wl);
-        if (ret == 0) {
+        wl1271_fetch_nvs(wl);
+        if (wl->nvs != NULL) {
                 /* NOTE: The wl->nvs->nvs element must be first, in
                  * order to simplify the casting, we assume it is at
                  * the beginning of the wl->nvs structure.
@@ -4970,9 +4986,11 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
                 WL1271_CIPHER_SUITE_GEM,
         };
 
-        /* The tx descriptor buffer and the TKIP space. */
-        wl->hw->extra_tx_headroom = WL1271_EXTRA_SPACE_TKIP +
-                sizeof(struct wl1271_tx_hw_descr);
+        /* The tx descriptor buffer */
+        wl->hw->extra_tx_headroom = sizeof(struct wl1271_tx_hw_descr);
+
+        if (wl->quirks & WLCORE_QUIRK_TKIP_HEADER_SPACE)
+                wl->hw->extra_tx_headroom += WL1271_EXTRA_SPACE_TKIP;
 
         /* unit us */
         /* FIXME: find a proper value */
@@ -5025,12 +5043,14 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
          */
         memcpy(&wl->bands[IEEE80211_BAND_2GHZ], &wl1271_band_2ghz,
                sizeof(wl1271_band_2ghz));
-        memcpy(&wl->bands[IEEE80211_BAND_2GHZ].ht_cap, &wl->ht_cap,
-               sizeof(wl->ht_cap));
+        memcpy(&wl->bands[IEEE80211_BAND_2GHZ].ht_cap,
+               &wl->ht_cap[IEEE80211_BAND_2GHZ],
+               sizeof(*wl->ht_cap));
         memcpy(&wl->bands[IEEE80211_BAND_5GHZ], &wl1271_band_5ghz,
                sizeof(wl1271_band_5ghz));
-        memcpy(&wl->bands[IEEE80211_BAND_5GHZ].ht_cap, &wl->ht_cap,
-               sizeof(wl->ht_cap));
+        memcpy(&wl->bands[IEEE80211_BAND_5GHZ].ht_cap,
+               &wl->ht_cap[IEEE80211_BAND_5GHZ],
+               sizeof(*wl->ht_cap));
 
         wl->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
                 &wl->bands[IEEE80211_BAND_2GHZ];
@@ -5117,6 +5137,7 @@ struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size)
         wl->rx_counter = 0;
         wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
         wl->band = IEEE80211_BAND_2GHZ;
+        wl->channel_type = NL80211_CHAN_NO_HT;
         wl->flags = 0;
         wl->sg_enabled = true;
         wl->hw_pg_ver = -1;
@@ -5142,6 +5163,7 @@ struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size)
         wl->state = WL1271_STATE_OFF;
         wl->fw_type = WL12XX_FW_TYPE_NONE;
         mutex_init(&wl->mutex);
+        mutex_init(&wl->flush_mutex);
 
         order = get_order(WL1271_AGGR_BUFFER_SIZE);
         wl->aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order);
@@ -5222,7 +5244,7 @@ int wlcore_free_hw(struct wl1271 *wl)
         kfree(wl->nvs);
         wl->nvs = NULL;
 
-        kfree(wl->fw_status);
+        kfree(wl->fw_status_1);
         kfree(wl->tx_res_if);
         destroy_workqueue(wl->freezable_wq);
 
@@ -5279,8 +5301,6 @@ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
         wlcore_adjust_conf(wl);
 
         wl->irq = platform_get_irq(pdev, 0);
-        wl->ref_clock = pdata->board_ref_clock;
-        wl->tcxo_clock = pdata->board_tcxo_clock;
         wl->platform_quirks = pdata->platform_quirks;
         wl->set_power = pdata->set_power;
         wl->dev = &pdev->dev;
@@ -5316,6 +5336,16 @@ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
         }
         disable_irq(wl->irq);
 
+        ret = wl12xx_get_hw_info(wl);
+        if (ret < 0) {
+                wl1271_error("couldn't get hw info");
+                goto out;
+        }
+
+        ret = wl->ops->identify_chip(wl);
+        if (ret < 0)
+                goto out;
+
         ret = wl1271_init_ieee80211(wl);
         if (ret)
                 goto out_irq;
diff --git a/drivers/net/wireless/ti/wlcore/ps.c b/drivers/net/wireless/ti/wlcore/ps.c
index 756eee2257b4..47e81b32f7da 100644
--- a/drivers/net/wireless/ti/wlcore/ps.c
+++ b/drivers/net/wireless/ti/wlcore/ps.c
@@ -28,6 +28,8 @@
 
 #define WL1271_WAKEUP_TIMEOUT 500
 
+#define ELP_ENTRY_DELAY  5
+
 void wl1271_elp_work(struct work_struct *work)
 {
         struct delayed_work *dwork;
@@ -72,6 +74,7 @@ out:
 void wl1271_ps_elp_sleep(struct wl1271 *wl)
 {
         struct wl12xx_vif *wlvif;
+        u32 timeout;
 
         if (wl->quirks & WLCORE_QUIRK_NO_ELP)
                 return;
@@ -89,8 +92,13 @@ void wl1271_ps_elp_sleep(struct wl1271 *wl)
                         return;
         }
 
+        if (wl->conf.conn.forced_ps)
+                timeout = ELP_ENTRY_DELAY;
+        else
+                timeout = wl->conf.conn.dynamic_ps_timeout;
+
         ieee80211_queue_delayed_work(wl->hw, &wl->elp_work,
-                msecs_to_jiffies(wl->conf.conn.dynamic_ps_timeout));
+                                     msecs_to_jiffies(timeout));
 }
 
 int wl1271_ps_elp_wakeup(struct wl1271 *wl)
@@ -185,8 +193,12 @@ int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 
                 set_bit(WLVIF_FLAG_IN_PS, &wlvif->flags);
 
-                /* enable beacon early termination. Not relevant for 5GHz */
-                if (wlvif->band == IEEE80211_BAND_2GHZ) {
+                /*
+                 * enable beacon early termination.
+                 * Not relevant for 5GHz and for high rates.
+                 */
+                if ((wlvif->band == IEEE80211_BAND_2GHZ) &&
+                    (wlvif->basic_rate < CONF_HW_BIT_RATE_9MBPS)) {
                         ret = wl1271_acx_bet_enable(wl, wlvif, true);
                         if (ret < 0)
                                 return ret;
@@ -196,7 +208,8 @@ int wl1271_ps_set_mode(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                 wl1271_debug(DEBUG_PSM, "leaving psm");
 
                 /* disable beacon early termination */
-                if (wlvif->band == IEEE80211_BAND_2GHZ) {
+                if ((wlvif->band == IEEE80211_BAND_2GHZ) &&
+                    (wlvif->basic_rate < CONF_HW_BIT_RATE_9MBPS)) {
                         ret = wl1271_acx_bet_enable(wl, wlvif, false);
                         if (ret < 0)
                                 return ret;
diff --git a/drivers/net/wireless/ti/wlcore/rx.c b/drivers/net/wireless/ti/wlcore/rx.c
index d6a3c6b07827..78200dcacfca 100644
--- a/drivers/net/wireless/ti/wlcore/rx.c
+++ b/drivers/net/wireless/ti/wlcore/rx.c
@@ -186,6 +186,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
                 is_data = 1;
 
         wl1271_rx_status(wl, desc, IEEE80211_SKB_RXCB(skb), beacon);
+        wlcore_hw_set_rx_csum(wl, desc, skb);
 
         seq_num = (le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4;
         wl1271_debug(DEBUG_RX, "rx skb 0x%p: %d B %s seq %d hlid %d", skb,
@@ -199,12 +200,12 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
         return is_data;
 }
 
-void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status *status)
+void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status_1 *status)
 {
         unsigned long active_hlids[BITS_TO_LONGS(WL12XX_MAX_LINKS)] = {0};
         u32 buf_size;
-        u32 fw_rx_counter  = status->fw_rx_counter & NUM_RX_PKT_DESC_MOD_MASK;
-        u32 drv_rx_counter = wl->rx_counter & NUM_RX_PKT_DESC_MOD_MASK;
+        u32 fw_rx_counter = status->fw_rx_counter % wl->num_rx_desc;
+        u32 drv_rx_counter = wl->rx_counter % wl->num_rx_desc;
         u32 rx_counter;
         u32 pkt_len, align_pkt_len;
         u32 pkt_offset, des;
@@ -223,7 +224,7 @@ void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status *status)
                                 break;
                         buf_size += align_pkt_len;
                         rx_counter++;
-                        rx_counter &= NUM_RX_PKT_DESC_MOD_MASK;
+                        rx_counter %= wl->num_rx_desc;
                 }
 
                 if (buf_size == 0) {
@@ -263,7 +264,7 @@ void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status *status)
 
                         wl->rx_counter++;
                         drv_rx_counter++;
-                        drv_rx_counter &= NUM_RX_PKT_DESC_MOD_MASK;
+                        drv_rx_counter %= wl->num_rx_desc;
                         pkt_offset += wlcore_rx_get_align_buf_size(wl, pkt_len);
                 }
         }
diff --git a/drivers/net/wireless/ti/wlcore/rx.h b/drivers/net/wireless/ti/wlcore/rx.h
index e9a162a864ca..9be780179456 100644
--- a/drivers/net/wireless/ti/wlcore/rx.h
+++ b/drivers/net/wireless/ti/wlcore/rx.h
@@ -38,8 +38,6 @@
 #define RX_DESC_PACKETID_SHIFT 11
 #define RX_MAX_PACKET_ID 3
 
-#define NUM_RX_PKT_DESC_MOD_MASK   7
-
 #define RX_DESC_VALID_FCS         0x0001
 #define RX_DESC_MATCH_RXADDR1     0x0002
 #define RX_DESC_MCAST             0x0004
@@ -102,6 +100,9 @@
 /* If set, the start of IP payload is not 4 bytes aligned */
 #define RX_BUF_UNALIGNED_PAYLOAD     BIT(20)
 
+/* If set, the buffer was padded by the FW to be 4 bytes aligned */
+#define RX_BUF_PADDED_PAYLOAD        BIT(30)
+
 /* Describes the alignment state of a Rx buffer */
 enum wl_rx_buf_align {
         WLCORE_RX_BUF_ALIGNED,
@@ -136,7 +137,7 @@ struct wl1271_rx_descriptor {
         u8  reserved;
 } __packed;
 
-void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status *status);
+void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status_1 *status);
 u8 wl1271_rate_to_idx(int rate, enum ieee80211_band band);
 int wl1271_rx_filter_enable(struct wl1271 *wl,
                             int index, bool enable,
diff --git a/drivers/net/wireless/ti/wlcore/scan.c b/drivers/net/wireless/ti/wlcore/scan.c
index ade21a011c45..d9daed53ceb7 100644
--- a/drivers/net/wireless/ti/wlcore/scan.c
+++ b/drivers/net/wireless/ti/wlcore/scan.c
@@ -411,7 +411,8 @@ wl1271_scan_get_sched_scan_channels(struct wl1271 *wl,
                                     struct cfg80211_sched_scan_request *req,
                                     struct conn_scan_ch_params *channels,
                                     u32 band, bool radar, bool passive,
-                                    int start, int max_channels)
+                                    int start, int max_channels,
+                                    u8 *n_pactive_ch)
 {
         struct conf_sched_scan_settings *c = &wl->conf.sched_scan;
         int i, j;
@@ -479,6 +480,23 @@ wl1271_scan_get_sched_scan_channels(struct wl1271 *wl,
                         channels[j].tx_power_att = req->channels[i]->max_power;
                         channels[j].channel = req->channels[i]->hw_value;
 
+                        if ((band == IEEE80211_BAND_2GHZ) &&
+                            (channels[j].channel >= 12) &&
+                            (channels[j].channel <= 14) &&
+                            (flags & IEEE80211_CHAN_PASSIVE_SCAN) &&
+                            !force_passive) {
+                                /* pactive channels treated as DFS */
+                                channels[j].flags = SCAN_CHANNEL_FLAGS_DFS;
+
+                                /*
+                                 * n_pactive_ch is counted down from the end of
+                                 * the passive channel list
+                                 */
+                                (*n_pactive_ch)++;
+                                wl1271_debug(DEBUG_SCAN, "n_pactive_ch = %d",
+                                             *n_pactive_ch);
+                        }
+
                         j++;
                 }
         }
@@ -491,38 +509,47 @@ wl1271_scan_sched_scan_channels(struct wl1271 *wl,
                                 struct cfg80211_sched_scan_request *req,
                                 struct wl1271_cmd_sched_scan_config *cfg)
 {
+        u8 n_pactive_ch = 0;
+
         cfg->passive[0] =
                 wl1271_scan_get_sched_scan_channels(wl, req, cfg->channels_2,
                                                     IEEE80211_BAND_2GHZ,
                                                     false, true, 0,
-                                                    MAX_CHANNELS_2GHZ);
+                                                    MAX_CHANNELS_2GHZ,
+                                                    &n_pactive_ch);
         cfg->active[0] =
                 wl1271_scan_get_sched_scan_channels(wl, req, cfg->channels_2,
                                                     IEEE80211_BAND_2GHZ,
                                                     false, false,
                                                     cfg->passive[0],
-                                                    MAX_CHANNELS_2GHZ);
+                                                    MAX_CHANNELS_2GHZ,
+                                                    &n_pactive_ch);
         cfg->passive[1] =
                 wl1271_scan_get_sched_scan_channels(wl, req, cfg->channels_5,
                                                     IEEE80211_BAND_5GHZ,
                                                     false, true, 0,
-                                                    MAX_CHANNELS_5GHZ);
+                                                    MAX_CHANNELS_5GHZ,
+                                                    &n_pactive_ch);
         cfg->dfs =
                 wl1271_scan_get_sched_scan_channels(wl, req, cfg->channels_5,
                                                     IEEE80211_BAND_5GHZ,
                                                     true, true,
                                                     cfg->passive[1],
-                                                    MAX_CHANNELS_5GHZ);
+                                                    MAX_CHANNELS_5GHZ,
+                                                    &n_pactive_ch);
         cfg->active[1] =
                 wl1271_scan_get_sched_scan_channels(wl, req, cfg->channels_5,
                                                     IEEE80211_BAND_5GHZ,
                                                     false, false,
                                                     cfg->passive[1] + cfg->dfs,
-                                                    MAX_CHANNELS_5GHZ);
+                                                    MAX_CHANNELS_5GHZ,
+                                                    &n_pactive_ch);
         /* 802.11j channels are not supported yet */
         cfg->passive[2] = 0;
         cfg->active[2] = 0;
 
+        cfg->n_pactive_ch = n_pactive_ch;
+
         wl1271_debug(DEBUG_SCAN, "    2.4GHz: active %d passive %d",
                      cfg->active[0], cfg->passive[0]);
         wl1271_debug(DEBUG_SCAN, "    5GHz: active %d passive %d",
@@ -537,6 +564,7 @@ wl1271_scan_sched_scan_channels(struct wl1271 *wl,
 /* Returns the scan type to be used or a negative value on error */
 static int
 wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl,
+                                 struct wl12xx_vif *wlvif,
                                  struct cfg80211_sched_scan_request *req)
 {
         struct wl1271_cmd_sched_scan_ssid_list *cmd = NULL;
@@ -565,6 +593,7 @@ wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl,
                 goto out;
         }
 
+        cmd->role_id = wlvif->dev_role_id;
         if (!n_match_ssids) {
                 /* No filter, with ssids */
                 type = SCAN_SSID_FILTER_DISABLED;
@@ -603,7 +632,9 @@ wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl,
                                         continue;
 
                                 for (j = 0; j < cmd->n_ssids; j++)
-                                        if (!memcmp(req->ssids[i].ssid,
+                                        if ((req->ssids[i].ssid_len ==
+                                             req->ssids[j].ssid_len) &&
+                                            !memcmp(req->ssids[i].ssid,
                                                    cmd->ssids[j].ssid,
                                                    req->ssids[i].ssid_len)) {
                                                 cmd->ssids[j].type =
@@ -652,6 +683,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
         if (!cfg)
                 return -ENOMEM;
 
+        cfg->role_id = wlvif->dev_role_id;
         cfg->rssi_threshold = c->rssi_threshold;
         cfg->snr_threshold  = c->snr_threshold;
         cfg->n_probe_reqs = c->num_probe_reqs;
@@ -669,7 +701,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
                 cfg->intervals[i] = cpu_to_le32(req->interval);
 
         cfg->ssid_len = 0;
-        ret = wl12xx_scan_sched_scan_ssid_list(wl, req);
+        ret = wl12xx_scan_sched_scan_ssid_list(wl, wlvif, req);
         if (ret < 0)
                 goto out;
 
@@ -741,6 +773,7 @@ int wl1271_scan_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif *wlvif)
         if (!start)
                 return -ENOMEM;
 
+        start->role_id = wlvif->dev_role_id;
         start->tag = WL1271_SCAN_DEFAULT_TAG;
 
         ret = wl1271_cmd_send(wl, CMD_START_PERIODIC_SCAN, start,
@@ -762,7 +795,7 @@ void wl1271_scan_sched_scan_results(struct wl1271 *wl)
         ieee80211_sched_scan_results(wl->hw);
 }
 
-void wl1271_scan_sched_scan_stop(struct wl1271 *wl)
+void wl1271_scan_sched_scan_stop(struct wl1271 *wl,  struct wl12xx_vif *wlvif)
 {
         struct wl1271_cmd_sched_scan_stop *stop;
         int ret = 0;
@@ -776,6 +809,7 @@ void wl1271_scan_sched_scan_stop(struct wl1271 *wl)
                 return;
         }
 
+        stop->role_id = wlvif->dev_role_id;
         stop->tag = WL1271_SCAN_DEFAULT_TAG;
 
         ret = wl1271_cmd_send(wl, CMD_STOP_PERIODIC_SCAN, stop,
diff --git a/drivers/net/wireless/ti/wlcore/scan.h b/drivers/net/wireless/ti/wlcore/scan.h
index 81ee36ac2078..29f3c8d6b046 100644
--- a/drivers/net/wireless/ti/wlcore/scan.h
+++ b/drivers/net/wireless/ti/wlcore/scan.h
@@ -40,7 +40,7 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
                                      struct cfg80211_sched_scan_request *req,
                                      struct ieee80211_sched_scan_ies *ies);
 int wl1271_scan_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif *wlvif);
-void wl1271_scan_sched_scan_stop(struct wl1271 *wl);
+void wl1271_scan_sched_scan_stop(struct wl1271 *wl,  struct wl12xx_vif *wlvif);
 void wl1271_scan_sched_scan_results(struct wl1271 *wl);
 
 #define WL1271_SCAN_MAX_CHANNELS       24
@@ -142,7 +142,8 @@ enum {
         SCAN_BSS_TYPE_ANY,
 };
 
-#define SCAN_CHANNEL_FLAGS_DFS          BIT(0)
+#define SCAN_CHANNEL_FLAGS_DFS          BIT(0) /* channel is passive until an
+                                                  activity is detected on it */
 #define SCAN_CHANNEL_FLAGS_DFS_ENABLED  BIT(1)
 
 struct conn_scan_ch_params {
@@ -185,7 +186,10 @@ struct wl1271_cmd_sched_scan_config {
 
         u8 dfs;
 
-        u8 padding[3];
+        u8 n_pactive_ch; /* number of pactive (passive until fw detects energy)
+                            channels in BG band */
+        u8 role_id;
+        u8 padding[1];
 
         struct conn_scan_ch_params channels_2[MAX_CHANNELS_2GHZ];
         struct conn_scan_ch_params channels_5[MAX_CHANNELS_5GHZ];
@@ -212,21 +216,24 @@ struct wl1271_cmd_sched_scan_ssid_list {
 
         u8 n_ssids;
         struct wl1271_ssid ssids[SCHED_SCAN_MAX_SSIDS];
-        u8 padding[3];
+        u8 role_id;
+        u8 padding[2];
 } __packed;
 
 struct wl1271_cmd_sched_scan_start {
         struct wl1271_cmd_header header;
 
         u8 tag;
-        u8 padding[3];
+        u8 role_id;
+        u8 padding[2];
 } __packed;
 
 struct wl1271_cmd_sched_scan_stop {
         struct wl1271_cmd_header header;
 
         u8 tag;
-        u8 padding[3];
+        u8 role_id;
+        u8 padding[2];
 } __packed;
 
 
diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
index 0a72347cfc4c..c67ec482e445 100644
--- a/drivers/net/wireless/ti/wlcore/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/vmalloc.h>
 #include <linux/platform_device.h>
+#include <linux/mmc/sdio.h>
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/sdio_ids.h>
 #include <linux/mmc/card.h>
@@ -32,6 +33,7 @@
 #include <linux/gpio.h>
 #include <linux/wl12xx.h>
 #include <linux/pm_runtime.h>
+#include <linux/printk.h>
 
 #include "wlcore.h"
 #include "wl12xx_80211.h"
@@ -45,6 +47,8 @@
 #define SDIO_DEVICE_ID_TI_WL1271        0x4076
 #endif
 
+static bool dump = false;
+
 struct wl12xx_sdio_glue {
         struct device *dev;
         struct platform_device *core;
@@ -76,6 +80,13 @@ static void wl12xx_sdio_raw_read(struct device *child, int addr, void *buf,
 
         sdio_claim_host(func);
 
+        if (unlikely(dump)) {
+                printk(KERN_DEBUG "wlcore_sdio: READ from 0x%04x\n", addr);
+                print_hex_dump(KERN_DEBUG, "wlcore_sdio: READ ",
+                                DUMP_PREFIX_OFFSET, 16, 1,
+                                buf, len, false);
+        }
+
         if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG)) {
                 ((u8 *)buf)[0] = sdio_f0_readb(func, addr, &ret);
                 dev_dbg(child->parent, "sdio read 52 addr 0x%x, byte 0x%02x\n",
@@ -105,6 +116,13 @@ static void wl12xx_sdio_raw_write(struct device *child, int addr, void *buf,
 
         sdio_claim_host(func);
 
+        if (unlikely(dump)) {
+                printk(KERN_DEBUG "wlcore_sdio: WRITE to 0x%04x\n", addr);
+                print_hex_dump(KERN_DEBUG, "wlcore_sdio: WRITE ",
+                                DUMP_PREFIX_OFFSET, 16, 1,
+                                buf, len, false);
+        }
+
         if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG)) {
                 sdio_f0_writeb(func, ((u8 *)buf)[0], addr, &ret);
                 dev_dbg(child->parent, "sdio write 52 addr 0x%x, byte 0x%02x\n",
@@ -196,6 +214,7 @@ static int __devinit wl1271_probe(struct sdio_func *func,
         struct resource res[1];
         mmc_pm_flag_t mmcflags;
         int ret = -ENOMEM;
+        const char *chip_family;
 
         /* We are only able to handle the wlan function */
         if (func->num != 0x02)
@@ -236,7 +255,18 @@ static int __devinit wl1271_probe(struct sdio_func *func,
         /* Tell PM core that we don't need the card to be powered now */
         pm_runtime_put_noidle(&func->dev);
 
-        glue->core = platform_device_alloc("wl12xx", -1);
+        /*
+         * Due to a hardware bug, we can't differentiate wl18xx from
+         * wl12xx, because both report the same device ID.  The only
+         * way to differentiate is by checking the SDIO revision,
+         * which is 3.00 on the wl18xx chips.
+         */
+        if (func->card->cccr.sdio_vsn == SDIO_SDIO_REV_3_00)
+                chip_family = "wl18xx";
+        else
+                chip_family = "wl12xx";
+
+        glue->core = platform_device_alloc(chip_family, -1);
         if (!glue->core) {
                 dev_err(glue->dev, "can't allocate platform_device");
                 ret = -ENOMEM;
@@ -367,6 +397,9 @@ static void __exit wl1271_exit(void)
 module_init(wl1271_init);
 module_exit(wl1271_exit);
 
+module_param(dump, bool, S_IRUSR | S_IWUSR);
+MODULE_PARM_DESC(dump, "Enable sdio read/write dumps.");
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>");
 MODULE_AUTHOR("Juuso Oikarinen <juuso.oikarinen@nokia.com>");
diff --git a/drivers/net/wireless/ti/wlcore/tx.c b/drivers/net/wireless/ti/wlcore/tx.c
index 6893bc207994..9273fdb3aaec 100644
--- a/drivers/net/wireless/ti/wlcore/tx.c
+++ b/drivers/net/wireless/ti/wlcore/tx.c
@@ -72,7 +72,7 @@ static int wl1271_alloc_tx_id(struct wl1271 *wl, struct sk_buff *skb)
         return id;
 }
 
-static void wl1271_free_tx_id(struct wl1271 *wl, int id)
+void wl1271_free_tx_id(struct wl1271 *wl, int id)
 {
         if (__test_and_clear_bit(id, wl->tx_frames_map)) {
                 if (unlikely(wl->tx_frames_cnt == wl->num_tx_desc))
@@ -82,6 +82,7 @@ static void wl1271_free_tx_id(struct wl1271 *wl, int id)
                 wl->tx_frames_cnt--;
         }
 }
+EXPORT_SYMBOL(wl1271_free_tx_id);
 
 static void wl1271_tx_ap_update_inconnection_sta(struct wl1271 *wl,
                                                  struct sk_buff *skb)
@@ -127,6 +128,7 @@ bool wl12xx_is_dummy_packet(struct wl1271 *wl, struct sk_buff *skb)
 {
         return wl->dummy_packet == skb;
 }
+EXPORT_SYMBOL(wl12xx_is_dummy_packet);
 
 u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                          struct sk_buff *skb)
@@ -146,10 +148,10 @@ u8 wl12xx_tx_get_hlid_ap(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                         return wl->system_hlid;
 
                 hdr = (struct ieee80211_hdr *)skb->data;
-                if (ieee80211_is_mgmt(hdr->frame_control))
-                        return wlvif->ap.global_hlid;
-                else
+                if (is_multicast_ether_addr(ieee80211_get_DA(hdr)))
                         return wlvif->ap.bcast_hlid;
+                else
+                        return wlvif->ap.global_hlid;
         }
 }
 
@@ -176,37 +178,34 @@ u8 wl12xx_tx_get_hlid(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 unsigned int wlcore_calc_packet_alignment(struct wl1271 *wl,
                                           unsigned int packet_length)
 {
-        if (wl->quirks & WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN)
-                return ALIGN(packet_length, WL12XX_BUS_BLOCK_SIZE);
-        else
+        if ((wl->quirks & WLCORE_QUIRK_TX_PAD_LAST_FRAME) ||
+            !(wl->quirks & WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN))
                 return ALIGN(packet_length, WL1271_TX_ALIGN_TO);
+        else
+                return ALIGN(packet_length, WL12XX_BUS_BLOCK_SIZE);
 }
 EXPORT_SYMBOL(wlcore_calc_packet_alignment);
 
 static int wl1271_tx_allocate(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                               struct sk_buff *skb, u32 extra, u32 buf_offset,
-                              u8 hlid)
+                              u8 hlid, bool is_gem)
 {
         struct wl1271_tx_hw_descr *desc;
         u32 total_len = skb->len + sizeof(struct wl1271_tx_hw_descr) + extra;
         u32 total_blocks;
         int id, ret = -EBUSY, ac;
-        u32 spare_blocks = wl->normal_tx_spare;
-        bool is_dummy = false;
+        u32 spare_blocks;
 
         if (buf_offset + total_len > WL1271_AGGR_BUFFER_SIZE)
                 return -EAGAIN;
 
+        spare_blocks = wlcore_hw_get_spare_blocks(wl, is_gem);
+
         /* allocate free identifier for the packet */
         id = wl1271_alloc_tx_id(wl, skb);
         if (id < 0)
                 return id;
 
-        if (unlikely(wl12xx_is_dummy_packet(wl, skb)))
-                is_dummy = true;
-        else if (wlvif->is_gem)
-                spare_blocks = wl->gem_tx_spare;
-
         total_blocks = wlcore_hw_calc_tx_blocks(wl, total_len, spare_blocks);
 
         if (total_blocks <= wl->tx_blocks_available) {
@@ -228,7 +227,7 @@ static int wl1271_tx_allocate(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                 ac = wl1271_tx_get_queue(skb_get_queue_mapping(skb));
                 wl->tx_allocated_pkts[ac]++;
 
-                if (!is_dummy && wlvif &&
+                if (!wl12xx_is_dummy_packet(wl, skb) && wlvif &&
                     wlvif->bss_type == BSS_TYPE_AP_BSS &&
                     test_bit(hlid, wlvif->ap.sta_hlid_map))
                         wl->links[hlid].allocated_pkts++;
@@ -268,6 +267,7 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         if (extra) {
                 int hdrlen = ieee80211_hdrlen(frame_control);
                 memmove(frame_start, hdr, hdrlen);
+                skb_set_network_header(skb, skb_network_offset(skb) + extra);
         }
 
         /* configure packet life time */
@@ -330,9 +330,9 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,
             ieee80211_has_protected(frame_control))
                 tx_attr |= TX_HW_ATTR_HOST_ENCRYPT;
 
-        desc->reserved = 0;
         desc->tx_attr = cpu_to_le16(tx_attr);
 
+        wlcore_hw_set_tx_desc_csum(wl, desc, skb);
         wlcore_hw_set_tx_desc_data_len(wl, desc, skb);
 }
 
@@ -346,6 +346,7 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         u32 total_len;
         u8 hlid;
         bool is_dummy;
+        bool is_gem = false;
 
         if (!skb)
                 return -EINVAL;
@@ -355,7 +356,8 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         /* TODO: handle dummy packets on multi-vifs */
         is_dummy = wl12xx_is_dummy_packet(wl, skb);
 
-        if (info->control.hw_key &&
+        if ((wl->quirks & WLCORE_QUIRK_TKIP_HEADER_SPACE) &&
+            info->control.hw_key &&
             info->control.hw_key->cipher == WLAN_CIPHER_SUITE_TKIP)
                 extra = WL1271_EXTRA_SPACE_TKIP;
 
@@ -373,6 +375,8 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                                 return ret;
                         wlvif->default_key = idx;
                 }
+
+                is_gem = (cipher == WL1271_CIPHER_SUITE_GEM);
         }
         hlid = wl12xx_tx_get_hlid(wl, wlvif, skb);
         if (hlid == WL12XX_INVALID_LINK_ID) {
@@ -380,7 +384,8 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                 return -EINVAL;
         }
 
-        ret = wl1271_tx_allocate(wl, wlvif, skb, extra, buf_offset, hlid);
+        ret = wl1271_tx_allocate(wl, wlvif, skb, extra, buf_offset, hlid,
+                                 is_gem);
         if (ret < 0)
                 return ret;
 
@@ -425,10 +430,10 @@ u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set,
                 rate_set >>= 1;
         }
 
-        /* MCS rates indication are on bits 16 - 23 */
+        /* MCS rates indication are on bits 16 - 31 */
         rate_set >>= HW_HT_RATES_OFFSET - band->n_bitrates;
 
-        for (bit = 0; bit < 8; bit++) {
+        for (bit = 0; bit < 16; bit++) {
                 if (rate_set & 0x1)
                         enabled_rates |= (CONF_HW_BIT_RATE_MCS_0 << bit);
                 rate_set >>= 1;
@@ -439,18 +444,15 @@ u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set,
 
 void wl1271_handle_tx_low_watermark(struct wl1271 *wl)
 {
-        unsigned long flags;
         int i;
 
         for (i = 0; i < NUM_TX_QUEUES; i++) {
-                if (test_bit(i, &wl->stopped_queues_map) &&
+                if (wlcore_is_queue_stopped_by_reason(wl, i,
+                        WLCORE_QUEUE_STOP_REASON_WATERMARK) &&
                     wl->tx_queue_count[i] <= WL1271_TX_QUEUE_LOW_WATERMARK) {
                         /* firmware buffer has space, restart queues */
-                        spin_lock_irqsave(&wl->wl_lock, flags);
-                        ieee80211_wake_queue(wl->hw,
-                                             wl1271_tx_get_mac80211_queue(i));
-                        clear_bit(i, &wl->stopped_queues_map);
-                        spin_unlock_irqrestore(&wl->wl_lock, flags);
+                        wlcore_wake_queue(wl, i,
+                                          WLCORE_QUEUE_STOP_REASON_WATERMARK);
                 }
         }
 }
@@ -661,7 +663,7 @@ void wl1271_tx_work_locked(struct wl1271 *wl)
         struct wl12xx_vif *wlvif;
         struct sk_buff *skb;
         struct wl1271_tx_hw_descr *desc;
-        u32 buf_offset = 0;
+        u32 buf_offset = 0, last_len = 0;
         bool sent_packets = false;
         unsigned long active_hlids[BITS_TO_LONGS(WL12XX_MAX_LINKS)] = {0};
         int ret;
@@ -685,6 +687,9 @@ void wl1271_tx_work_locked(struct wl1271 *wl)
                          * Flush buffer and try again.
                          */
                         wl1271_skb_queue_head(wl, wlvif, skb);
+
+                        buf_offset = wlcore_hw_pre_pkt_send(wl, buf_offset,
+                                                            last_len);
                         wlcore_write_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
                                           buf_offset, true);
                         sent_packets = true;
@@ -710,7 +715,8 @@ void wl1271_tx_work_locked(struct wl1271 *wl)
                                 ieee80211_free_txskb(wl->hw, skb);
                         goto out_ack;
                 }
-                buf_offset += ret;
+                last_len = ret;
+                buf_offset += last_len;
                 wl->tx_packets_count++;
                 if (has_data) {
                         desc = (struct wl1271_tx_hw_descr *) skb->data;
@@ -720,6 +726,7 @@ void wl1271_tx_work_locked(struct wl1271 *wl)
 
 out_ack:
         if (buf_offset) {
+                buf_offset = wlcore_hw_pre_pkt_send(wl, buf_offset, last_len);
                 wlcore_write_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
                                   buf_offset, true);
                 sent_packets = true;
@@ -849,7 +856,8 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
         skb_pull(skb, sizeof(struct wl1271_tx_hw_descr));
 
         /* remove TKIP header space if present */
-        if (info->control.hw_key &&
+        if ((wl->quirks & WLCORE_QUIRK_TKIP_HEADER_SPACE) &&
+            info->control.hw_key &&
             info->control.hw_key->cipher == WLAN_CIPHER_SUITE_TKIP) {
                 int hdrlen = ieee80211_get_hdrlen_from_skb(skb);
                 memmove(skb->data + WL1271_EXTRA_SPACE_TKIP, skb->data,
@@ -871,8 +879,7 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
 /* Called upon reception of a TX complete interrupt */
 void wl1271_tx_complete(struct wl1271 *wl)
 {
-        struct wl1271_acx_mem_map *memmap =
-                (struct wl1271_acx_mem_map *)wl->target_mem_map;
+        struct wl1271_acx_mem_map *memmap = wl->target_mem_map;
         u32 count, fw_counter;
         u32 i;
 
@@ -958,7 +965,7 @@ void wl12xx_tx_reset_wlvif(struct wl1271 *wl, struct wl12xx_vif *wlvif)
 
 }
 /* caller must hold wl->mutex and TX must be stopped */
-void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues)
+void wl12xx_tx_reset(struct wl1271 *wl)
 {
         int i;
         struct sk_buff *skb;
@@ -973,15 +980,12 @@ void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues)
                         wl->tx_queue_count[i] = 0;
         }
 
-        wl->stopped_queues_map = 0;
-
         /*
          * Make sure the driver is at a consistent state, in case this
          * function is called from a context other than interface removal.
          * This call will always wake the TX queues.
          */
-        if (reset_tx_queues)
-                wl1271_handle_tx_low_watermark(wl);
+        wl1271_handle_tx_low_watermark(wl);
 
         for (i = 0; i < wl->num_tx_desc; i++) {
                 if (wl->tx_frames[i] == NULL)
@@ -998,7 +1002,8 @@ void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues)
                          */
                         info = IEEE80211_SKB_CB(skb);
                         skb_pull(skb, sizeof(struct wl1271_tx_hw_descr));
-                        if (info->control.hw_key &&
+                        if ((wl->quirks & WLCORE_QUIRK_TKIP_HEADER_SPACE) &&
+                            info->control.hw_key &&
                             info->control.hw_key->cipher ==
                             WLAN_CIPHER_SUITE_TKIP) {
                                 int hdrlen = ieee80211_get_hdrlen_from_skb(skb);
@@ -1024,6 +1029,11 @@ void wl1271_tx_flush(struct wl1271 *wl)
         int i;
         timeout = jiffies + usecs_to_jiffies(WL1271_TX_FLUSH_TIMEOUT);
 
+        /* only one flush should be in progress, for consistent queue state */
+        mutex_lock(&wl->flush_mutex);
+
+        wlcore_stop_queues(wl, WLCORE_QUEUE_STOP_REASON_FLUSH);
+
         while (!time_after(jiffies, timeout)) {
                 mutex_lock(&wl->mutex);
                 wl1271_debug(DEBUG_TX, "flushing tx buffer: %d %d",
@@ -1032,7 +1042,7 @@ void wl1271_tx_flush(struct wl1271 *wl)
                 if ((wl->tx_frames_cnt == 0) &&
                     (wl1271_tx_total_queue_count(wl) == 0)) {
                         mutex_unlock(&wl->mutex);
-                        return;
+                        goto out;
                 }
                 mutex_unlock(&wl->mutex);
                 msleep(1);
@@ -1045,7 +1055,12 @@ void wl1271_tx_flush(struct wl1271 *wl)
         for (i = 0; i < WL12XX_MAX_LINKS; i++)
                 wl1271_tx_reset_link_queues(wl, i);
         mutex_unlock(&wl->mutex);
+
+out:
+        wlcore_wake_queues(wl, WLCORE_QUEUE_STOP_REASON_FLUSH);
+        mutex_unlock(&wl->flush_mutex);
 }
+EXPORT_SYMBOL_GPL(wl1271_tx_flush);
 
 u32 wl1271_tx_min_rate_get(struct wl1271 *wl, u32 rate_set)
 {
@@ -1054,3 +1069,96 @@ u32 wl1271_tx_min_rate_get(struct wl1271 *wl, u32 rate_set)
 
         return BIT(__ffs(rate_set));
 }
+
+void wlcore_stop_queue_locked(struct wl1271 *wl, u8 queue,
+                              enum wlcore_queue_stop_reason reason)
+{
+        bool stopped = !!wl->queue_stop_reasons[queue];
+
+        /* queue should not be stopped for this reason */
+        WARN_ON(test_and_set_bit(reason, &wl->queue_stop_reasons[queue]));
+
+        if (stopped)
+                return;
+
+        ieee80211_stop_queue(wl->hw, wl1271_tx_get_mac80211_queue(queue));
+}
+
+void wlcore_stop_queue(struct wl1271 *wl, u8 queue,
+                       enum wlcore_queue_stop_reason reason)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&wl->wl_lock, flags);
+        wlcore_stop_queue_locked(wl, queue, reason);
+        spin_unlock_irqrestore(&wl->wl_lock, flags);
+}
+
+void wlcore_wake_queue(struct wl1271 *wl, u8 queue,
+                       enum wlcore_queue_stop_reason reason)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&wl->wl_lock, flags);
+
+        /* queue should not be clear for this reason */
+        WARN_ON(!test_and_clear_bit(reason, &wl->queue_stop_reasons[queue]));
+
+        if (wl->queue_stop_reasons[queue])
+                goto out;
+
+        ieee80211_wake_queue(wl->hw, wl1271_tx_get_mac80211_queue(queue));
+
+out:
+        spin_unlock_irqrestore(&wl->wl_lock, flags);
+}
+
+void wlcore_stop_queues(struct wl1271 *wl,
+                        enum wlcore_queue_stop_reason reason)
+{
+        int i;
+
+        for (i = 0; i < NUM_TX_QUEUES; i++)
+                wlcore_stop_queue(wl, i, reason);
+}
+EXPORT_SYMBOL_GPL(wlcore_stop_queues);
+
+void wlcore_wake_queues(struct wl1271 *wl,
+                        enum wlcore_queue_stop_reason reason)
+{
+        int i;
+
+        for (i = 0; i < NUM_TX_QUEUES; i++)
+                wlcore_wake_queue(wl, i, reason);
+}
+EXPORT_SYMBOL_GPL(wlcore_wake_queues);
+
+void wlcore_reset_stopped_queues(struct wl1271 *wl)
+{
+        int i;
+        unsigned long flags;
+
+        spin_lock_irqsave(&wl->wl_lock, flags);
+
+        for (i = 0; i < NUM_TX_QUEUES; i++) {
+                if (!wl->queue_stop_reasons[i])
+                        continue;
+
+                wl->queue_stop_reasons[i] = 0;
+                ieee80211_wake_queue(wl->hw,
+                                     wl1271_tx_get_mac80211_queue(i));
+        }
+
+        spin_unlock_irqrestore(&wl->wl_lock, flags);
+}
+
+bool wlcore_is_queue_stopped_by_reason(struct wl1271 *wl, u8 queue,
+                             enum wlcore_queue_stop_reason reason)
+{
+        return test_bit(reason, &wl->queue_stop_reasons[queue]);
+}
+
+bool wlcore_is_queue_stopped(struct wl1271 *wl, u8 queue)
+{
+        return !!wl->queue_stop_reasons[queue];
+}
diff --git a/drivers/net/wireless/ti/wlcore/tx.h b/drivers/net/wireless/ti/wlcore/tx.h
index 2fd6e5dc6f75..fa4be1b91135 100644
--- a/drivers/net/wireless/ti/wlcore/tx.h
+++ b/drivers/net/wireless/ti/wlcore/tx.h
@@ -85,6 +85,19 @@ struct wl128x_tx_mem {
         u8 extra_bytes;
 } __packed;
 
+struct wl18xx_tx_mem {
+        /*
+         * Total number of memory blocks allocated by the host for
+         * this packet.
+         */
+        u8 total_mem_blocks;
+
+        /*
+         * control bits
+         */
+        u8 ctrl;
+} __packed;
+
 /*
  * On wl128x based devices, when TX packets are aggregated, each packet
  * size must be aligned to the SDIO block size. The maximum block size
@@ -100,6 +113,7 @@ struct wl1271_tx_hw_descr {
         union {
                 struct wl127x_tx_mem wl127x_mem;
                 struct wl128x_tx_mem wl128x_mem;
+                struct wl18xx_tx_mem wl18xx_mem;
         } __packed;
         /* Device time (in us) when the packet arrived to the driver */
         __le32 start_time;
@@ -116,7 +130,16 @@ struct wl1271_tx_hw_descr {
         u8 tid;
         /* host link ID (HLID) */
         u8 hlid;
-        u8 reserved;
+
+        union {
+                u8 wl12xx_reserved;
+
+                /*
+                 * bit 0   -> 0 = udp, 1 = tcp
+                 * bit 1:7 -> IP header offset
+                 */
+                u8 wl18xx_checksum_data;
+        } __packed;
 } __packed;
 
 enum wl1271_tx_hw_res_status {
@@ -161,6 +184,13 @@ struct wl1271_tx_hw_res_if {
         struct wl1271_tx_hw_res_descr tx_results_queue[TX_HW_RESULT_QUEUE_LEN];
 } __packed;
 
+enum wlcore_queue_stop_reason {
+        WLCORE_QUEUE_STOP_REASON_WATERMARK,
+        WLCORE_QUEUE_STOP_REASON_FW_RESTART,
+        WLCORE_QUEUE_STOP_REASON_FLUSH,
+        WLCORE_QUEUE_STOP_REASON_SPARE_BLK, /* 18xx specific */
+};
+
 static inline int wl1271_tx_get_queue(int queue)
 {
         switch (queue) {
@@ -207,7 +237,7 @@ void wl1271_tx_work(struct work_struct *work);
 void wl1271_tx_work_locked(struct wl1271 *wl);
 void wl1271_tx_complete(struct wl1271 *wl);
 void wl12xx_tx_reset_wlvif(struct wl1271 *wl, struct wl12xx_vif *wlvif);
-void wl12xx_tx_reset(struct wl1271 *wl, bool reset_tx_queues);
+void wl12xx_tx_reset(struct wl1271 *wl);
 void wl1271_tx_flush(struct wl1271 *wl);
 u8 wlcore_rate_to_idx(struct wl1271 *wl, u8 rate, enum ieee80211_band band);
 u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set,
@@ -223,6 +253,21 @@ bool wl12xx_is_dummy_packet(struct wl1271 *wl, struct sk_buff *skb);
 void wl12xx_rearm_rx_streaming(struct wl1271 *wl, unsigned long *active_hlids);
 unsigned int wlcore_calc_packet_alignment(struct wl1271 *wl,
                                           unsigned int packet_length);
+void wl1271_free_tx_id(struct wl1271 *wl, int id);
+void wlcore_stop_queue_locked(struct wl1271 *wl, u8 queue,
+                              enum wlcore_queue_stop_reason reason);
+void wlcore_stop_queue(struct wl1271 *wl, u8 queue,
+                       enum wlcore_queue_stop_reason reason);
+void wlcore_wake_queue(struct wl1271 *wl, u8 queue,
+                       enum wlcore_queue_stop_reason reason);
+void wlcore_stop_queues(struct wl1271 *wl,
+                        enum wlcore_queue_stop_reason reason);
+void wlcore_wake_queues(struct wl1271 *wl,
+                        enum wlcore_queue_stop_reason reason);
+void wlcore_reset_stopped_queues(struct wl1271 *wl);
+bool wlcore_is_queue_stopped_by_reason(struct wl1271 *wl, u8 queue,
+                                       enum wlcore_queue_stop_reason reason);
+bool wlcore_is_queue_stopped(struct wl1271 *wl, u8 queue);
 
 /* from main.c */
 void wl1271_free_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif, u8 hlid);
diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
index 0b3f0b586f4b..761a72f4b8d1 100644
--- a/drivers/net/wireless/ti/wlcore/wlcore.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
@@ -24,8 +24,9 @@
 
 #include <linux/platform_device.h>
 
-#include "wl12xx.h"
+#include "wlcore_i.h"
 #include "event.h"
+#include "boot.h"
 
 /* The maximum number of Tx descriptors in all chip families */
 #define WLCORE_MAX_TX_DESCRIPTORS 32
@@ -33,11 +34,13 @@
 /* forward declaration */
 struct wl1271_tx_hw_descr;
 enum wl_rx_buf_align;
+struct wl1271_rx_descriptor;
 
 struct wlcore_ops {
         int (*identify_chip)(struct wl1271 *wl);
         int (*identify_fw)(struct wl1271 *wl);
         int (*boot)(struct wl1271 *wl);
+        int (*plt_init)(struct wl1271 *wl);
         void (*trigger_cmd)(struct wl1271 *wl, int cmd_box_addr,
                             void *buf, size_t len);
         void (*ack_event)(struct wl1271 *wl);
@@ -61,6 +64,23 @@ struct wlcore_ops {
                                     struct wl12xx_vif *wlvif);
         s8 (*get_pg_ver)(struct wl1271 *wl);
         void (*get_mac)(struct wl1271 *wl);
+        void (*set_tx_desc_csum)(struct wl1271 *wl,
+                                 struct wl1271_tx_hw_descr *desc,
+                                 struct sk_buff *skb);
+        void (*set_rx_csum)(struct wl1271 *wl,
+                            struct wl1271_rx_descriptor *desc,
+                            struct sk_buff *skb);
+        u32 (*ap_get_mimo_wide_rate_mask)(struct wl1271 *wl,
+                                          struct wl12xx_vif *wlvif);
+        int (*debugfs_init)(struct wl1271 *wl, struct dentry *rootdir);
+        int (*handle_static_data)(struct wl1271 *wl,
+                                  struct wl1271_static_data *static_data);
+        int (*get_spare_blocks)(struct wl1271 *wl, bool is_gem);
+        int (*set_key)(struct wl1271 *wl, enum set_key_cmd cmd,
+                       struct ieee80211_vif *vif,
+                       struct ieee80211_sta *sta,
+                       struct ieee80211_key_conf *key_conf);
+        u32 (*pre_pkt_send)(struct wl1271 *wl, u32 buf_offset, u32 last_len);
 };
 
 enum wlcore_partitions {
@@ -109,6 +129,15 @@ enum wlcore_registers {
         REG_TABLE_LEN,
 };
 
+struct wl1271_stats {
+        void *fw_stats;
+        unsigned long fw_stats_update;
+        size_t fw_stats_len;
+
+        unsigned int retry_count;
+        unsigned int excessive_retries;
+};
+
 struct wl1271 {
         struct ieee80211_hw *hw;
         bool mac80211_registered;
@@ -121,7 +150,6 @@ struct wl1271 {
 
         void (*set_power)(bool enable);
         int irq;
-        int ref_clock;
 
         spinlock_t wl_lock;
 
@@ -186,7 +214,7 @@ struct wl1271 {
 
         /* Frames scheduled for transmission, not handled yet */
         int tx_queue_count[NUM_TX_QUEUES];
-        long stopped_queues_map;
+        unsigned long queue_stop_reasons[NUM_TX_QUEUES];
 
         /* Frames received, not handled yet by mac80211 */
         struct sk_buff_head deferred_rx_queue;
@@ -205,9 +233,6 @@ struct wl1271 {
         /* FW Rx counter */
         u32 rx_counter;
 
-        /* Rx memory pool address */
-        struct wl1271_rx_mem_pool_addr rx_mem_pool_addr;
-
         /* Intermediate buffer, used for packet aggregation */
         u8 *aggr_buf;
 
@@ -228,6 +253,7 @@ struct wl1271 {
 
         /* Hardware recovery work */
         struct work_struct recovery_work;
+        bool watchdog_recovery;
 
         /* Pointer that holds DMA-friendly block for the mailbox */
         struct event_mailbox *mbox;
@@ -263,7 +289,8 @@ struct wl1271 {
         u32 buffer_cmd;
         u32 buffer_busyword[WL1271_BUSY_WORD_CNT];
 
-        struct wl_fw_status *fw_status;
+        struct wl_fw_status_1 *fw_status_1;
+        struct wl_fw_status_2 *fw_status_2;
         struct wl1271_tx_hw_res_if *tx_res_if;
 
         /* Current chipset configuration */
@@ -279,8 +306,6 @@ struct wl1271 {
         /* bands supported by this instance of wl12xx */
         struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
 
-        int tcxo_clock;
-
         /*
          * wowlan trigger was configured during suspend.
          * (currently, only "ANY" trigger is supported)
@@ -333,10 +358,8 @@ struct wl1271 {
 
         /* number of TX descriptors the HW supports. */
         u32 num_tx_desc;
-
-        /* spare Tx blocks for normal/GEM operating modes */
-        u32 normal_tx_spare;
-        u32 gem_tx_spare;
+        /* number of RX descriptors the HW supports. */
+        u32 num_rx_desc;
 
         /* translate HW Tx rates to standard rate-indices */
         const u8 **band_rate_to_idx;
@@ -348,19 +371,32 @@ struct wl1271 {
         u8 hw_min_ht_rate;
 
         /* HW HT (11n) capabilities */
-        struct ieee80211_sta_ht_cap ht_cap;
+        struct ieee80211_sta_ht_cap ht_cap[IEEE80211_NUM_BANDS];
 
         /* size of the private FW status data */
         size_t fw_status_priv_len;
 
         /* RX Data filter rule state - enabled/disabled */
         bool rx_filter_enabled[WL1271_MAX_RX_FILTERS];
+
+        /* size of the private static data */
+        size_t static_data_priv_len;
+
+        /* the current channel type */
+        enum nl80211_channel_type channel_type;
+
+        /* mutex for protecting the tx_flush function */
+        struct mutex flush_mutex;
 };
 
 int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev);
 int __devexit wlcore_remove(struct platform_device *pdev);
 struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size);
 int wlcore_free_hw(struct wl1271 *wl);
+int wlcore_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
+                   struct ieee80211_vif *vif,
+                   struct ieee80211_sta *sta,
+                   struct ieee80211_key_conf *key_conf);
 
 /* Firmware image load chunk size */
 #define CHUNK_SIZE      16384
@@ -385,6 +421,12 @@ int wlcore_free_hw(struct wl1271 *wl);
 /* Some firmwares may not support ELP */
 #define WLCORE_QUIRK_NO_ELP                     BIT(6)
 
+/* pad only the last frame in the aggregate buffer */
+#define WLCORE_QUIRK_TX_PAD_LAST_FRAME          BIT(7)
+
+/* extra header space is required for TKIP */
+#define WLCORE_QUIRK_TKIP_HEADER_SPACE          BIT(8)
+
 /* TODO: move to the lower drivers when all usages are abstracted */
 #define CHIP_ID_1271_PG10              (0x4030101)
 #define CHIP_ID_1271_PG20              (0x4030111)
diff --git a/drivers/net/wireless/ti/wlcore/wl12xx.h b/drivers/net/wireless/ti/wlcore/wlcore_i.h
index f12bdf745180..8260b1e9288a 100644
--- a/drivers/net/wireless/ti/wlcore/wl12xx.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore_i.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __WL12XX_H__
-#define __WL12XX_H__
+#ifndef __WLCORE_I_H__
+#define __WLCORE_I_H__
 
 #include <linux/mutex.h>
 #include <linux/completion.h>
@@ -89,7 +89,7 @@
 #define WL1271_AP_BSS_INDEX        0
 #define WL1271_AP_DEF_BEACON_EXP   20
 
-#define WL1271_AGGR_BUFFER_SIZE (4 * PAGE_SIZE)
+#define WL1271_AGGR_BUFFER_SIZE (5 * PAGE_SIZE)
 
 enum wl1271_state {
         WL1271_STATE_OFF,
@@ -132,16 +132,7 @@ struct wl1271_chip {
         unsigned int fw_ver[NUM_FW_VER];
 };
 
-struct wl1271_stats {
-        struct acx_statistics *fw_stats;
-        unsigned long fw_stats_update;
-
-        unsigned int retry_count;
-        unsigned int excessive_retries;
-};
-
 #define NUM_TX_QUEUES              4
-#define NUM_RX_PKT_DESC            8
 
 #define AP_MAX_STATIONS            8
 
@@ -159,13 +150,26 @@ struct wl_fw_packet_counters {
 } __packed;
 
 /* FW status registers */
-struct wl_fw_status {
+struct wl_fw_status_1 {
         __le32 intr;
         u8  fw_rx_counter;
         u8  drv_rx_counter;
         u8  reserved;
         u8  tx_results_counter;
-        __le32 rx_pkt_descs[NUM_RX_PKT_DESC];
+        __le32 rx_pkt_descs[0];
+} __packed;
+
+/*
+ * Each HW arch has a different number of Rx descriptors.
+ * The length of the status depends on it, since it holds an array
+ * of descriptors.
+ */
+#define WLCORE_FW_STATUS_1_LEN(num_rx_desc) \
+                (sizeof(struct wl_fw_status_1) + \
+                (sizeof(((struct wl_fw_status_1 *)0)->rx_pkt_descs[0])) * \
+                num_rx_desc)
+
+struct wl_fw_status_2 {
         __le32 fw_localtime;
 
         /*
@@ -194,11 +198,6 @@ struct wl_fw_status {
         u8 priv[0];
 } __packed;
 
-struct wl1271_rx_mem_pool_addr {
-        u32 addr;
-        u32 addr_extra;
-};
-
 #define WL1271_MAX_CHANNELS 64
 struct wl1271_scan {
         struct cfg80211_scan_request *req;
@@ -367,6 +366,7 @@ struct wl12xx_vif {
         /* The current band */
         enum ieee80211_band band;
         int channel;
+        enum nl80211_channel_type channel_type;
 
         u32 bitrate_masks[IEEE80211_NUM_BANDS];
         u32 basic_rate_set;
@@ -417,9 +417,6 @@ struct wl12xx_vif {
         struct work_struct rx_streaming_disable_work;
         struct timer_list rx_streaming_timer;
 
-        /* does the current role use GEM for encryption (AP or STA) */
-        bool is_gem;
-
         /*
          * This struct must be last!
          * data that has to be saved acrossed reconfigs (e.g. recovery)
@@ -501,7 +498,8 @@ void wl1271_rx_filter_flatten_fields(struct wl12xx_rx_filter *filter,
 /* Macros to handle wl1271.sta_rate_set */
 #define HW_BG_RATES_MASK        0xffff
 #define HW_HT_RATES_OFFSET      16
+#define HW_MIMO_RATES_OFFSET    24
 
 #define WL12XX_HW_BLOCK_SIZE    256
 
-#endif
+#endif /* __WLCORE_I_H__ */
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
index 117c4123943c..7ab922209b25 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.h
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -827,7 +827,7 @@ int zd_ioread32v_locked(struct zd_chip *chip, u32 *values,
 static inline int zd_ioread32_locked(struct zd_chip *chip, u32 *value,
                                      const zd_addr_t addr)
 {
-        return zd_ioread32v_locked(chip, value, (const zd_addr_t *)&addr, 1);
+        return zd_ioread32v_locked(chip, value, &addr, 1);
 }
 
 static inline int zd_iowrite16_locked(struct zd_chip *chip, u16 value,
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.h b/drivers/net/wireless/zd1211rw/zd_usb.h
index 99193b456a79..45e3bb28a01c 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.h
+++ b/drivers/net/wireless/zd1211rw/zd_usb.h
@@ -274,7 +274,7 @@ int zd_usb_ioread16v(struct zd_usb *usb, u16 *values,
 static inline int zd_usb_ioread16(struct zd_usb *usb, u16 *value,
                               const zd_addr_t addr)
 {
-        return zd_usb_ioread16v(usb, value, (const zd_addr_t *)&addr, 1);
+        return zd_usb_ioread16v(usb, value, &addr, 1);
 }
 
 void zd_usb_iowrite16v_async_start(struct zd_usb *usb);