417 files changed, 51889 insertions, 12506 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 16fe4f9b719..dc280bc8eba 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -238,8 +238,8 @@ source "drivers/net/arm/Kconfig"
 config AX88796
         tristate "ASIX AX88796 NE2000 clone support"
         depends on ARM || MIPS || SUPERH
-        select CRC32
-        select MII
+        select PHYLIB
+        select MDIO_BITBANG
         help
           AX88796 driver, using platform bus to provide
           chip detection and resources
@@ -1498,7 +1498,7 @@ config FORCEDETH
 config CS89x0
         tristate "CS89x0 support"
         depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
-                || ARCH_IXDP2X01 || MACH_MX31ADS)
+                || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440)
         ---help---
           Support for CS89x0 chipset based Ethernet cards. If you have a
           network (Ethernet) card of this type, say Y and read the
@@ -1512,7 +1512,7 @@ config CS89x0
 config CS89x0_NONISA_IRQ
         def_bool y
         depends on CS89x0 != n
-        depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS
+        depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440
 
 config TC35815
         tristate "TOSHIBA TC35815 Ethernet support"
@@ -1944,7 +1944,8 @@ config 68360_ENET
 config FEC
         bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
         depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
-                MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28
+                IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC
+        default IMX_HAVE_PLATFORM_FEC || MXS_HAVE_PLATFORM_FEC if ARM
         select PHYLIB
         help
           Say Y here if you want to use the built-in 10/100 Fast ethernet
@@ -2007,6 +2008,15 @@ config BCM63XX_ENET
           This driver supports the ethernet MACs in the Broadcom 63xx
           MIPS chipset family (BCM63XX).
 
+config FTMAC100
+        tristate "Faraday FTMAC100 10/100 Ethernet support"
+        depends on ARM
+        select MII
+        help
+          This driver supports the FTMAC100 10/100 Ethernet controller
+          from Faraday. It is used on Faraday A320, Andes AG101 and some
+          other ARM/NDS32 SoC's.
+
 source "drivers/net/fs_enet/Kconfig"
 
 source "drivers/net/octeon/Kconfig"
@@ -2098,7 +2108,9 @@ config E1000
 
 config E1000E
         tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
+        select CRC32
         depends on PCI && (!SPARC32 || BROKEN)
+        select CRC32
         ---help---
           This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
           ethernet family of adapters. For PCI or PCI-X e1000 adapters,
@@ -2235,15 +2247,6 @@ config R8169
           To compile this driver as a module, choose M here: the module
           will be called r8169.  This is recommended.
 
-config R8169_VLAN
-        bool "VLAN support"
-        depends on R8169 && VLAN_8021Q
-        ---help---
-          Say Y here for the r8169 driver to support the functions required
-          by the kernel 802.1Q code.
-
-          If in doubt, say Y.
-
 config SB1250_MAC
         tristate "SB1250 Gigabit Ethernet support"
         depends on SIBYTE_SB1xxx_SOC
@@ -2594,14 +2597,9 @@ config CHELSIO_T1_1G
           Enables support for Chelsio's gigabit Ethernet PCI cards.  If you
           are using only 10G cards say 'N' here.
 
-config CHELSIO_T3_DEPENDS
-        tristate
-        depends on PCI && INET
-        default y
-
 config CHELSIO_T3
         tristate "Chelsio Communications T3 10Gb Ethernet support"
-        depends on CHELSIO_T3_DEPENDS
+        depends on PCI && INET
         select FW_LOADER
         select MDIO
         help
@@ -2619,14 +2617,9 @@ config CHELSIO_T3
           To compile this driver as a module, choose M here: the module
           will be called cxgb3.
 
-config CHELSIO_T4_DEPENDS
-        tristate
-        depends on PCI && INET
-        default y
-
 config CHELSIO_T4
         tristate "Chelsio Communications T4 Ethernet support"
-        depends on CHELSIO_T4_DEPENDS
+        depends on PCI
         select FW_LOADER
         select MDIO
         help
@@ -2644,14 +2637,9 @@ config CHELSIO_T4
           To compile this driver as a module choose M here; the module
           will be called cxgb4.
 
-config CHELSIO_T4VF_DEPENDS
-        tristate
-        depends on PCI && INET
-        default y
-
 config CHELSIO_T4VF
         tristate "Chelsio Communications T4 Virtual Function Ethernet support"
-        depends on CHELSIO_T4VF_DEPENDS
+        depends on PCI
         help
           This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
           adapters with PCI-E SR-IOV Virtual Functions.
@@ -2864,7 +2852,7 @@ config MLX4_CORE
         default n
 
 config MLX4_DEBUG
-        bool "Verbose debugging output" if (MLX4_CORE && EMBEDDED)
+        bool "Verbose debugging output" if (MLX4_CORE && EXPERT)
         depends on MLX4_CORE
         default y
         ---help---
@@ -2966,12 +2954,38 @@ config XEN_NETDEV_FRONTEND
         select XEN_XENBUS_FRONTEND
         default y
         help
-          The network device frontend driver allows the kernel to
-          access network devices exported exported by a virtual
-          machine containing a physical network device driver. The
-          frontend driver is intended for unprivileged guest domains;
-          if you are compiling a kernel for a Xen guest, you almost
-          certainly want to enable this.
+          This driver provides support for Xen paravirtual network
+          devices exported by a Xen network driver domain (often
+          domain 0).
+
+          The corresponding Linux backend driver is enabled by the
+          CONFIG_XEN_NETDEV_BACKEND option.
+
+          If you are compiling a kernel for use as Xen guest, you
+          should say Y here. To compile this driver as a module, chose
+          M here: the module will be called xen-netfront.
+
+config XEN_NETDEV_BACKEND
+        tristate "Xen backend network device"
+        depends on XEN_BACKEND
+        help
+          This driver allows the kernel to act as a Xen network driver
+          domain which exports paravirtual network devices to other
+          Xen domains. These devices can be accessed by any operating
+          system that implements a compatible front end.
+
+          The corresponding Linux frontend driver is enabled by the
+          CONFIG_XEN_NETDEV_FRONTEND configuration option.
+
+          The backend driver presents a standard network device
+          endpoint for each paravirtual network device to the driver
+          domain network stack. These can then be bridged or routed
+          etc in order to provide full network connectivity.
+
+          If you are compiling a kernel to run in a Xen network driver
+          domain (often this is domain 0) you should say Y here. To
+          compile this driver as a module, chose M here: the module
+          will be called xen-netback.
 
 config ISERIES_VETH
         tristate "iSeries Virtual Ethernet driver support"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b90738d1399..01b604ad155 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -147,6 +147,7 @@ obj-$(CONFIG_FORCEDETH) += forcedeth.o
 obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
 obj-$(CONFIG_AX88796) += ax88796.o
 obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o
+obj-$(CONFIG_FTMAC100) += ftmac100.o
 
 obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
 obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
@@ -171,6 +172,7 @@ obj-$(CONFIG_SLIP) += slip.o
 obj-$(CONFIG_SLHC) += slhc.o
 
 obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
+obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
 
 obj-$(CONFIG_DUMMY) += dummy.o
 obj-$(CONFIG_IFB) += ifb.o
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index f142cc21e45..deaa8bc16cf 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -711,14 +711,14 @@ static int __devinit a2065_init_one(struct zorro_dev *z,
                 return -EBUSY;
         r2 = request_mem_region(mem_start, A2065_RAM_SIZE, "RAM");
         if (!r2) {
-                release_resource(r1);
+                release_mem_region(base_addr, sizeof(struct lance_regs));
                 return -EBUSY;
         }
 
         dev = alloc_etherdev(sizeof(struct lance_private));
         if (dev == NULL) {
-                release_resource(r1);
-                release_resource(r2);
+                release_mem_region(base_addr, sizeof(struct lance_regs));
+                release_mem_region(mem_start, A2065_RAM_SIZE);
                 return -ENOMEM;
         }
 
@@ -764,8 +764,8 @@ static int __devinit a2065_init_one(struct zorro_dev *z,
 
         err = register_netdev(dev);
         if (err) {
-                release_resource(r1);
-                release_resource(r2);
+                release_mem_region(base_addr, sizeof(struct lance_regs));
+                release_mem_region(mem_start, A2065_RAM_SIZE);
                 free_netdev(dev);
                 return err;
         }
diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig
index 0b376a99097..f5a89164e77 100644
--- a/drivers/net/appletalk/Kconfig
+++ b/drivers/net/appletalk/Kconfig
@@ -3,7 +3,6 @@
 #
 config ATALK
         tristate "Appletalk protocol support"
-        depends on BKL # waiting to be removed from net/appletalk/ddp.c
         select LLC
         ---help---
           AppleTalk is the protocol that Apple computers can use to communicate
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 39214e51245..b7f45cd756a 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -182,14 +182,14 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
         return -EBUSY;
     r2 = request_mem_region(mem_start, ARIADNE_RAM_SIZE, "RAM");
     if (!r2) {
-        release_resource(r1);
+        release_mem_region(base_addr, sizeof(struct Am79C960));
         return -EBUSY;
     }
 
     dev = alloc_etherdev(sizeof(struct ariadne_private));
     if (dev == NULL) {
-        release_resource(r1);
-        release_resource(r2);
+        release_mem_region(base_addr, sizeof(struct Am79C960));
+        release_mem_region(mem_start, ARIADNE_RAM_SIZE);
         return -ENOMEM;
     }
 
@@ -213,8 +213,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
 
     err = register_netdev(dev);
     if (err) {
-        release_resource(r1);
-        release_resource(r2);
+        release_mem_region(base_addr, sizeof(struct Am79C960));
+        release_mem_region(mem_start, ARIADNE_RAM_SIZE);
         free_netdev(dev);
         return err;
     }
@@ -425,11 +425,6 @@ static irqreturn_t ariadne_interrupt(int irq, void *data)
     int csr0, boguscnt;
     int handled = 0;
 
-    if (dev == NULL) {
-        printk(KERN_WARNING "ariadne_interrupt(): irq for unknown device.\n");
-        return IRQ_NONE;
-    }
-
     lance->RAP = CSR0;                  /* PCnet-ISA Controller Status */
 
     if (!(lance->RDP & INTR))           /* Check if any interrupt has been */
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c
index 62d6f88cbab..aa07657744c 100644
--- a/drivers/net/arm/ks8695net.c
+++ b/drivers/net/arm/ks8695net.c
@@ -1644,7 +1644,7 @@ ks8695_cleanup(void)
 module_init(ks8695_init);
 module_exit(ks8695_cleanup);
 
-MODULE_AUTHOR("Simtec Electronics")
+MODULE_AUTHOR("Simtec Electronics");
 MODULE_DESCRIPTION("Micrel KS8695 (Centaur) Ethernet driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:" MODULENAME);
diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/atl1c/atl1c.h
index 9ab58097fa2..7cb375e0e29 100644
--- a/drivers/net/atl1c/atl1c.h
+++ b/drivers/net/atl1c/atl1c.h
@@ -265,7 +265,7 @@ struct atl1c_recv_ret_status {
         __le32  word3;
 };
 
-/* RFD desciptor */
+/* RFD descriptor */
 struct atl1c_rx_free_desc {
         __le64  buffer_addr;
 };
@@ -531,7 +531,7 @@ struct atl1c_rfd_ring {
         struct atl1c_buffer *buffer_info;
 };
 
-/* receive return desciptor (rrd) ring */
+/* receive return descriptor (rrd) ring */
 struct atl1c_rrd_ring {
         void *desc;             /* descriptor ring virtual address */
         dma_addr_t dma;         /* descriptor ring physical address */
diff --git a/drivers/net/atl1c/atl1c_hw.c b/drivers/net/atl1c/atl1c_hw.c
index 1bf67200994..23f2ab0f2fa 100644
--- a/drivers/net/atl1c/atl1c_hw.c
+++ b/drivers/net/atl1c/atl1c_hw.c
@@ -345,7 +345,7 @@ int atl1c_write_phy_reg(struct atl1c_hw *hw, u32 reg_addr, u16 phy_data)
  */
 static int atl1c_phy_setup_adv(struct atl1c_hw *hw)
 {
-        u16 mii_adv_data = ADVERTISE_DEFAULT_CAP & ~ADVERTISE_SPEED_MASK;
+        u16 mii_adv_data = ADVERTISE_DEFAULT_CAP & ~ADVERTISE_ALL;
         u16 mii_giga_ctrl_data = GIGA_CR_1000T_DEFAULT_CAP &
                                 ~GIGA_CR_1000T_SPEED_MASK;
 
@@ -373,7 +373,7 @@ static int atl1c_phy_setup_adv(struct atl1c_hw *hw)
         }
 
         if (atl1c_write_phy_reg(hw, MII_ADVERTISE, mii_adv_data) != 0 ||
-            atl1c_write_phy_reg(hw, MII_GIGA_CR, mii_giga_ctrl_data) != 0)
+            atl1c_write_phy_reg(hw, MII_CTRL1000, mii_giga_ctrl_data) != 0)
                 return -1;
         return 0;
 }
@@ -517,19 +517,18 @@ int atl1c_phy_init(struct atl1c_hw *hw)
                                         "Error Setting up Auto-Negotiation\n");
                         return ret_val;
                 }
-                mii_bmcr_data |= BMCR_AUTO_NEG_EN | BMCR_RESTART_AUTO_NEG;
+                mii_bmcr_data |= BMCR_ANENABLE | BMCR_ANRESTART;
                 break;
         case MEDIA_TYPE_100M_FULL:
-                mii_bmcr_data |= BMCR_SPEED_100 | BMCR_FULL_DUPLEX;
+                mii_bmcr_data |= BMCR_SPEED100 | BMCR_FULLDPLX;
                 break;
         case MEDIA_TYPE_100M_HALF:
-                mii_bmcr_data |= BMCR_SPEED_100;
+                mii_bmcr_data |= BMCR_SPEED100;
                 break;
         case MEDIA_TYPE_10M_FULL:
-                mii_bmcr_data |= BMCR_SPEED_10 | BMCR_FULL_DUPLEX;
+                mii_bmcr_data |= BMCR_FULLDPLX;
                 break;
         case MEDIA_TYPE_10M_HALF:
-                mii_bmcr_data |= BMCR_SPEED_10;
                 break;
         default:
                 if (netif_msg_link(adapter))
@@ -657,7 +656,7 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw)
         err = atl1c_phy_setup_adv(hw);
         if (err)
                 return err;
-        mii_bmcr_data |= BMCR_AUTO_NEG_EN | BMCR_RESTART_AUTO_NEG;
+        mii_bmcr_data |= BMCR_ANENABLE | BMCR_ANRESTART;
 
         return atl1c_write_phy_reg(hw, MII_BMCR, mii_bmcr_data);
 }
diff --git a/drivers/net/atl1c/atl1c_hw.h b/drivers/net/atl1c/atl1c_hw.h
index 3dd675979aa..655fc6c4a8a 100644
--- a/drivers/net/atl1c/atl1c_hw.h
+++ b/drivers/net/atl1c/atl1c_hw.h
@@ -736,55 +736,16 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define REG_DEBUG_DATA0                 0x1900
 #define REG_DEBUG_DATA1                 0x1904
 
-/* PHY Control Register */
-#define MII_BMCR                        0x00
-#define BMCR_SPEED_SELECT_MSB           0x0040  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define BMCR_COLL_TEST_ENABLE           0x0080  /* Collision test enable */
-#define BMCR_FULL_DUPLEX                0x0100  /* FDX =1, half duplex =0 */
-#define BMCR_RESTART_AUTO_NEG           0x0200  /* Restart auto negotiation */
-#define BMCR_ISOLATE                    0x0400  /* Isolate PHY from MII */
-#define BMCR_POWER_DOWN                 0x0800  /* Power down */
-#define BMCR_AUTO_NEG_EN                0x1000  /* Auto Neg Enable */
-#define BMCR_SPEED_SELECT_LSB           0x2000  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define BMCR_LOOPBACK                   0x4000  /* 0 = normal, 1 = loopback */
-#define BMCR_RESET                      0x8000  /* 0 = normal, 1 = PHY reset */
-#define BMCR_SPEED_MASK                 0x2040
-#define BMCR_SPEED_1000                 0x0040
-#define BMCR_SPEED_100                  0x2000
-#define BMCR_SPEED_10                   0x0000
-
-/* PHY Status Register */
-#define MII_BMSR                        0x01
-#define BMMSR_EXTENDED_CAPS             0x0001  /* Extended register capabilities */
-#define BMSR_JABBER_DETECT              0x0002  /* Jabber Detected */
-#define BMSR_LINK_STATUS                0x0004  /* Link Status 1 = link */
-#define BMSR_AUTONEG_CAPS               0x0008  /* Auto Neg Capable */
-#define BMSR_REMOTE_FAULT               0x0010  /* Remote Fault Detect */
-#define BMSR_AUTONEG_COMPLETE           0x0020  /* Auto Neg Complete */
-#define BMSR_PREAMBLE_SUPPRESS          0x0040  /* Preamble may be suppressed */
-#define BMSR_EXTENDED_STATUS            0x0100  /* Ext. status info in Reg 0x0F */
-#define BMSR_100T2_HD_CAPS              0x0200  /* 100T2 Half Duplex Capable */
-#define BMSR_100T2_FD_CAPS              0x0400  /* 100T2 Full Duplex Capable */
-#define BMSR_10T_HD_CAPS                0x0800  /* 10T   Half Duplex Capable */
-#define BMSR_10T_FD_CAPS                0x1000  /* 10T   Full Duplex Capable */
-#define BMSR_100X_HD_CAPS               0x2000  /* 100X  Half Duplex Capable */
-#define BMMII_SR_100X_FD_CAPS           0x4000  /* 100X  Full Duplex Capable */
-#define BMMII_SR_100T4_CAPS             0x8000  /* 100T4 Capable */
-
-#define MII_PHYSID1                     0x02
-#define MII_PHYSID2                     0x03
 #define L1D_MPW_PHYID1                  0xD01C  /* V7 */
 #define L1D_MPW_PHYID2                  0xD01D  /* V1-V6 */
 #define L1D_MPW_PHYID3                  0xD01E  /* V8 */
 
 
 /* Autoneg Advertisement Register */
-#define MII_ADVERTISE                   0x04
-#define ADVERTISE_SPEED_MASK            0x01E0
-#define ADVERTISE_DEFAULT_CAP           0x0DE0
+#define ADVERTISE_DEFAULT_CAP \
+        (ADVERTISE_ALL | ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)
 
 /* 1000BASE-T Control Register */
-#define MII_GIGA_CR                     0x09
 #define GIGA_CR_1000T_REPEATER_DTE      0x0400  /* 1=Repeater/switch device port 0=DTE device */
 
 #define GIGA_CR_1000T_MS_VALUE          0x0800  /* 1=Configure PHY as Master 0=Configure PHY as Slave */
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index a699bbf20eb..7d9d5067a65 100644
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -48,6 +48,7 @@ static DEFINE_PCI_DEVICE_TABLE(atl1c_pci_tbl) = {
         {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B)},
         {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B2)},
         {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D_2_0)},
         /* required last entry */
         { 0 }
 };
@@ -1101,10 +1102,10 @@ static void atl1c_configure_tx(struct atl1c_adapter *adapter)
         AT_READ_REG(hw, REG_DEVICE_CTRL, &dev_ctrl_data);
         max_pay_load  = (dev_ctrl_data >> DEVICE_CTRL_MAX_PAYLOAD_SHIFT) &
                         DEVICE_CTRL_MAX_PAYLOAD_MASK;
-        hw->dmaw_block = min(max_pay_load, hw->dmaw_block);
+        hw->dmaw_block = min_t(u32, max_pay_load, hw->dmaw_block);
         max_pay_load  = (dev_ctrl_data >> DEVICE_CTRL_MAX_RREQ_SZ_SHIFT) &
                         DEVICE_CTRL_MAX_RREQ_SZ_MASK;
-        hw->dmar_block = min(max_pay_load, hw->dmar_block);
+        hw->dmar_block = min_t(u32, max_pay_load, hw->dmar_block);
 
         txq_ctrl_data = (hw->tpd_burst & TXQ_NUM_TPD_BURST_MASK) <<
                         TXQ_NUM_TPD_BURST_SHIFT;
@@ -2717,7 +2718,6 @@ static int __devinit atl1c_probe(struct pci_dev *pdev,
                 goto err_reset;
         }
 
-        device_init_wakeup(&pdev->dev, 1);
         /* reset the controller to
          * put the device in a known good starting state */
         err = atl1c_phy_init(&adapter->hw);
diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c
index 6943a6c3b94..1209297433b 100644
--- a/drivers/net/atl1e/atl1e_ethtool.c
+++ b/drivers/net/atl1e/atl1e_ethtool.c
@@ -95,18 +95,18 @@ static int atl1e_set_settings(struct net_device *netdev,
                 ecmd->advertising = hw->autoneg_advertised |
                                     ADVERTISED_TP | ADVERTISED_Autoneg;
 
-                adv4 = hw->mii_autoneg_adv_reg & ~MII_AR_SPEED_MASK;
+                adv4 = hw->mii_autoneg_adv_reg & ~ADVERTISE_ALL;
                 adv9 = hw->mii_1000t_ctrl_reg & ~MII_AT001_CR_1000T_SPEED_MASK;
                 if (hw->autoneg_advertised & ADVERTISE_10_HALF)
-                        adv4 |= MII_AR_10T_HD_CAPS;
+                        adv4 |= ADVERTISE_10HALF;
                 if (hw->autoneg_advertised & ADVERTISE_10_FULL)
-                        adv4 |= MII_AR_10T_FD_CAPS;
+                        adv4 |= ADVERTISE_10FULL;
                 if (hw->autoneg_advertised & ADVERTISE_100_HALF)
-                        adv4 |= MII_AR_100TX_HD_CAPS;
+                        adv4 |= ADVERTISE_100HALF;
                 if (hw->autoneg_advertised & ADVERTISE_100_FULL)
-                        adv4 |= MII_AR_100TX_FD_CAPS;
+                        adv4 |= ADVERTISE_100FULL;
                 if (hw->autoneg_advertised & ADVERTISE_1000_FULL)
-                        adv9 |= MII_AT001_CR_1000T_FD_CAPS;
+                        adv9 |= ADVERTISE_1000FULL;
 
                 if (adv4 != hw->mii_autoneg_adv_reg ||
                                 adv9 != hw->mii_1000t_ctrl_reg) {
diff --git a/drivers/net/atl1e/atl1e_hw.c b/drivers/net/atl1e/atl1e_hw.c
index 76cc043def8..923063d2e5b 100644
--- a/drivers/net/atl1e/atl1e_hw.c
+++ b/drivers/net/atl1e/atl1e_hw.c
@@ -318,7 +318,7 @@ static int atl1e_phy_setup_autoneg_adv(struct atl1e_hw *hw)
          * Advertisement Register (Address 4) and the 1000 mb speed bits in
          * the  1000Base-T control Register (Address 9).
          */
-        mii_autoneg_adv_reg &= ~MII_AR_SPEED_MASK;
+        mii_autoneg_adv_reg &= ~ADVERTISE_ALL;
         mii_1000t_ctrl_reg  &= ~MII_AT001_CR_1000T_SPEED_MASK;
 
         /*
@@ -327,44 +327,37 @@ static int atl1e_phy_setup_autoneg_adv(struct atl1e_hw *hw)
          */
         switch (hw->media_type) {
         case MEDIA_TYPE_AUTO_SENSOR:
-                mii_autoneg_adv_reg |= (MII_AR_10T_HD_CAPS   |
-                                        MII_AR_10T_FD_CAPS   |
-                                        MII_AR_100TX_HD_CAPS |
-                                        MII_AR_100TX_FD_CAPS);
-                hw->autoneg_advertised = ADVERTISE_10_HALF  |
-                                         ADVERTISE_10_FULL  |
-                                         ADVERTISE_100_HALF |
-                                         ADVERTISE_100_FULL;
+                mii_autoneg_adv_reg |= ADVERTISE_ALL;
+                hw->autoneg_advertised = ADVERTISE_ALL;
                 if (hw->nic_type == athr_l1e) {
-                        mii_1000t_ctrl_reg |=
-                                MII_AT001_CR_1000T_FD_CAPS;
+                        mii_1000t_ctrl_reg |= ADVERTISE_1000FULL;
                         hw->autoneg_advertised |= ADVERTISE_1000_FULL;
                 }
                 break;
 
         case MEDIA_TYPE_100M_FULL:
-                mii_autoneg_adv_reg   |= MII_AR_100TX_FD_CAPS;
+                mii_autoneg_adv_reg   |= ADVERTISE_100FULL;
                 hw->autoneg_advertised = ADVERTISE_100_FULL;
                 break;
 
         case MEDIA_TYPE_100M_HALF:
-                mii_autoneg_adv_reg   |= MII_AR_100TX_HD_CAPS;
+                mii_autoneg_adv_reg   |= ADVERTISE_100_HALF;
                 hw->autoneg_advertised = ADVERTISE_100_HALF;
                 break;
 
         case MEDIA_TYPE_10M_FULL:
-                mii_autoneg_adv_reg   |= MII_AR_10T_FD_CAPS;
+                mii_autoneg_adv_reg   |= ADVERTISE_10_FULL;
                 hw->autoneg_advertised = ADVERTISE_10_FULL;
                 break;
 
         default:
-                mii_autoneg_adv_reg   |= MII_AR_10T_HD_CAPS;
+                mii_autoneg_adv_reg   |= ADVERTISE_10_HALF;
                 hw->autoneg_advertised = ADVERTISE_10_HALF;
                 break;
         }
 
         /* flow control fixed to enable all */
-        mii_autoneg_adv_reg |= (MII_AR_ASM_DIR | MII_AR_PAUSE);
+        mii_autoneg_adv_reg |= (ADVERTISE_PAUSE_ASYM | ADVERTISE_PAUSE_CAP);
 
         hw->mii_autoneg_adv_reg = mii_autoneg_adv_reg;
         hw->mii_1000t_ctrl_reg  = mii_1000t_ctrl_reg;
@@ -374,7 +367,7 @@ static int atl1e_phy_setup_autoneg_adv(struct atl1e_hw *hw)
                 return ret_val;
 
         if (hw->nic_type == athr_l1e || hw->nic_type == athr_l2e_revA) {
-                ret_val = atl1e_write_phy_reg(hw, MII_AT001_CR,
+                ret_val = atl1e_write_phy_reg(hw, MII_CTRL1000,
                                            mii_1000t_ctrl_reg);
                 if (ret_val)
                         return ret_val;
@@ -397,7 +390,7 @@ int atl1e_phy_commit(struct atl1e_hw *hw)
         int ret_val;
         u16 phy_data;
 
-        phy_data = MII_CR_RESET | MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG;
+        phy_data = BMCR_RESET | BMCR_ANENABLE | BMCR_ANRESTART;
 
         ret_val = atl1e_write_phy_reg(hw, MII_BMCR, phy_data);
         if (ret_val) {
@@ -645,15 +638,14 @@ int atl1e_restart_autoneg(struct atl1e_hw *hw)
                 return err;
 
         if (hw->nic_type == athr_l1e || hw->nic_type == athr_l2e_revA) {
-                err = atl1e_write_phy_reg(hw, MII_AT001_CR,
+                err = atl1e_write_phy_reg(hw, MII_CTRL1000,
                                        hw->mii_1000t_ctrl_reg);
                 if (err)
                         return err;
         }
 
         err = atl1e_write_phy_reg(hw, MII_BMCR,
-                        MII_CR_RESET | MII_CR_AUTO_NEG_EN |
-                        MII_CR_RESTART_AUTO_NEG);
+                        BMCR_RESET | BMCR_ANENABLE | BMCR_ANRESTART);
         return err;
 }
 
diff --git a/drivers/net/atl1e/atl1e_hw.h b/drivers/net/atl1e/atl1e_hw.h
index 5ea2f4d86cf..74df16aef79 100644
--- a/drivers/net/atl1e/atl1e_hw.h
+++ b/drivers/net/atl1e/atl1e_hw.h
@@ -629,127 +629,24 @@ s32 atl1e_restart_autoneg(struct atl1e_hw *hw);
 
 /***************************** MII definition ***************************************/
 /* PHY Common Register */
-#define MII_BMCR                        0x00
-#define MII_BMSR                        0x01
-#define MII_PHYSID1                     0x02
-#define MII_PHYSID2                     0x03
-#define MII_ADVERTISE                   0x04
-#define MII_LPA                         0x05
-#define MII_EXPANSION                   0x06
-#define MII_AT001_CR                    0x09
-#define MII_AT001_SR                    0x0A
-#define MII_AT001_ESR                   0x0F
 #define MII_AT001_PSCR                  0x10
 #define MII_AT001_PSSR                  0x11
 #define MII_INT_CTRL                    0x12
 #define MII_INT_STATUS                  0x13
 #define MII_SMARTSPEED                  0x14
-#define MII_RERRCOUNTER                 0x15
-#define MII_SREVISION                   0x16
-#define MII_RESV1                       0x17
 #define MII_LBRERROR                    0x18
-#define MII_PHYADDR                     0x19
 #define MII_RESV2                       0x1a
-#define MII_TPISTATUS                   0x1b
-#define MII_NCONFIG                     0x1c
 
 #define MII_DBG_ADDR                    0x1D
 #define MII_DBG_DATA                    0x1E
 
-
-/* PHY Control Register */
-#define MII_CR_SPEED_SELECT_MSB                  0x0040  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_COLL_TEST_ENABLE                  0x0080  /* Collision test enable */
-#define MII_CR_FULL_DUPLEX                       0x0100  /* FDX =1, half duplex =0 */
-#define MII_CR_RESTART_AUTO_NEG                  0x0200  /* Restart auto negotiation */
-#define MII_CR_ISOLATE                           0x0400  /* Isolate PHY from MII */
-#define MII_CR_POWER_DOWN                        0x0800  /* Power down */
-#define MII_CR_AUTO_NEG_EN                       0x1000  /* Auto Neg Enable */
-#define MII_CR_SPEED_SELECT_LSB                  0x2000  /* bits 6,13: 10=1000, 01=100, 00=10 */
-#define MII_CR_LOOPBACK                          0x4000  /* 0 = normal, 1 = loopback */
-#define MII_CR_RESET                             0x8000  /* 0 = normal, 1 = PHY reset */
-#define MII_CR_SPEED_MASK                        0x2040
-#define MII_CR_SPEED_1000                        0x0040
-#define MII_CR_SPEED_100                         0x2000
-#define MII_CR_SPEED_10                          0x0000
-
-
-/* PHY Status Register */
-#define MII_SR_EXTENDED_CAPS                     0x0001  /* Extended register capabilities */
-#define MII_SR_JABBER_DETECT                     0x0002  /* Jabber Detected */
-#define MII_SR_LINK_STATUS                       0x0004  /* Link Status 1 = link */
-#define MII_SR_AUTONEG_CAPS                      0x0008  /* Auto Neg Capable */
-#define MII_SR_REMOTE_FAULT                      0x0010  /* Remote Fault Detect */
-#define MII_SR_AUTONEG_COMPLETE                  0x0020  /* Auto Neg Complete */
-#define MII_SR_PREAMBLE_SUPPRESS                 0x0040  /* Preamble may be suppressed */
-#define MII_SR_EXTENDED_STATUS                   0x0100  /* Ext. status info in Reg 0x0F */
-#define MII_SR_100T2_HD_CAPS                     0x0200  /* 100T2 Half Duplex Capable */
-#define MII_SR_100T2_FD_CAPS                     0x0400  /* 100T2 Full Duplex Capable */
-#define MII_SR_10T_HD_CAPS                       0x0800  /* 10T   Half Duplex Capable */
-#define MII_SR_10T_FD_CAPS                       0x1000  /* 10T   Full Duplex Capable */
-#define MII_SR_100X_HD_CAPS                      0x2000  /* 100X  Half Duplex Capable */
-#define MII_SR_100X_FD_CAPS                      0x4000  /* 100X  Full Duplex Capable */
-#define MII_SR_100T4_CAPS                        0x8000  /* 100T4 Capable */
-
-/* Link partner ability register. */
-#define MII_LPA_SLCT                             0x001f  /* Same as advertise selector  */
-#define MII_LPA_10HALF                           0x0020  /* Can do 10mbps half-duplex   */
-#define MII_LPA_10FULL                           0x0040  /* Can do 10mbps full-duplex   */
-#define MII_LPA_100HALF                          0x0080  /* Can do 100mbps half-duplex  */
-#define MII_LPA_100FULL                          0x0100  /* Can do 100mbps full-duplex  */
-#define MII_LPA_100BASE4                         0x0200  /* 100BASE-T4  */
-#define MII_LPA_PAUSE                            0x0400  /* PAUSE */
-#define MII_LPA_ASYPAUSE                         0x0800  /* Asymmetrical PAUSE */
-#define MII_LPA_RFAULT                           0x2000  /* Link partner faulted        */
-#define MII_LPA_LPACK                            0x4000  /* Link partner acked us       */
-#define MII_LPA_NPAGE                            0x8000  /* Next page bit               */
-
 /* Autoneg Advertisement Register */
-#define MII_AR_SELECTOR_FIELD                   0x0001  /* indicates IEEE 802.3 CSMA/CD */
-#define MII_AR_10T_HD_CAPS                      0x0020  /* 10T   Half Duplex Capable */
-#define MII_AR_10T_FD_CAPS                      0x0040  /* 10T   Full Duplex Capable */
-#define MII_AR_100TX_HD_CAPS                    0x0080  /* 100TX Half Duplex Capable */
-#define MII_AR_100TX_FD_CAPS                    0x0100  /* 100TX Full Duplex Capable */
-#define MII_AR_100T4_CAPS                       0x0200  /* 100T4 Capable */
-#define MII_AR_PAUSE                            0x0400  /* Pause operation desired */
-#define MII_AR_ASM_DIR                          0x0800  /* Asymmetric Pause Direction bit */
-#define MII_AR_REMOTE_FAULT                     0x2000  /* Remote Fault detected */
-#define MII_AR_NEXT_PAGE                        0x8000  /* Next Page ability supported */
-#define MII_AR_SPEED_MASK                       0x01E0
-#define MII_AR_DEFAULT_CAP_MASK                 0x0DE0
+#define MII_AR_DEFAULT_CAP_MASK                 0
 
 /* 1000BASE-T Control Register */
-#define MII_AT001_CR_1000T_HD_CAPS              0x0100  /* Advertise 1000T HD capability */
-#define MII_AT001_CR_1000T_FD_CAPS              0x0200  /* Advertise 1000T FD capability  */
-#define MII_AT001_CR_1000T_REPEATER_DTE         0x0400  /* 1=Repeater/switch device port */
-/* 0=DTE device */
-#define MII_AT001_CR_1000T_MS_VALUE             0x0800  /* 1=Configure PHY as Master */
-/* 0=Configure PHY as Slave */
-#define MII_AT001_CR_1000T_MS_ENABLE            0x1000  /* 1=Master/Slave manual config value */
-/* 0=Automatic Master/Slave config */
-#define MII_AT001_CR_1000T_TEST_MODE_NORMAL     0x0000  /* Normal Operation */
-#define MII_AT001_CR_1000T_TEST_MODE_1          0x2000  /* Transmit Waveform test */
-#define MII_AT001_CR_1000T_TEST_MODE_2          0x4000  /* Master Transmit Jitter test */
-#define MII_AT001_CR_1000T_TEST_MODE_3          0x6000  /* Slave Transmit Jitter test */
-#define MII_AT001_CR_1000T_TEST_MODE_4          0x8000  /* Transmitter Distortion test */
-#define MII_AT001_CR_1000T_SPEED_MASK           0x0300
-#define MII_AT001_CR_1000T_DEFAULT_CAP_MASK     0x0300
-
-/* 1000BASE-T Status Register */
-#define MII_AT001_SR_1000T_LP_HD_CAPS           0x0400  /* LP is 1000T HD capable */
-#define MII_AT001_SR_1000T_LP_FD_CAPS           0x0800  /* LP is 1000T FD capable */
-#define MII_AT001_SR_1000T_REMOTE_RX_STATUS     0x1000  /* Remote receiver OK */
-#define MII_AT001_SR_1000T_LOCAL_RX_STATUS      0x2000  /* Local receiver OK */
-#define MII_AT001_SR_1000T_MS_CONFIG_RES        0x4000  /* 1=Local TX is Master, 0=Slave */
-#define MII_AT001_SR_1000T_MS_CONFIG_FAULT      0x8000  /* Master/Slave config fault */
-#define MII_AT001_SR_1000T_REMOTE_RX_STATUS_SHIFT   12
-#define MII_AT001_SR_1000T_LOCAL_RX_STATUS_SHIFT    13
-
-/* Extended Status Register */
-#define MII_AT001_ESR_1000T_HD_CAPS             0x1000  /* 1000T HD capable */
-#define MII_AT001_ESR_1000T_FD_CAPS             0x2000  /* 1000T FD capable */
-#define MII_AT001_ESR_1000X_HD_CAPS             0x4000  /* 1000X HD capable */
-#define MII_AT001_ESR_1000X_FD_CAPS             0x8000  /* 1000X FD capable */
+#define MII_AT001_CR_1000T_SPEED_MASK \
+        (ADVERTISE_1000FULL | ADVERTISE_1000HALF)
+#define MII_AT001_CR_1000T_DEFAULT_CAP_MASK     MII_AT001_CR_1000T_SPEED_MASK
 
 /* AT001 PHY Specific Control Register */
 #define MII_AT001_PSCR_JABBER_DISABLE           0x0001  /* 1=Jabber Function disabled */
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index e28f8baf394..1ff001a8270 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -547,8 +547,8 @@ static int __devinit atl1e_sw_init(struct atl1e_adapter *adapter)
         hw->device_id = pdev->device;
         hw->subsystem_vendor_id = pdev->subsystem_vendor;
         hw->subsystem_id = pdev->subsystem_device;
+        hw->revision_id  = pdev->revision;
 
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
         pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word);
 
         phy_status_data = AT_READ_REG(hw, REG_PHY_STATUS);
@@ -932,11 +932,11 @@ static inline void atl1e_configure_tx(struct atl1e_adapter *adapter)
         max_pay_load  = ((dev_ctrl_data >> DEVICE_CTRL_MAX_PAYLOAD_SHIFT)) &
                         DEVICE_CTRL_MAX_PAYLOAD_MASK;
 
-        hw->dmaw_block = min(max_pay_load, hw->dmaw_block);
+        hw->dmaw_block = min_t(u32, max_pay_load, hw->dmaw_block);
 
         max_pay_load  = ((dev_ctrl_data >> DEVICE_CTRL_MAX_RREQ_SZ_SHIFT)) &
                         DEVICE_CTRL_MAX_RREQ_SZ_MASK;
-        hw->dmar_block = min(max_pay_load, hw->dmar_block);
+        hw->dmar_block = min_t(u32, max_pay_load, hw->dmar_block);
 
         if (hw->nic_type != athr_l2e_revB)
                 AT_WRITE_REGW(hw, REG_TXQ_CTRL + 2,
@@ -2051,9 +2051,9 @@ static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)
                 atl1e_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data);
                 atl1e_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data);
 
-                mii_advertise_data = MII_AR_10T_HD_CAPS;
+                mii_advertise_data = ADVERTISE_10HALF;
 
-                if ((atl1e_write_phy_reg(hw, MII_AT001_CR, 0) != 0) ||
+                if ((atl1e_write_phy_reg(hw, MII_CTRL1000, 0) != 0) ||
                     (atl1e_write_phy_reg(hw,
                            MII_ADVERTISE, mii_advertise_data) != 0) ||
                     (atl1e_phy_commit(hw)) != 0) {
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 3b527687c28..67f40b9c16e 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -950,6 +950,7 @@ static int __devinit atl1_sw_init(struct atl1_adapter *adapter)
         hw->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
 
         adapter->wol = 0;
+        device_set_wakeup_enable(&adapter->pdev->dev, false);
         adapter->rx_buffer_len = (hw->max_frame_size + 7) & ~7;
         adapter->ict = 50000;           /* 100ms */
         adapter->link_speed = SPEED_0;  /* hardware init */
@@ -2735,15 +2736,15 @@ static int atl1_close(struct net_device *netdev)
 }
 
 #ifdef CONFIG_PM
-static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
+static int atl1_suspend(struct device *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct atl1_adapter *adapter = netdev_priv(netdev);
         struct atl1_hw *hw = &adapter->hw;
         u32 ctrl = 0;
         u32 wufc = adapter->wol;
         u32 val;
-        int retval;
         u16 speed;
         u16 duplex;
 
@@ -2751,17 +2752,15 @@ static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
         if (netif_running(netdev))
                 atl1_down(adapter);
 
-        retval = pci_save_state(pdev);
-        if (retval)
-                return retval;
-
         atl1_read_phy_reg(hw, MII_BMSR, (u16 *) & ctrl);
         atl1_read_phy_reg(hw, MII_BMSR, (u16 *) & ctrl);
         val = ctrl & BMSR_LSTATUS;
         if (val)
                 wufc &= ~ATLX_WUFC_LNKC;
+        if (!wufc)
+                goto disable_wol;
 
-        if (val && wufc) {
+        if (val) {
                 val = atl1_get_speed_and_duplex(hw, &speed, &duplex);
                 if (val) {
                         if (netif_msg_ifdown(adapter))
@@ -2798,23 +2797,18 @@ static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
                 ctrl |= PCIE_PHYMISC_FORCE_RCV_DET;
                 iowrite32(ctrl, hw->hw_addr + REG_PCIE_PHYMISC);
                 ioread32(hw->hw_addr + REG_PCIE_PHYMISC);
-
-                pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
-                goto exit;
-        }
-
-        if (!val && wufc) {
+        } else {
                 ctrl |= (WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN);
                 iowrite32(ctrl, hw->hw_addr + REG_WOL_CTRL);
                 ioread32(hw->hw_addr + REG_WOL_CTRL);
                 iowrite32(0, hw->hw_addr + REG_MAC_CTRL);
                 ioread32(hw->hw_addr + REG_MAC_CTRL);
                 hw->phy_configured = false;
-                pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
-                goto exit;
         }
 
-disable_wol:
+        return 0;
+
+ disable_wol:
         iowrite32(0, hw->hw_addr + REG_WOL_CTRL);
         ioread32(hw->hw_addr + REG_WOL_CTRL);
         ctrl = ioread32(hw->hw_addr + REG_PCIE_PHYMISC);
@@ -2822,37 +2816,17 @@ disable_wol:
         iowrite32(ctrl, hw->hw_addr + REG_PCIE_PHYMISC);
         ioread32(hw->hw_addr + REG_PCIE_PHYMISC);
         hw->phy_configured = false;
-        pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
-exit:
-        if (netif_running(netdev))
-                pci_disable_msi(adapter->pdev);
-        pci_disable_device(pdev);
-        pci_set_power_state(pdev, pci_choose_state(pdev, state));
 
         return 0;
 }
 
-static int atl1_resume(struct pci_dev *pdev)
+static int atl1_resume(struct device *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct atl1_adapter *adapter = netdev_priv(netdev);
-        u32 err;
 
-        pci_set_power_state(pdev, PCI_D0);
-        pci_restore_state(pdev);
-
-        err = pci_enable_device(pdev);
-        if (err) {
-                if (netif_msg_ifup(adapter))
-                        dev_printk(KERN_DEBUG, &pdev->dev,
-                                "error enabling pci device\n");
-                return err;
-        }
-
-        pci_set_master(pdev);
         iowrite32(0, adapter->hw.hw_addr + REG_WOL_CTRL);
-        pci_enable_wake(pdev, PCI_D3hot, 0);
-        pci_enable_wake(pdev, PCI_D3cold, 0);
 
         atl1_reset_hw(&adapter->hw);
 
@@ -2864,16 +2838,25 @@ static int atl1_resume(struct pci_dev *pdev)
 
         return 0;
 }
+
+static SIMPLE_DEV_PM_OPS(atl1_pm_ops, atl1_suspend, atl1_resume);
+#define ATL1_PM_OPS     (&atl1_pm_ops)
+
 #else
-#define atl1_suspend NULL
-#define atl1_resume NULL
+
+static int atl1_suspend(struct device *dev) { return 0; }
+
+#define ATL1_PM_OPS     NULL
 #endif
 
 static void atl1_shutdown(struct pci_dev *pdev)
 {
-#ifdef CONFIG_PM
-        atl1_suspend(pdev, PMSG_SUSPEND);
-#endif
+        struct net_device *netdev = pci_get_drvdata(pdev);
+        struct atl1_adapter *adapter = netdev_priv(netdev);
+
+        atl1_suspend(&pdev->dev);
+        pci_wake_from_d3(pdev, adapter->wol);
+        pci_set_power_state(pdev, PCI_D3hot);
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -3117,9 +3100,8 @@ static struct pci_driver atl1_driver = {
         .id_table = atl1_pci_tbl,
         .probe = atl1_probe,
         .remove = __devexit_p(atl1_remove),
-        .suspend = atl1_suspend,
-        .resume = atl1_resume,
-        .shutdown = atl1_shutdown
+        .shutdown = atl1_shutdown,
+        .driver.pm = ATL1_PM_OPS,
 };
 
 /*
@@ -3409,6 +3391,9 @@ static int atl1_set_wol(struct net_device *netdev,
         adapter->wol = 0;
         if (wol->wolopts & WAKE_MAGIC)
                 adapter->wol |= ATLX_WUFC_MAG;
+
+        device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
+
         return 0;
 }
 
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index 4e6f4e95a5a..e637e9f28fd 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -93,8 +93,8 @@ static int __devinit atl2_sw_init(struct atl2_adapter *adapter)
         hw->device_id = pdev->device;
         hw->subsystem_vendor_id = pdev->subsystem_vendor;
         hw->subsystem_id = pdev->subsystem_device;
+        hw->revision_id  = pdev->revision;
 
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
         pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word);
 
         adapter->wol = 0;
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index 4bebff3faea..e7cb8c8b977 100644
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -9,7 +9,7 @@
  * 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.
-*/
+ */
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -17,46 +17,45 @@
 #include <linux/isapnp.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/timer.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
-#include <linux/mii.h>
+#include <linux/mdio-bitbang.h>
+#include <linux/phy.h>
 #include <linux/eeprom_93cx6.h>
 #include <linux/slab.h>
 
 #include <net/ax88796.h>
 
 #include <asm/system.h>
-#include <asm/io.h>
-
-static int phy_debug = 0;
 
 /* Rename the lib8390.c functions to show that they are in this driver */
-#define __ei_open       ax_ei_open
-#define __ei_close      ax_ei_close
-#define __ei_poll       ax_ei_poll
+#define __ei_open ax_ei_open
+#define __ei_close ax_ei_close
+#define __ei_poll ax_ei_poll
 #define __ei_start_xmit ax_ei_start_xmit
 #define __ei_tx_timeout ax_ei_tx_timeout
-#define __ei_get_stats  ax_ei_get_stats
+#define __ei_get_stats ax_ei_get_stats
 #define __ei_set_multicast_list ax_ei_set_multicast_list
-#define __ei_interrupt  ax_ei_interrupt
+#define __ei_interrupt ax_ei_interrupt
 #define ____alloc_ei_netdev ax__alloc_ei_netdev
-#define __NS8390_init   ax_NS8390_init
+#define __NS8390_init ax_NS8390_init
 
 /* force unsigned long back to 'void __iomem *' */
 #define ax_convert_addr(_a) ((void __force __iomem *)(_a))
 
-#define ei_inb(_a)      readb(ax_convert_addr(_a))
+#define ei_inb(_a) readb(ax_convert_addr(_a))
 #define ei_outb(_v, _a) writeb(_v, ax_convert_addr(_a))
 
-#define ei_inb_p(_a)    ei_inb(_a)
+#define ei_inb_p(_a) ei_inb(_a)
 #define ei_outb_p(_v, _a) ei_outb(_v, _a)
 
 /* define EI_SHIFT() to take into account our register offsets */
-#define EI_SHIFT(x)     (ei_local->reg_offset[(x)])
+#define EI_SHIFT(x) (ei_local->reg_offset[(x)])
 
 /* Ensure we have our RCR base value */
 #define AX88796_PLATFORM
@@ -74,43 +73,46 @@ static unsigned char version[] = "ax88796.c: Copyright 2005,2007 Simtec Electron
 #define NE_DATAPORT     EI_SHIFT(0x10)
 
 #define NE1SM_START_PG  0x20    /* First page of TX buffer */
-#define NE1SM_STOP_PG   0x40    /* Last page +1 of RX ring */
+#define NE1SM_STOP_PG   0x40    /* Last page +1 of RX ring */
 #define NESM_START_PG   0x40    /* First page of TX buffer */
 #define NESM_STOP_PG    0x80    /* Last page +1 of RX ring */
 
+#define AX_GPOC_PPDSET  BIT(6)
+
 /* device private data */
 
 struct ax_device {
-        struct timer_list        mii_timer;
-        spinlock_t               mii_lock;
-        struct mii_if_info       mii;
-
-        u32                      msg_enable;
-        void __iomem            *map2;
-        struct platform_device  *dev;
-        struct resource         *mem;
-        struct resource         *mem2;
-        struct ax_plat_data     *plat;
-
-        unsigned char            running;
-        unsigned char            resume_open;
-        unsigned int             irqflags;
-
-        u32                      reg_offsets[0x20];
+        struct mii_bus *mii_bus;
+        struct mdiobb_ctrl bb_ctrl;
+        struct phy_device *phy_dev;
+        void __iomem *addr_memr;
+        u8 reg_memr;
+        int link;
+        int speed;
+        int duplex;
+
+        void __iomem *map2;
+        const struct ax_plat_data *plat;
+
+        unsigned char running;
+        unsigned char resume_open;
+        unsigned int irqflags;
+
+        u32 reg_offsets[0x20];
 };
 
 static inline struct ax_device *to_ax_dev(struct net_device *dev)
 {
         struct ei_device *ei_local = netdev_priv(dev);
-        return (struct ax_device *)(ei_local+1);
+        return (struct ax_device *)(ei_local + 1);
 }
 
-/* ax_initial_check
+/*
+ * ax_initial_check
  *
  * do an initial probe for the card to check wether it exists
  * and is functional
  */
-
 static int ax_initial_check(struct net_device *dev)
 {
         struct ei_device *ei_local = netdev_priv(dev);
@@ -122,10 +124,10 @@ static int ax_initial_check(struct net_device *dev)
         if (reg0 == 0xFF)
                 return -ENODEV;
 
-        ei_outb(E8390_NODMA+E8390_PAGE1+E8390_STOP, ioaddr + E8390_CMD);
+        ei_outb(E8390_NODMA + E8390_PAGE1 + E8390_STOP, ioaddr + E8390_CMD);
         regd = ei_inb(ioaddr + 0x0d);
         ei_outb(0xff, ioaddr + 0x0d);
-        ei_outb(E8390_NODMA+E8390_PAGE0, ioaddr + E8390_CMD);
+        ei_outb(E8390_NODMA + E8390_PAGE0, ioaddr + E8390_CMD);
         ei_inb(ioaddr + EN0_COUNTER0); /* Clear the counter by reading. */
         if (ei_inb(ioaddr + EN0_COUNTER0) != 0) {
                 ei_outb(reg0, ioaddr);
@@ -136,29 +138,28 @@ static int ax_initial_check(struct net_device *dev)
         return 0;
 }
 
-/* Hard reset the card.  This used to pause for the same period that a
-   8390 reset command required, but that shouldn't be necessary. */
-
+/*
+ * Hard reset the card. This used to pause for the same period that a
+ * 8390 reset command required, but that shouldn't be necessary.
+ */
 static void ax_reset_8390(struct net_device *dev)
 {
         struct ei_device *ei_local = netdev_priv(dev);
-        struct ax_device  *ax = to_ax_dev(dev);
         unsigned long reset_start_time = jiffies;
         void __iomem *addr = (void __iomem *)dev->base_addr;
 
         if (ei_debug > 1)
-                dev_dbg(&ax->dev->dev, "resetting the 8390 t=%ld\n", jiffies);
+                netdev_dbg(dev, "resetting the 8390 t=%ld\n", jiffies);
 
         ei_outb(ei_inb(addr + NE_RESET), addr + NE_RESET);
 
-        ei_status.txing = 0;
-        ei_status.dmaing = 0;
+        ei_local->txing = 0;
+        ei_local->dmaing = 0;
 
         /* This check _should_not_ be necessary, omit eventually. */
         while ((ei_inb(addr + EN0_ISR) & ENISR_RESET) == 0) {
-                if (jiffies - reset_start_time > 2*HZ/100) {
-                        dev_warn(&ax->dev->dev, "%s: %s did not complete.\n",
-                               __func__, dev->name);
+                if (jiffies - reset_start_time > 2 * HZ / 100) {
+                        netdev_warn(dev, "%s: did not complete.\n", __func__);
                         break;
                 }
         }
@@ -171,70 +172,72 @@ static void ax_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
                             int ring_page)
 {
         struct ei_device *ei_local = netdev_priv(dev);
-        struct ax_device  *ax = to_ax_dev(dev);
         void __iomem *nic_base = ei_local->mem;
 
         /* This *shouldn't* happen. If it does, it's the last thing you'll see */
-        if (ei_status.dmaing) {
-                dev_err(&ax->dev->dev, "%s: DMAing conflict in %s "
+        if (ei_local->dmaing) {
+                netdev_err(dev, "DMAing conflict in %s "
                         "[DMAstat:%d][irqlock:%d].\n",
-                        dev->name, __func__,
-                        ei_status.dmaing, ei_status.irqlock);
+                        __func__,
+                        ei_local->dmaing, ei_local->irqlock);
                 return;
         }
 
-        ei_status.dmaing |= 0x01;
-        ei_outb(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD);
+        ei_local->dmaing |= 0x01;
+        ei_outb(E8390_NODMA + E8390_PAGE0 + E8390_START, nic_base + NE_CMD);
         ei_outb(sizeof(struct e8390_pkt_hdr), nic_base + EN0_RCNTLO);
         ei_outb(0, nic_base + EN0_RCNTHI);
         ei_outb(0, nic_base + EN0_RSARLO);              /* On page boundary */
         ei_outb(ring_page, nic_base + EN0_RSARHI);
         ei_outb(E8390_RREAD+E8390_START, nic_base + NE_CMD);
 
-        if (ei_status.word16)
-                readsw(nic_base + NE_DATAPORT, hdr, sizeof(struct e8390_pkt_hdr)>>1);
+        if (ei_local->word16)
+                readsw(nic_base + NE_DATAPORT, hdr,
+                       sizeof(struct e8390_pkt_hdr) >> 1);
         else
-                readsb(nic_base + NE_DATAPORT, hdr, sizeof(struct e8390_pkt_hdr));
+                readsb(nic_base + NE_DATAPORT, hdr,
+                       sizeof(struct e8390_pkt_hdr));
 
         ei_outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
-        ei_status.dmaing &= ~0x01;
+        ei_local->dmaing &= ~0x01;
 
         le16_to_cpus(&hdr->count);
 }
 
 
-/* Block input and output, similar to the Crynwr packet driver.  If you
-   are porting to a new ethercard, look at the packet driver source for hints.
-   The NEx000 doesn't share the on-board packet memory -- you have to put
-   the packet out through the "remote DMA" dataport using ei_outb. */
-
+/*
+ * Block input and output, similar to the Crynwr packet driver. If
+ * you are porting to a new ethercard, look at the packet driver
+ * source for hints. The NEx000 doesn't share the on-board packet
+ * memory -- you have to put the packet out through the "remote DMA"
+ * dataport using ei_outb.
+ */
 static void ax_block_input(struct net_device *dev, int count,
                            struct sk_buff *skb, int ring_offset)
 {
         struct ei_device *ei_local = netdev_priv(dev);
-        struct ax_device  *ax = to_ax_dev(dev);
         void __iomem *nic_base = ei_local->mem;
         char *buf = skb->data;
 
-        if (ei_status.dmaing) {
-                dev_err(&ax->dev->dev,
-                        "%s: DMAing conflict in %s "
+        if (ei_local->dmaing) {
+                netdev_err(dev,
+                        "DMAing conflict in %s "
                         "[DMAstat:%d][irqlock:%d].\n",
-                        dev->name, __func__,
-                        ei_status.dmaing, ei_status.irqlock);
+                        __func__,
+                        ei_local->dmaing, ei_local->irqlock);
                 return;
         }
 
-        ei_status.dmaing |= 0x01;
+        ei_local->dmaing |= 0x01;
 
-        ei_outb(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD);
+        ei_outb(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base + NE_CMD);
         ei_outb(count & 0xff, nic_base + EN0_RCNTLO);
         ei_outb(count >> 8, nic_base + EN0_RCNTHI);
         ei_outb(ring_offset & 0xff, nic_base + EN0_RSARLO);
         ei_outb(ring_offset >> 8, nic_base + EN0_RSARHI);
         ei_outb(E8390_RREAD+E8390_START, nic_base + NE_CMD);
 
-        if (ei_status.word16) {
+        if (ei_local->word16) {
                 readsw(nic_base + NE_DATAPORT, buf, count >> 1);
                 if (count & 0x01)
                         buf[count-1] = ei_inb(nic_base + NE_DATAPORT);
@@ -243,34 +246,34 @@ static void ax_block_input(struct net_device *dev, int count,
                 readsb(nic_base + NE_DATAPORT, buf, count);
         }
 
-        ei_status.dmaing &= ~1;
+        ei_local->dmaing &= ~1;
 }
 
 static void ax_block_output(struct net_device *dev, int count,
                             const unsigned char *buf, const int start_page)
 {
         struct ei_device *ei_local = netdev_priv(dev);
-        struct ax_device  *ax = to_ax_dev(dev);
         void __iomem *nic_base = ei_local->mem;
         unsigned long dma_start;
 
-        /* Round the count up for word writes.  Do we need to do this?
-           What effect will an odd byte count have on the 8390?
-           I should check someday. */
-
-        if (ei_status.word16 && (count & 0x01))
+        /*
+         * Round the count up for word writes. Do we need to do this?
+         * What effect will an odd byte count have on the 8390?  I
+         * should check someday.
+         */
+        if (ei_local->word16 && (count & 0x01))
                 count++;
 
         /* This *shouldn't* happen. If it does, it's the last thing you'll see */
-        if (ei_status.dmaing) {
-                dev_err(&ax->dev->dev, "%s: DMAing conflict in %s."
+        if (ei_local->dmaing) {
+                netdev_err(dev, "DMAing conflict in %s."
                         "[DMAstat:%d][irqlock:%d]\n",
-                        dev->name, __func__,
-                       ei_status.dmaing, ei_status.irqlock);
+                        __func__,
+                       ei_local->dmaing, ei_local->irqlock);
                 return;
         }
 
-        ei_status.dmaing |= 0x01;
+        ei_local->dmaing |= 0x01;
         /* We should already be in page 0, but to be safe... */
         ei_outb(E8390_PAGE0+E8390_START+E8390_NODMA, nic_base + NE_CMD);
 
@@ -278,250 +281,170 @@ static void ax_block_output(struct net_device *dev, int count,
 
         /* Now the normal output. */
         ei_outb(count & 0xff, nic_base + EN0_RCNTLO);
-        ei_outb(count >> 8,   nic_base + EN0_RCNTHI);
+        ei_outb(count >> 8, nic_base + EN0_RCNTHI);
         ei_outb(0x00, nic_base + EN0_RSARLO);
         ei_outb(start_page, nic_base + EN0_RSARHI);
 
         ei_outb(E8390_RWRITE+E8390_START, nic_base + NE_CMD);
-        if (ei_status.word16) {
-                writesw(nic_base + NE_DATAPORT, buf, count>>1);
-        } else {
+        if (ei_local->word16)
+                writesw(nic_base + NE_DATAPORT, buf, count >> 1);
+        else
                 writesb(nic_base + NE_DATAPORT, buf, count);
-        }
 
         dma_start = jiffies;
 
         while ((ei_inb(nic_base + EN0_ISR) & ENISR_RDC) == 0) {
-                if (jiffies - dma_start > 2*HZ/100) {           /* 20ms */
-                        dev_warn(&ax->dev->dev,
-                                 "%s: timeout waiting for Tx RDC.\n", dev->name);
+                if (jiffies - dma_start > 2 * HZ / 100) {               /* 20ms */
+                        netdev_warn(dev, "timeout waiting for Tx RDC.\n");
                         ax_reset_8390(dev);
-                        ax_NS8390_init(dev,1);
+                        ax_NS8390_init(dev, 1);
                         break;
                 }
         }
 
         ei_outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
-        ei_status.dmaing &= ~0x01;
+        ei_local->dmaing &= ~0x01;
 }
 
 /* definitions for accessing MII/EEPROM interface */
 
 #define AX_MEMR                 EI_SHIFT(0x14)
-#define AX_MEMR_MDC             (1<<0)
-#define AX_MEMR_MDIR            (1<<1)
-#define AX_MEMR_MDI             (1<<2)
-#define AX_MEMR_MDO             (1<<3)
-#define AX_MEMR_EECS            (1<<4)
-#define AX_MEMR_EEI             (1<<5)
-#define AX_MEMR_EEO             (1<<6)
-#define AX_MEMR_EECLK           (1<<7)
-
-/* ax_mii_ei_outbits
- *
- * write the specified set of bits to the phy
-*/
-
-static void
-ax_mii_ei_outbits(struct net_device *dev, unsigned int bits, int len)
+#define AX_MEMR_MDC             BIT(0)
+#define AX_MEMR_MDIR            BIT(1)
+#define AX_MEMR_MDI             BIT(2)
+#define AX_MEMR_MDO             BIT(3)
+#define AX_MEMR_EECS            BIT(4)
+#define AX_MEMR_EEI             BIT(5)
+#define AX_MEMR_EEO             BIT(6)
+#define AX_MEMR_EECLK           BIT(7)
+
+static void ax_handle_link_change(struct net_device *dev)
 {
-        struct ei_device *ei_local = netdev_priv(dev);
-        void __iomem *memr_addr = (void __iomem *)dev->base_addr + AX_MEMR;
-        unsigned int memr;
-
-        /* clock low, data to output mode */
-        memr = ei_inb(memr_addr);
-        memr &= ~(AX_MEMR_MDC | AX_MEMR_MDIR);
-        ei_outb(memr, memr_addr);
-
-        for (len--; len >= 0; len--) {
-                if (bits & (1 << len))
-                        memr |= AX_MEMR_MDO;
-                else
-                        memr &= ~AX_MEMR_MDO;
-
-                ei_outb(memr, memr_addr);
-
-                /* clock high */
+        struct ax_device  *ax = to_ax_dev(dev);
+        struct phy_device *phy_dev = ax->phy_dev;
+        int status_change = 0;
 
-                ei_outb(memr | AX_MEMR_MDC, memr_addr);
-                udelay(1);
+        if (phy_dev->link && ((ax->speed != phy_dev->speed) ||
+                             (ax->duplex != phy_dev->duplex))) {
 
-                /* clock low */
-                ei_outb(memr, memr_addr);
+                ax->speed = phy_dev->speed;
+                ax->duplex = phy_dev->duplex;
+                status_change = 1;
         }
 
-        /* leaves the clock line low, mdir input */
-        memr |= AX_MEMR_MDIR;
-        ei_outb(memr, (void __iomem *)dev->base_addr + AX_MEMR);
-}
-
-/* ax_phy_ei_inbits
- *
- * read a specified number of bits from the phy
-*/
-
-static unsigned int
-ax_phy_ei_inbits(struct net_device *dev, int no)
-{
-        struct ei_device *ei_local = netdev_priv(dev);
-        void __iomem *memr_addr = (void __iomem *)dev->base_addr + AX_MEMR;
-        unsigned int memr;
-        unsigned int result = 0;
-
-        /* clock low, data to input mode */
-        memr = ei_inb(memr_addr);
-        memr &= ~AX_MEMR_MDC;
-        memr |= AX_MEMR_MDIR;
-        ei_outb(memr, memr_addr);
-
-        for (no--; no >= 0; no--) {
-                ei_outb(memr | AX_MEMR_MDC, memr_addr);
-
-                udelay(1);
-
-                if (ei_inb(memr_addr) & AX_MEMR_MDI)
-                        result |= (1<<no);
+        if (phy_dev->link != ax->link) {
+                if (!phy_dev->link) {
+                        ax->speed = 0;
+                        ax->duplex = -1;
+                }
+                ax->link = phy_dev->link;
 
-                ei_outb(memr, memr_addr);
+                status_change = 1;
         }
 
-        return result;
-}
-
-/* ax_phy_issueaddr
- *
- * use the low level bit shifting routines to send the address
- * and command to the specified phy
-*/
-
-static void
-ax_phy_issueaddr(struct net_device *dev, int phy_addr, int reg, int opc)
-{
-        if (phy_debug)
-                pr_debug("%s: dev %p, %04x, %04x, %d\n",
-                        __func__, dev, phy_addr, reg, opc);
-
-        ax_mii_ei_outbits(dev, 0x3f, 6);        /* pre-amble */
-        ax_mii_ei_outbits(dev, 1, 2);           /* frame-start */
-        ax_mii_ei_outbits(dev, opc, 2);         /* op code */
-        ax_mii_ei_outbits(dev, phy_addr, 5);    /* phy address */
-        ax_mii_ei_outbits(dev, reg, 5);         /* reg address */
+        if (status_change)
+                phy_print_status(phy_dev);
 }
 
-static int
-ax_phy_read(struct net_device *dev, int phy_addr, int reg)
+static int ax_mii_probe(struct net_device *dev)
 {
-        struct ei_device *ei_local = netdev_priv(dev);
-        unsigned long flags;
-        unsigned int result;
+        struct ax_device  *ax = to_ax_dev(dev);
+        struct phy_device *phy_dev = NULL;
+        int ret;
 
-        spin_lock_irqsave(&ei_local->page_lock, flags);
+        /* find the first phy */
+        phy_dev = phy_find_first(ax->mii_bus);
+        if (!phy_dev) {
+                netdev_err(dev, "no PHY found\n");
+                return -ENODEV;
+        }
 
-        ax_phy_issueaddr(dev, phy_addr, reg, 2);
+        ret = phy_connect_direct(dev, phy_dev, ax_handle_link_change, 0,
+                                 PHY_INTERFACE_MODE_MII);
+        if (ret) {
+                netdev_err(dev, "Could not attach to PHY\n");
+                return ret;
+        }
 
-        result = ax_phy_ei_inbits(dev, 17);
-        result &= ~(3<<16);
+        /* mask with MAC supported features */
+        phy_dev->supported &= PHY_BASIC_FEATURES;
+        phy_dev->advertising = phy_dev->supported;
 
-        spin_unlock_irqrestore(&ei_local->page_lock, flags);
+        ax->phy_dev = phy_dev;
 
-        if (phy_debug)
-                pr_debug("%s: %04x.%04x => read %04x\n", __func__,
-                         phy_addr, reg, result);
+        netdev_info(dev, "PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
+                    phy_dev->drv->name, dev_name(&phy_dev->dev), phy_dev->irq);
 
-        return result;
+        return 0;
 }
 
-static void
-ax_phy_write(struct net_device *dev, int phy_addr, int reg, int value)
+static void ax_phy_switch(struct net_device *dev, int on)
 {
-        struct ei_device *ei = netdev_priv(dev);
-        struct ax_device  *ax = to_ax_dev(dev);
-        unsigned long flags;
-
-        dev_dbg(&ax->dev->dev, "%s: %p, %04x, %04x %04x\n",
-                __func__, dev, phy_addr, reg, value);
-
-        spin_lock_irqsave(&ei->page_lock, flags);
-
-        ax_phy_issueaddr(dev, phy_addr, reg, 1);
-        ax_mii_ei_outbits(dev, 2, 2);           /* send TA */
-        ax_mii_ei_outbits(dev, value, 16);
-
-        spin_unlock_irqrestore(&ei->page_lock, flags);
-}
+        struct ei_device *ei_local = netdev_priv(dev);
+        struct ax_device *ax = to_ax_dev(dev);
 
-static void ax_mii_expiry(unsigned long data)
-{
-        struct net_device *dev = (struct net_device *)data;
-        struct ax_device  *ax = to_ax_dev(dev);
-        unsigned long flags;
+        u8 reg_gpoc =  ax->plat->gpoc_val;
 
-        spin_lock_irqsave(&ax->mii_lock, flags);
-        mii_check_media(&ax->mii, netif_msg_link(ax), 0);
-        spin_unlock_irqrestore(&ax->mii_lock, flags);
+        if (!!on)
+                reg_gpoc &= ~AX_GPOC_PPDSET;
+        else
+                reg_gpoc |= AX_GPOC_PPDSET;
 
-        if (ax->running) {
-                ax->mii_timer.expires = jiffies + HZ*2;
-                add_timer(&ax->mii_timer);
-        }
+        ei_outb(reg_gpoc, ei_local->mem + EI_SHIFT(0x17));
 }
 
 static int ax_open(struct net_device *dev)
 {
-        struct ax_device  *ax = to_ax_dev(dev);
-        struct ei_device *ei_local = netdev_priv(dev);
+        struct ax_device *ax = to_ax_dev(dev);
         int ret;
 
-        dev_dbg(&ax->dev->dev, "%s: open\n", dev->name);
+        netdev_dbg(dev, "open\n");
 
         ret = request_irq(dev->irq, ax_ei_interrupt, ax->irqflags,
                           dev->name, dev);
         if (ret)
-                return ret;
-
-        ret = ax_ei_open(dev);
-        if (ret) {
-                free_irq(dev->irq, dev);
-                return ret;
-        }
+                goto failed_request_irq;
 
         /* turn the phy on (if turned off) */
+        ax_phy_switch(dev, 1);
 
-        ei_outb(ax->plat->gpoc_val, ei_local->mem + EI_SHIFT(0x17));
-        ax->running = 1;
-
-        /* start the MII timer */
-
-        init_timer(&ax->mii_timer);
+        ret = ax_mii_probe(dev);
+        if (ret)
+                goto failed_mii_probe;
+        phy_start(ax->phy_dev);
 
-        ax->mii_timer.expires  = jiffies+1;
-        ax->mii_timer.data     = (unsigned long) dev;
-        ax->mii_timer.function = ax_mii_expiry;
+        ret = ax_ei_open(dev);
+        if (ret)
+                goto failed_ax_ei_open;
 
-        add_timer(&ax->mii_timer);
+        ax->running = 1;
 
         return 0;
+
+ failed_ax_ei_open:
+        phy_disconnect(ax->phy_dev);
+ failed_mii_probe:
+        ax_phy_switch(dev, 0);
+        free_irq(dev->irq, dev);
+ failed_request_irq:
+        return ret;
 }
 
 static int ax_close(struct net_device *dev)
 {
         struct ax_device *ax = to_ax_dev(dev);
-        struct ei_device *ei_local = netdev_priv(dev);
 
-        dev_dbg(&ax->dev->dev, "%s: close\n", dev->name);
-
-        /* turn the phy off */
-
-        ei_outb(ax->plat->gpoc_val | (1<<6),
-               ei_local->mem + EI_SHIFT(0x17));
+        netdev_dbg(dev, "close\n");
 
         ax->running = 0;
         wmb();
 
-        del_timer_sync(&ax->mii_timer);
         ax_ei_close(dev);
 
+        /* turn the phy off */
+        ax_phy_switch(dev, 0);
+        phy_disconnect(ax->phy_dev);
+
         free_irq(dev->irq, dev);
         return 0;
 }
@@ -529,17 +452,15 @@ static int ax_close(struct net_device *dev)
 static int ax_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 {
         struct ax_device *ax = to_ax_dev(dev);
-        unsigned long flags;
-        int rc;
+        struct phy_device *phy_dev = ax->phy_dev;
 
         if (!netif_running(dev))
                 return -EINVAL;
 
-        spin_lock_irqsave(&ax->mii_lock, flags);
-        rc = generic_mii_ioctl(&ax->mii, if_mii(req), cmd, NULL);
-        spin_unlock_irqrestore(&ax->mii_lock, flags);
+        if (!phy_dev)
+                return -ENODEV;
 
-        return rc;
+        return phy_mii_ioctl(phy_dev, req, cmd);
 }
 
 /* ethtool ops */
@@ -547,56 +468,40 @@ static int ax_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 static void ax_get_drvinfo(struct net_device *dev,
                            struct ethtool_drvinfo *info)
 {
-        struct ax_device *ax = to_ax_dev(dev);
+        struct platform_device *pdev = to_platform_device(dev->dev.parent);
 
         strcpy(info->driver, DRV_NAME);
         strcpy(info->version, DRV_VERSION);
-        strcpy(info->bus_info, ax->dev->name);
+        strcpy(info->bus_info, pdev->name);
 }
 
 static int ax_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct ax_device *ax = to_ax_dev(dev);
-        unsigned long flags;
+        struct phy_device *phy_dev = ax->phy_dev;
 
-        spin_lock_irqsave(&ax->mii_lock, flags);
-        mii_ethtool_gset(&ax->mii, cmd);
-        spin_unlock_irqrestore(&ax->mii_lock, flags);
+        if (!phy_dev)
+                return -ENODEV;
 
-        return 0;
+        return phy_ethtool_gset(phy_dev, cmd);
 }
 
 static int ax_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct ax_device *ax = to_ax_dev(dev);
-        unsigned long flags;
-        int rc;
+        struct phy_device *phy_dev = ax->phy_dev;
 
-        spin_lock_irqsave(&ax->mii_lock, flags);
-        rc = mii_ethtool_sset(&ax->mii, cmd);
-        spin_unlock_irqrestore(&ax->mii_lock, flags);
-
-        return rc;
-}
-
-static int ax_nway_reset(struct net_device *dev)
-{
-        struct ax_device *ax = to_ax_dev(dev);
-        return mii_nway_restart(&ax->mii);
-}
+        if (!phy_dev)
+                return -ENODEV;
 
-static u32 ax_get_link(struct net_device *dev)
-{
-        struct ax_device *ax = to_ax_dev(dev);
-        return mii_link_ok(&ax->mii);
+        return phy_ethtool_sset(phy_dev, cmd);
 }
 
 static const struct ethtool_ops ax_ethtool_ops = {
         .get_drvinfo            = ax_get_drvinfo,
         .get_settings           = ax_get_settings,
         .set_settings           = ax_set_settings,
-        .nway_reset             = ax_nway_reset,
-        .get_link               = ax_get_link,
+        .get_link               = ethtool_op_get_link,
 };
 
 #ifdef CONFIG_AX88796_93CX6
@@ -640,37 +545,131 @@ static const struct net_device_ops ax_netdev_ops = {
         .ndo_get_stats          = ax_ei_get_stats,
         .ndo_set_multicast_list = ax_ei_set_multicast_list,
         .ndo_validate_addr      = eth_validate_addr,
-        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_change_mtu         = eth_change_mtu,
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = ax_ei_poll,
 #endif
 };
 
+static void ax_bb_mdc(struct mdiobb_ctrl *ctrl, int level)
+{
+        struct ax_device *ax = container_of(ctrl, struct ax_device, bb_ctrl);
+
+        if (level)
+                ax->reg_memr |= AX_MEMR_MDC;
+        else
+                ax->reg_memr &= ~AX_MEMR_MDC;
+
+        ei_outb(ax->reg_memr, ax->addr_memr);
+}
+
+static void ax_bb_dir(struct mdiobb_ctrl *ctrl, int output)
+{
+        struct ax_device *ax = container_of(ctrl, struct ax_device, bb_ctrl);
+
+        if (output)
+                ax->reg_memr &= ~AX_MEMR_MDIR;
+        else
+                ax->reg_memr |= AX_MEMR_MDIR;
+
+        ei_outb(ax->reg_memr, ax->addr_memr);
+}
+
+static void ax_bb_set_data(struct mdiobb_ctrl *ctrl, int value)
+{
+        struct ax_device *ax = container_of(ctrl, struct ax_device, bb_ctrl);
+
+        if (value)
+                ax->reg_memr |= AX_MEMR_MDO;
+        else
+                ax->reg_memr &= ~AX_MEMR_MDO;
+
+        ei_outb(ax->reg_memr, ax->addr_memr);
+}
+
+static int ax_bb_get_data(struct mdiobb_ctrl *ctrl)
+{
+        struct ax_device *ax = container_of(ctrl, struct ax_device, bb_ctrl);
+        int reg_memr = ei_inb(ax->addr_memr);
+
+        return reg_memr & AX_MEMR_MDI ? 1 : 0;
+}
+
+static struct mdiobb_ops bb_ops = {
+        .owner = THIS_MODULE,
+        .set_mdc = ax_bb_mdc,
+        .set_mdio_dir = ax_bb_dir,
+        .set_mdio_data = ax_bb_set_data,
+        .get_mdio_data = ax_bb_get_data,
+};
+
 /* setup code */
 
+static int ax_mii_init(struct net_device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev->dev.parent);
+        struct ei_device *ei_local = netdev_priv(dev);
+        struct ax_device *ax = to_ax_dev(dev);
+        int err, i;
+
+        ax->bb_ctrl.ops = &bb_ops;
+        ax->addr_memr = ei_local->mem + AX_MEMR;
+        ax->mii_bus = alloc_mdio_bitbang(&ax->bb_ctrl);
+        if (!ax->mii_bus) {
+                err = -ENOMEM;
+                goto out;
+        }
+
+        ax->mii_bus->name = "ax88796_mii_bus";
+        ax->mii_bus->parent = dev->dev.parent;
+        snprintf(ax->mii_bus->id, MII_BUS_ID_SIZE, "%x", pdev->id);
+
+        ax->mii_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
+        if (!ax->mii_bus->irq) {
+                err = -ENOMEM;
+                goto out_free_mdio_bitbang;
+        }
+
+        for (i = 0; i < PHY_MAX_ADDR; i++)
+                ax->mii_bus->irq[i] = PHY_POLL;
+
+        err = mdiobus_register(ax->mii_bus);
+        if (err)
+                goto out_free_irq;
+
+        return 0;
+
+ out_free_irq:
+        kfree(ax->mii_bus->irq);
+ out_free_mdio_bitbang:
+        free_mdio_bitbang(ax->mii_bus);
+ out:
+        return err;
+}
+
 static void ax_initial_setup(struct net_device *dev, struct ei_device *ei_local)
 {
         void __iomem *ioaddr = ei_local->mem;
         struct ax_device *ax = to_ax_dev(dev);
 
-        /* Select page 0*/
-        ei_outb(E8390_NODMA+E8390_PAGE0+E8390_STOP, ioaddr + E8390_CMD);
+        /* Select page 0 */
+        ei_outb(E8390_NODMA + E8390_PAGE0 + E8390_STOP, ioaddr + E8390_CMD);
 
         /* set to byte access */
         ei_outb(ax->plat->dcr_val & ~1, ioaddr + EN0_DCFG);
         ei_outb(ax->plat->gpoc_val, ioaddr + EI_SHIFT(0x17));
 }
 
-/* ax_init_dev
+/*
+ * ax_init_dev
  *
  * initialise the specified device, taking care to note the MAC
  * address it may already have (if configured), ensure
  * the device is ready to be used by lib8390.c and registerd with
  * the network layer.
  */
-
-static int ax_init_dev(struct net_device *dev, int first_init)
+static int ax_init_dev(struct net_device *dev)
 {
         struct ei_device *ei_local = netdev_priv(dev);
         struct ax_device *ax = to_ax_dev(dev);
@@ -690,23 +689,23 @@ static int ax_init_dev(struct net_device *dev, int first_init)
 
         /* read the mac from the card prom if we need it */
 
-        if (first_init && ax->plat->flags & AXFLG_HAS_EEPROM) {
+        if (ax->plat->flags & AXFLG_HAS_EEPROM) {
                 unsigned char SA_prom[32];
 
-                for(i = 0; i < sizeof(SA_prom); i+=2) {
+                for (i = 0; i < sizeof(SA_prom); i += 2) {
                         SA_prom[i] = ei_inb(ioaddr + NE_DATAPORT);
-                        SA_prom[i+1] = ei_inb(ioaddr + NE_DATAPORT);
+                        SA_prom[i + 1] = ei_inb(ioaddr + NE_DATAPORT);
                 }
 
                 if (ax->plat->wordlength == 2)
                         for (i = 0; i < 16; i++)
                                 SA_prom[i] = SA_prom[i+i];
 
-                memcpy(dev->dev_addr,  SA_prom, 6);
+                memcpy(dev->dev_addr, SA_prom, 6);
         }
 
 #ifdef CONFIG_AX88796_93CX6
-        if (first_init && ax->plat->flags & AXFLG_HAS_93CX6) {
+        if (ax->plat->flags & AXFLG_HAS_93CX6) {
                 unsigned char mac_addr[6];
                 struct eeprom_93cx6 eeprom;
 
@@ -719,7 +718,7 @@ static int ax_init_dev(struct net_device *dev, int first_init)
                                        (__le16 __force *)mac_addr,
                                        sizeof(mac_addr) >> 1);
 
-                memcpy(dev->dev_addr,  mac_addr, 6);
+                memcpy(dev->dev_addr, mac_addr, 6);
         }
 #endif
         if (ax->plat->wordlength == 2) {
@@ -732,67 +731,56 @@ static int ax_init_dev(struct net_device *dev, int first_init)
                 stop_page = NE1SM_STOP_PG;
         }
 
-        /* load the mac-address from the device if this is the
-         * first time we've initialised */
-
-        if (first_init) {
-                if (ax->plat->flags & AXFLG_MAC_FROMDEV) {
-                        ei_outb(E8390_NODMA + E8390_PAGE1 + E8390_STOP,
-                                ei_local->mem + E8390_CMD); /* 0x61 */
-                        for (i = 0; i < ETHER_ADDR_LEN; i++)
-                                dev->dev_addr[i] =
-                                        ei_inb(ioaddr + EN1_PHYS_SHIFT(i));
-                }
-
-                if ((ax->plat->flags & AXFLG_MAC_FROMPLATFORM) &&
-                     ax->plat->mac_addr)
-                        memcpy(dev->dev_addr, ax->plat->mac_addr,
-                                ETHER_ADDR_LEN);
+        /* load the mac-address from the device */
+        if (ax->plat->flags & AXFLG_MAC_FROMDEV) {
+                ei_outb(E8390_NODMA + E8390_PAGE1 + E8390_STOP,
+                        ei_local->mem + E8390_CMD); /* 0x61 */
+                for (i = 0; i < ETHER_ADDR_LEN; i++)
+                        dev->dev_addr[i] =
+                                ei_inb(ioaddr + EN1_PHYS_SHIFT(i));
         }
 
+        if ((ax->plat->flags & AXFLG_MAC_FROMPLATFORM) &&
+            ax->plat->mac_addr)
+                memcpy(dev->dev_addr, ax->plat->mac_addr,
+                       ETHER_ADDR_LEN);
+
         ax_reset_8390(dev);
 
-        ei_status.name = "AX88796";
-        ei_status.tx_start_page = start_page;
-        ei_status.stop_page = stop_page;
-        ei_status.word16 = (ax->plat->wordlength == 2);
-        ei_status.rx_start_page = start_page + TX_PAGES;
+        ei_local->name = "AX88796";
+        ei_local->tx_start_page = start_page;
+        ei_local->stop_page = stop_page;
+        ei_local->word16 = (ax->plat->wordlength == 2);
+        ei_local->rx_start_page = start_page + TX_PAGES;
 
 #ifdef PACKETBUF_MEMSIZE
-         /* Allow the packet buffer size to be overridden by know-it-alls. */
-        ei_status.stop_page = ei_status.tx_start_page + PACKETBUF_MEMSIZE;
+        /* Allow the packet buffer size to be overridden by know-it-alls. */
+        ei_local->stop_page = ei_local->tx_start_page + PACKETBUF_MEMSIZE;
 #endif
 
-        ei_status.reset_8390    = &ax_reset_8390;
-        ei_status.block_input   = &ax_block_input;
-        ei_status.block_output  = &ax_block_output;
-        ei_status.get_8390_hdr  = &ax_get_8390_hdr;
-        ei_status.priv = 0;
-
-        dev->netdev_ops         = &ax_netdev_ops;
-        dev->ethtool_ops        = &ax_ethtool_ops;
-
-        ax->msg_enable          = NETIF_MSG_LINK;
-        ax->mii.phy_id_mask     = 0x1f;
-        ax->mii.reg_num_mask    = 0x1f;
-        ax->mii.phy_id          = 0x10;         /* onboard phy */
-        ax->mii.force_media     = 0;
-        ax->mii.full_duplex     = 0;
-        ax->mii.mdio_read       = ax_phy_read;
-        ax->mii.mdio_write      = ax_phy_write;
-        ax->mii.dev             = dev;
+        ei_local->reset_8390 = &ax_reset_8390;
+        ei_local->block_input = &ax_block_input;
+        ei_local->block_output = &ax_block_output;
+        ei_local->get_8390_hdr = &ax_get_8390_hdr;
+        ei_local->priv = 0;
 
-        ax_NS8390_init(dev, 0);
+        dev->netdev_ops = &ax_netdev_ops;
+        dev->ethtool_ops = &ax_ethtool_ops;
 
-        if (first_init)
-                dev_info(&ax->dev->dev, "%dbit, irq %d, %lx, MAC: %pM\n",
-                         ei_status.word16 ? 16:8, dev->irq, dev->base_addr,
-                         dev->dev_addr);
+        ret = ax_mii_init(dev);
+        if (ret)
+                goto out_irq;
+
+        ax_NS8390_init(dev, 0);
 
         ret = register_netdev(dev);
         if (ret)
                 goto out_irq;
 
+        netdev_info(dev, "%dbit, irq %d, %lx, MAC: %pM\n",
+                    ei_local->word16 ? 16 : 8, dev->irq, dev->base_addr,
+                    dev->dev_addr);
+
         return 0;
 
  out_irq:
@@ -802,24 +790,24 @@ static int ax_init_dev(struct net_device *dev, int first_init)
         return ret;
 }
 
-static int ax_remove(struct platform_device *_dev)
+static int ax_remove(struct platform_device *pdev)
 {
-        struct net_device *dev = platform_get_drvdata(_dev);
-        struct ax_device  *ax;
-
-        ax = to_ax_dev(dev);
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct ei_device *ei_local = netdev_priv(dev);
+        struct ax_device *ax = to_ax_dev(dev);
+        struct resource *mem;
 
         unregister_netdev(dev);
         free_irq(dev->irq, dev);
 
-        iounmap(ei_status.mem);
-        release_resource(ax->mem);
-        kfree(ax->mem);
+        iounmap(ei_local->mem);
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(mem->start, resource_size(mem));
 
         if (ax->map2) {
                 iounmap(ax->map2);
-                release_resource(ax->mem2);
-                kfree(ax->mem2);
+                mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+                release_mem_region(mem->start, resource_size(mem));
         }
 
         free_netdev(dev);
@@ -827,19 +815,20 @@ static int ax_remove(struct platform_device *_dev)
         return 0;
 }
 
-/* ax_probe
+/*
+ * ax_probe
  *
  * This is the entry point when the platform device system uses to
- * notify us of a new device to attach to. Allocate memory, find
- * the resources and information passed, and map the necessary registers.
-*/
-
+ * notify us of a new device to attach to. Allocate memory, find the
+ * resources and information passed, and map the necessary registers.
+ */
 static int ax_probe(struct platform_device *pdev)
 {
         struct net_device *dev;
-        struct ax_device  *ax;
-        struct resource   *res;
-        size_t size;
+        struct ei_device *ei_local;
+        struct ax_device *ax;
+        struct resource *irq, *mem, *mem2;
+        resource_size_t mem_size, mem2_size = 0;
         int ret = 0;
 
         dev = ax__alloc_ei_netdev(sizeof(struct ax_device));
@@ -847,120 +836,107 @@ static int ax_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         /* ok, let's setup our device */
+        SET_NETDEV_DEV(dev, &pdev->dev);
+        ei_local = netdev_priv(dev);
         ax = to_ax_dev(dev);
 
-        memset(ax, 0, sizeof(struct ax_device));
-
-        spin_lock_init(&ax->mii_lock);
-
-        ax->dev = pdev;
         ax->plat = pdev->dev.platform_data;
         platform_set_drvdata(pdev, dev);
 
-        ei_status.rxcr_base  = ax->plat->rcr_val;
+        ei_local->rxcr_base = ax->plat->rcr_val;
 
         /* find the platform resources */
-
-        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        if (res == NULL) {
+        irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (!irq) {
                 dev_err(&pdev->dev, "no IRQ specified\n");
                 ret = -ENXIO;
                 goto exit_mem;
         }
 
-        dev->irq = res->start;
-        ax->irqflags = res->flags & IRQF_TRIGGER_MASK;
+        dev->irq = irq->start;
+        ax->irqflags = irq->flags & IRQF_TRIGGER_MASK;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (res == NULL) {
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!mem) {
                 dev_err(&pdev->dev, "no MEM specified\n");
                 ret = -ENXIO;
                 goto exit_mem;
         }
 
-        size = (res->end - res->start) + 1;
-
-        /* setup the register offsets from either the platform data
-         * or by using the size of the resource provided */
+        mem_size = resource_size(mem);
 
+        /*
+         * setup the register offsets from either the platform data or
+         * by using the size of the resource provided
+         */
         if (ax->plat->reg_offsets)
-                ei_status.reg_offset = ax->plat->reg_offsets;
+                ei_local->reg_offset = ax->plat->reg_offsets;
         else {
-                ei_status.reg_offset = ax->reg_offsets;
+                ei_local->reg_offset = ax->reg_offsets;
                 for (ret = 0; ret < 0x18; ret++)
-                        ax->reg_offsets[ret] = (size / 0x18) * ret;
+                        ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
         }
 
-        ax->mem = request_mem_region(res->start, size, pdev->name);
-        if (ax->mem == NULL) {
+        if (!request_mem_region(mem->start, mem_size, pdev->name)) {
                 dev_err(&pdev->dev, "cannot reserve registers\n");
-                ret = -ENXIO;
+                ret = -ENXIO;
                 goto exit_mem;
         }
 
-        ei_status.mem = ioremap(res->start, size);
-        dev->base_addr = (unsigned long)ei_status.mem;
+        ei_local->mem = ioremap(mem->start, mem_size);
+        dev->base_addr = (unsigned long)ei_local->mem;
 
-        if (ei_status.mem == NULL) {
-                dev_err(&pdev->dev, "Cannot ioremap area (%08llx,%08llx)\n",
-                        (unsigned long long)res->start,
-                        (unsigned long long)res->end);
+        if (ei_local->mem == NULL) {
+                dev_err(&pdev->dev, "Cannot ioremap area %pR\n", mem);
 
-                ret = -ENXIO;
+                ret = -ENXIO;
                 goto exit_req;
         }
 
         /* look for reset area */
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        if (res == NULL) {
+        mem2 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+        if (!mem2) {
                 if (!ax->plat->reg_offsets) {
                         for (ret = 0; ret < 0x20; ret++)
-                                ax->reg_offsets[ret] = (size / 0x20) * ret;
+                                ax->reg_offsets[ret] = (mem_size / 0x20) * ret;
                 }
-
-                ax->map2 = NULL;
         } else {
-                size = (res->end - res->start) + 1;
+                mem2_size = resource_size(mem2);
 
-                ax->mem2 = request_mem_region(res->start, size, pdev->name);
-                if (ax->mem2 == NULL) {
+                if (!request_mem_region(mem2->start, mem2_size, pdev->name)) {
                         dev_err(&pdev->dev, "cannot reserve registers\n");
                         ret = -ENXIO;
                         goto exit_mem1;
                 }
 
-                ax->map2 = ioremap(res->start, size);
-                if (ax->map2 == NULL) {
+                ax->map2 = ioremap(mem2->start, mem2_size);
+                if (!ax->map2) {
                         dev_err(&pdev->dev, "cannot map reset register\n");
                         ret = -ENXIO;
                         goto exit_mem2;
                 }
 
-                ei_status.reg_offset[0x1f] = ax->map2 - ei_status.mem;
+                ei_local->reg_offset[0x1f] = ax->map2 - ei_local->mem;
         }
 
         /* got resources, now initialise and register device */
-
-        ret = ax_init_dev(dev, 1);
+        ret = ax_init_dev(dev);
         if (!ret)
                 return 0;
 
-        if (ax->map2 == NULL)
+        if (!ax->map2)
                 goto exit_mem1;
 
         iounmap(ax->map2);
 
  exit_mem2:
-        release_resource(ax->mem2);
-        kfree(ax->mem2);
+        release_mem_region(mem2->start, mem2_size);
 
  exit_mem1:
-        iounmap(ei_status.mem);
+        iounmap(ei_local->mem);
 
  exit_req:
-        release_resource(ax->mem);
-        kfree(ax->mem);
+        release_mem_region(mem->start, mem_size);
 
  exit_mem:
         free_netdev(dev);
@@ -974,7 +950,7 @@ static int ax_probe(struct platform_device *pdev)
 static int ax_suspend(struct platform_device *dev, pm_message_t state)
 {
         struct net_device *ndev = platform_get_drvdata(dev);
-        struct ax_device  *ax = to_ax_dev(ndev);
+        struct ax_device *ax = to_ax_dev(ndev);
 
         ax->resume_open = ax->running;
 
@@ -987,7 +963,7 @@ static int ax_suspend(struct platform_device *dev, pm_message_t state)
 static int ax_resume(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
-        struct ax_device  *ax = to_ax_dev(ndev);
+        struct ax_device *ax = to_ax_dev(ndev);
 
         ax_initial_setup(ndev, netdev_priv(ndev));
         ax_NS8390_init(ndev, ax->resume_open);
@@ -1001,7 +977,7 @@ static int ax_resume(struct platform_device *pdev)
 
 #else
 #define ax_suspend NULL
-#define ax_resume  NULL
+#define ax_resume NULL
 #endif
 
 static struct platform_driver axdrv = {
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index add0b93350d..f803c58b941 100644
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2010 ServerEngines
+ * Copyright (C) 2005 - 2011 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -8,11 +8,11 @@
  * Public License is included in this distribution in the file called COPYING.
  *
  * Contact Information:
- * linux-drivers@serverengines.com
+ * linux-drivers@emulex.com
  *
- * ServerEngines
- * 209 N. Fair Oaks Ave
- * Sunnyvale, CA 94085
+ * Emulex
+ * 3333 Susan Street
+ * Costa Mesa, CA 92626
  */
 
 #ifndef BE_H
@@ -33,7 +33,7 @@
 
 #include "be_hw.h"
 
-#define DRV_VER                 "2.103.175u"
+#define DRV_VER                 "4.0.100u"
 #define DRV_NAME                "be2net"
 #define BE_NAME                 "ServerEngines BladeEngine2 10Gbps NIC"
 #define BE3_NAME                "ServerEngines BladeEngine3 10Gbps NIC"
@@ -67,7 +67,7 @@ static inline char *nic_name(struct pci_dev *pdev)
 }
 
 /* Number of bytes of an RX frame that are copied to skb->data */
-#define BE_HDR_LEN              64
+#define BE_HDR_LEN              ((u16) 64)
 #define BE_MAX_JUMBO_FRAME_SIZE 9018
 #define BE_MIN_MTU              256
 
@@ -211,18 +211,40 @@ struct be_rx_stats {
         u32 rx_fps;             /* Rx frags per second */
 };
 
+struct be_rx_compl_info {
+        u32 rss_hash;
+        u16 vid;
+        u16 pkt_size;
+        u16 rxq_idx;
+        u16 mac_id;
+        u8 vlanf;
+        u8 num_rcvd;
+        u8 err;
+        u8 ipf;
+        u8 tcpf;
+        u8 udpf;
+        u8 ip_csum;
+        u8 l4_csum;
+        u8 ipv6;
+        u8 vtm;
+        u8 pkt_type;
+};
+
 struct be_rx_obj {
         struct be_adapter *adapter;
         struct be_queue_info q;
         struct be_queue_info cq;
+        struct be_rx_compl_info rxcp;
         struct be_rx_page_info page_info_tbl[RX_Q_LEN];
         struct be_eq_obj rx_eq;
         struct be_rx_stats stats;
         u8 rss_id;
         bool rx_post_starved;   /* Zero rx frags have been posted to BE */
-        u16 last_frag_index;
-        u16 rsvd;
-        u32 cache_line_barrier[15];
+        u32 cache_line_barrier[16];
+};
+
+struct be_drv_stats {
+        u8 be_on_die_temperature;
 };
 
 struct be_vf_cfg {
@@ -234,6 +256,7 @@ struct be_vf_cfg {
 };
 
 #define BE_INVALID_PMAC_ID              0xffffffff
+
 struct be_adapter {
         struct pci_dev *pdev;
         struct net_device *netdev;
@@ -269,6 +292,7 @@ struct be_adapter {
         u32 big_page_size;      /* Compounded page size shared by rx wrbs */
 
         u8 msix_vec_next_idx;
+        struct be_drv_stats drv_stats;
 
         struct vlan_group *vlan_grp;
         u16 vlans_added;
@@ -281,6 +305,7 @@ struct be_adapter {
         struct be_dma_mem stats_cmd;
         /* Work queue used to perform periodic tasks like getting statistics */
         struct delayed_work work;
+        u16 work_counter;
 
         /* Ethtool knobs and info */
         bool rx_csum;           /* BE card must perform rx-checksumming */
@@ -298,7 +323,7 @@ struct be_adapter {
         u32 rx_fc;              /* Rx flow control */
         u32 tx_fc;              /* Tx flow control */
         bool ue_detected;
-        bool stats_ioctl_sent;
+        bool stats_cmd_sent;
         int link_speed;
         u8 port_type;
         u8 transceiver;
@@ -307,10 +332,13 @@ struct be_adapter {
         u32 flash_status;
         struct completion flash_compl;
 
+        bool be3_native;
         bool sriov_enabled;
         struct be_vf_cfg vf_cfg[BE_MAX_VF];
         u8 is_virtfn;
         u32 sli_family;
+        u8 hba_port_num;
+        u16 pvid;
 };
 
 #define be_physfn(adapter) (!adapter->is_virtfn)
@@ -450,9 +478,8 @@ static inline void be_vf_eth_addr_generate(struct be_adapter *adapter, u8 *mac)
         mac[5] = (u8)(addr & 0xFF);
         mac[4] = (u8)((addr >> 8) & 0xFF);
         mac[3] = (u8)((addr >> 16) & 0xFF);
-        mac[2] = 0xC9;
-        mac[1] = 0x00;
-        mac[0] = 0x00;
+        /* Use the OUI from the current MAC address */
+        memcpy(mac, adapter->netdev->dev_addr, 3);
 }
 
 extern void be_cq_notify(struct be_adapter *adapter, u16 qid, bool arm,
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 0c7811faf72..5a4a87e7c5e 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2010 ServerEngines
+ * Copyright (C) 2005 - 2011 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -8,21 +8,30 @@
  * Public License is included in this distribution in the file called COPYING.
  *
  * Contact Information:
- * linux-drivers@serverengines.com
+ * linux-drivers@emulex.com
  *
- * ServerEngines
- * 209 N. Fair Oaks Ave
- * Sunnyvale, CA 94085
+ * Emulex
+ * 3333 Susan Street
+ * Costa Mesa, CA 92626
  */
 
 #include "be.h"
 #include "be_cmds.h"
 
+/* Must be a power of 2 or else MODULO will BUG_ON */
+static int be_get_temp_freq = 32;
+
 static void be_mcc_notify(struct be_adapter *adapter)
 {
         struct be_queue_info *mccq = &adapter->mcc_obj.q;
         u32 val = 0;
 
+        if (adapter->eeh_err) {
+                dev_info(&adapter->pdev->dev,
+                        "Error in Card Detected! Cannot issue commands\n");
+                return;
+        }
+
         val |= mccq->id & DB_MCCQ_RING_ID_MASK;
         val |= 1 << DB_MCCQ_NUM_POSTED_SHIFT;
 
@@ -75,7 +84,7 @@ static int be_mcc_compl_process(struct be_adapter *adapter,
                         be_dws_le_to_cpu(&resp->hw_stats,
                                                 sizeof(resp->hw_stats));
                         netdev_stats_update(adapter);
-                        adapter->stats_ioctl_sent = false;
+                        adapter->stats_cmd_sent = false;
                 }
         } else if ((compl_status != MCC_STATUS_NOT_SUPPORTED) &&
                    (compl->tag0 != OPCODE_COMMON_NTWK_MAC_QUERY)) {
@@ -102,6 +111,7 @@ static void be_async_grp5_cos_priority_process(struct be_adapter *adapter,
 {
         if (evt->valid) {
                 adapter->vlan_prio_bmap = evt->available_priority_bmap;
+                adapter->recommended_prio &= ~VLAN_PRIO_MASK;
                 adapter->recommended_prio =
                         evt->reco_default_priority << VLAN_PRIO_SHIFT;
         }
@@ -117,6 +127,16 @@ static void be_async_grp5_qos_speed_process(struct be_adapter *adapter,
         }
 }
 
+/*Grp5 PVID evt*/
+static void be_async_grp5_pvid_state_process(struct be_adapter *adapter,
+                struct be_async_event_grp5_pvid_state *evt)
+{
+        if (evt->enabled)
+                adapter->pvid = evt->tag;
+        else
+                adapter->pvid = 0;
+}
+
 static void be_async_grp5_evt_process(struct be_adapter *adapter,
                 u32 trailer, struct be_mcc_compl *evt)
 {
@@ -134,6 +154,10 @@ static void be_async_grp5_evt_process(struct be_adapter *adapter,
                 be_async_grp5_qos_speed_process(adapter,
                 (struct be_async_event_grp5_qos_link_speed *)evt);
         break;
+        case ASYNC_EVENT_PVID_STATE:
+                be_async_grp5_pvid_state_process(adapter,
+                (struct be_async_event_grp5_pvid_state *)evt);
+        break;
         default:
                 dev_warn(&adapter->pdev->dev, "Unknown grp5 event!\n");
                 break;
@@ -216,6 +240,9 @@ static int be_mcc_wait_compl(struct be_adapter *adapter)
         int i, num, status = 0;
         struct be_mcc_obj *mcc_obj = &adapter->mcc_obj;
 
+        if (adapter->eeh_err)
+                return -EIO;
+
         for (i = 0; i < mcc_timeout; i++) {
                 num = be_process_mcc(adapter, &status);
                 if (num)
@@ -245,6 +272,12 @@ static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db)
         int msecs = 0;
         u32 ready;
 
+        if (adapter->eeh_err) {
+                dev_err(&adapter->pdev->dev,
+                        "Error detected in card.Cannot issue commands\n");
+                return -EIO;
+        }
+
         do {
                 ready = ioread32(db);
                 if (ready == 0xffffffff) {
@@ -598,7 +631,7 @@ int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,
 
 /* Uses synchronous MCCQ */
 int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,
-                u32 if_id, u32 *pmac_id)
+                u32 if_id, u32 *pmac_id, u32 domain)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_pmac_add *req;
@@ -619,6 +652,7 @@ int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,
         be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                 OPCODE_COMMON_NTWK_PMAC_ADD, sizeof(*req));
 
+        req->hdr.domain = domain;
         req->if_id = cpu_to_le32(if_id);
         memcpy(req->mac_address, mac_addr, ETH_ALEN);
 
@@ -634,7 +668,7 @@ err:
 }
 
 /* Uses synchronous MCCQ */
-int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, u32 pmac_id)
+int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, u32 pmac_id, u32 dom)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_pmac_del *req;
@@ -655,6 +689,7 @@ int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, u32 pmac_id)
         be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                 OPCODE_COMMON_NTWK_PMAC_DEL, sizeof(*req));
 
+        req->hdr.domain = dom;
         req->if_id = cpu_to_le32(if_id);
         req->pmac_id = cpu_to_le32(pmac_id);
 
@@ -691,7 +726,7 @@ int be_cmd_cq_create(struct be_adapter *adapter,
 
         req->num_pages =  cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size));
         if (lancer_chip(adapter)) {
-                req->hdr.version = 1;
+                req->hdr.version = 2;
                 req->page_size = 1; /* 1 for 4K */
                 AMAP_SET_BITS(struct amap_cq_context_lancer, coalescwm, ctxt,
                                                                 coalesce_wm);
@@ -827,6 +862,12 @@ int be_cmd_txq_create(struct be_adapter *adapter,
         be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_ETH, OPCODE_ETH_TX_CREATE,
                 sizeof(*req));
 
+        if (lancer_chip(adapter)) {
+                req->hdr.version = 1;
+                AMAP_SET_BITS(struct amap_tx_context, if_id, ctxt,
+                                        adapter->if_handle);
+        }
+
         req->num_pages = PAGES_4K_SPANNED(q_mem->va, q_mem->size);
         req->ulp_num = BE_ULP1_NUM;
         req->type = BE_ETH_TX_RING_TYPE_STANDARD;
@@ -995,7 +1036,7 @@ int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags, u32 en_flags,
 }
 
 /* Uses mbox */
-int be_cmd_if_destroy(struct be_adapter *adapter, u32 interface_id)
+int be_cmd_if_destroy(struct be_adapter *adapter, u32 interface_id, u32 domain)
 {
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_if_destroy *req;
@@ -1016,6 +1057,7 @@ int be_cmd_if_destroy(struct be_adapter *adapter, u32 interface_id)
         be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
                 OPCODE_COMMON_NTWK_INTERFACE_DESTROY, sizeof(*req));
 
+        req->hdr.domain = domain;
         req->interface_id = cpu_to_le32(interface_id);
 
         status = be_mbox_notify_wait(adapter);
@@ -1036,6 +1078,9 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)
         struct be_sge *sge;
         int status = 0;
 
+        if (MODULO(adapter->work_counter, be_get_temp_freq) == 0)
+                be_cmd_get_die_temperature(adapter);
+
         spin_lock_bh(&adapter->mcc_lock);
 
         wrb = wrb_from_mccq(adapter);
@@ -1056,7 +1101,7 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)
         sge->len = cpu_to_le32(nonemb_cmd->size);
 
         be_mcc_notify(adapter);
-        adapter->stats_ioctl_sent = true;
+        adapter->stats_cmd_sent = true;
 
 err:
         spin_unlock_bh(&adapter->mcc_lock);
@@ -1103,6 +1148,44 @@ err:
         return status;
 }
 
+/* Uses synchronous mcc */
+int be_cmd_get_die_temperature(struct be_adapter *adapter)
+{
+        struct be_mcc_wrb *wrb;
+        struct be_cmd_req_get_cntl_addnl_attribs *req;
+        int status;
+
+        spin_lock_bh(&adapter->mcc_lock);
+
+        wrb = wrb_from_mccq(adapter);
+        if (!wrb) {
+                status = -EBUSY;
+                goto err;
+        }
+        req = embedded_payload(wrb);
+
+        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
+                        OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES);
+
+        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES, sizeof(*req));
+
+        status = be_mcc_notify_wait(adapter);
+        if (!status) {
+                struct be_cmd_resp_get_cntl_addnl_attribs *resp =
+                                                embedded_payload(wrb);
+                adapter->drv_stats.be_on_die_temperature =
+                                                resp->on_die_temperature;
+        }
+        /* If IOCTL fails once, do not bother issuing it again */
+        else
+                be_get_temp_freq = 0;
+
+err:
+        spin_unlock_bh(&adapter->mcc_lock);
+        return status;
+}
+
 /* Uses Mbox */
 int be_cmd_get_fw_ver(struct be_adapter *adapter, char *fw_ver)
 {
@@ -1786,6 +1869,10 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,
         spin_lock_bh(&adapter->mcc_lock);
 
         wrb = wrb_from_mccq(adapter);
+        if (!wrb) {
+                status = -EBUSY;
+                goto err;
+        }
         req = nonemb_cmd->va;
         sge = nonembedded_sgl(wrb);
 
@@ -1801,6 +1888,7 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,
 
         status = be_mcc_notify_wait(adapter);
 
+err:
         spin_unlock_bh(&adapter->mcc_lock);
         return status;
 }
@@ -1863,8 +1951,8 @@ int be_cmd_set_qos(struct be_adapter *adapter, u32 bps, u32 domain)
                         OPCODE_COMMON_SET_QOS, sizeof(*req));
 
         req->hdr.domain = domain;
-        req->valid_bits = BE_QOS_BITS_NIC;
-        req->max_bps_nic = bps;
+        req->valid_bits = cpu_to_le32(BE_QOS_BITS_NIC);
+        req->max_bps_nic = cpu_to_le32(bps);
 
         status = be_mcc_notify_wait(adapter);
 
@@ -1872,3 +1960,96 @@ err:
         spin_unlock_bh(&adapter->mcc_lock);
         return status;
 }
+
+int be_cmd_get_cntl_attributes(struct be_adapter *adapter)
+{
+        struct be_mcc_wrb *wrb;
+        struct be_cmd_req_cntl_attribs *req;
+        struct be_cmd_resp_cntl_attribs *resp;
+        struct be_sge *sge;
+        int status;
+        int payload_len = max(sizeof(*req), sizeof(*resp));
+        struct mgmt_controller_attrib *attribs;
+        struct be_dma_mem attribs_cmd;
+
+        memset(&attribs_cmd, 0, sizeof(struct be_dma_mem));
+        attribs_cmd.size = sizeof(struct be_cmd_resp_cntl_attribs);
+        attribs_cmd.va = pci_alloc_consistent(adapter->pdev, attribs_cmd.size,
+                                                &attribs_cmd.dma);
+        if (!attribs_cmd.va) {
+                dev_err(&adapter->pdev->dev,
+                                "Memory allocation failure\n");
+                return -ENOMEM;
+        }
+
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
+
+        wrb = wrb_from_mbox(adapter);
+        if (!wrb) {
+                status = -EBUSY;
+                goto err;
+        }
+        req = attribs_cmd.va;
+        sge = nonembedded_sgl(wrb);
+
+        be_wrb_hdr_prepare(wrb, payload_len, false, 1,
+                        OPCODE_COMMON_GET_CNTL_ATTRIBUTES);
+        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                         OPCODE_COMMON_GET_CNTL_ATTRIBUTES, payload_len);
+        sge->pa_hi = cpu_to_le32(upper_32_bits(attribs_cmd.dma));
+        sge->pa_lo = cpu_to_le32(attribs_cmd.dma & 0xFFFFFFFF);
+        sge->len = cpu_to_le32(attribs_cmd.size);
+
+        status = be_mbox_notify_wait(adapter);
+        if (!status) {
+                attribs = (struct mgmt_controller_attrib *)( attribs_cmd.va +
+                                        sizeof(struct be_cmd_resp_hdr));
+                adapter->hba_port_num = attribs->hba_attribs.phy_port;
+        }
+
+err:
+        mutex_unlock(&adapter->mbox_lock);
+        pci_free_consistent(adapter->pdev, attribs_cmd.size, attribs_cmd.va,
+                                        attribs_cmd.dma);
+        return status;
+}
+
+/* Uses mbox */
+int be_cmd_check_native_mode(struct be_adapter *adapter)
+{
+        struct be_mcc_wrb *wrb;
+        struct be_cmd_req_set_func_cap *req;
+        int status;
+
+        if (mutex_lock_interruptible(&adapter->mbox_lock))
+                return -1;
+
+        wrb = wrb_from_mbox(adapter);
+        if (!wrb) {
+                status = -EBUSY;
+                goto err;
+        }
+
+        req = embedded_payload(wrb);
+
+        be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0,
+                OPCODE_COMMON_SET_DRIVER_FUNCTION_CAP);
+
+        be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
+                OPCODE_COMMON_SET_DRIVER_FUNCTION_CAP, sizeof(*req));
+
+        req->valid_cap_flags = cpu_to_le32(CAPABILITY_SW_TIMESTAMPS |
+                                CAPABILITY_BE3_NATIVE_ERX_API);
+        req->cap_flags = cpu_to_le32(CAPABILITY_BE3_NATIVE_ERX_API);
+
+        status = be_mbox_notify_wait(adapter);
+        if (!status) {
+                struct be_cmd_resp_set_func_cap *resp = embedded_payload(wrb);
+                adapter->be3_native = le32_to_cpu(resp->cap_flags) &
+                                        CAPABILITY_BE3_NATIVE_ERX_API;
+        }
+err:
+        mutex_unlock(&adapter->mbox_lock);
+        return status;
+}
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h
index 83d15c8a9fa..4f254cfaabe 100644
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2010 ServerEngines
+ * Copyright (C) 2005 - 2011 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -8,11 +8,11 @@
  * Public License is included in this distribution in the file called COPYING.
  *
  * Contact Information:
- * linux-drivers@serverengines.com
+ * linux-drivers@emulex.com
  *
- * ServerEngines
- * 209 N. Fair Oaks Ave
- * Sunnyvale, CA 94085
+ * Emulex
+ * 3333 Susan Street
+ * Costa Mesa, CA 92626
  */
 
 /*
@@ -88,6 +88,7 @@ struct be_mcc_compl {
 #define ASYNC_EVENT_CODE_GRP_5          0x5
 #define ASYNC_EVENT_QOS_SPEED           0x1
 #define ASYNC_EVENT_COS_PRIORITY        0x2
+#define ASYNC_EVENT_PVID_STATE          0x3
 struct be_async_event_trailer {
         u32 code;
 };
@@ -134,6 +135,18 @@ struct be_async_event_grp5_cos_priority {
         struct be_async_event_trailer trailer;
 } __packed;
 
+/* When the event code of an async trailer is GRP5 and event type is
+ * PVID state, the mcc_compl must be interpreted as follows
+ */
+struct be_async_event_grp5_pvid_state {
+        u8 enabled;
+        u8 rsvd0;
+        u16 tag;
+        u32 event_tag;
+        u32 rsvd1;
+        struct be_async_event_trailer trailer;
+} __packed;
+
 struct be_mcc_mailbox {
         struct be_mcc_wrb wrb;
         struct be_mcc_compl compl;
@@ -156,6 +169,7 @@ struct be_mcc_mailbox {
 #define OPCODE_COMMON_SET_QOS                           28
 #define OPCODE_COMMON_MCC_CREATE_EXT                    90
 #define OPCODE_COMMON_SEEPROM_READ                      30
+#define OPCODE_COMMON_GET_CNTL_ATTRIBUTES               32
 #define OPCODE_COMMON_NTWK_RX_FILTER                    34
 #define OPCODE_COMMON_GET_FW_VERSION                    35
 #define OPCODE_COMMON_SET_FLOW_CONTROL                  36
@@ -176,6 +190,8 @@ struct be_mcc_mailbox {
 #define OPCODE_COMMON_GET_BEACON_STATE                  70
 #define OPCODE_COMMON_READ_TRANSRECV_DATA               73
 #define OPCODE_COMMON_GET_PHY_DETAILS                   102
+#define OPCODE_COMMON_SET_DRIVER_FUNCTION_CAP           103
+#define OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES    121
 
 #define OPCODE_ETH_RSS_CONFIG                           1
 #define OPCODE_ETH_ACPI_CONFIG                          2
@@ -415,7 +431,7 @@ struct be_cmd_resp_mcc_create {
 /* Pseudo amap definition in which each bit of the actual structure is defined
  * as a byte: used to calculate offset/shift/mask of each field */
 struct amap_tx_context {
-        u8 rsvd0[16];           /* dword 0 */
+        u8 if_id[16];           /* dword 0 */
         u8 tx_ring_size[4];     /* dword 0 */
         u8 rsvd1[26];           /* dword 0 */
         u8 pci_func_id[8];      /* dword 1 */
@@ -503,7 +519,8 @@ enum be_if_flags {
         BE_IF_FLAGS_VLAN = 0x100,
         BE_IF_FLAGS_MCAST_PROMISCUOUS = 0x200,
         BE_IF_FLAGS_PASS_L2_ERRORS = 0x400,
-        BE_IF_FLAGS_PASS_L3L4_ERRORS = 0x800
+        BE_IF_FLAGS_PASS_L3L4_ERRORS = 0x800,
+        BE_IF_FLAGS_MULTICAST = 0x1000
 };
 
 /* An RX interface is an object with one or more MAC addresses and
@@ -619,7 +636,10 @@ struct be_rxf_stats {
         u32 rx_drops_invalid_ring;      /* dword 145*/
         u32 forwarded_packets;  /* dword 146*/
         u32 rx_drops_mtu;       /* dword 147*/
-        u32 rsvd0[15];
+        u32 rsvd0[7];
+        u32 port0_jabber_events;
+        u32 port1_jabber_events;
+        u32 rsvd1[6];
 };
 
 struct be_erx_stats {
@@ -630,11 +650,16 @@ struct be_erx_stats {
         u32 debug_pmem_pbuf_dealloc;       /* dword 47*/
 };
 
+struct be_pmem_stats {
+        u32 eth_red_drops;
+        u32 rsvd[4];
+};
+
 struct be_hw_stats {
         struct be_rxf_stats rxf;
         u32 rsvd[48];
         struct be_erx_stats erx;
-        u32 rsvd1[6];
+        struct be_pmem_stats pmem;
 };
 
 struct be_cmd_req_get_stats {
@@ -647,6 +672,20 @@ struct be_cmd_resp_get_stats {
         struct be_hw_stats hw_stats;
 };
 
+struct be_cmd_req_get_cntl_addnl_attribs {
+        struct be_cmd_req_hdr hdr;
+        u8 rsvd[8];
+};
+
+struct be_cmd_resp_get_cntl_addnl_attribs {
+        struct be_cmd_resp_hdr hdr;
+        u16 ipl_file_number;
+        u8 ipl_file_version;
+        u8 rsvd0;
+        u8 on_die_temperature; /* in degrees centigrade*/
+        u8 rsvd1[3];
+};
+
 struct be_cmd_req_vlan_config {
         struct be_cmd_req_hdr hdr;
         u8 interface_id;
@@ -994,17 +1033,47 @@ struct be_cmd_resp_set_qos {
         u32 rsvd;
 };
 
+/*********************** Controller Attributes ***********************/
+struct be_cmd_req_cntl_attribs {
+        struct be_cmd_req_hdr hdr;
+};
+
+struct be_cmd_resp_cntl_attribs {
+        struct be_cmd_resp_hdr hdr;
+        struct mgmt_controller_attrib attribs;
+};
+
+/*********************** Set driver function ***********************/
+#define CAPABILITY_SW_TIMESTAMPS        2
+#define CAPABILITY_BE3_NATIVE_ERX_API   4
+
+struct be_cmd_req_set_func_cap {
+        struct be_cmd_req_hdr hdr;
+        u32 valid_cap_flags;
+        u32 cap_flags;
+        u8 rsvd[212];
+};
+
+struct be_cmd_resp_set_func_cap {
+        struct be_cmd_resp_hdr hdr;
+        u32 valid_cap_flags;
+        u32 cap_flags;
+        u8 rsvd[212];
+};
+
 extern int be_pci_fnum_get(struct be_adapter *adapter);
 extern int be_cmd_POST(struct be_adapter *adapter);
 extern int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,
                         u8 type, bool permanent, u32 if_handle);
 extern int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,
-                        u32 if_id, u32 *pmac_id);
-extern int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, u32 pmac_id);
+                        u32 if_id, u32 *pmac_id, u32 domain);
+extern int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id,
+                        u32 pmac_id, u32 domain);
 extern int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags,
                         u32 en_flags, u8 *mac, bool pmac_invalid,
                         u32 *if_handle, u32 *pmac_id, u32 domain);
-extern int be_cmd_if_destroy(struct be_adapter *adapter, u32 if_handle);
+extern int be_cmd_if_destroy(struct be_adapter *adapter, u32 if_handle,
+                        u32 domain);
 extern int be_cmd_eq_create(struct be_adapter *adapter,
                         struct be_queue_info *eq, int eq_delay);
 extern int be_cmd_cq_create(struct be_adapter *adapter,
@@ -1076,4 +1145,7 @@ extern int be_cmd_get_phy_info(struct be_adapter *adapter,
                 struct be_dma_mem *cmd);
 extern int be_cmd_set_qos(struct be_adapter *adapter, u32 bps, u32 domain);
 extern void be_detect_dump_ue(struct be_adapter *adapter);
+extern int be_cmd_get_die_temperature(struct be_adapter *adapter);
+extern int be_cmd_get_cntl_attributes(struct be_adapter *adapter);
+extern int be_cmd_check_native_mode(struct be_adapter *adapter);
 
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index b4be0271efe..aac248fbd18 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2010 ServerEngines
+ * Copyright (C) 2005 - 2011 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -8,11 +8,11 @@
  * Public License is included in this distribution in the file called COPYING.
  *
  * Contact Information:
- * linux-drivers@serverengines.com
+ * linux-drivers@emulex.com
  *
- * ServerEngines
- * 209 N. Fair Oaks Ave
- * Sunnyvale, CA 94085
+ * Emulex
+ * 3333 Susan Street
+ * Costa Mesa, CA 92626
  */
 
 #include "be.h"
@@ -26,7 +26,8 @@ struct be_ethtool_stat {
         int offset;
 };
 
-enum {NETSTAT, PORTSTAT, MISCSTAT, DRVSTAT_TX, DRVSTAT_RX, ERXSTAT};
+enum {NETSTAT, PORTSTAT, MISCSTAT, DRVSTAT_TX, DRVSTAT_RX, ERXSTAT,
+                        PMEMSTAT, DRVSTAT};
 #define FIELDINFO(_struct, field) FIELD_SIZEOF(_struct, field), \
                                         offsetof(_struct, field)
 #define NETSTAT_INFO(field)     #field, NETSTAT,\
@@ -43,6 +44,11 @@ enum {NETSTAT, PORTSTAT, MISCSTAT, DRVSTAT_TX, DRVSTAT_RX, ERXSTAT};
                                                 field)
 #define ERXSTAT_INFO(field)     #field, ERXSTAT,\
                                         FIELDINFO(struct be_erx_stats, field)
+#define PMEMSTAT_INFO(field)    #field, PMEMSTAT,\
+                                        FIELDINFO(struct be_pmem_stats, field)
+#define DRVSTAT_INFO(field)     #field, DRVSTAT,\
+                                        FIELDINFO(struct be_drv_stats, \
+                                                field)
 
 static const struct be_ethtool_stat et_stats[] = {
         {NETSTAT_INFO(rx_packets)},
@@ -99,7 +105,11 @@ static const struct be_ethtool_stat et_stats[] = {
         {MISCSTAT_INFO(rx_drops_too_many_frags)},
         {MISCSTAT_INFO(rx_drops_invalid_ring)},
         {MISCSTAT_INFO(forwarded_packets)},
-        {MISCSTAT_INFO(rx_drops_mtu)}
+        {MISCSTAT_INFO(rx_drops_mtu)},
+        {MISCSTAT_INFO(port0_jabber_events)},
+        {MISCSTAT_INFO(port1_jabber_events)},
+        {PMEMSTAT_INFO(eth_red_drops)},
+        {DRVSTAT_INFO(be_on_die_temperature)}
 };
 #define ETHTOOL_STATS_NUM ARRAY_SIZE(et_stats)
 
@@ -121,7 +131,7 @@ static const char et_self_tests[][ETH_GSTRING_LEN] = {
         "MAC Loopback test",
         "PHY Loopback test",
         "External Loopback test",
-        "DDR DMA test"
+        "DDR DMA test",
         "Link test"
 };
 
@@ -276,6 +286,12 @@ be_get_ethtool_stats(struct net_device *netdev,
                 case MISCSTAT:
                         p = &hw_stats->rxf;
                         break;
+                case PMEMSTAT:
+                        p = &hw_stats->pmem;
+                        break;
+                case DRVSTAT:
+                        p = &adapter->drv_stats;
+                        break;
                 }
 
                 p = (u8 *)p + et_stats[i].offset;
@@ -376,8 +392,9 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                 }
 
                 phy_cmd.size = sizeof(struct be_cmd_req_get_phy_info);
-                phy_cmd.va = pci_alloc_consistent(adapter->pdev, phy_cmd.size,
-                                        &phy_cmd.dma);
+                phy_cmd.va = dma_alloc_coherent(&adapter->pdev->dev,
+                                                phy_cmd.size, &phy_cmd.dma,
+                                                GFP_KERNEL);
                 if (!phy_cmd.va) {
                         dev_err(&adapter->pdev->dev, "Memory alloc failure\n");
                         return -ENOMEM;
@@ -416,8 +433,8 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                 adapter->port_type = ecmd->port;
                 adapter->transceiver = ecmd->transceiver;
                 adapter->autoneg = ecmd->autoneg;
-                pci_free_consistent(adapter->pdev, phy_cmd.size,
-                                        phy_cmd.va, phy_cmd.dma);
+                dma_free_coherent(&adapter->pdev->dev, phy_cmd.size, phy_cmd.va,
+                                  phy_cmd.dma);
         } else {
                 ecmd->speed = adapter->link_speed;
                 ecmd->port = adapter->port_type;
@@ -496,7 +513,7 @@ be_phys_id(struct net_device *netdev, u32 data)
         int status;
         u32 cur;
 
-        be_cmd_get_beacon_state(adapter, adapter->port_num, &cur);
+        be_cmd_get_beacon_state(adapter, adapter->hba_port_num, &cur);
 
         if (cur == BEACON_STATE_ENABLED)
                 return 0;
@@ -504,23 +521,34 @@ be_phys_id(struct net_device *netdev, u32 data)
         if (data < 2)
                 data = 2;
 
-        status = be_cmd_set_beacon_state(adapter, adapter->port_num, 0, 0,
+        status = be_cmd_set_beacon_state(adapter, adapter->hba_port_num, 0, 0,
                         BEACON_STATE_ENABLED);
         set_current_state(TASK_INTERRUPTIBLE);
         schedule_timeout(data*HZ);
 
-        status = be_cmd_set_beacon_state(adapter, adapter->port_num, 0, 0,
+        status = be_cmd_set_beacon_state(adapter, adapter->hba_port_num, 0, 0,
                         BEACON_STATE_DISABLED);
 
         return status;
 }
 
+static bool
+be_is_wol_supported(struct be_adapter *adapter)
+{
+        if (!be_physfn(adapter))
+                return false;
+        else
+                return true;
+}
+
 static void
 be_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
 
-        wol->supported = WAKE_MAGIC;
+        if (be_is_wol_supported(adapter))
+                wol->supported = WAKE_MAGIC;
+
         if (adapter->wol)
                 wol->wolopts = WAKE_MAGIC;
         else
@@ -536,7 +564,7 @@ be_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
         if (wol->wolopts & ~WAKE_MAGIC)
                 return -EINVAL;
 
-        if (wol->wolopts & WAKE_MAGIC)
+        if ((wol->wolopts & WAKE_MAGIC) && be_is_wol_supported(adapter))
                 adapter->wol = true;
         else
                 adapter->wol = false;
@@ -554,8 +582,8 @@ be_test_ddr_dma(struct be_adapter *adapter)
         };
 
         ddrdma_cmd.size = sizeof(struct be_cmd_req_ddrdma_test);
-        ddrdma_cmd.va = pci_alloc_consistent(adapter->pdev, ddrdma_cmd.size,
-                                        &ddrdma_cmd.dma);
+        ddrdma_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, ddrdma_cmd.size,
+                                           &ddrdma_cmd.dma, GFP_KERNEL);
         if (!ddrdma_cmd.va) {
                 dev_err(&adapter->pdev->dev, "Memory allocation failure\n");
                 return -ENOMEM;
@@ -569,20 +597,20 @@ be_test_ddr_dma(struct be_adapter *adapter)
         }
 
 err:
-        pci_free_consistent(adapter->pdev, ddrdma_cmd.size,
-                        ddrdma_cmd.va, ddrdma_cmd.dma);
+        dma_free_coherent(&adapter->pdev->dev, ddrdma_cmd.size, ddrdma_cmd.va,
+                          ddrdma_cmd.dma);
         return ret;
 }
 
 static u64 be_loopback_test(struct be_adapter *adapter, u8 loopback_type,
                                 u64 *status)
 {
-        be_cmd_set_loopback(adapter, adapter->port_num,
+        be_cmd_set_loopback(adapter, adapter->hba_port_num,
                                 loopback_type, 1);
-        *status = be_cmd_loopback_test(adapter, adapter->port_num,
+        *status = be_cmd_loopback_test(adapter, adapter->hba_port_num,
                                 loopback_type, 1500,
                                 2, 0xabc);
-        be_cmd_set_loopback(adapter, adapter->port_num,
+        be_cmd_set_loopback(adapter, adapter->hba_port_num,
                                 BE_NO_LOOPBACK, 1);
         return *status;
 }
@@ -621,7 +649,8 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
                                 &qos_link_speed) != 0) {
                 test->flags |= ETH_TEST_FL_FAILED;
                 data[4] = -1;
-        } else if (mac_speed) {
+        } else if (!mac_speed) {
+                test->flags |= ETH_TEST_FL_FAILED;
                 data[4] = 1;
         }
 }
@@ -662,8 +691,8 @@ be_read_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
 
         memset(&eeprom_cmd, 0, sizeof(struct be_dma_mem));
         eeprom_cmd.size = sizeof(struct be_cmd_req_seeprom_read);
-        eeprom_cmd.va = pci_alloc_consistent(adapter->pdev, eeprom_cmd.size,
-                                &eeprom_cmd.dma);
+        eeprom_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, eeprom_cmd.size,
+                                           &eeprom_cmd.dma, GFP_KERNEL);
 
         if (!eeprom_cmd.va) {
                 dev_err(&adapter->pdev->dev,
@@ -677,8 +706,8 @@ be_read_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
                 resp = (struct be_cmd_resp_seeprom_read *) eeprom_cmd.va;
                 memcpy(data, resp->seeprom_data + eeprom->offset, eeprom->len);
         }
-        pci_free_consistent(adapter->pdev, eeprom_cmd.size, eeprom_cmd.va,
-                        eeprom_cmd.dma);
+        dma_free_coherent(&adapter->pdev->dev, eeprom_cmd.size, eeprom_cmd.va,
+                          eeprom_cmd.dma);
 
         return status;
 }
diff --git a/drivers/net/benet/be_hw.h b/drivers/net/benet/be_hw.h
index 4096d977823..d4344a06090 100644
--- a/drivers/net/benet/be_hw.h
+++ b/drivers/net/benet/be_hw.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2010 ServerEngines
+ * Copyright (C) 2005 - 2011 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -8,11 +8,11 @@
  * Public License is included in this distribution in the file called COPYING.
  *
  * Contact Information:
- * linux-drivers@serverengines.com
+ * linux-drivers@emulex.com
  *
- * ServerEngines
- * 209 N. Fair Oaks Ave
- * Sunnyvale, CA 94085
+ * Emulex
+ * 3333 Susan Street
+ * Costa Mesa, CA 92626
  */
 
 /********* Mailbox door bell *************/
@@ -44,6 +44,18 @@
 #define POST_STAGE_BE_RESET             0x3 /* Host wants to reset chip */
 #define POST_STAGE_ARMFW_RDY            0xc000  /* FW is done with POST */
 
+
+/* Lancer SLIPORT_CONTROL SLIPORT_STATUS registers */
+#define SLIPORT_STATUS_OFFSET           0x404
+#define SLIPORT_CONTROL_OFFSET          0x408
+
+#define SLIPORT_STATUS_ERR_MASK         0x80000000
+#define SLIPORT_STATUS_RN_MASK          0x01000000
+#define SLIPORT_STATUS_RDY_MASK         0x00800000
+
+
+#define SLI_PORT_CONTROL_IP_MASK        0x08000000
+
 /********* Memory BAR register ************/
 #define PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET      0xfc
 /* Host Interrupt Enable, if set interrupts are enabled although "PCI Interrupt
@@ -289,10 +301,10 @@ struct be_eth_rx_d {
 
 /* RX Compl Queue Descriptor */
 
-/* Pseudo amap definition for eth_rx_compl in which each bit of the
- * actual structure is defined as a byte: used to calculate
+/* Pseudo amap definition for BE2 and BE3 legacy mode eth_rx_compl in which
+ * each bit of the actual structure is defined as a byte: used to calculate
  * offset/shift/mask of each field */
-struct amap_eth_rx_compl {
+struct amap_eth_rx_compl_v0 {
         u8 vlan_tag[16];        /* dword 0 */
         u8 pktsize[14];         /* dword 0 */
         u8 port;                /* dword 0 */
@@ -323,10 +335,92 @@ struct amap_eth_rx_compl {
         u8 rsshash[32];         /* dword 3 */
 } __packed;
 
+/* Pseudo amap definition for BE3 native mode eth_rx_compl in which
+ * each bit of the actual structure is defined as a byte: used to calculate
+ * offset/shift/mask of each field */
+struct amap_eth_rx_compl_v1 {
+        u8 vlan_tag[16];        /* dword 0 */
+        u8 pktsize[14];         /* dword 0 */
+        u8 vtp;                 /* dword 0 */
+        u8 ip_opt;              /* dword 0 */
+        u8 err;                 /* dword 1 */
+        u8 rsshp;               /* dword 1 */
+        u8 ipf;                 /* dword 1 */
+        u8 tcpf;                /* dword 1 */
+        u8 udpf;                /* dword 1 */
+        u8 ipcksm;              /* dword 1 */
+        u8 l4_cksm;             /* dword 1 */
+        u8 ip_version;          /* dword 1 */
+        u8 macdst[7];           /* dword 1 */
+        u8 rsvd0;               /* dword 1 */
+        u8 fragndx[10];         /* dword 1 */
+        u8 ct[2];               /* dword 1 */
+        u8 sw;                  /* dword 1 */
+        u8 numfrags[3];         /* dword 1 */
+        u8 rss_flush;           /* dword 2 */
+        u8 cast_enc[2];         /* dword 2 */
+        u8 vtm;                 /* dword 2 */
+        u8 rss_bank;            /* dword 2 */
+        u8 port[2];             /* dword 2 */
+        u8 vntagp;              /* dword 2 */
+        u8 header_len[8];       /* dword 2 */
+        u8 header_split[2];     /* dword 2 */
+        u8 rsvd1[13];           /* dword 2 */
+        u8 valid;               /* dword 2 */
+        u8 rsshash[32];         /* dword 3 */
+} __packed;
+
 struct be_eth_rx_compl {
         u32 dw[4];
 };
 
+struct mgmt_hba_attribs {
+        u8 flashrom_version_string[32];
+        u8 manufacturer_name[32];
+        u32 supported_modes;
+        u32 rsvd0[3];
+        u8 ncsi_ver_string[12];
+        u32 default_extended_timeout;
+        u8 controller_model_number[32];
+        u8 controller_description[64];
+        u8 controller_serial_number[32];
+        u8 ip_version_string[32];
+        u8 firmware_version_string[32];
+        u8 bios_version_string[32];
+        u8 redboot_version_string[32];
+        u8 driver_version_string[32];
+        u8 fw_on_flash_version_string[32];
+        u32 functionalities_supported;
+        u16 max_cdblength;
+        u8 asic_revision;
+        u8 generational_guid[16];
+        u8 hba_port_count;
+        u16 default_link_down_timeout;
+        u8 iscsi_ver_min_max;
+        u8 multifunction_device;
+        u8 cache_valid;
+        u8 hba_status;
+        u8 max_domains_supported;
+        u8 phy_port;
+        u32 firmware_post_status;
+        u32 hba_mtu[8];
+        u32 rsvd1[4];
+};
+
+struct mgmt_controller_attrib {
+        struct mgmt_hba_attribs hba_attribs;
+        u16 pci_vendor_id;
+        u16 pci_device_id;
+        u16 pci_sub_vendor_id;
+        u16 pci_sub_system_id;
+        u8 pci_bus_number;
+        u8 pci_device_number;
+        u8 pci_function_number;
+        u8 interface_type;
+        u64 unique_identifier;
+        u32 rsvd0[5];
+};
+
 struct controller_id {
         u32 vendor;
         u32 device;
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index de40d3b7152..a71163f1e34 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2010 ServerEngines
+ * Copyright (C) 2005 - 2011 Emulex
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -8,11 +8,11 @@
  * Public License is included in this distribution in the file called COPYING.
  *
  * Contact Information:
- * linux-drivers@serverengines.com
+ * linux-drivers@emulex.com
  *
- * ServerEngines
- * 209 N. Fair Oaks Ave
- * Sunnyvale, CA 94085
+ * Emulex
+ * 3333 Susan Street
+ * Costa Mesa, CA 92626
  */
 
 #include "be.h"
@@ -25,9 +25,9 @@ MODULE_DESCRIPTION(DRV_DESC " " DRV_VER);
 MODULE_AUTHOR("ServerEngines Corporation");
 MODULE_LICENSE("GPL");
 
-static unsigned int rx_frag_size = 2048;
+static ushort rx_frag_size = 2048;
 static unsigned int num_vfs;
-module_param(rx_frag_size, uint, S_IRUGO);
+module_param(rx_frag_size, ushort, S_IRUGO);
 module_param(num_vfs, uint, S_IRUGO);
 MODULE_PARM_DESC(rx_frag_size, "Size of a fragment that holds rcvd data.");
 MODULE_PARM_DESC(num_vfs, "Number of PCI VFs to initialize");
@@ -125,8 +125,8 @@ static void be_queue_free(struct be_adapter *adapter, struct be_queue_info *q)
 {
         struct be_dma_mem *mem = &q->dma_mem;
         if (mem->va)
-                pci_free_consistent(adapter->pdev, mem->size,
-                        mem->va, mem->dma);
+                dma_free_coherent(&adapter->pdev->dev, mem->size, mem->va,
+                                  mem->dma);
 }
 
 static int be_queue_alloc(struct be_adapter *adapter, struct be_queue_info *q,
@@ -138,7 +138,8 @@ static int be_queue_alloc(struct be_adapter *adapter, struct be_queue_info *q,
         q->len = len;
         q->entry_size = entry_size;
         mem->size = len * entry_size;
-        mem->va = pci_alloc_consistent(adapter->pdev, mem->size, &mem->dma);
+        mem->va = dma_alloc_coherent(&adapter->pdev->dev, mem->size, &mem->dma,
+                                     GFP_KERNEL);
         if (!mem->va)
                 return -1;
         memset(mem->va, 0, mem->size);
@@ -235,12 +236,13 @@ static int be_mac_addr_set(struct net_device *netdev, void *p)
         if (!be_physfn(adapter))
                 goto netdev_addr;
 
-        status = be_cmd_pmac_del(adapter, adapter->if_handle, adapter->pmac_id);
+        status = be_cmd_pmac_del(adapter, adapter->if_handle,
+                                adapter->pmac_id, 0);
         if (status)
                 return status;
 
         status = be_cmd_pmac_add(adapter, (u8 *)addr->sa_data,
-                        adapter->if_handle, &adapter->pmac_id);
+                                adapter->if_handle, &adapter->pmac_id, 0);
 netdev_addr:
         if (!status)
                 memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
@@ -312,11 +314,9 @@ void be_link_status_update(struct be_adapter *adapter, bool link_up)
         if (adapter->link_up != link_up) {
                 adapter->link_speed = -1;
                 if (link_up) {
-                        netif_start_queue(netdev);
                         netif_carrier_on(netdev);
                         printk(KERN_INFO "%s: Link up\n", netdev->name);
                 } else {
-                        netif_stop_queue(netdev);
                         netif_carrier_off(netdev);
                         printk(KERN_INFO "%s: Link down\n", netdev->name);
                 }
@@ -486,7 +486,7 @@ static void wrb_fill_hdr(struct be_adapter *adapter, struct be_eth_hdr_wrb *hdr,
         AMAP_SET_BITS(struct amap_eth_hdr_wrb, len, hdr, len);
 }
 
-static void unmap_tx_frag(struct pci_dev *pdev, struct be_eth_wrb *wrb,
+static void unmap_tx_frag(struct device *dev, struct be_eth_wrb *wrb,
                 bool unmap_single)
 {
         dma_addr_t dma;
@@ -496,11 +496,10 @@ static void unmap_tx_frag(struct pci_dev *pdev, struct be_eth_wrb *wrb,
         dma = (u64)wrb->frag_pa_hi << 32 | (u64)wrb->frag_pa_lo;
         if (wrb->frag_len) {
                 if (unmap_single)
-                        pci_unmap_single(pdev, dma, wrb->frag_len,
-                                PCI_DMA_TODEVICE);
+                        dma_unmap_single(dev, dma, wrb->frag_len,
+                                         DMA_TO_DEVICE);
                 else
-                        pci_unmap_page(pdev, dma, wrb->frag_len,
-                                PCI_DMA_TODEVICE);
+                        dma_unmap_page(dev, dma, wrb->frag_len, DMA_TO_DEVICE);
         }
 }
 
@@ -509,7 +508,7 @@ static int make_tx_wrbs(struct be_adapter *adapter,
 {
         dma_addr_t busaddr;
         int i, copied = 0;
-        struct pci_dev *pdev = adapter->pdev;
+        struct device *dev = &adapter->pdev->dev;
         struct sk_buff *first_skb = skb;
         struct be_queue_info *txq = &adapter->tx_obj.q;
         struct be_eth_wrb *wrb;
@@ -523,9 +522,8 @@ static int make_tx_wrbs(struct be_adapter *adapter,
 
         if (skb->len > skb->data_len) {
                 int len = skb_headlen(skb);
-                busaddr = pci_map_single(pdev, skb->data, len,
-                                         PCI_DMA_TODEVICE);
-                if (pci_dma_mapping_error(pdev, busaddr))
+                busaddr = dma_map_single(dev, skb->data, len, DMA_TO_DEVICE);
+                if (dma_mapping_error(dev, busaddr))
                         goto dma_err;
                 map_single = true;
                 wrb = queue_head_node(txq);
@@ -538,10 +536,9 @@ static int make_tx_wrbs(struct be_adapter *adapter,
         for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                 struct skb_frag_struct *frag =
                         &skb_shinfo(skb)->frags[i];
-                busaddr = pci_map_page(pdev, frag->page,
-                                       frag->page_offset,
-                                       frag->size, PCI_DMA_TODEVICE);
-                if (pci_dma_mapping_error(pdev, busaddr))
+                busaddr = dma_map_page(dev, frag->page, frag->page_offset,
+                                       frag->size, DMA_TO_DEVICE);
+                if (dma_mapping_error(dev, busaddr))
                         goto dma_err;
                 wrb = queue_head_node(txq);
                 wrb_fill(wrb, busaddr, frag->size);
@@ -565,7 +562,7 @@ dma_err:
         txq->head = map_head;
         while (copied) {
                 wrb = queue_head_node(txq);
-                unmap_tx_frag(pdev, wrb, map_single);
+                unmap_tx_frag(dev, wrb, map_single);
                 map_single = false;
                 copied -= wrb->frag_len;
                 queue_head_inc(txq);
@@ -745,11 +742,11 @@ static int be_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
         if (adapter->vf_cfg[vf].vf_pmac_id != BE_INVALID_PMAC_ID)
                 status = be_cmd_pmac_del(adapter,
                                         adapter->vf_cfg[vf].vf_if_handle,
-                                        adapter->vf_cfg[vf].vf_pmac_id);
+                                        adapter->vf_cfg[vf].vf_pmac_id, vf + 1);
 
         status = be_cmd_pmac_add(adapter, mac,
                                 adapter->vf_cfg[vf].vf_if_handle,
-                                &adapter->vf_cfg[vf].vf_pmac_id);
+                                &adapter->vf_cfg[vf].vf_pmac_id, vf + 1);
 
         if (status)
                 dev_err(&adapter->pdev->dev, "MAC %pM set on VF %d Failed\n",
@@ -824,7 +821,7 @@ static int be_set_vf_tx_rate(struct net_device *netdev,
                 rate = 10000;
 
         adapter->vf_cfg[vf].vf_tx_rate = rate;
-        status = be_cmd_set_qos(adapter, rate / 10, vf);
+        status = be_cmd_set_qos(adapter, rate / 10, vf + 1);
 
         if (status)
                 dev_info(&adapter->pdev->dev,
@@ -854,28 +851,26 @@ static void be_rx_rate_update(struct be_rx_obj *rxo)
 }
 
 static void be_rx_stats_update(struct be_rx_obj *rxo,
-                u32 pktsize, u16 numfrags, u8 pkt_type)
+                struct be_rx_compl_info *rxcp)
 {
         struct be_rx_stats *stats = &rxo->stats;
 
         stats->rx_compl++;
-        stats->rx_frags += numfrags;
-        stats->rx_bytes += pktsize;
+        stats->rx_frags += rxcp->num_rcvd;
+        stats->rx_bytes += rxcp->pkt_size;
         stats->rx_pkts++;
-        if (pkt_type == BE_MULTICAST_PACKET)
+        if (rxcp->pkt_type == BE_MULTICAST_PACKET)
                 stats->rx_mcast_pkts++;
+        if (rxcp->err)
+                stats->rxcp_err++;
 }
 
-static inline bool csum_passed(struct be_eth_rx_compl *rxcp)
+static inline bool csum_passed(struct be_rx_compl_info *rxcp)
 {
-        u8 l4_cksm, ipv6, ipcksm;
-
-        l4_cksm = AMAP_GET_BITS(struct amap_eth_rx_compl, l4_cksm, rxcp);
-        ipcksm = AMAP_GET_BITS(struct amap_eth_rx_compl, ipcksm, rxcp);
-        ipv6 = AMAP_GET_BITS(struct amap_eth_rx_compl, ip_version, rxcp);
-
-        /* Ignore ipcksm for ipv6 pkts */
-        return l4_cksm && (ipcksm || ipv6);
+        /* L4 checksum is not reliable for non TCP/UDP packets.
+         * Also ignore ipcksm for ipv6 pkts */
+        return (rxcp->tcpf || rxcp->udpf) && rxcp->l4_csum &&
+                                (rxcp->ip_csum || rxcp->ipv6);
 }
 
 static struct be_rx_page_info *
@@ -890,8 +885,9 @@ get_rx_page_info(struct be_adapter *adapter,
         BUG_ON(!rx_page_info->page);
 
         if (rx_page_info->last_page_user) {
-                pci_unmap_page(adapter->pdev, dma_unmap_addr(rx_page_info, bus),
-                        adapter->big_page_size, PCI_DMA_FROMDEVICE);
+                dma_unmap_page(&adapter->pdev->dev,
+                               dma_unmap_addr(rx_page_info, bus),
+                               adapter->big_page_size, DMA_FROM_DEVICE);
                 rx_page_info->last_page_user = false;
         }
 
@@ -902,26 +898,17 @@ get_rx_page_info(struct be_adapter *adapter,
 /* Throwaway the data in the Rx completion */
 static void be_rx_compl_discard(struct be_adapter *adapter,
                 struct be_rx_obj *rxo,
-                struct be_eth_rx_compl *rxcp)
+                struct be_rx_compl_info *rxcp)
 {
         struct be_queue_info *rxq = &rxo->q;
         struct be_rx_page_info *page_info;
-        u16 rxq_idx, i, num_rcvd;
+        u16 i, num_rcvd = rxcp->num_rcvd;
 
-        rxq_idx = AMAP_GET_BITS(struct amap_eth_rx_compl, fragndx, rxcp);
-        num_rcvd = AMAP_GET_BITS(struct amap_eth_rx_compl, numfrags, rxcp);
-
-         /* Skip out-of-buffer compl(lancer) or flush compl(BE) */
-        if (likely(rxq_idx != rxo->last_frag_index && num_rcvd != 0)) {
-
-                rxo->last_frag_index = rxq_idx;
-
-                for (i = 0; i < num_rcvd; i++) {
-                        page_info = get_rx_page_info(adapter, rxo, rxq_idx);
-                        put_page(page_info->page);
-                        memset(page_info, 0, sizeof(*page_info));
-                        index_inc(&rxq_idx, rxq->len);
-                }
+        for (i = 0; i < num_rcvd; i++) {
+                page_info = get_rx_page_info(adapter, rxo, rxcp->rxq_idx);
+                put_page(page_info->page);
+                memset(page_info, 0, sizeof(*page_info));
+                index_inc(&rxcp->rxq_idx, rxq->len);
         }
 }
 
@@ -930,30 +917,23 @@ static void be_rx_compl_discard(struct be_adapter *adapter,
  * indicated by rxcp.
  */
 static void skb_fill_rx_data(struct be_adapter *adapter, struct be_rx_obj *rxo,
-                        struct sk_buff *skb, struct be_eth_rx_compl *rxcp,
-                        u16 num_rcvd)
+                        struct sk_buff *skb, struct be_rx_compl_info *rxcp)
 {
         struct be_queue_info *rxq = &rxo->q;
         struct be_rx_page_info *page_info;
-        u16 rxq_idx, i, j;
-        u32 pktsize, hdr_len, curr_frag_len, size;
+        u16 i, j;
+        u16 hdr_len, curr_frag_len, remaining;
         u8 *start;
-        u8 pkt_type;
-
-        rxq_idx = AMAP_GET_BITS(struct amap_eth_rx_compl, fragndx, rxcp);
-        pktsize = AMAP_GET_BITS(struct amap_eth_rx_compl, pktsize, rxcp);
-        pkt_type = AMAP_GET_BITS(struct amap_eth_rx_compl, cast_enc, rxcp);
-
-        page_info = get_rx_page_info(adapter, rxo, rxq_idx);
 
+        page_info = get_rx_page_info(adapter, rxo, rxcp->rxq_idx);
         start = page_address(page_info->page) + page_info->page_offset;
         prefetch(start);
 
         /* Copy data in the first descriptor of this completion */
-        curr_frag_len = min(pktsize, rx_frag_size);
+        curr_frag_len = min(rxcp->pkt_size, rx_frag_size);
 
         /* Copy the header portion into skb_data */
-        hdr_len = min((u32)BE_HDR_LEN, curr_frag_len);
+        hdr_len = min(BE_HDR_LEN, curr_frag_len);
         memcpy(skb->data, start, hdr_len);
         skb->len = curr_frag_len;
         if (curr_frag_len <= BE_HDR_LEN) { /* tiny packet */
@@ -972,19 +952,17 @@ static void skb_fill_rx_data(struct be_adapter *adapter, struct be_rx_obj *rxo,
         }
         page_info->page = NULL;
 
-        if (pktsize <= rx_frag_size) {
-                BUG_ON(num_rcvd != 1);
-                goto done;
+        if (rxcp->pkt_size <= rx_frag_size) {
+                BUG_ON(rxcp->num_rcvd != 1);
+                return;
         }
 
         /* More frags present for this completion */
-        size = pktsize;
-        for (i = 1, j = 0; i < num_rcvd; i++) {
-                size -= curr_frag_len;
-                index_inc(&rxq_idx, rxq->len);
-                page_info = get_rx_page_info(adapter, rxo, rxq_idx);
-
-                curr_frag_len = min(size, rx_frag_size);
+        index_inc(&rxcp->rxq_idx, rxq->len);
+        remaining = rxcp->pkt_size - curr_frag_len;
+        for (i = 1, j = 0; i < rxcp->num_rcvd; i++) {
+                page_info = get_rx_page_info(adapter, rxo, rxcp->rxq_idx);
+                curr_frag_len = min(remaining, rx_frag_size);
 
                 /* Coalesce all frags from the same physical page in one slot */
                 if (page_info->page_offset == 0) {
@@ -1003,25 +981,19 @@ static void skb_fill_rx_data(struct be_adapter *adapter, struct be_rx_obj *rxo,
                 skb->len += curr_frag_len;
                 skb->data_len += curr_frag_len;
 
+                remaining -= curr_frag_len;
+                index_inc(&rxcp->rxq_idx, rxq->len);
                 page_info->page = NULL;
         }
         BUG_ON(j > MAX_SKB_FRAGS);
-
-done:
-        be_rx_stats_update(rxo, pktsize, num_rcvd, pkt_type);
 }
 
 /* Process the RX completion indicated by rxcp when GRO is disabled */
 static void be_rx_compl_process(struct be_adapter *adapter,
                         struct be_rx_obj *rxo,
-                        struct be_eth_rx_compl *rxcp)
+                        struct be_rx_compl_info *rxcp)
 {
         struct sk_buff *skb;
-        u32 vlanf, vid;
-        u16 num_rcvd;
-        u8 vtm;
-
-        num_rcvd = AMAP_GET_BITS(struct amap_eth_rx_compl, numfrags, rxcp);
 
         skb = netdev_alloc_skb_ip_align(adapter->netdev, BE_HDR_LEN);
         if (unlikely(!skb)) {
@@ -1031,7 +1003,7 @@ static void be_rx_compl_process(struct be_adapter *adapter,
                 return;
         }
 
-        skb_fill_rx_data(adapter, rxo, skb, rxcp, num_rcvd);
+        skb_fill_rx_data(adapter, rxo, skb, rxcp);
 
         if (likely(adapter->rx_csum && csum_passed(rxcp)))
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -1041,23 +1013,12 @@ static void be_rx_compl_process(struct be_adapter *adapter,
         skb->truesize = skb->len + sizeof(struct sk_buff);
         skb->protocol = eth_type_trans(skb, adapter->netdev);
 
-        vlanf = AMAP_GET_BITS(struct amap_eth_rx_compl, vtp, rxcp);
-        vtm = AMAP_GET_BITS(struct amap_eth_rx_compl, vtm, rxcp);
-
-        /* vlanf could be wrongly set in some cards.
-         * ignore if vtm is not set */
-        if ((adapter->function_mode & 0x400) && !vtm)
-                vlanf = 0;
-
-        if (unlikely(vlanf)) {
+        if (unlikely(rxcp->vlanf)) {
                 if (!adapter->vlan_grp || adapter->vlans_added == 0) {
                         kfree_skb(skb);
                         return;
                 }
-                vid = AMAP_GET_BITS(struct amap_eth_rx_compl, vlan_tag, rxcp);
-                if (!lancer_chip(adapter))
-                        vid = swab16(vid);
-                vlan_hwaccel_receive_skb(skb, adapter->vlan_grp, vid);
+                vlan_hwaccel_receive_skb(skb, adapter->vlan_grp, rxcp->vid);
         } else {
                 netif_receive_skb(skb);
         }
@@ -1066,28 +1027,14 @@ static void be_rx_compl_process(struct be_adapter *adapter,
 /* Process the RX completion indicated by rxcp when GRO is enabled */
 static void be_rx_compl_process_gro(struct be_adapter *adapter,
                 struct be_rx_obj *rxo,
-                struct be_eth_rx_compl *rxcp)
+                struct be_rx_compl_info *rxcp)
 {
         struct be_rx_page_info *page_info;
         struct sk_buff *skb = NULL;
         struct be_queue_info *rxq = &rxo->q;
         struct be_eq_obj *eq_obj =  &rxo->rx_eq;
-        u32 num_rcvd, pkt_size, remaining, vlanf, curr_frag_len;
-        u16 i, rxq_idx = 0, vid, j;
-        u8 vtm;
-        u8 pkt_type;
-
-        num_rcvd = AMAP_GET_BITS(struct amap_eth_rx_compl, numfrags, rxcp);
-        pkt_size = AMAP_GET_BITS(struct amap_eth_rx_compl, pktsize, rxcp);
-        vlanf = AMAP_GET_BITS(struct amap_eth_rx_compl, vtp, rxcp);
-        rxq_idx = AMAP_GET_BITS(struct amap_eth_rx_compl, fragndx, rxcp);
-        vtm = AMAP_GET_BITS(struct amap_eth_rx_compl, vtm, rxcp);
-        pkt_type = AMAP_GET_BITS(struct amap_eth_rx_compl, cast_enc, rxcp);
-
-        /* vlanf could be wrongly set in some cards.
-         * ignore if vtm is not set */
-        if ((adapter->function_mode & 0x400) && !vtm)
-                vlanf = 0;
+        u16 remaining, curr_frag_len;
+        u16 i, j;
 
         skb = napi_get_frags(&eq_obj->napi);
         if (!skb) {
@@ -1095,9 +1042,9 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter,
                 return;
         }
 
-        remaining = pkt_size;
-        for (i = 0, j = -1; i < num_rcvd; i++) {
-                page_info = get_rx_page_info(adapter, rxo, rxq_idx);
+        remaining = rxcp->pkt_size;
+        for (i = 0, j = -1; i < rxcp->num_rcvd; i++) {
+                page_info = get_rx_page_info(adapter, rxo, rxcp->rxq_idx);
 
                 curr_frag_len = min(remaining, rx_frag_size);
 
@@ -1115,70 +1062,125 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter,
                 skb_shinfo(skb)->frags[j].size += curr_frag_len;
 
                 remaining -= curr_frag_len;
-                index_inc(&rxq_idx, rxq->len);
+                index_inc(&rxcp->rxq_idx, rxq->len);
                 memset(page_info, 0, sizeof(*page_info));
         }
         BUG_ON(j > MAX_SKB_FRAGS);
 
         skb_shinfo(skb)->nr_frags = j + 1;
-        skb->len = pkt_size;
-        skb->data_len = pkt_size;
-        skb->truesize += pkt_size;
+        skb->len = rxcp->pkt_size;
+        skb->data_len = rxcp->pkt_size;
+        skb->truesize += rxcp->pkt_size;
         skb->ip_summed = CHECKSUM_UNNECESSARY;
 
-        if (likely(!vlanf)) {
+        if (likely(!rxcp->vlanf))
                 napi_gro_frags(&eq_obj->napi);
-        } else {
-                vid = AMAP_GET_BITS(struct amap_eth_rx_compl, vlan_tag, rxcp);
-                if (!lancer_chip(adapter))
-                        vid = swab16(vid);
+        else
+                vlan_gro_frags(&eq_obj->napi, adapter->vlan_grp, rxcp->vid);
+}
+
+static void be_parse_rx_compl_v1(struct be_adapter *adapter,
+                                struct be_eth_rx_compl *compl,
+                                struct be_rx_compl_info *rxcp)
+{
+        rxcp->pkt_size =
+                AMAP_GET_BITS(struct amap_eth_rx_compl_v1, pktsize, compl);
+        rxcp->vlanf = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vtp, compl);
+        rxcp->err = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, err, compl);
+        rxcp->tcpf = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, tcpf, compl);
+        rxcp->udpf = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, udpf, compl);
+        rxcp->ip_csum =
+                AMAP_GET_BITS(struct amap_eth_rx_compl_v1, ipcksm, compl);
+        rxcp->l4_csum =
+                AMAP_GET_BITS(struct amap_eth_rx_compl_v1, l4_cksm, compl);
+        rxcp->ipv6 =
+                AMAP_GET_BITS(struct amap_eth_rx_compl_v1, ip_version, compl);
+        rxcp->rxq_idx =
+                AMAP_GET_BITS(struct amap_eth_rx_compl_v1, fragndx, compl);
+        rxcp->num_rcvd =
+                AMAP_GET_BITS(struct amap_eth_rx_compl_v1, numfrags, compl);
+        rxcp->pkt_type =
+                AMAP_GET_BITS(struct amap_eth_rx_compl_v1, cast_enc, compl);
+        rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vtm, compl);
+        rxcp->vid = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vlan_tag, compl);
+}
+
+static void be_parse_rx_compl_v0(struct be_adapter *adapter,
+                                struct be_eth_rx_compl *compl,
+                                struct be_rx_compl_info *rxcp)
+{
+        rxcp->pkt_size =
+                AMAP_GET_BITS(struct amap_eth_rx_compl_v0, pktsize, compl);
+        rxcp->vlanf = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vtp, compl);
+        rxcp->err = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, err, compl);
+        rxcp->tcpf = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, tcpf, compl);
+        rxcp->udpf = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, udpf, compl);
+        rxcp->ip_csum =
+                AMAP_GET_BITS(struct amap_eth_rx_compl_v0, ipcksm, compl);
+        rxcp->l4_csum =
+                AMAP_GET_BITS(struct amap_eth_rx_compl_v0, l4_cksm, compl);
+        rxcp->ipv6 =
+                AMAP_GET_BITS(struct amap_eth_rx_compl_v0, ip_version, compl);
+        rxcp->rxq_idx =
+                AMAP_GET_BITS(struct amap_eth_rx_compl_v0, fragndx, compl);
+        rxcp->num_rcvd =
+                AMAP_GET_BITS(struct amap_eth_rx_compl_v0, numfrags, compl);
+        rxcp->pkt_type =
+                AMAP_GET_BITS(struct amap_eth_rx_compl_v0, cast_enc, compl);
+        rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vtm, compl);
+        rxcp->vid = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vlan_tag, compl);
+}
+
+static struct be_rx_compl_info *be_rx_compl_get(struct be_rx_obj *rxo)
+{
+        struct be_eth_rx_compl *compl = queue_tail_node(&rxo->cq);
+        struct be_rx_compl_info *rxcp = &rxo->rxcp;
+        struct be_adapter *adapter = rxo->adapter;
 
-                if (!adapter->vlan_grp || adapter->vlans_added == 0)
-                        return;
+        /* For checking the valid bit it is Ok to use either definition as the
+         * valid bit is at the same position in both v0 and v1 Rx compl */
+        if (compl->dw[offsetof(struct amap_eth_rx_compl_v1, valid) / 32] == 0)
+                return NULL;
 
-                vlan_gro_frags(&eq_obj->napi, adapter->vlan_grp, vid);
-        }
+        rmb();
+        be_dws_le_to_cpu(compl, sizeof(*compl));
 
-        be_rx_stats_update(rxo, pkt_size, num_rcvd, pkt_type);
-}
+        if (adapter->be3_native)
+                be_parse_rx_compl_v1(adapter, compl, rxcp);
+        else
+                be_parse_rx_compl_v0(adapter, compl, rxcp);
 
-static struct be_eth_rx_compl *be_rx_compl_get(struct be_rx_obj *rxo)
-{
-        struct be_eth_rx_compl *rxcp = queue_tail_node(&rxo->cq);
+        /* vlanf could be wrongly set in some cards. ignore if vtm is not set */
+        if ((adapter->function_mode & 0x400) && !rxcp->vtm)
+                rxcp->vlanf = 0;
 
-        if (rxcp->dw[offsetof(struct amap_eth_rx_compl, valid) / 32] == 0)
-                return NULL;
+        if (!lancer_chip(adapter))
+                rxcp->vid = swab16(rxcp->vid);
 
-        rmb();
-        be_dws_le_to_cpu(rxcp, sizeof(*rxcp));
+        if ((adapter->pvid == rxcp->vid) && !adapter->vlan_tag[rxcp->vid])
+                rxcp->vlanf = 0;
+
+        /* As the compl has been parsed, reset it; we wont touch it again */
+        compl->dw[offsetof(struct amap_eth_rx_compl_v1, valid) / 32] = 0;
 
         queue_tail_inc(&rxo->cq);
         return rxcp;
 }
 
-/* To reset the valid bit, we need to reset the whole word as
- * when walking the queue the valid entries are little-endian
- * and invalid entries are host endian
- */
-static inline void be_rx_compl_reset(struct be_eth_rx_compl *rxcp)
+static inline struct page *be_alloc_pages(u32 size, gfp_t gfp)
 {
-        rxcp->dw[offsetof(struct amap_eth_rx_compl, valid) / 32] = 0;
-}
-
-static inline struct page *be_alloc_pages(u32 size)
-{
-        gfp_t alloc_flags = GFP_ATOMIC;
         u32 order = get_order(size);
+
         if (order > 0)
-                alloc_flags |= __GFP_COMP;
-        return  alloc_pages(alloc_flags, order);
+                gfp |= __GFP_COMP;
+        return  alloc_pages(gfp, order);
 }
 
 /*
  * Allocate a page, split it to fragments of size rx_frag_size and post as
  * receive buffers to BE
  */
-static void be_post_rx_frags(struct be_rx_obj *rxo)
+static void be_post_rx_frags(struct be_rx_obj *rxo, gfp_t gfp)
 {
         struct be_adapter *adapter = rxo->adapter;
         struct be_rx_page_info *page_info_tbl = rxo->page_info_tbl;
@@ -1192,14 +1194,14 @@ static void be_post_rx_frags(struct be_rx_obj *rxo)
         page_info = &rxo->page_info_tbl[rxq->head];
         for (posted = 0; posted < MAX_RX_POST && !page_info->page; posted++) {
                 if (!pagep) {
-                        pagep = be_alloc_pages(adapter->big_page_size);
+                        pagep = be_alloc_pages(adapter->big_page_size, gfp);
                         if (unlikely(!pagep)) {
                                 rxo->stats.rx_post_fail++;
                                 break;
                         }
-                        page_dmaaddr = pci_map_page(adapter->pdev, pagep, 0,
-                                                adapter->big_page_size,
-                                                PCI_DMA_FROMDEVICE);
+                        page_dmaaddr = dma_map_page(&adapter->pdev->dev, pagep,
+                                                    0, adapter->big_page_size,
+                                                    DMA_FROM_DEVICE);
                         page_info->page_offset = 0;
                 } else {
                         get_page(pagep);
@@ -1272,8 +1274,8 @@ static void be_tx_compl_process(struct be_adapter *adapter, u16 last_index)
         do {
                 cur_index = txq->tail;
                 wrb = queue_tail_node(txq);
-                unmap_tx_frag(adapter->pdev, wrb, (unmap_skb_hdr &&
-                                        skb_headlen(sent_skb)));
+                unmap_tx_frag(&adapter->pdev->dev, wrb,
+                              (unmap_skb_hdr && skb_headlen(sent_skb)));
                 unmap_skb_hdr = false;
 
                 num_wrbs++;
@@ -1341,13 +1343,12 @@ static void be_rx_q_clean(struct be_adapter *adapter, struct be_rx_obj *rxo)
         struct be_rx_page_info *page_info;
         struct be_queue_info *rxq = &rxo->q;
         struct be_queue_info *rx_cq = &rxo->cq;
-        struct be_eth_rx_compl *rxcp;
+        struct be_rx_compl_info *rxcp;
         u16 tail;
 
         /* First cleanup pending rx completions */
         while ((rxcp = be_rx_compl_get(rxo)) != NULL) {
                 be_rx_compl_discard(adapter, rxo, rxcp);
-                be_rx_compl_reset(rxcp);
                 be_cq_notify(adapter, rx_cq->id, false, 1);
         }
 
@@ -1575,9 +1576,6 @@ static int be_rx_queues_create(struct be_adapter *adapter)
         adapter->big_page_size = (1 << get_order(rx_frag_size)) * PAGE_SIZE;
         for_all_rx_queues(adapter, rxo, i) {
                 rxo->adapter = adapter;
-                /* Init last_frag_index so that the frag index in the first
-                 * completion will never match */
-                rxo->last_frag_index = 0xffff;
                 rxo->rx_eq.max_eqd = BE_MAX_EQD;
                 rxo->rx_eq.enable_aic = true;
 
@@ -1699,15 +1697,9 @@ static irqreturn_t be_msix_tx_mcc(int irq, void *dev)
         return IRQ_HANDLED;
 }
 
-static inline bool do_gro(struct be_rx_obj *rxo,
-                        struct be_eth_rx_compl *rxcp, u8 err)
+static inline bool do_gro(struct be_rx_compl_info *rxcp)
 {
-        int tcp_frame = AMAP_GET_BITS(struct amap_eth_rx_compl, tcpf, rxcp);
-
-        if (err)
-                rxo->stats.rxcp_err++;
-
-        return (tcp_frame && !err) ? true : false;
+        return (rxcp->tcpf && !rxcp->err) ? true : false;
 }
 
 static int be_poll_rx(struct napi_struct *napi, int budget)
@@ -1716,10 +1708,8 @@ static int be_poll_rx(struct napi_struct *napi, int budget)
         struct be_rx_obj *rxo = container_of(rx_eq, struct be_rx_obj, rx_eq);
         struct be_adapter *adapter = rxo->adapter;
         struct be_queue_info *rx_cq = &rxo->cq;
-        struct be_eth_rx_compl *rxcp;
+        struct be_rx_compl_info *rxcp;
         u32 work_done;
-        u16 frag_index, num_rcvd;
-        u8 err;
 
         rxo->stats.rx_polls++;
         for (work_done = 0; work_done < budget; work_done++) {
@@ -1727,29 +1717,19 @@ static int be_poll_rx(struct napi_struct *napi, int budget)
                 if (!rxcp)
                         break;
 
-                err = AMAP_GET_BITS(struct amap_eth_rx_compl, err, rxcp);
-                frag_index = AMAP_GET_BITS(struct amap_eth_rx_compl, fragndx,
-                                                                rxcp);
-                num_rcvd = AMAP_GET_BITS(struct amap_eth_rx_compl, numfrags,
-                                                                rxcp);
-
-                /* Skip out-of-buffer compl(lancer) or flush compl(BE) */
-                if (likely(frag_index != rxo->last_frag_index &&
-                                num_rcvd != 0)) {
-                        rxo->last_frag_index = frag_index;
-
-                        if (do_gro(rxo, rxcp, err))
+                /* Ignore flush completions */
+                if (rxcp->num_rcvd) {
+                        if (do_gro(rxcp))
                                 be_rx_compl_process_gro(adapter, rxo, rxcp);
                         else
                                 be_rx_compl_process(adapter, rxo, rxcp);
                 }
-
-                be_rx_compl_reset(rxcp);
+                be_rx_stats_update(rxo, rxcp);
         }
 
         /* Refill the queue */
         if (atomic_read(&rxo->q.used) < RX_FRAGS_REFILL_WM)
-                be_post_rx_frags(rxo);
+                be_post_rx_frags(rxo, GFP_ATOMIC);
 
         /* All consumed */
         if (work_done < budget) {
@@ -1829,6 +1809,7 @@ void be_detect_dump_ue(struct be_adapter *adapter)
 
         if (ue_status_lo || ue_status_hi) {
                 adapter->ue_detected = true;
+                adapter->eeh_err = true;
                 dev_err(&adapter->pdev->dev, "UE Detected!!\n");
         }
 
@@ -1867,10 +1848,14 @@ static void be_worker(struct work_struct *work)
                         struct be_mcc_obj *mcc_obj = &adapter->mcc_obj;
                         be_cq_notify(adapter, mcc_obj->cq.id, false, mcc_compl);
                 }
+
+                if (!adapter->ue_detected && !lancer_chip(adapter))
+                        be_detect_dump_ue(adapter);
+
                 goto reschedule;
         }
 
-        if (!adapter->stats_ioctl_sent)
+        if (!adapter->stats_cmd_sent)
                 be_cmd_get_stats(adapter, &adapter->stats_cmd);
 
         be_tx_rate_update(adapter);
@@ -1881,7 +1866,7 @@ static void be_worker(struct work_struct *work)
 
                 if (rxo->rx_post_starved) {
                         rxo->rx_post_starved = false;
-                        be_post_rx_frags(rxo);
+                        be_post_rx_frags(rxo, GFP_KERNEL);
                 }
         }
         if (!adapter->ue_detected && !lancer_chip(adapter))
@@ -2085,13 +2070,24 @@ static int be_close(struct net_device *netdev)
 
         be_async_mcc_disable(adapter);
 
-        netif_stop_queue(netdev);
         netif_carrier_off(netdev);
         adapter->link_up = false;
 
         if (!lancer_chip(adapter))
                 be_intr_set(adapter, false);
 
+        for_all_rx_queues(adapter, rxo, i)
+                napi_disable(&rxo->rx_eq.napi);
+
+        napi_disable(&tx_eq->napi);
+
+        if (lancer_chip(adapter)) {
+                be_cq_notify(adapter, adapter->tx_obj.cq.id, false, 0);
+                be_cq_notify(adapter, adapter->mcc_obj.cq.id, false, 0);
+                for_all_rx_queues(adapter, rxo, i)
+                         be_cq_notify(adapter, rxo->cq.id, false, 0);
+        }
+
         if (adapter->msix_enabled) {
                 vec = be_msix_vec_get(adapter, tx_eq);
                 synchronize_irq(vec);
@@ -2105,11 +2101,6 @@ static int be_close(struct net_device *netdev)
         }
         be_irq_unregister(adapter);
 
-        for_all_rx_queues(adapter, rxo, i)
-                napi_disable(&rxo->rx_eq.napi);
-
-        napi_disable(&tx_eq->napi);
-
         /* Wait for all pending tx completions to arrive so that
          * all tx skbs are freed.
          */
@@ -2129,7 +2120,7 @@ static int be_open(struct net_device *netdev)
         u16 link_speed;
 
         for_all_rx_queues(adapter, rxo, i) {
-                be_post_rx_frags(rxo);
+                be_post_rx_frags(rxo, GFP_KERNEL);
                 napi_enable(&rxo->rx_eq.napi);
         }
         napi_enable(&tx_eq->napi);
@@ -2181,7 +2172,8 @@ static int be_setup_wol(struct be_adapter *adapter, bool enable)
         memset(mac, 0, ETH_ALEN);
 
         cmd.size = sizeof(struct be_cmd_req_acpi_wol_magic_config);
-        cmd.va = pci_alloc_consistent(adapter->pdev, cmd.size, &cmd.dma);
+        cmd.va = dma_alloc_coherent(&adapter->pdev->dev, cmd.size, &cmd.dma,
+                                    GFP_KERNEL);
         if (cmd.va == NULL)
                 return -1;
         memset(cmd.va, 0, cmd.size);
@@ -2192,8 +2184,8 @@ static int be_setup_wol(struct be_adapter *adapter, bool enable)
                 if (status) {
                         dev_err(&adapter->pdev->dev,
                                 "Could not enable Wake-on-lan\n");
-                        pci_free_consistent(adapter->pdev, cmd.size, cmd.va,
-                                        cmd.dma);
+                        dma_free_coherent(&adapter->pdev->dev, cmd.size, cmd.va,
+                                          cmd.dma);
                         return status;
                 }
                 status = be_cmd_enable_magic_wol(adapter,
@@ -2206,7 +2198,7 @@ static int be_setup_wol(struct be_adapter *adapter, bool enable)
                 pci_enable_wake(adapter->pdev, PCI_D3cold, 0);
         }
 
-        pci_free_consistent(adapter->pdev, cmd.size, cmd.va, cmd.dma);
+        dma_free_coherent(&adapter->pdev->dev, cmd.size, cmd.va, cmd.dma);
         return status;
 }
 
@@ -2227,7 +2219,8 @@ static inline int be_vf_eth_addr_config(struct be_adapter *adapter)
         for (vf = 0; vf < num_vfs; vf++) {
                 status = be_cmd_pmac_add(adapter, mac,
                                         adapter->vf_cfg[vf].vf_if_handle,
-                                        &adapter->vf_cfg[vf].vf_pmac_id);
+                                        &adapter->vf_cfg[vf].vf_pmac_id,
+                                        vf + 1);
                 if (status)
                         dev_err(&adapter->pdev->dev,
                                 "Mac address add failed for VF %d\n", vf);
@@ -2247,7 +2240,7 @@ static inline void be_vf_eth_addr_rem(struct be_adapter *adapter)
                 if (adapter->vf_cfg[vf].vf_pmac_id != BE_INVALID_PMAC_ID)
                         be_cmd_pmac_del(adapter,
                                         adapter->vf_cfg[vf].vf_if_handle,
-                                        adapter->vf_cfg[vf].vf_pmac_id);
+                                        adapter->vf_cfg[vf].vf_pmac_id, vf + 1);
         }
 }
 
@@ -2258,7 +2251,9 @@ static int be_setup(struct be_adapter *adapter)
         int status;
         u8 mac[ETH_ALEN];
 
-        cap_flags = en_flags = BE_IF_FLAGS_UNTAGGED | BE_IF_FLAGS_BROADCAST;
+        cap_flags = en_flags = BE_IF_FLAGS_UNTAGGED |
+                                BE_IF_FLAGS_BROADCAST |
+                                BE_IF_FLAGS_MULTICAST;
 
         if (be_physfn(adapter)) {
                 cap_flags |= BE_IF_FLAGS_MCAST_PROMISCUOUS |
@@ -2279,22 +2274,26 @@ static int be_setup(struct be_adapter *adapter)
                 goto do_none;
 
         if (be_physfn(adapter)) {
-                while (vf < num_vfs) {
-                        cap_flags = en_flags = BE_IF_FLAGS_UNTAGGED
-                                        | BE_IF_FLAGS_BROADCAST;
-                        status = be_cmd_if_create(adapter, cap_flags, en_flags,
-                                        mac, true,
+                if (adapter->sriov_enabled) {
+                        while (vf < num_vfs) {
+                                cap_flags = en_flags = BE_IF_FLAGS_UNTAGGED |
+                                                        BE_IF_FLAGS_BROADCAST;
+                                status = be_cmd_if_create(adapter, cap_flags,
+                                        en_flags, mac, true,
                                         &adapter->vf_cfg[vf].vf_if_handle,
                                         NULL, vf+1);
-                        if (status) {
-                                dev_err(&adapter->pdev->dev,
-                                "Interface Create failed for VF %d\n", vf);
-                                goto if_destroy;
+                                if (status) {
+                                        dev_err(&adapter->pdev->dev,
+                                        "Interface Create failed for VF %d\n",
+                                        vf);
+                                        goto if_destroy;
+                                }
+                                adapter->vf_cfg[vf].vf_pmac_id =
+                                                        BE_INVALID_PMAC_ID;
+                                vf++;
                         }
-                        adapter->vf_cfg[vf].vf_pmac_id = BE_INVALID_PMAC_ID;
-                        vf++;
                 }
-        } else if (!be_physfn(adapter)) {
+        } else {
                 status = be_cmd_mac_addr_query(adapter, mac,
                         MAC_ADDRESS_TYPE_NETWORK, false, adapter->if_handle);
                 if (!status) {
@@ -2315,44 +2314,46 @@ static int be_setup(struct be_adapter *adapter)
         if (status != 0)
                 goto rx_qs_destroy;
 
-        if (be_physfn(adapter)) {
-                status = be_vf_eth_addr_config(adapter);
-                if (status)
-                        goto mcc_q_destroy;
-        }
-
         adapter->link_speed = -1;
 
         return 0;
 
-mcc_q_destroy:
-        if (be_physfn(adapter))
-                be_vf_eth_addr_rem(adapter);
         be_mcc_queues_destroy(adapter);
 rx_qs_destroy:
         be_rx_queues_destroy(adapter);
 tx_qs_destroy:
         be_tx_queues_destroy(adapter);
 if_destroy:
-        for (vf = 0; vf < num_vfs; vf++)
-                if (adapter->vf_cfg[vf].vf_if_handle)
-                        be_cmd_if_destroy(adapter,
-                                        adapter->vf_cfg[vf].vf_if_handle);
-        be_cmd_if_destroy(adapter, adapter->if_handle);
+        if (be_physfn(adapter) && adapter->sriov_enabled)
+                for (vf = 0; vf < num_vfs; vf++)
+                        if (adapter->vf_cfg[vf].vf_if_handle)
+                                be_cmd_if_destroy(adapter,
+                                        adapter->vf_cfg[vf].vf_if_handle,
+                                        vf + 1);
+        be_cmd_if_destroy(adapter, adapter->if_handle, 0);
 do_none:
         return status;
 }
 
 static int be_clear(struct be_adapter *adapter)
 {
-        if (be_physfn(adapter))
+        int vf;
+
+        if (be_physfn(adapter) && adapter->sriov_enabled)
                 be_vf_eth_addr_rem(adapter);
 
         be_mcc_queues_destroy(adapter);
         be_rx_queues_destroy(adapter);
         be_tx_queues_destroy(adapter);
 
-        be_cmd_if_destroy(adapter, adapter->if_handle);
+        if (be_physfn(adapter) && adapter->sriov_enabled)
+                for (vf = 0; vf < num_vfs; vf++)
+                        if (adapter->vf_cfg[vf].vf_if_handle)
+                                be_cmd_if_destroy(adapter,
+                                        adapter->vf_cfg[vf].vf_if_handle,
+                                        vf + 1);
+
+        be_cmd_if_destroy(adapter, adapter->if_handle,  0);
 
         /* tell fw we're done with firing cmds */
         be_cmd_fw_clean(adapter);
@@ -2455,8 +2456,8 @@ static int be_flash_data(struct be_adapter *adapter,
                         continue;
                 if ((pflashcomp[i].optype == IMG_TYPE_REDBOOT) &&
                         (!be_flash_redboot(adapter, fw->data,
-                         pflashcomp[i].offset, pflashcomp[i].size,
-                         filehdr_size)))
+                        pflashcomp[i].offset, pflashcomp[i].size, filehdr_size +
+                        (num_of_images * sizeof(struct image_hdr)))))
                         continue;
                 p = fw->data;
                 p += filehdr_size + pflashcomp[i].offset
@@ -2530,8 +2531,8 @@ int be_load_fw(struct be_adapter *adapter, u8 *func)
         dev_info(&adapter->pdev->dev, "Flashing firmware file %s\n", fw_file);
 
         flash_cmd.size = sizeof(struct be_cmd_write_flashrom) + 32*1024;
-        flash_cmd.va = pci_alloc_consistent(adapter->pdev, flash_cmd.size,
-                                        &flash_cmd.dma);
+        flash_cmd.va = dma_alloc_coherent(&adapter->pdev->dev, flash_cmd.size,
+                                          &flash_cmd.dma, GFP_KERNEL);
         if (!flash_cmd.va) {
                 status = -ENOMEM;
                 dev_err(&adapter->pdev->dev,
@@ -2560,8 +2561,8 @@ int be_load_fw(struct be_adapter *adapter, u8 *func)
                 status = -1;
         }
 
-        pci_free_consistent(adapter->pdev, flash_cmd.size, flash_cmd.va,
-                                flash_cmd.dma);
+        dma_free_coherent(&adapter->pdev->dev, flash_cmd.size, flash_cmd.va,
+                          flash_cmd.dma);
         if (status) {
                 dev_err(&adapter->pdev->dev, "Firmware load error\n");
                 goto fw_exit;
@@ -2628,8 +2629,6 @@ static void be_netdev_init(struct net_device *netdev)
 
         netif_napi_add(netdev, &adapter->tx_eq.napi, be_poll_tx_mcc,
                 BE_NAPI_WEIGHT);
-
-        netif_stop_queue(netdev);
 }
 
 static void be_unmap_pci_bars(struct be_adapter *adapter)
@@ -2704,13 +2703,13 @@ static void be_ctrl_cleanup(struct be_adapter *adapter)
         be_unmap_pci_bars(adapter);
 
         if (mem->va)
-                pci_free_consistent(adapter->pdev, mem->size,
-                        mem->va, mem->dma);
+                dma_free_coherent(&adapter->pdev->dev, mem->size, mem->va,
+                                  mem->dma);
 
         mem = &adapter->mc_cmd_mem;
         if (mem->va)
-                pci_free_consistent(adapter->pdev, mem->size,
-                        mem->va, mem->dma);
+                dma_free_coherent(&adapter->pdev->dev, mem->size, mem->va,
+                                  mem->dma);
 }
 
 static int be_ctrl_init(struct be_adapter *adapter)
@@ -2725,8 +2724,10 @@ static int be_ctrl_init(struct be_adapter *adapter)
                 goto done;
 
         mbox_mem_alloc->size = sizeof(struct be_mcc_mailbox) + 16;
-        mbox_mem_alloc->va = pci_alloc_consistent(adapter->pdev,
-                                mbox_mem_alloc->size, &mbox_mem_alloc->dma);
+        mbox_mem_alloc->va = dma_alloc_coherent(&adapter->pdev->dev,
+                                                mbox_mem_alloc->size,
+                                                &mbox_mem_alloc->dma,
+                                                GFP_KERNEL);
         if (!mbox_mem_alloc->va) {
                 status = -ENOMEM;
                 goto unmap_pci_bars;
@@ -2738,8 +2739,9 @@ static int be_ctrl_init(struct be_adapter *adapter)
         memset(mbox_mem_align->va, 0, sizeof(struct be_mcc_mailbox));
 
         mc_cmd_mem->size = sizeof(struct be_cmd_req_mcast_mac_config);
-        mc_cmd_mem->va = pci_alloc_consistent(adapter->pdev, mc_cmd_mem->size,
-                        &mc_cmd_mem->dma);
+        mc_cmd_mem->va = dma_alloc_coherent(&adapter->pdev->dev,
+                                            mc_cmd_mem->size, &mc_cmd_mem->dma,
+                                            GFP_KERNEL);
         if (mc_cmd_mem->va == NULL) {
                 status = -ENOMEM;
                 goto free_mbox;
@@ -2755,8 +2757,8 @@ static int be_ctrl_init(struct be_adapter *adapter)
         return 0;
 
 free_mbox:
-        pci_free_consistent(adapter->pdev, mbox_mem_alloc->size,
-                mbox_mem_alloc->va, mbox_mem_alloc->dma);
+        dma_free_coherent(&adapter->pdev->dev, mbox_mem_alloc->size,
+                          mbox_mem_alloc->va, mbox_mem_alloc->dma);
 
 unmap_pci_bars:
         be_unmap_pci_bars(adapter);
@@ -2770,8 +2772,8 @@ static void be_stats_cleanup(struct be_adapter *adapter)
         struct be_dma_mem *cmd = &adapter->stats_cmd;
 
         if (cmd->va)
-                pci_free_consistent(adapter->pdev, cmd->size,
-                        cmd->va, cmd->dma);
+                dma_free_coherent(&adapter->pdev->dev, cmd->size,
+                                  cmd->va, cmd->dma);
 }
 
 static int be_stats_init(struct be_adapter *adapter)
@@ -2779,7 +2781,8 @@ static int be_stats_init(struct be_adapter *adapter)
         struct be_dma_mem *cmd = &adapter->stats_cmd;
 
         cmd->size = sizeof(struct be_cmd_req_get_stats);
-        cmd->va = pci_alloc_consistent(adapter->pdev, cmd->size, &cmd->dma);
+        cmd->va = dma_alloc_coherent(&adapter->pdev->dev, cmd->size, &cmd->dma,
+                                     GFP_KERNEL);
         if (cmd->va == NULL)
                 return -1;
         memset(cmd->va, 0, cmd->size);
@@ -2849,6 +2852,11 @@ static int be_get_config(struct be_adapter *adapter)
         else
                 adapter->max_vlans = BE_NUM_VLANS_SUPPORTED;
 
+        status = be_cmd_get_cntl_attributes(adapter);
+        if (status)
+                return status;
+
+        be_cmd_check_native_mode(adapter);
         return 0;
 }
 
@@ -2890,6 +2898,54 @@ static int be_dev_family_check(struct be_adapter *adapter)
         return 0;
 }
 
+static int lancer_wait_ready(struct be_adapter *adapter)
+{
+#define SLIPORT_READY_TIMEOUT 500
+        u32 sliport_status;
+        int status = 0, i;
+
+        for (i = 0; i < SLIPORT_READY_TIMEOUT; i++) {
+                sliport_status = ioread32(adapter->db + SLIPORT_STATUS_OFFSET);
+                if (sliport_status & SLIPORT_STATUS_RDY_MASK)
+                        break;
+
+                msleep(20);
+        }
+
+        if (i == SLIPORT_READY_TIMEOUT)
+                status = -1;
+
+        return status;
+}
+
+static int lancer_test_and_set_rdy_state(struct be_adapter *adapter)
+{
+        int status;
+        u32 sliport_status, err, reset_needed;
+        status = lancer_wait_ready(adapter);
+        if (!status) {
+                sliport_status = ioread32(adapter->db + SLIPORT_STATUS_OFFSET);
+                err = sliport_status & SLIPORT_STATUS_ERR_MASK;
+                reset_needed = sliport_status & SLIPORT_STATUS_RN_MASK;
+                if (err && reset_needed) {
+                        iowrite32(SLI_PORT_CONTROL_IP_MASK,
+                                        adapter->db + SLIPORT_CONTROL_OFFSET);
+
+                        /* check adapter has corrected the error */
+                        status = lancer_wait_ready(adapter);
+                        sliport_status = ioread32(adapter->db +
+                                                        SLIPORT_STATUS_OFFSET);
+                        sliport_status &= (SLIPORT_STATUS_ERR_MASK |
+                                                SLIPORT_STATUS_RN_MASK);
+                        if (status || sliport_status)
+                                status = -1;
+                } else if (err || reset_needed) {
+                        status = -1;
+                }
+        }
+        return status;
+}
+
 static int __devinit be_probe(struct pci_dev *pdev,
                         const struct pci_device_id *pdev_id)
 {
@@ -2922,11 +2978,11 @@ static int __devinit be_probe(struct pci_dev *pdev,
         adapter->netdev = netdev;
         SET_NETDEV_DEV(netdev, &pdev->dev);
 
-        status = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
+        status = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
         if (!status) {
                 netdev->features |= NETIF_F_HIGHDMA;
         } else {
-                status = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+                status = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
                 if (status) {
                         dev_err(&pdev->dev, "Could not set PCI DMA Mask\n");
                         goto free_netdev;
@@ -2939,6 +2995,14 @@ static int __devinit be_probe(struct pci_dev *pdev,
         if (status)
                 goto free_netdev;
 
+        if (lancer_chip(adapter)) {
+                status = lancer_test_and_set_rdy_state(adapter);
+                if (status) {
+                        dev_err(&pdev->dev, "Adapter in non recoverable error\n");
+                        goto free_netdev;
+                }
+        }
+
         /* sync up with fw's ready state */
         if (be_physfn(adapter)) {
                 status = be_cmd_POST(adapter);
@@ -2951,11 +3015,9 @@ static int __devinit be_probe(struct pci_dev *pdev,
         if (status)
                 goto ctrl_clean;
 
-        if (be_physfn(adapter)) {
-                status = be_cmd_reset_function(adapter);
-                if (status)
-                        goto ctrl_clean;
-        }
+        status = be_cmd_reset_function(adapter);
+        if (status)
+                goto ctrl_clean;
 
         status = be_stats_init(adapter);
         if (status)
@@ -2979,10 +3041,18 @@ static int __devinit be_probe(struct pci_dev *pdev,
                 goto unsetup;
         netif_carrier_off(netdev);
 
+        if (be_physfn(adapter) && adapter->sriov_enabled) {
+                status = be_vf_eth_addr_config(adapter);
+                if (status)
+                        goto unreg_netdev;
+        }
+
         dev_info(&pdev->dev, "%s port %d\n", nic_name(pdev), adapter->port_num);
         schedule_delayed_work(&adapter->work, msecs_to_jiffies(100));
         return 0;
 
+unreg_netdev:
+        unregister_netdev(netdev);
 unsetup:
         be_clear(adapter);
 msix_disable:
@@ -3009,6 +3079,7 @@ static int be_suspend(struct pci_dev *pdev, pm_message_t state)
         struct be_adapter *adapter = pci_get_drvdata(pdev);
         struct net_device *netdev =  adapter->netdev;
 
+        cancel_delayed_work_sync(&adapter->work);
         if (adapter->wol)
                 be_setup_wol(adapter, true);
 
@@ -3021,6 +3092,7 @@ static int be_suspend(struct pci_dev *pdev, pm_message_t state)
         be_cmd_get_flow_control(adapter, &adapter->tx_fc, &adapter->rx_fc);
         be_clear(adapter);
 
+        be_msix_disable(adapter);
         pci_save_state(pdev);
         pci_disable_device(pdev);
         pci_set_power_state(pdev, pci_choose_state(pdev, state));
@@ -3042,6 +3114,7 @@ static int be_resume(struct pci_dev *pdev)
         pci_set_power_state(pdev, 0);
         pci_restore_state(pdev);
 
+        be_msix_enable(adapter);
         /* tell fw we're ready to fire cmds */
         status = be_cmd_fw_init(adapter);
         if (status)
@@ -3057,6 +3130,8 @@ static int be_resume(struct pci_dev *pdev)
 
         if (adapter->wol)
                 be_setup_wol(adapter, false);
+
+        schedule_delayed_work(&adapter->work, msecs_to_jiffies(100));
         return 0;
 }
 
@@ -3068,6 +3143,9 @@ static void be_shutdown(struct pci_dev *pdev)
         struct be_adapter *adapter = pci_get_drvdata(pdev);
         struct net_device *netdev =  adapter->netdev;
 
+        if (netif_running(netdev))
+                cancel_delayed_work_sync(&adapter->work);
+
         netif_device_detach(netdev);
 
         be_cmd_reset_function(adapter);
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 22abfb39d81..68d45ba2d9b 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -1237,8 +1237,17 @@ static int bfin_mac_enable(struct phy_device *phydev)
 
         if (phydev->interface == PHY_INTERFACE_MODE_RMII) {
                 opmode |= RMII; /* For Now only 100MBit are supported */
-#if (defined(CONFIG_BF537) || defined(CONFIG_BF536)) && CONFIG_BF_REV_0_2
-                opmode |= TE;
+#if defined(CONFIG_BF537) || defined(CONFIG_BF536)
+                if (__SILICON_REVISION__ < 3) {
+                        /*
+                         * This isn't publicly documented (fun times!), but in
+                         * silicon <=0.2, the RX and TX pins are clocked together.
+                         * So in order to recv, we must enable the transmit side
+                         * as well.  This will cause a spurious TX interrupt too,
+                         * but we can easily consume that.
+                         */
+                        opmode |= TE;
+                }
 #endif
         }
 
diff --git a/drivers/net/bna/bnad.c b/drivers/net/bna/bnad.c
index fad912656fe..9f356d5d0f3 100644
--- a/drivers/net/bna/bnad.c
+++ b/drivers/net/bna/bnad.c
@@ -126,22 +126,22 @@ bnad_free_all_txbufs(struct bnad *bnad,
                 }
                 unmap_array[unmap_cons].skb = NULL;
 
-                pci_unmap_single(bnad->pcidev,
-                                 pci_unmap_addr(&unmap_array[unmap_cons],
+                dma_unmap_single(&bnad->pcidev->dev,
+                                 dma_unmap_addr(&unmap_array[unmap_cons],
                                                 dma_addr), skb_headlen(skb),
-                                                PCI_DMA_TODEVICE);
+                                                DMA_TO_DEVICE);
 
-                pci_unmap_addr_set(&unmap_array[unmap_cons], dma_addr, 0);
+                dma_unmap_addr_set(&unmap_array[unmap_cons], dma_addr, 0);
                 if (++unmap_cons >= unmap_q->q_depth)
                         break;
 
                 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-                        pci_unmap_page(bnad->pcidev,
-                                       pci_unmap_addr(&unmap_array[unmap_cons],
+                        dma_unmap_page(&bnad->pcidev->dev,
+                                       dma_unmap_addr(&unmap_array[unmap_cons],
                                                       dma_addr),
                                        skb_shinfo(skb)->frags[i].size,
-                                       PCI_DMA_TODEVICE);
-                        pci_unmap_addr_set(&unmap_array[unmap_cons], dma_addr,
+                                       DMA_TO_DEVICE);
+                        dma_unmap_addr_set(&unmap_array[unmap_cons], dma_addr,
                                            0);
                         if (++unmap_cons >= unmap_q->q_depth)
                                 break;
@@ -199,23 +199,23 @@ bnad_free_txbufs(struct bnad *bnad,
                 sent_bytes += skb->len;
                 wis -= BNA_TXQ_WI_NEEDED(1 + skb_shinfo(skb)->nr_frags);
 
-                pci_unmap_single(bnad->pcidev,
-                                 pci_unmap_addr(&unmap_array[unmap_cons],
+                dma_unmap_single(&bnad->pcidev->dev,
+                                 dma_unmap_addr(&unmap_array[unmap_cons],
                                                 dma_addr), skb_headlen(skb),
-                                 PCI_DMA_TODEVICE);
-                pci_unmap_addr_set(&unmap_array[unmap_cons], dma_addr, 0);
+                                 DMA_TO_DEVICE);
+                dma_unmap_addr_set(&unmap_array[unmap_cons], dma_addr, 0);
                 BNA_QE_INDX_ADD(unmap_cons, 1, unmap_q->q_depth);
 
                 prefetch(&unmap_array[unmap_cons + 1]);
                 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                         prefetch(&unmap_array[unmap_cons + 1]);
 
-                        pci_unmap_page(bnad->pcidev,
-                                       pci_unmap_addr(&unmap_array[unmap_cons],
+                        dma_unmap_page(&bnad->pcidev->dev,
+                                       dma_unmap_addr(&unmap_array[unmap_cons],
                                                       dma_addr),
                                        skb_shinfo(skb)->frags[i].size,
-                                       PCI_DMA_TODEVICE);
-                        pci_unmap_addr_set(&unmap_array[unmap_cons], dma_addr,
+                                       DMA_TO_DEVICE);
+                        dma_unmap_addr_set(&unmap_array[unmap_cons], dma_addr,
                                            0);
                         BNA_QE_INDX_ADD(unmap_cons, 1, unmap_q->q_depth);
                 }
@@ -340,19 +340,22 @@ static void
 bnad_free_all_rxbufs(struct bnad *bnad, struct bna_rcb *rcb)
 {
         struct bnad_unmap_q *unmap_q;
+        struct bnad_skb_unmap *unmap_array;
         struct sk_buff *skb;
         int unmap_cons;
 
         unmap_q = rcb->unmap_q;
+        unmap_array = unmap_q->unmap_array;
         for (unmap_cons = 0; unmap_cons < unmap_q->q_depth; unmap_cons++) {
-                skb = unmap_q->unmap_array[unmap_cons].skb;
+                skb = unmap_array[unmap_cons].skb;
                 if (!skb)
                         continue;
-                unmap_q->unmap_array[unmap_cons].skb = NULL;
-                pci_unmap_single(bnad->pcidev, pci_unmap_addr(&unmap_q->
-                                        unmap_array[unmap_cons],
-                                        dma_addr), rcb->rxq->buffer_size,
-                                        PCI_DMA_FROMDEVICE);
+                unmap_array[unmap_cons].skb = NULL;
+                dma_unmap_single(&bnad->pcidev->dev,
+                                 dma_unmap_addr(&unmap_array[unmap_cons],
+                                                dma_addr),
+                                 rcb->rxq->buffer_size,
+                                 DMA_FROM_DEVICE);
                 dev_kfree_skb(skb);
         }
         bnad_reset_rcb(bnad, rcb);
@@ -391,9 +394,10 @@ bnad_alloc_n_post_rxbufs(struct bnad *bnad, struct bna_rcb *rcb)
                 skb->dev = bnad->netdev;
                 skb_reserve(skb, NET_IP_ALIGN);
                 unmap_array[unmap_prod].skb = skb;
-                dma_addr = pci_map_single(bnad->pcidev, skb->data,
-                        rcb->rxq->buffer_size, PCI_DMA_FROMDEVICE);
-                pci_unmap_addr_set(&unmap_array[unmap_prod], dma_addr,
+                dma_addr = dma_map_single(&bnad->pcidev->dev, skb->data,
+                                          rcb->rxq->buffer_size,
+                                          DMA_FROM_DEVICE);
+                dma_unmap_addr_set(&unmap_array[unmap_prod], dma_addr,
                                    dma_addr);
                 BNA_SET_DMA_ADDR(dma_addr, &rxent->host_addr);
                 BNA_QE_INDX_ADD(unmap_prod, 1, unmap_q->q_depth);
@@ -434,8 +438,9 @@ bnad_poll_cq(struct bnad *bnad, struct bna_ccb *ccb, int budget)
         struct bna_rcb *rcb = NULL;
         unsigned int wi_range, packets = 0, wis = 0;
         struct bnad_unmap_q *unmap_q;
+        struct bnad_skb_unmap *unmap_array;
         struct sk_buff *skb;
-        u32 flags;
+        u32 flags, unmap_cons;
         u32 qid0 = ccb->rcb[0]->rxq->rxq_id;
         struct bna_pkt_rate *pkt_rt = &ccb->pkt_rate;
 
@@ -456,17 +461,17 @@ bnad_poll_cq(struct bnad *bnad, struct bna_ccb *ccb, int budget)
                         rcb = ccb->rcb[1];
 
                 unmap_q = rcb->unmap_q;
+                unmap_array = unmap_q->unmap_array;
+                unmap_cons = unmap_q->consumer_index;
 
-                skb = unmap_q->unmap_array[unmap_q->consumer_index].skb;
+                skb = unmap_array[unmap_cons].skb;
                 BUG_ON(!(skb));
-                unmap_q->unmap_array[unmap_q->consumer_index].skb = NULL;
-                pci_unmap_single(bnad->pcidev,
-                                 pci_unmap_addr(&unmap_q->
-                                                unmap_array[unmap_q->
-                                                            consumer_index],
+                unmap_array[unmap_cons].skb = NULL;
+                dma_unmap_single(&bnad->pcidev->dev,
+                                 dma_unmap_addr(&unmap_array[unmap_cons],
                                                 dma_addr),
-                                                rcb->rxq->buffer_size,
-                                                PCI_DMA_FROMDEVICE);
+                                 rcb->rxq->buffer_size,
+                                 DMA_FROM_DEVICE);
                 BNA_QE_INDX_ADD(unmap_q->consumer_index, 1, unmap_q->q_depth);
 
                 /* Should be more efficient ? Performance ? */
@@ -1015,9 +1020,9 @@ bnad_mem_free(struct bnad *bnad,
                         if (mem_info->mem_type == BNA_MEM_T_DMA) {
                                 BNA_GET_DMA_ADDR(&(mem_info->mdl[i].dma),
                                                 dma_pa);
-                                pci_free_consistent(bnad->pcidev,
-                                                mem_info->mdl[i].len,
-                                                mem_info->mdl[i].kva, dma_pa);
+                                dma_free_coherent(&bnad->pcidev->dev,
+                                                  mem_info->mdl[i].len,
+                                                  mem_info->mdl[i].kva, dma_pa);
                         } else
                                 kfree(mem_info->mdl[i].kva);
                 }
@@ -1047,8 +1052,9 @@ bnad_mem_alloc(struct bnad *bnad,
                 for (i = 0; i < mem_info->num; i++) {
                         mem_info->mdl[i].len = mem_info->len;
                         mem_info->mdl[i].kva =
-                                pci_alloc_consistent(bnad->pcidev,
-                                                mem_info->len, &dma_pa);
+                                dma_alloc_coherent(&bnad->pcidev->dev,
+                                                mem_info->len, &dma_pa,
+                                                GFP_KERNEL);
 
                         if (mem_info->mdl[i].kva == NULL)
                                 goto err_return;
@@ -2600,9 +2606,9 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
         unmap_q->unmap_array[unmap_prod].skb = skb;
         BUG_ON(!(skb_headlen(skb) <= BFI_TX_MAX_DATA_PER_VECTOR));
         txqent->vector[vect_id].length = htons(skb_headlen(skb));
-        dma_addr = pci_map_single(bnad->pcidev, skb->data, skb_headlen(skb),
-                PCI_DMA_TODEVICE);
-        pci_unmap_addr_set(&unmap_q->unmap_array[unmap_prod], dma_addr,
+        dma_addr = dma_map_single(&bnad->pcidev->dev, skb->data,
+                                  skb_headlen(skb), DMA_TO_DEVICE);
+        dma_unmap_addr_set(&unmap_q->unmap_array[unmap_prod], dma_addr,
                            dma_addr);
 
         BNA_SET_DMA_ADDR(dma_addr, &txqent->vector[vect_id].host_addr);
@@ -2630,11 +2636,9 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
 
                 BUG_ON(!(size <= BFI_TX_MAX_DATA_PER_VECTOR));
                 txqent->vector[vect_id].length = htons(size);
-                dma_addr =
-                        pci_map_page(bnad->pcidev, frag->page,
-                                     frag->page_offset, size,
-                                     PCI_DMA_TODEVICE);
-                pci_unmap_addr_set(&unmap_q->unmap_array[unmap_prod], dma_addr,
+                dma_addr = dma_map_page(&bnad->pcidev->dev, frag->page,
+                                        frag->page_offset, size, DMA_TO_DEVICE);
+                dma_unmap_addr_set(&unmap_q->unmap_array[unmap_prod], dma_addr,
                                    dma_addr);
                 BNA_SET_DMA_ADDR(dma_addr, &txqent->vector[vect_id].host_addr);
                 BNA_QE_INDX_ADD(unmap_prod, 1, unmap_q->q_depth);
@@ -3022,14 +3026,14 @@ bnad_pci_init(struct bnad *bnad,
         err = pci_request_regions(pdev, BNAD_NAME);
         if (err)
                 goto disable_device;
-        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
-            !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
+        if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
+            !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
                 *using_dac = 1;
         } else {
-                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+                err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
                 if (err) {
-                        err = pci_set_consistent_dma_mask(pdev,
-                                                DMA_BIT_MASK(32));
+                        err = dma_set_coherent_mask(&pdev->dev,
+                                                    DMA_BIT_MASK(32));
                         if (err)
                                 goto release_regions;
                 }
diff --git a/drivers/net/bna/bnad.h b/drivers/net/bna/bnad.h
index 8b1d51557de..a89117fa497 100644
--- a/drivers/net/bna/bnad.h
+++ b/drivers/net/bna/bnad.h
@@ -181,7 +181,7 @@ struct bnad_rx_info {
 /* Unmap queues for Tx / Rx cleanup */
 struct bnad_skb_unmap {
         struct sk_buff          *skb;
-        DECLARE_PCI_UNMAP_ADDR(dma_addr)
+        DEFINE_DMA_UNMAP_ADDR(dma_addr);
 };
 
 struct bnad_unmap_q {
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index df99edf3464..8e6d618b530 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -1,6 +1,6 @@
 /* bnx2.c: Broadcom NX2 network driver.
  *
- * Copyright (c) 2004-2010 Broadcom Corporation
+ * Copyright (c) 2004-2011 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,11 +56,11 @@
 #include "bnx2_fw.h"
 
 #define DRV_MODULE_NAME         "bnx2"
-#define DRV_MODULE_VERSION      "2.0.21"
-#define DRV_MODULE_RELDATE      "Dec 23, 2010"
+#define DRV_MODULE_VERSION      "2.1.6"
+#define DRV_MODULE_RELDATE      "Mar 7, 2011"
 #define FW_MIPS_FILE_06         "bnx2/bnx2-mips-06-6.2.1.fw"
 #define FW_RV2P_FILE_06         "bnx2/bnx2-rv2p-06-6.0.15.fw"
-#define FW_MIPS_FILE_09         "bnx2/bnx2-mips-09-6.2.1.fw"
+#define FW_MIPS_FILE_09         "bnx2/bnx2-mips-09-6.2.1a.fw"
 #define FW_RV2P_FILE_09_Ax      "bnx2/bnx2-rv2p-09ax-6.0.17.fw"
 #define FW_RV2P_FILE_09         "bnx2/bnx2-rv2p-09-6.0.17.fw"
 
@@ -435,7 +435,8 @@ bnx2_cnic_stop(struct bnx2 *bp)
         struct cnic_ctl_info info;
 
         mutex_lock(&bp->cnic_lock);
-        c_ops = bp->cnic_ops;
+        c_ops = rcu_dereference_protected(bp->cnic_ops,
+                                          lockdep_is_held(&bp->cnic_lock));
         if (c_ops) {
                 info.cmd = CNIC_CTL_STOP_CMD;
                 c_ops->cnic_ctl(bp->cnic_data, &info);
@@ -450,7 +451,8 @@ bnx2_cnic_start(struct bnx2 *bp)
         struct cnic_ctl_info info;
 
         mutex_lock(&bp->cnic_lock);
-        c_ops = bp->cnic_ops;
+        c_ops = rcu_dereference_protected(bp->cnic_ops,
+                                          lockdep_is_held(&bp->cnic_lock));
         if (c_ops) {
                 if (!(bp->flags & BNX2_FLAG_USING_MSIX)) {
                         struct bnx2_napi *bnapi = &bp->bnx2_napi[0];
@@ -7553,6 +7555,10 @@ bnx2_set_flags(struct net_device *dev, u32 data)
             !(data & ETH_FLAG_RXVLAN))
                 return -EINVAL;
 
+        /* TSO with VLAN tag won't work with current firmware */
+        if (!(data & ETH_FLAG_TXVLAN))
+                return -EINVAL;
+
         rc = ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH | ETH_FLAG_RXVLAN |
                                   ETH_FLAG_TXVLAN);
         if (rc)
@@ -7962,11 +7968,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 
                 /* AER (Advanced Error Reporting) hooks */
                 err = pci_enable_pcie_error_reporting(pdev);
-                if (err) {
-                        dev_err(&pdev->dev, "pci_enable_pcie_error_reporting "
-                                            "failed 0x%x\n", err);
-                        /* non-fatal, continue */
-                }
+                if (!err)
+                        bp->flags |= BNX2_FLAG_AER_ENABLED;
 
         } else {
                 bp->pcix_cap = pci_find_capability(pdev, PCI_CAP_ID_PCIX);
@@ -8229,8 +8232,10 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         return 0;
 
 err_out_unmap:
-        if (bp->flags & BNX2_FLAG_PCIE)
+        if (bp->flags & BNX2_FLAG_AER_ENABLED) {
                 pci_disable_pcie_error_reporting(pdev);
+                bp->flags &= ~BNX2_FLAG_AER_ENABLED;
+        }
 
         if (bp->regview) {
                 iounmap(bp->regview);
@@ -8312,7 +8317,7 @@ static const struct net_device_ops bnx2_netdev_ops = {
 #endif
 };
 
-static void inline vlan_features_add(struct net_device *dev, unsigned long flags)
+static inline void vlan_features_add(struct net_device *dev, u32 flags)
 {
         dev->vlan_features |= flags;
 }
@@ -8418,8 +8423,10 @@ bnx2_remove_one(struct pci_dev *pdev)
 
         kfree(bp->temp_stats_blk);
 
-        if (bp->flags & BNX2_FLAG_PCIE)
+        if (bp->flags & BNX2_FLAG_AER_ENABLED) {
                 pci_disable_pcie_error_reporting(pdev);
+                bp->flags &= ~BNX2_FLAG_AER_ENABLED;
+        }
 
         free_netdev(dev);
 
@@ -8535,7 +8542,7 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev)
         }
         rtnl_unlock();
 
-        if (!(bp->flags & BNX2_FLAG_PCIE))
+        if (!(bp->flags & BNX2_FLAG_AER_ENABLED))
                 return result;
 
         err = pci_cleanup_aer_uncorrect_error_status(pdev);
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 5488a2e82fe..68020451dc4 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -1,6 +1,6 @@
 /* bnx2.h: Broadcom NX2 network driver.
  *
- * Copyright (c) 2004-2009 Broadcom Corporation
+ * Copyright (c) 2004-2011 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -6207,6 +6207,8 @@ struct l2_fhdr {
 
 #define BNX2_CP_SCRATCH                                 0x001a0000
 
+#define BNX2_FW_MAX_ISCSI_CONN                           0x001a0080
+
 
 /*
  *  mcp_reg definition
@@ -6741,6 +6743,7 @@ struct bnx2 {
 #define BNX2_FLAG_JUMBO_BROKEN          0x00000800
 #define BNX2_FLAG_CAN_KEEP_VLAN         0x00001000
 #define BNX2_FLAG_BROKEN_STATS          0x00002000
+#define BNX2_FLAG_AER_ENABLED           0x00004000
 
         struct bnx2_napi        bnx2_napi[BNX2_MAX_MSIX_VEC];
 
@@ -6758,7 +6761,7 @@ struct bnx2 {
         u32             tx_wake_thresh;
 
 #ifdef BCM_CNIC
-        struct cnic_ops         *cnic_ops;
+        struct cnic_ops __rcu   *cnic_ops;
         void                    *cnic_data;
 #endif
 
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index a6cd335c943..b7ff87b35fb 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -22,8 +22,8 @@
  * (you will need to reboot afterwards) */
 /* #define BNX2X_STOP_ON_ERROR */
 
-#define DRV_MODULE_VERSION      "1.62.00-3"
-#define DRV_MODULE_RELDATE      "2010/12/21"
+#define DRV_MODULE_VERSION      "1.62.11-0"
+#define DRV_MODULE_RELDATE      "2011/01/31"
 #define BNX2X_BC_VER            0x040200
 
 #define BNX2X_MULTI_QUEUE
@@ -31,7 +31,7 @@
 #define BNX2X_NEW_NAPI
 
 #if defined(CONFIG_DCB)
-#define BCM_DCB
+#define BCM_DCBNL
 #endif
 #if defined(CONFIG_CNIC) || defined(CONFIG_CNIC_MODULE)
 #define BCM_CNIC 1
@@ -129,6 +129,7 @@ void bnx2x_panic_dump(struct bnx2x *bp);
 #endif
 
 #define bnx2x_mc_addr(ha)      ((ha)->addr)
+#define bnx2x_uc_addr(ha)      ((ha)->addr)
 
 #define U64_LO(x)                       (u32)(((u64)(x)) & 0xffffffff)
 #define U64_HI(x)                       (u32)(((u64)(x)) >> 32)
@@ -341,6 +342,8 @@ struct bnx2x_fastpath {
         /* chip independed shortcut into rx_prods_offset memory */
         u32                     ustorm_rx_prods_offset;
 
+        u32                     rx_buf_size;
+
         dma_addr_t              status_blk_mapping;
 
         struct sw_tx_bd         *tx_buf_ring;
@@ -428,6 +431,10 @@ struct bnx2x_fastpath {
 };
 
 #define bnx2x_fp(bp, nr, var)           (bp->fp[nr].var)
+
+/* Use 2500 as a mini-jumbo MTU for FCoE */
+#define BNX2X_FCOE_MINI_JUMBO_MTU       2500
+
 #ifdef BCM_CNIC
 /* FCoE L2 `fastpath' is right after the eth entries */
 #define FCOE_IDX                        BNX2X_NUM_ETH_QUEUES(bp)
@@ -810,6 +817,7 @@ struct bnx2x_slowpath {
         struct eth_stats_query          fw_stats;
         struct mac_configuration_cmd    mac_config;
         struct mac_configuration_cmd    mcast_config;
+        struct mac_configuration_cmd    uc_mac_config;
         struct client_init_ramrod_data  client_init_data;
 
         /* used by dmae command executer */
@@ -911,7 +919,6 @@ struct bnx2x {
         int                     tx_ring_size;
 
         u32                     rx_csum;
-        u32                     rx_buf_size;
 /* L2 header size + 2*VLANs (8 bytes) + LLC SNAP (8 bytes) */
 #define ETH_OVREHEAD            (ETH_HLEN + 8 + 8)
 #define ETH_MIN_PACKET_SIZE             60
@@ -939,7 +946,7 @@ struct bnx2x {
         struct eth_spe          *spq_prod_bd;
         struct eth_spe          *spq_last_bd;
         __le16                  *dsb_sp_prod;
-        atomic_t                spq_left; /* serialize spq */
+        atomic_t                cq_spq_left; /* ETH_XXX ramrods credit */
         /* used to synchronize spq accesses */
         spinlock_t              spq_lock;
 
@@ -949,6 +956,7 @@ struct bnx2x {
         u16                     eq_prod;
         u16                     eq_cons;
         __le16                  *eq_cons_sb;
+        atomic_t                eq_spq_left; /* COMMON_XXX ramrods credit */
 
         /* Flags for marking that there is a STAT_QUERY or
            SET_MAC ramrod pending */
@@ -976,8 +984,12 @@ struct bnx2x {
 #define MF_FUNC_DIS                     0x1000
 #define FCOE_MACS_SET                   0x2000
 #define NO_FCOE_FLAG                    0x4000
+#define NO_ISCSI_OOO_FLAG               0x8000
+#define NO_ISCSI_FLAG                   0x10000
 
 #define NO_FCOE(bp)             ((bp)->flags & NO_FCOE_FLAG)
+#define NO_ISCSI(bp)            ((bp)->flags & NO_ISCSI_FLAG)
+#define NO_ISCSI_OOO(bp)        ((bp)->flags & NO_ISCSI_OOO_FLAG)
 
         int                     pf_num; /* absolute PF number */
         int                     pfid;   /* per-path PF number */
@@ -1064,6 +1076,7 @@ struct bnx2x {
         int                     num_queues;
         int                     disable_tpa;
         int                     int_mode;
+        u32                     *rx_indir_table;
 
         struct tstorm_eth_mac_filter_config     mac_filters;
 #define BNX2X_ACCEPT_NONE               0x0000
@@ -1110,7 +1123,7 @@ struct bnx2x {
 #define BNX2X_CNIC_FLAG_MAC_SET         1
         void                    *t2;
         dma_addr_t              t2_mapping;
-        struct cnic_ops         *cnic_ops;
+        struct cnic_ops __rcu   *cnic_ops;
         void                    *cnic_data;
         u32                     cnic_tag;
         struct cnic_eth_dev     cnic_eth_dev;
@@ -1125,13 +1138,12 @@ struct bnx2x {
         u16                     cnic_kwq_pending;
         u16                     cnic_spq_pending;
         struct mutex            cnic_mutex;
-        u8                      iscsi_mac[ETH_ALEN];
         u8                      fip_mac[ETH_ALEN];
 #endif
 
         int                     dmae_ready;
         /* used to synchronize dmae accesses */
-        struct mutex            dmae_mutex;
+        spinlock_t              dmae_lock;
 
         /* used to protect the FW mail box */
         struct mutex            fw_mb_mutex;
@@ -1211,6 +1223,7 @@ struct bnx2x {
         /* DCBX Negotation results */
         struct dcbx_features                    dcbx_local_feat;
         u32                                     dcbx_error;
+        u32                                     pending_max;
 };
 
 /**
@@ -1447,6 +1460,12 @@ u32 bnx2x_fw_command(struct bnx2x *bp, u32 command, u32 param);
 void bnx2x_calc_fc_adv(struct bnx2x *bp);
 int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,
                   u32 data_hi, u32 data_lo, int common);
+
+/* Clears multicast and unicast list configuration in the chip. */
+void bnx2x_invalidate_e1_mc_list(struct bnx2x *bp);
+void bnx2x_invalidate_e1h_mc_list(struct bnx2x *bp);
+void bnx2x_invalidate_uc_list(struct bnx2x *bp);
+
 void bnx2x_update_coalesce(struct bnx2x *bp);
 int bnx2x_get_link_cfg_idx(struct bnx2x *bp);
 
@@ -1613,19 +1632,23 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
 #define BNX2X_BTR                       4
 #define MAX_SPQ_PENDING                 8
 
-
-/* CMNG constants
-   derived from lab experiments, and not from system spec calculations !!! */
-#define DEF_MIN_RATE                    100
-/* resolution of the rate shaping timer - 100 usec */
-#define RS_PERIODIC_TIMEOUT_USEC        100
-/* resolution of fairness algorithm in usecs -
-   coefficient for calculating the actual t fair */
-#define T_FAIR_COEF                     10000000
+/* CMNG constants, as derived from system spec calculations */
+/* default MIN rate in case VNIC min rate is configured to zero - 100Mbps */
+#define DEF_MIN_RATE                                    100
+/* resolution of the rate shaping timer - 400 usec */
+#define RS_PERIODIC_TIMEOUT_USEC                        400
 /* number of bytes in single QM arbitration cycle -
-   coefficient for calculating the fairness timer */
-#define QM_ARB_BYTES                    40000
-#define FAIR_MEM                        2
+ * coefficient for calculating the fairness timer */
+#define QM_ARB_BYTES                                    160000
+/* resolution of Min algorithm 1:100 */
+#define MIN_RES                                         100
+/* how many bytes above threshold for the minimal credit of Min algorithm*/
+#define MIN_ABOVE_THRESH                                32768
+/* Fairness algorithm integration time coefficient -
+ * for calculating the actual Tfair */
+#define T_FAIR_COEF     ((MIN_ABOVE_THRESH +  QM_ARB_BYTES) * 8 * MIN_RES)
+/* Memory of fairness algorithm . 2 cycles */
+#define FAIR_MEM                                        2
 
 
 #define ATTN_NIG_FOR_FUNC               (1L << 8)
@@ -1782,5 +1805,6 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,
 BNX2X_EXTERN int load_count[2][3]; /* per path: 0-common, 1-port0, 2-port1 */
 
 extern void bnx2x_set_ethtool_ops(struct net_device *netdev);
+void bnx2x_push_indir_table(struct bnx2x *bp);
 
 #endif /* bnx2x.h */
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c
index 710ce5d04c5..e83ac6dd6fc 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/bnx2x/bnx2x_cmn.c
@@ -232,7 +232,7 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
         /* move empty skb from pool to prod and map it */
         prod_rx_buf->skb = fp->tpa_pool[queue].skb;
         mapping = dma_map_single(&bp->pdev->dev, fp->tpa_pool[queue].skb->data,
-                                 bp->rx_buf_size, DMA_FROM_DEVICE);
+                                 fp->rx_buf_size, DMA_FROM_DEVICE);
         dma_unmap_addr_set(prod_rx_buf, mapping, mapping);
 
         /* move partial skb from cons to pool (don't unmap yet) */
@@ -259,10 +259,44 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,
 #endif
 }
 
+/* Timestamp option length allowed for TPA aggregation:
+ *
+ *              nop nop kind length echo val
+ */
+#define TPA_TSTAMP_OPT_LEN      12
+/**
+ * Calculate the approximate value of the MSS for this
+ * aggregation using the first packet of it.
+ *
+ * @param bp
+ * @param parsing_flags Parsing flags from the START CQE
+ * @param len_on_bd Total length of the first packet for the
+ *                   aggregation.
+ */
+static inline u16 bnx2x_set_lro_mss(struct bnx2x *bp, u16 parsing_flags,
+                                    u16 len_on_bd)
+{
+        /* TPA arrgregation won't have an IP options and TCP options
+         * other than timestamp.
+         */
+        u16 hdrs_len = ETH_HLEN + sizeof(struct iphdr) + sizeof(struct tcphdr);
+
+
+        /* Check if there was a TCP timestamp, if there is it's will
+         * always be 12 bytes length: nop nop kind length echo val.
+         *
+         * Otherwise FW would close the aggregation.
+         */
+        if (parsing_flags & PARSING_FLAGS_TIME_STAMP_EXIST_FLAG)
+                hdrs_len += TPA_TSTAMP_OPT_LEN;
+
+        return len_on_bd - hdrs_len;
+}
+
 static int bnx2x_fill_frag_skb(struct bnx2x *bp, struct bnx2x_fastpath *fp,
                                struct sk_buff *skb,
                                struct eth_fast_path_rx_cqe *fp_cqe,
-                               u16 cqe_idx)
+                               u16 cqe_idx, u16 parsing_flags)
 {
         struct sw_rx_page *rx_pg, old_rx_pg;
         u16 len_on_bd = le16_to_cpu(fp_cqe->len_on_bd);
@@ -275,8 +309,8 @@ static int bnx2x_fill_frag_skb(struct bnx2x *bp, struct bnx2x_fastpath *fp,
 
         /* This is needed in order to enable forwarding support */
         if (frag_size)
-                skb_shinfo(skb)->gso_size = min((u32)SGE_PAGE_SIZE,
-                                               max(frag_size, (u32)len_on_bd));
+                skb_shinfo(skb)->gso_size = bnx2x_set_lro_mss(bp, parsing_flags,
+                                                              len_on_bd);
 
 #ifdef BNX2X_STOP_ON_ERROR
         if (pages > min_t(u32, 8, MAX_SKB_FRAGS)*SGE_PAGE_SIZE*PAGES_PER_SGE) {
@@ -333,26 +367,28 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
         struct sw_rx_bd *rx_buf = &fp->tpa_pool[queue];
         struct sk_buff *skb = rx_buf->skb;
         /* alloc new skb */
-        struct sk_buff *new_skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+        struct sk_buff *new_skb = netdev_alloc_skb(bp->dev, fp->rx_buf_size);
 
         /* Unmap skb in the pool anyway, as we are going to change
            pool entry status to BNX2X_TPA_STOP even if new skb allocation
            fails. */
         dma_unmap_single(&bp->pdev->dev, dma_unmap_addr(rx_buf, mapping),
-                         bp->rx_buf_size, DMA_FROM_DEVICE);
+                         fp->rx_buf_size, DMA_FROM_DEVICE);
 
         if (likely(new_skb)) {
                 /* fix ip xsum and give it to the stack */
                 /* (no need to map the new skb) */
+                u16 parsing_flags =
+                        le16_to_cpu(cqe->fast_path_cqe.pars_flags.flags);
 
                 prefetch(skb);
                 prefetch(((char *)(skb)) + L1_CACHE_BYTES);
 
 #ifdef BNX2X_STOP_ON_ERROR
-                if (pad + len > bp->rx_buf_size) {
+                if (pad + len > fp->rx_buf_size) {
                         BNX2X_ERR("skb_put is about to fail...  "
                                   "pad %d  len %d  rx_buf_size %d\n",
-                                  pad, len, bp->rx_buf_size);
+                                  pad, len, fp->rx_buf_size);
                         bnx2x_panic();
                         return;
                 }
@@ -373,9 +409,9 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
                 }
 
                 if (!bnx2x_fill_frag_skb(bp, fp, skb,
-                                         &cqe->fast_path_cqe, cqe_idx)) {
-                        if ((le16_to_cpu(cqe->fast_path_cqe.
-                            pars_flags.flags) & PARSING_FLAGS_VLAN))
+                                         &cqe->fast_path_cqe, cqe_idx,
+                                         parsing_flags)) {
+                        if (parsing_flags & PARSING_FLAGS_VLAN)
                                 __vlan_hwaccel_put_tag(skb,
                                                  le16_to_cpu(cqe->fast_path_cqe.
                                                              vlan_tag));
@@ -582,7 +618,7 @@ int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
                         if (likely(bnx2x_alloc_rx_skb(bp, fp, bd_prod) == 0)) {
                                 dma_unmap_single(&bp->pdev->dev,
                                         dma_unmap_addr(rx_buf, mapping),
-                                                 bp->rx_buf_size,
+                                                 fp->rx_buf_size,
                                                  DMA_FROM_DEVICE);
                                 skb_reserve(skb, pad);
                                 skb_put(skb, len);
@@ -703,19 +739,20 @@ u16 bnx2x_get_mf_speed(struct bnx2x *bp)
 {
         u16 line_speed = bp->link_vars.line_speed;
         if (IS_MF(bp)) {
-                u16 maxCfg = (bp->mf_config[BP_VN(bp)] &
-                                                FUNC_MF_CFG_MAX_BW_MASK) >>
-                                                FUNC_MF_CFG_MAX_BW_SHIFT;
-                /* Calculate the current MAX line speed limit for the DCC
-                 * capable devices
+                u16 maxCfg = bnx2x_extract_max_cfg(bp,
+                                                   bp->mf_config[BP_VN(bp)]);
+
+                /* Calculate the current MAX line speed limit for the MF
+                 * devices
                  */
-                if (IS_MF_SD(bp)) {
+                if (IS_MF_SI(bp))
+                        line_speed = (line_speed * maxCfg) / 100;
+                else { /* SD mode */
                         u16 vn_max_rate = maxCfg * 100;
 
                         if (vn_max_rate < line_speed)
                                 line_speed = vn_max_rate;
-                } else /* IS_MF_SI(bp)) */
-                        line_speed = (line_speed * maxCfg) / 100;
+                }
         }
 
         return line_speed;
@@ -821,19 +858,16 @@ void bnx2x_init_rx_rings(struct bnx2x *bp)
         u16 ring_prod;
         int i, j;
 
-        bp->rx_buf_size = bp->dev->mtu + ETH_OVREHEAD + BNX2X_RX_ALIGN +
-                IP_HEADER_ALIGNMENT_PADDING;
-
-        DP(NETIF_MSG_IFUP,
-           "mtu %d  rx_buf_size %d\n", bp->dev->mtu, bp->rx_buf_size);
-
         for_each_rx_queue(bp, j) {
                 struct bnx2x_fastpath *fp = &bp->fp[j];
 
+                DP(NETIF_MSG_IFUP,
+                   "mtu %d  rx_buf_size %d\n", bp->dev->mtu, fp->rx_buf_size);
+
                 if (!fp->disable_tpa) {
                         for (i = 0; i < max_agg_queues; i++) {
                                 fp->tpa_pool[i].skb =
-                                   netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+                                   netdev_alloc_skb(bp->dev, fp->rx_buf_size);
                                 if (!fp->tpa_pool[i].skb) {
                                         BNX2X_ERR("Failed to allocate TPA "
                                                   "skb pool for queue[%d] - "
@@ -941,7 +975,7 @@ static void bnx2x_free_rx_skbs(struct bnx2x *bp)
 
                         dma_unmap_single(&bp->pdev->dev,
                                          dma_unmap_addr(rx_buf, mapping),
-                                         bp->rx_buf_size, DMA_FROM_DEVICE);
+                                         fp->rx_buf_size, DMA_FROM_DEVICE);
 
                         rx_buf->skb = NULL;
                         dev_kfree_skb(skb);
@@ -959,6 +993,23 @@ void bnx2x_free_skbs(struct bnx2x *bp)
         bnx2x_free_rx_skbs(bp);
 }
 
+void bnx2x_update_max_mf_config(struct bnx2x *bp, u32 value)
+{
+        /* load old values */
+        u32 mf_cfg = bp->mf_config[BP_VN(bp)];
+
+        if (value != bnx2x_extract_max_cfg(bp, mf_cfg)) {
+                /* leave all but MAX value */
+                mf_cfg &= ~FUNC_MF_CFG_MAX_BW_MASK;
+
+                /* set new MAX value */
+                mf_cfg |= (value << FUNC_MF_CFG_MAX_BW_SHIFT)
+                                & FUNC_MF_CFG_MAX_BW_MASK;
+
+                bnx2x_fw_command(bp, DRV_MSG_CODE_SET_MF_BW, mf_cfg);
+        }
+}
+
 static void bnx2x_free_msix_irqs(struct bnx2x *bp)
 {
         int i, offset = 1;
@@ -1249,6 +1300,31 @@ static inline int bnx2x_set_real_num_queues(struct bnx2x *bp)
         return rc;
 }
 
+static inline void bnx2x_set_rx_buf_size(struct bnx2x *bp)
+{
+        int i;
+
+        for_each_queue(bp, i) {
+                struct bnx2x_fastpath *fp = &bp->fp[i];
+
+                /* Always use a mini-jumbo MTU for the FCoE L2 ring */
+                if (IS_FCOE_IDX(i))
+                        /*
+                         * Although there are no IP frames expected to arrive to
+                         * this ring we still want to add an
+                         * IP_HEADER_ALIGNMENT_PADDING to prevent a buffer
+                         * overrun attack.
+                         */
+                        fp->rx_buf_size =
+                                BNX2X_FCOE_MINI_JUMBO_MTU + ETH_OVREHEAD +
+                                BNX2X_RX_ALIGN + IP_HEADER_ALIGNMENT_PADDING;
+                else
+                        fp->rx_buf_size =
+                                bp->dev->mtu + ETH_OVREHEAD + BNX2X_RX_ALIGN +
+                                IP_HEADER_ALIGNMENT_PADDING;
+        }
+}
+
 /* must be called with rtnl_lock */
 int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
 {
@@ -1272,6 +1348,9 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
         /* must be called before memory allocation and HW init */
         bnx2x_ilt_set_info(bp);
 
+        /* Set the receive queues buffer size */
+        bnx2x_set_rx_buf_size(bp);
+
         if (bnx2x_alloc_mem(bp))
                 return -ENOMEM;
 
@@ -1427,28 +1506,40 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
 
         bnx2x_set_eth_mac(bp, 1);
 
+        /* Clear MC configuration */
+        if (CHIP_IS_E1(bp))
+                bnx2x_invalidate_e1_mc_list(bp);
+        else
+                bnx2x_invalidate_e1h_mc_list(bp);
+
+        /* Clear UC lists configuration */
+        bnx2x_invalidate_uc_list(bp);
+
+        if (bp->pending_max) {
+                bnx2x_update_max_mf_config(bp, bp->pending_max);
+                bp->pending_max = 0;
+        }
+
         if (bp->port.pmf)
                 bnx2x_initial_phy_init(bp, load_mode);
 
+        /* Initialize Rx filtering */
+        bnx2x_set_rx_mode(bp->dev);
+
         /* Start fast path */
         switch (load_mode) {
         case LOAD_NORMAL:
                 /* Tx queue should be only reenabled */
                 netif_tx_wake_all_queues(bp->dev);
                 /* Initialize the receive filter. */
-                bnx2x_set_rx_mode(bp->dev);
                 break;
 
         case LOAD_OPEN:
                 netif_tx_start_all_queues(bp->dev);
                 smp_mb__after_clear_bit();
-                /* Initialize the receive filter. */
-                bnx2x_set_rx_mode(bp->dev);
                 break;
 
         case LOAD_DIAG:
-                /* Initialize the receive filter. */
-                bnx2x_set_rx_mode(bp->dev);
                 bp->state = BNX2X_STATE_DIAG;
                 break;
 
diff --git a/drivers/net/bnx2x/bnx2x_cmn.h b/drivers/net/bnx2x/bnx2x_cmn.h
index 03eb4d68e6b..ef37b98d614 100644
--- a/drivers/net/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/bnx2x/bnx2x_cmn.h
@@ -341,6 +341,15 @@ void bnx2x_dcbx_init(struct bnx2x *bp);
  */
 int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state);
 
+/**
+ * Updates MAX part of MF configuration in HW
+ * (if required)
+ *
+ * @param bp
+ * @param value
+ */
+void bnx2x_update_max_mf_config(struct bnx2x *bp, u32 value);
+
 /* dev_close main block */
 int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode);
 
@@ -822,11 +831,11 @@ static inline int bnx2x_alloc_rx_skb(struct bnx2x *bp,
         struct eth_rx_bd *rx_bd = &fp->rx_desc_ring[index];
         dma_addr_t mapping;
 
-        skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+        skb = netdev_alloc_skb(bp->dev, fp->rx_buf_size);
         if (unlikely(skb == NULL))
                 return -ENOMEM;
 
-        mapping = dma_map_single(&bp->pdev->dev, skb->data, bp->rx_buf_size,
+        mapping = dma_map_single(&bp->pdev->dev, skb->data, fp->rx_buf_size,
                                  DMA_FROM_DEVICE);
         if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {
                 dev_kfree_skb(skb);
@@ -892,7 +901,7 @@ static inline void bnx2x_free_tpa_pool(struct bnx2x *bp,
                 if (fp->tpa_state[i] == BNX2X_TPA_START)
                         dma_unmap_single(&bp->pdev->dev,
                                          dma_unmap_addr(rx_buf, mapping),
-                                         bp->rx_buf_size, DMA_FROM_DEVICE);
+                                         fp->rx_buf_size, DMA_FROM_DEVICE);
 
                 dev_kfree_skb(skb);
                 rx_buf->skb = NULL;
@@ -1044,4 +1053,24 @@ static inline void storm_memset_cmng(struct bnx2x *bp,
 void bnx2x_acquire_phy_lock(struct bnx2x *bp);
 void bnx2x_release_phy_lock(struct bnx2x *bp);
 
+/**
+ * Extracts MAX BW part from MF configuration.
+ *
+ * @param bp
+ * @param mf_cfg
+ *
+ * @return u16
+ */
+static inline u16 bnx2x_extract_max_cfg(struct bnx2x *bp, u32 mf_cfg)
+{
+        u16 max_cfg = (mf_cfg & FUNC_MF_CFG_MAX_BW_MASK) >>
+                              FUNC_MF_CFG_MAX_BW_SHIFT;
+        if (!max_cfg) {
+                BNX2X_ERR("Illegal configuration detected for Max BW - "
+                          "using 100 instead\n");
+                max_cfg = 100;
+        }
+        return max_cfg;
+}
+
 #endif /* BNX2X_CMN_H */
diff --git a/drivers/net/bnx2x/bnx2x_dcb.c b/drivers/net/bnx2x/bnx2x_dcb.c
index fb60021f81f..9a24d79c71d 100644
--- a/drivers/net/bnx2x/bnx2x_dcb.c
+++ b/drivers/net/bnx2x/bnx2x_dcb.c
@@ -19,6 +19,9 @@
 #include <linux/netdevice.h>
 #include <linux/types.h>
 #include <linux/errno.h>
+#ifdef BCM_DCBNL
+#include <linux/dcbnl.h>
+#endif
 
 #include "bnx2x.h"
 #include "bnx2x_cmn.h"
@@ -508,13 +511,75 @@ static int bnx2x_dcbx_read_shmem_neg_results(struct bnx2x *bp)
         return 0;
 }
 
+
+#ifdef BCM_DCBNL
+static inline
+u8 bnx2x_dcbx_dcbnl_app_up(struct dcbx_app_priority_entry *ent)
+{
+        u8 pri;
+
+        /* Choose the highest priority */
+        for (pri = MAX_PFC_PRIORITIES - 1; pri > 0; pri--)
+                if (ent->pri_bitmap & (1 << pri))
+                        break;
+        return pri;
+}
+
+static inline
+u8 bnx2x_dcbx_dcbnl_app_idtype(struct dcbx_app_priority_entry *ent)
+{
+        return ((ent->appBitfield & DCBX_APP_ENTRY_SF_MASK) ==
+                DCBX_APP_SF_PORT) ? DCB_APP_IDTYPE_PORTNUM :
+                DCB_APP_IDTYPE_ETHTYPE;
+}
+
+static inline
+void bnx2x_dcbx_invalidate_local_apps(struct bnx2x *bp)
+{
+        int i;
+        for (i = 0; i < DCBX_MAX_APP_PROTOCOL; i++)
+                bp->dcbx_local_feat.app.app_pri_tbl[i].appBitfield &=
+                                                        ~DCBX_APP_ENTRY_VALID;
+}
+
+int bnx2x_dcbnl_update_applist(struct bnx2x *bp, bool delall)
+{
+        int i, err = 0;
+
+        for (i = 0; i < DCBX_MAX_APP_PROTOCOL && err == 0; i++) {
+                struct dcbx_app_priority_entry *ent =
+                        &bp->dcbx_local_feat.app.app_pri_tbl[i];
+
+                if (ent->appBitfield & DCBX_APP_ENTRY_VALID) {
+                        u8 up = bnx2x_dcbx_dcbnl_app_up(ent);
+
+                        /* avoid invalid user-priority */
+                        if (up) {
+                                struct dcb_app app;
+                                app.selector = bnx2x_dcbx_dcbnl_app_idtype(ent);
+                                app.protocol = ent->app_id;
+                                app.priority = delall ? 0 : up;
+                                err = dcb_setapp(bp->dev, &app);
+                        }
+                }
+        }
+        return err;
+}
+#endif
+
 void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state)
 {
         switch (state) {
         case BNX2X_DCBX_STATE_NEG_RECEIVED:
                 {
                         DP(NETIF_MSG_LINK, "BNX2X_DCBX_STATE_NEG_RECEIVED\n");
-
+#ifdef BCM_DCBNL
+                        /**
+                         * Delete app tlvs from dcbnl before reading new
+                         * negotiation results
+                         */
+                        bnx2x_dcbnl_update_applist(bp, true);
+#endif
                         /* Read neg results if dcbx is in the FW */
                         if (bnx2x_dcbx_read_shmem_neg_results(bp))
                                 return;
@@ -526,10 +591,24 @@ void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state)
                                                  bp->dcbx_error);
 
                         if (bp->state != BNX2X_STATE_OPENING_WAIT4_LOAD) {
+#ifdef BCM_DCBNL
+                                /**
+                                 * Add new app tlvs to dcbnl
+                                 */
+                                bnx2x_dcbnl_update_applist(bp, false);
+#endif
                                 bnx2x_dcbx_stop_hw_tx(bp);
                                 return;
                         }
                         /* fall through */
+#ifdef BCM_DCBNL
+                        /**
+                         * Invalidate the local app tlvs if they are not added
+                         * to the dcbnl app list to avoid deleting them from
+                         * the list later on
+                         */
+                        bnx2x_dcbx_invalidate_local_apps(bp);
+#endif
                 }
         case BNX2X_DCBX_STATE_TX_PAUSED:
                 DP(NETIF_MSG_LINK, "BNX2X_DCBX_STATE_TX_PAUSED\n");
@@ -1505,8 +1584,7 @@ static void bnx2x_pfc_fw_struct_e2(struct bnx2x *bp)
         bnx2x_dcbx_print_cos_params(bp, pfc_fw_cfg);
 }
 /* DCB netlink */
-#ifdef BCM_DCB
-#include <linux/dcbnl.h>
+#ifdef BCM_DCBNL
 
 #define BNX2X_DCBX_CAPS         (DCB_CAP_DCBX_LLD_MANAGED | \
                                 DCB_CAP_DCBX_VER_CEE | DCB_CAP_DCBX_STATIC)
@@ -1816,32 +1894,6 @@ static void bnx2x_dcbnl_set_pfc_state(struct net_device *netdev, u8 state)
         bp->dcbx_config_params.admin_pfc_enable = (state ? 1 : 0);
 }
 
-static bool bnx2x_app_is_equal(struct dcbx_app_priority_entry *app_ent,
-                               u8 idtype, u16 idval)
-{
-        if (!(app_ent->appBitfield & DCBX_APP_ENTRY_VALID))
-                return false;
-
-        switch (idtype) {
-        case DCB_APP_IDTYPE_ETHTYPE:
-                if ((app_ent->appBitfield & DCBX_APP_ENTRY_SF_MASK) !=
-                        DCBX_APP_SF_ETH_TYPE)
-                        return false;
-                break;
-        case DCB_APP_IDTYPE_PORTNUM:
-                if ((app_ent->appBitfield & DCBX_APP_ENTRY_SF_MASK) !=
-                        DCBX_APP_SF_PORT)
-                        return false;
-                break;
-        default:
-                return false;
-        }
-        if (app_ent->app_id != idval)
-                return false;
-
-        return true;
-}
-
 static void bnx2x_admin_app_set_ent(
         struct bnx2x_admin_priority_app_table *app_ent,
         u8 idtype, u16 idval, u8 up)
@@ -1943,30 +1995,6 @@ static u8 bnx2x_dcbnl_set_app_up(struct net_device *netdev, u8 idtype,
         return bnx2x_set_admin_app_up(bp, idtype, idval, up);
 }
 
-static u8 bnx2x_dcbnl_get_app_up(struct net_device *netdev, u8 idtype,
-                                 u16 idval)
-{
-        int i;
-        u8 up = 0;
-
-        struct bnx2x *bp = netdev_priv(netdev);
-        DP(NETIF_MSG_LINK, "app_type %d, app_id 0x%x\n", idtype, idval);
-
-        /* iterate over the app entries looking for idtype and idval */
-        for (i = 0; i < DCBX_MAX_APP_PROTOCOL; i++)
-                if (bnx2x_app_is_equal(&bp->dcbx_local_feat.app.app_pri_tbl[i],
-                                       idtype, idval))
-                        break;
-
-        if (i < DCBX_MAX_APP_PROTOCOL)
-                /* if found return up */
-                up = bp->dcbx_local_feat.app.app_pri_tbl[i].pri_bitmap;
-        else
-                DP(NETIF_MSG_LINK, "app not found\n");
-
-        return up;
-}
-
 static u8 bnx2x_dcbnl_get_dcbx(struct net_device *netdev)
 {
         struct bnx2x *bp = netdev_priv(netdev);
@@ -2107,7 +2135,6 @@ const struct dcbnl_rtnl_ops bnx2x_dcbnl_ops = {
         .setnumtcs      = bnx2x_dcbnl_set_numtcs,
         .getpfcstate    = bnx2x_dcbnl_get_pfc_state,
         .setpfcstate    = bnx2x_dcbnl_set_pfc_state,
-        .getapp         = bnx2x_dcbnl_get_app_up,
         .setapp         = bnx2x_dcbnl_set_app_up,
         .getdcbx        = bnx2x_dcbnl_get_dcbx,
         .setdcbx        = bnx2x_dcbnl_set_dcbx,
@@ -2115,4 +2142,4 @@ const struct dcbnl_rtnl_ops bnx2x_dcbnl_ops = {
         .setfeatcfg     = bnx2x_dcbnl_set_featcfg,
 };
 
-#endif /* BCM_DCB */
+#endif /* BCM_DCBNL */
diff --git a/drivers/net/bnx2x/bnx2x_dcb.h b/drivers/net/bnx2x/bnx2x_dcb.h
index f650f98e409..71b8eda43bd 100644
--- a/drivers/net/bnx2x/bnx2x_dcb.h
+++ b/drivers/net/bnx2x/bnx2x_dcb.h
@@ -189,8 +189,9 @@ enum {
 void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state);
 
 /* DCB netlink */
-#ifdef BCM_DCB
+#ifdef BCM_DCBNL
 extern const struct dcbnl_rtnl_ops bnx2x_dcbnl_ops;
-#endif /* BCM_DCB */
+int bnx2x_dcbnl_update_applist(struct bnx2x *bp, bool delall);
+#endif /* BCM_DCBNL */
 
 #endif /* BNX2X_DCB_H */
diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c
index 5b44a8b4850..f5050155c6b 100644
--- a/drivers/net/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/bnx2x/bnx2x_ethtool.c
@@ -238,7 +238,7 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         speed |= (cmd->speed_hi << 16);
 
         if (IS_MF_SI(bp)) {
-                u32 param = 0;
+                u32 part;
                 u32 line_speed = bp->link_vars.line_speed;
 
                 /* use 10G if no link detected */
@@ -251,23 +251,22 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                                        REQ_BC_VER_4_SET_MF_BW);
                         return -EINVAL;
                 }
-                if (line_speed < speed) {
-                        BNX2X_DEV_INFO("New speed should be less or equal "
-                                       "to actual line speed\n");
+
+                part = (speed * 100) / line_speed;
+
+                if (line_speed < speed || !part) {
+                        BNX2X_DEV_INFO("Speed setting should be in a range "
+                                       "from 1%% to 100%% "
+                                       "of actual line speed\n");
                         return -EINVAL;
                 }
-                /* load old values */
-                param = bp->mf_config[BP_VN(bp)];
-
-                /* leave only MIN value */
-                param &= FUNC_MF_CFG_MIN_BW_MASK;
 
-                /* set new MAX value */
-                param |= (((speed * 100) / line_speed)
-                                 << FUNC_MF_CFG_MAX_BW_SHIFT)
-                                  & FUNC_MF_CFG_MAX_BW_MASK;
+                if (bp->state != BNX2X_STATE_OPEN)
+                        /* store value for following "load" */
+                        bp->pending_max = part;
+                else
+                        bnx2x_update_max_mf_config(bp, part);
 
-                bnx2x_fw_command(bp, DRV_MSG_CODE_SET_MF_BW, param);
                 return 0;
         }
 
@@ -1618,7 +1617,7 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up)
         /* prepare the loopback packet */
         pkt_size = (((bp->dev->mtu < ETH_MAX_PACKET_SIZE) ?
                      bp->dev->mtu : ETH_MAX_PACKET_SIZE) + ETH_HLEN);
-        skb = netdev_alloc_skb(bp->dev, bp->rx_buf_size);
+        skb = netdev_alloc_skb(bp->dev, fp_rx->rx_buf_size);
         if (!skb) {
                 rc = -ENOMEM;
                 goto test_loopback_exit;
@@ -1781,9 +1780,7 @@ static int bnx2x_test_nvram(struct bnx2x *bp)
                 { 0x100, 0x350 }, /* manuf_info */
                 { 0x450,  0xf0 }, /* feature_info */
                 { 0x640,  0x64 }, /* upgrade_key_info */
-                { 0x6a4,  0x64 },
                 { 0x708,  0x70 }, /* manuf_key_info */
-                { 0x778,  0x70 },
                 {     0,     0 }
         };
         __be32 buf[0x350 / 4];
@@ -1933,11 +1930,11 @@ static void bnx2x_self_test(struct net_device *dev,
                 buf[4] = 1;
                 etest->flags |= ETH_TEST_FL_FAILED;
         }
-        if (bp->port.pmf)
-                if (bnx2x_link_test(bp, is_serdes) != 0) {
-                        buf[5] = 1;
-                        etest->flags |= ETH_TEST_FL_FAILED;
-                }
+
+        if (bnx2x_link_test(bp, is_serdes) != 0) {
+                buf[5] = 1;
+                etest->flags |= ETH_TEST_FL_FAILED;
+        }
 
 #ifdef BNX2X_EXTRA_DEBUG
         bnx2x_panic_dump(bp);
@@ -2134,6 +2131,59 @@ static int bnx2x_phys_id(struct net_device *dev, u32 data)
         return 0;
 }
 
+static int bnx2x_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
+                           void *rules __always_unused)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+
+        switch (info->cmd) {
+        case ETHTOOL_GRXRINGS:
+                info->data = BNX2X_NUM_ETH_QUEUES(bp);
+                return 0;
+
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
+static int bnx2x_get_rxfh_indir(struct net_device *dev,
+                                struct ethtool_rxfh_indir *indir)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        size_t copy_size =
+                min_t(size_t, indir->size, TSTORM_INDIRECTION_TABLE_SIZE);
+
+        if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
+                return -EOPNOTSUPP;
+
+        indir->size = TSTORM_INDIRECTION_TABLE_SIZE;
+        memcpy(indir->ring_index, bp->rx_indir_table,
+               copy_size * sizeof(bp->rx_indir_table[0]));
+        return 0;
+}
+
+static int bnx2x_set_rxfh_indir(struct net_device *dev,
+                                const struct ethtool_rxfh_indir *indir)
+{
+        struct bnx2x *bp = netdev_priv(dev);
+        size_t i;
+
+        if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
+                return -EOPNOTSUPP;
+
+        /* Validate size and indices */
+        if (indir->size != TSTORM_INDIRECTION_TABLE_SIZE)
+                return -EINVAL;
+        for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
+                if (indir->ring_index[i] >= BNX2X_NUM_ETH_QUEUES(bp))
+                        return -EINVAL;
+
+        memcpy(bp->rx_indir_table, indir->ring_index,
+               indir->size * sizeof(bp->rx_indir_table[0]));
+        bnx2x_push_indir_table(bp);
+        return 0;
+}
+
 static const struct ethtool_ops bnx2x_ethtool_ops = {
         .get_settings           = bnx2x_get_settings,
         .set_settings           = bnx2x_set_settings,
@@ -2170,6 +2220,9 @@ static const struct ethtool_ops bnx2x_ethtool_ops = {
         .get_strings            = bnx2x_get_strings,
         .phys_id                = bnx2x_phys_id,
         .get_ethtool_stats      = bnx2x_get_ethtool_stats,
+        .get_rxnfc              = bnx2x_get_rxnfc,
+        .get_rxfh_indir         = bnx2x_get_rxfh_indir,
+        .set_rxfh_indir         = bnx2x_set_rxfh_indir,
 };
 
 void bnx2x_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/bnx2x/bnx2x_hsi.h b/drivers/net/bnx2x/bnx2x_hsi.h
index 6238d4f6398..be503cc0a50 100644
--- a/drivers/net/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/bnx2x/bnx2x_hsi.h
@@ -11,20 +11,27 @@
 
 #include "bnx2x_fw_defs.h"
 
+#define FW_ENCODE_32BIT_PATTERN         0x1e1e1e1e
+
 struct license_key {
         u32 reserved[6];
 
-#if defined(__BIG_ENDIAN)
-        u16 max_iscsi_init_conn;
-        u16 max_iscsi_trgt_conn;
-#elif defined(__LITTLE_ENDIAN)
-        u16 max_iscsi_trgt_conn;
-        u16 max_iscsi_init_conn;
-#endif
+        u32 max_iscsi_conn;
+#define BNX2X_MAX_ISCSI_TRGT_CONN_MASK  0xFFFF
+#define BNX2X_MAX_ISCSI_TRGT_CONN_SHIFT 0
+#define BNX2X_MAX_ISCSI_INIT_CONN_MASK  0xFFFF0000
+#define BNX2X_MAX_ISCSI_INIT_CONN_SHIFT 16
 
-        u32 reserved_a[6];
-};
+        u32 reserved_a;
+
+        u32 max_fcoe_conn;
+#define BNX2X_MAX_FCOE_TRGT_CONN_MASK   0xFFFF
+#define BNX2X_MAX_FCOE_TRGT_CONN_SHIFT  0
+#define BNX2X_MAX_FCOE_INIT_CONN_MASK   0xFFFF0000
+#define BNX2X_MAX_FCOE_INIT_CONN_SHIFT  16
 
+        u32 reserved_b[4];
+};
 
 #define PORT_0                          0
 #define PORT_1                          1
@@ -237,8 +244,26 @@ struct port_hw_cfg {			    /* port 0: 0x12c  port 1: 0x2bc */
 #define PORT_HW_CFG_SERDES_RX_DRV_EQUALIZER_SHIFT             16
 
 
-        u32 Reserved0[16];                                  /* 0x158 */
-
+        u32 Reserved0[3];                                   /* 0x158 */
+        /*      Controls the TX laser of the SFP+ module */
+        u32 sfp_ctrl;                                   /* 0x164 */
+#define PORT_HW_CFG_TX_LASER_MASK                             0x000000FF
+#define PORT_HW_CFG_TX_LASER_SHIFT                            0
+#define PORT_HW_CFG_TX_LASER_MDIO                             0x00000000
+#define PORT_HW_CFG_TX_LASER_GPIO0                            0x00000001
+#define PORT_HW_CFG_TX_LASER_GPIO1                            0x00000002
+#define PORT_HW_CFG_TX_LASER_GPIO2                            0x00000003
+#define PORT_HW_CFG_TX_LASER_GPIO3                            0x00000004
+
+    /*  Controls the fault module LED of the SFP+ */
+#define PORT_HW_CFG_FAULT_MODULE_LED_MASK                     0x0000FF00
+#define PORT_HW_CFG_FAULT_MODULE_LED_SHIFT                    8
+#define PORT_HW_CFG_FAULT_MODULE_LED_GPIO0                    0x00000000
+#define PORT_HW_CFG_FAULT_MODULE_LED_GPIO1                    0x00000100
+#define PORT_HW_CFG_FAULT_MODULE_LED_GPIO2                    0x00000200
+#define PORT_HW_CFG_FAULT_MODULE_LED_GPIO3                    0x00000300
+#define PORT_HW_CFG_FAULT_MODULE_LED_DISABLED                 0x00000400
+        u32 Reserved01[12];                                 /* 0x158 */
         /*  for external PHY, or forced mode or during AN */
         u16 xgxs_config_rx[4];                              /* 0x198 */
 
@@ -246,12 +271,78 @@ struct port_hw_cfg {			    /* port 0: 0x12c  port 1: 0x2bc */
 
         u32 Reserved1[56];                                  /* 0x1A8 */
         u32 default_cfg;                                    /* 0x288 */
+#define PORT_HW_CFG_GPIO0_CONFIG_MASK                         0x00000003
+#define PORT_HW_CFG_GPIO0_CONFIG_SHIFT                        0
+#define PORT_HW_CFG_GPIO0_CONFIG_NA                           0x00000000
+#define PORT_HW_CFG_GPIO0_CONFIG_LOW                          0x00000001
+#define PORT_HW_CFG_GPIO0_CONFIG_HIGH                         0x00000002
+#define PORT_HW_CFG_GPIO0_CONFIG_INPUT                        0x00000003
+
+#define PORT_HW_CFG_GPIO1_CONFIG_MASK                         0x0000000C
+#define PORT_HW_CFG_GPIO1_CONFIG_SHIFT                        2
+#define PORT_HW_CFG_GPIO1_CONFIG_NA                           0x00000000
+#define PORT_HW_CFG_GPIO1_CONFIG_LOW                          0x00000004
+#define PORT_HW_CFG_GPIO1_CONFIG_HIGH                         0x00000008
+#define PORT_HW_CFG_GPIO1_CONFIG_INPUT                        0x0000000c
+
+#define PORT_HW_CFG_GPIO2_CONFIG_MASK                         0x00000030
+#define PORT_HW_CFG_GPIO2_CONFIG_SHIFT                        4
+#define PORT_HW_CFG_GPIO2_CONFIG_NA                           0x00000000
+#define PORT_HW_CFG_GPIO2_CONFIG_LOW                          0x00000010
+#define PORT_HW_CFG_GPIO2_CONFIG_HIGH                         0x00000020
+#define PORT_HW_CFG_GPIO2_CONFIG_INPUT                        0x00000030
+
+#define PORT_HW_CFG_GPIO3_CONFIG_MASK                         0x000000C0
+#define PORT_HW_CFG_GPIO3_CONFIG_SHIFT                        6
+#define PORT_HW_CFG_GPIO3_CONFIG_NA                           0x00000000
+#define PORT_HW_CFG_GPIO3_CONFIG_LOW                          0x00000040
+#define PORT_HW_CFG_GPIO3_CONFIG_HIGH                         0x00000080
+#define PORT_HW_CFG_GPIO3_CONFIG_INPUT                        0x000000c0
+
+        /*
+         * When KR link is required to be set to force which is not
+         * KR-compliant, this parameter determine what is the trigger for it.
+         * When GPIO is selected, low input will force the speed. Currently
+         * default speed is 1G. In the future, it may be widen to select the
+         * forced speed in with another parameter. Note when force-1G is
+         * enabled, it override option 56: Link Speed option.
+         */
+#define PORT_HW_CFG_FORCE_KR_ENABLER_MASK                     0x00000F00
+#define PORT_HW_CFG_FORCE_KR_ENABLER_SHIFT                    8
+#define PORT_HW_CFG_FORCE_KR_ENABLER_NOT_FORCED               0x00000000
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO0_P0                 0x00000100
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO1_P0                 0x00000200
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO2_P0                 0x00000300
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO3_P0                 0x00000400
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO0_P1                 0x00000500
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO1_P1                 0x00000600
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO2_P1                 0x00000700
+#define PORT_HW_CFG_FORCE_KR_ENABLER_GPIO3_P1                 0x00000800
+#define PORT_HW_CFG_FORCE_KR_ENABLER_FORCED                   0x00000900
+    /*  Enable to determine with which GPIO to reset the external phy */
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_MASK                     0x000F0000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_SHIFT                    16
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_PHY_TYPE                 0x00000000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO0_P0                 0x00010000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO1_P0                 0x00020000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO2_P0                 0x00030000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO3_P0                 0x00040000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO0_P1                 0x00050000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO1_P1                 0x00060000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO2_P1                 0x00070000
+#define PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO3_P1                 0x00080000
         /*  Enable BAM on KR */
 #define PORT_HW_CFG_ENABLE_BAM_ON_KR_MASK                     0x00100000
 #define PORT_HW_CFG_ENABLE_BAM_ON_KR_SHIFT                    20
 #define PORT_HW_CFG_ENABLE_BAM_ON_KR_DISABLED                 0x00000000
 #define PORT_HW_CFG_ENABLE_BAM_ON_KR_ENABLED                  0x00100000
 
+        /*  Enable Common Mode Sense */
+#define PORT_HW_CFG_ENABLE_CMS_MASK                           0x00200000
+#define PORT_HW_CFG_ENABLE_CMS_SHIFT                          21
+#define PORT_HW_CFG_ENABLE_CMS_DISABLED                       0x00000000
+#define PORT_HW_CFG_ENABLE_CMS_ENABLED                        0x00200000
+
         u32 speed_capability_mask2;                         /* 0x28C */
 #define PORT_HW_CFG_SPEED_CAPABILITY2_D3_MASK                 0x0000FFFF
 #define PORT_HW_CFG_SPEED_CAPABILITY2_D3_SHIFT                0
@@ -352,6 +443,10 @@ struct port_hw_cfg {			    /* port 0: 0x12c  port 1: 0x2bc */
 #define PORT_HW_CFG_LANE_SWAP_CFG_31203120          0x0000d8d8
         /* forced only */
 #define PORT_HW_CFG_LANE_SWAP_CFG_32103210          0x0000e4e4
+    /*  Indicate whether to swap the external phy polarity */
+#define PORT_HW_CFG_SWAP_PHY_POLARITY_MASK             0x00010000
+#define PORT_HW_CFG_SWAP_PHY_POLARITY_DISABLED      0x00000000
+#define PORT_HW_CFG_SWAP_PHY_POLARITY_ENABLED       0x00010000
 
         u32 external_phy_config;
 #define PORT_HW_CFG_SERDES_EXT_PHY_TYPE_MASK        0xff000000
@@ -377,6 +472,7 @@ struct port_hw_cfg {			    /* port 0: 0x12c  port 1: 0x2bc */
 #define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727       0x00000900
 #define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727_NOC   0x00000a00
 #define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823      0x00000b00
+#define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833      0x00000d00
 #define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE       0x0000fd00
 #define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN      0x0000ff00
 
diff --git a/drivers/net/bnx2x/bnx2x_init.h b/drivers/net/bnx2x/bnx2x_init.h
index 5a268e9a089..fa6dbe3f205 100644
--- a/drivers/net/bnx2x/bnx2x_init.h
+++ b/drivers/net/bnx2x/bnx2x_init.h
@@ -241,7 +241,7 @@ static const struct {
         /* Block IGU, MISC, PXP and PXP2 parity errors as long as we don't
          * want to handle "system kill" flow at the moment.
          */
-        BLOCK_PRTY_INFO(PXP, 0x3ffffff, 0x3ffffff, 0x3ffffff, 0x3ffffff),
+        BLOCK_PRTY_INFO(PXP, 0x7ffffff, 0x3ffffff, 0x3ffffff, 0x7ffffff),
         BLOCK_PRTY_INFO_0(PXP2, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff),
         BLOCK_PRTY_INFO_1(PXP2, 0x7ff, 0x7f, 0x7f, 0x7ff),
         BLOCK_PRTY_INFO(HC, 0x7, 0x7, 0x7, 0),
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index 43b0de24f39..f2f367d4e74 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -1,4 +1,4 @@
-/* Copyright 2008-2009 Broadcom Corporation
+/* Copyright 2008-2011 Broadcom Corporation
  *
  * Unless you and Broadcom execute a separate written software license
  * agreement governing use of this software, this software is licensed to you
@@ -28,12 +28,13 @@
 
 /********************************************************/
 #define ETH_HLEN                        14
-#define ETH_OVREHEAD            (ETH_HLEN + 8 + 8)/* 16 for CRC + VLAN + LLC */
+/* L2 header size + 2*VLANs (8 bytes) + LLC SNAP (8 bytes) */
+#define ETH_OVREHEAD                    (ETH_HLEN + 8 + 8)
 #define ETH_MIN_PACKET_SIZE             60
 #define ETH_MAX_PACKET_SIZE             1500
 #define ETH_MAX_JUMBO_PACKET_SIZE       9600
 #define MDIO_ACCESS_TIMEOUT             1000
-#define BMAC_CONTROL_RX_ENABLE  2
+#define BMAC_CONTROL_RX_ENABLE          2
 
 /***********************************************************/
 /*                      Shortcut definitions               */
@@ -79,7 +80,7 @@
 
 #define AUTONEG_CL37            SHARED_HW_CFG_AN_ENABLE_CL37
 #define AUTONEG_CL73            SHARED_HW_CFG_AN_ENABLE_CL73
-#define AUTONEG_BAM             SHARED_HW_CFG_AN_ENABLE_BAM
+#define AUTONEG_BAM             SHARED_HW_CFG_AN_ENABLE_BAM
 #define AUTONEG_PARALLEL \
                                 SHARED_HW_CFG_AN_ENABLE_PARALLEL_DETECTION
 #define AUTONEG_SGMII_FIBER_AUTODET \
@@ -112,10 +113,10 @@
 #define GP_STATUS_10G_KX4 \
                         MDIO_GP_STATUS_TOP_AN_STATUS1_ACTUAL_SPEED_10G_KX4
 
-#define LINK_10THD                      LINK_STATUS_SPEED_AND_DUPLEX_10THD
-#define LINK_10TFD                      LINK_STATUS_SPEED_AND_DUPLEX_10TFD
+#define LINK_10THD              LINK_STATUS_SPEED_AND_DUPLEX_10THD
+#define LINK_10TFD              LINK_STATUS_SPEED_AND_DUPLEX_10TFD
 #define LINK_100TXHD            LINK_STATUS_SPEED_AND_DUPLEX_100TXHD
-#define LINK_100T4                      LINK_STATUS_SPEED_AND_DUPLEX_100T4
+#define LINK_100T4              LINK_STATUS_SPEED_AND_DUPLEX_100T4
 #define LINK_100TXFD            LINK_STATUS_SPEED_AND_DUPLEX_100TXFD
 #define LINK_1000THD            LINK_STATUS_SPEED_AND_DUPLEX_1000THD
 #define LINK_1000TFD            LINK_STATUS_SPEED_AND_DUPLEX_1000TFD
@@ -123,18 +124,18 @@
 #define LINK_2500THD            LINK_STATUS_SPEED_AND_DUPLEX_2500THD
 #define LINK_2500TFD            LINK_STATUS_SPEED_AND_DUPLEX_2500TFD
 #define LINK_2500XFD            LINK_STATUS_SPEED_AND_DUPLEX_2500XFD
-#define LINK_10GTFD                     LINK_STATUS_SPEED_AND_DUPLEX_10GTFD
-#define LINK_10GXFD                     LINK_STATUS_SPEED_AND_DUPLEX_10GXFD
-#define LINK_12GTFD                     LINK_STATUS_SPEED_AND_DUPLEX_12GTFD
-#define LINK_12GXFD                     LINK_STATUS_SPEED_AND_DUPLEX_12GXFD
+#define LINK_10GTFD             LINK_STATUS_SPEED_AND_DUPLEX_10GTFD
+#define LINK_10GXFD             LINK_STATUS_SPEED_AND_DUPLEX_10GXFD
+#define LINK_12GTFD             LINK_STATUS_SPEED_AND_DUPLEX_12GTFD
+#define LINK_12GXFD             LINK_STATUS_SPEED_AND_DUPLEX_12GXFD
 #define LINK_12_5GTFD           LINK_STATUS_SPEED_AND_DUPLEX_12_5GTFD
 #define LINK_12_5GXFD           LINK_STATUS_SPEED_AND_DUPLEX_12_5GXFD
-#define LINK_13GTFD                     LINK_STATUS_SPEED_AND_DUPLEX_13GTFD
-#define LINK_13GXFD                     LINK_STATUS_SPEED_AND_DUPLEX_13GXFD
-#define LINK_15GTFD                     LINK_STATUS_SPEED_AND_DUPLEX_15GTFD
-#define LINK_15GXFD                     LINK_STATUS_SPEED_AND_DUPLEX_15GXFD
-#define LINK_16GTFD                     LINK_STATUS_SPEED_AND_DUPLEX_16GTFD
-#define LINK_16GXFD                     LINK_STATUS_SPEED_AND_DUPLEX_16GXFD
+#define LINK_13GTFD             LINK_STATUS_SPEED_AND_DUPLEX_13GTFD
+#define LINK_13GXFD             LINK_STATUS_SPEED_AND_DUPLEX_13GXFD
+#define LINK_15GTFD             LINK_STATUS_SPEED_AND_DUPLEX_15GTFD
+#define LINK_15GXFD             LINK_STATUS_SPEED_AND_DUPLEX_15GXFD
+#define LINK_16GTFD             LINK_STATUS_SPEED_AND_DUPLEX_16GTFD
+#define LINK_16GXFD             LINK_STATUS_SPEED_AND_DUPLEX_16GXFD
 
 #define PHY_XGXS_FLAG                   0x1
 #define PHY_SGMII_FLAG                  0x2
@@ -142,7 +143,7 @@
 
 /* */
 #define SFP_EEPROM_CON_TYPE_ADDR                0x2
-        #define SFP_EEPROM_CON_TYPE_VAL_LC              0x7
+        #define SFP_EEPROM_CON_TYPE_VAL_LC      0x7
         #define SFP_EEPROM_CON_TYPE_VAL_COPPER  0x21
 
 
@@ -153,15 +154,15 @@
 
 #define SFP_EEPROM_FC_TX_TECH_ADDR              0x8
         #define SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_PASSIVE 0x4
-        #define SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_ACTIVE      0x8
+        #define SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_ACTIVE  0x8
 
-#define SFP_EEPROM_OPTIONS_ADDR                 0x40
+#define SFP_EEPROM_OPTIONS_ADDR                 0x40
         #define SFP_EEPROM_OPTIONS_LINEAR_RX_OUT_MASK 0x1
-#define SFP_EEPROM_OPTIONS_SIZE                 2
+#define SFP_EEPROM_OPTIONS_SIZE                 2
 
-#define EDC_MODE_LINEAR                         0x0022
-#define EDC_MODE_LIMITING                               0x0044
-#define EDC_MODE_PASSIVE_DAC                    0x0055
+#define EDC_MODE_LINEAR                         0x0022
+#define EDC_MODE_LIMITING                               0x0044
+#define EDC_MODE_PASSIVE_DAC                    0x0055
 
 
 #define ETS_BW_LIMIT_CREDIT_UPPER_BOUND         (0x5000)
@@ -170,24 +171,18 @@
 /*                     INTERFACE                          */
 /**********************************************************/
 
-#define CL45_WR_OVER_CL22(_bp, _phy, _bank, _addr, _val) \
+#define CL22_WR_OVER_CL45(_bp, _phy, _bank, _addr, _val) \
         bnx2x_cl45_write(_bp, _phy, \
                 (_phy)->def_md_devad, \
                 (_bank + (_addr & 0xf)), \
                 _val)
 
-#define CL45_RD_OVER_CL22(_bp, _phy, _bank, _addr, _val) \
+#define CL22_RD_OVER_CL45(_bp, _phy, _bank, _addr, _val) \
         bnx2x_cl45_read(_bp, _phy, \
                 (_phy)->def_md_devad, \
                 (_bank + (_addr & 0xf)), \
                 _val)
 
-static u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,
-                          u8 devad, u16 reg, u16 *ret_val);
-
-static u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
-                           u8 devad, u16 reg, u16 val);
-
 static u32 bnx2x_bits_en(struct bnx2x *bp, u32 reg, u32 bits)
 {
         u32 val = REG_RD(bp, reg);
@@ -216,7 +211,7 @@ void bnx2x_ets_disabled(struct link_params *params)
 
         DP(NETIF_MSG_LINK, "ETS disabled configuration\n");
 
-        /**
+        /*
          * mapping between entry  priority to client number (0,1,2 -debug and
          * management clients, 3 - COS0 client, 4 - COS client)(HIGHEST)
          * 3bits client num.
@@ -225,7 +220,7 @@ void bnx2x_ets_disabled(struct link_params *params)
          */
 
         REG_WR(bp, NIG_REG_P0_TX_ARB_PRIORITY_CLIENT, 0x4688);
-        /**
+        /*
          * Bitmap of 5bits length. Each bit specifies whether the entry behaves
          * as strict.  Bits 0,1,2 - debug and management entries, 3 -
          * COS0 entry, 4 - COS1 entry.
@@ -237,12 +232,12 @@ void bnx2x_ets_disabled(struct link_params *params)
         REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_IS_STRICT, 0x7);
         /* defines which entries (clients) are subjected to WFQ arbitration */
         REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_IS_SUBJECT2WFQ, 0);
-        /**
-        * For strict priority entries defines the number of consecutive
-        * slots for the highest priority.
-        */
+        /*
+         * For strict priority entries defines the number of consecutive
+         * slots for the highest priority.
+         */
         REG_WR(bp, NIG_REG_P0_TX_ARB_NUM_STRICT_ARB_SLOTS, 0x100);
-        /**
+        /*
          * mapping between the CREDIT_WEIGHT registers and actual client
          * numbers
          */
@@ -255,7 +250,7 @@ void bnx2x_ets_disabled(struct link_params *params)
         REG_WR(bp, PBF_REG_HIGH_PRIORITY_COS_NUM, 0);
         /* ETS mode disable */
         REG_WR(bp, PBF_REG_ETS_ENABLED, 0);
-        /**
+        /*
          * If ETS mode is enabled (there is no strict priority) defines a WFQ
          * weight for COS0/COS1.
          */
@@ -268,24 +263,24 @@ void bnx2x_ets_disabled(struct link_params *params)
         REG_WR(bp, PBF_REG_NUM_STRICT_ARB_SLOTS, 0);
 }
 
-void bnx2x_ets_bw_limit_common(const struct link_params *params)
+static void bnx2x_ets_bw_limit_common(const struct link_params *params)
 {
         /* ETS disabled configuration */
         struct bnx2x *bp = params->bp;
         DP(NETIF_MSG_LINK, "ETS enabled BW limit configuration\n");
-        /**
-        * defines which entries (clients) are subjected to WFQ arbitration
-        * COS0 0x8
-        * COS1 0x10
-        */
+        /*
+         * defines which entries (clients) are subjected to WFQ arbitration
+         * COS0 0x8
+         * COS1 0x10
+         */
         REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_IS_SUBJECT2WFQ, 0x18);
-        /**
-        * mapping between the ARB_CREDIT_WEIGHT registers and actual
-        * client numbers (WEIGHT_0 does not actually have to represent
-        * client 0)
-        *    PRI4    |    PRI3    |    PRI2    |    PRI1    |    PRI0
-        *  cos1-001     cos0-000     dbg1-100     dbg0-011     MCP-010
-        */
+        /*
+         * mapping between the ARB_CREDIT_WEIGHT registers and actual
+         * client numbers (WEIGHT_0 does not actually have to represent
+         * client 0)
+         *    PRI4    |    PRI3    |    PRI2    |    PRI1    |    PRI0
+         *  cos1-001     cos0-000     dbg1-100     dbg0-011     MCP-010
+         */
         REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_CREDIT_MAP, 0x111A);
 
         REG_WR(bp, NIG_REG_P0_TX_ARB_CREDIT_UPPER_BOUND_0,
@@ -298,14 +293,14 @@ void bnx2x_ets_bw_limit_common(const struct link_params *params)
 
         /* Defines the number of consecutive slots for the strict priority */
         REG_WR(bp, PBF_REG_NUM_STRICT_ARB_SLOTS, 0);
-        /**
-        * Bitmap of 5bits length. Each bit specifies whether the entry behaves
-        * as strict.  Bits 0,1,2 - debug and management entries, 3 - COS0
-        * entry, 4 - COS1 entry.
-        * COS1 | COS0 | DEBUG21 | DEBUG0 | MGMT
-        * bit4   bit3     bit2     bit1    bit0
-        * MCP and debug are strict
-        */
+        /*
+         * Bitmap of 5bits length. Each bit specifies whether the entry behaves
+         * as strict.  Bits 0,1,2 - debug and management entries, 3 - COS0
+         * entry, 4 - COS1 entry.
+         * COS1 | COS0 | DEBUG21 | DEBUG0 | MGMT
+         * bit4   bit3    bit2     bit1    bit0
+         * MCP and debug are strict
+         */
         REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_IS_STRICT, 0x7);
 
         /* Upper bound that COS0_WEIGHT can reach in the WFQ arbiter.*/
@@ -329,8 +324,7 @@ void bnx2x_ets_bw_limit(const struct link_params *params, const u32 cos0_bw,
         if ((0 == total_bw) ||
             (0 == cos0_bw) ||
             (0 == cos1_bw)) {
-                DP(NETIF_MSG_LINK,
-                   "bnx2x_ets_bw_limit: Total BW can't be zero\n");
+                DP(NETIF_MSG_LINK, "Total BW can't be zero\n");
                 return;
         }
 
@@ -355,7 +349,7 @@ u8 bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos)
         u32 val = 0;
 
         DP(NETIF_MSG_LINK, "ETS enabled strict configuration\n");
-        /**
+        /*
          * Bitmap of 5bits length. Each bit specifies whether the entry behaves
          * as strict.  Bits 0,1,2 - debug and management entries,
          * 3 - COS0 entry, 4 - COS1 entry.
@@ -364,7 +358,7 @@ u8 bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos)
          * MCP and debug are strict
          */
         REG_WR(bp, NIG_REG_P0_TX_ARB_CLIENT_IS_STRICT, 0x1F);
-        /**
+        /*
          * For strict priority entries defines the number of consecutive slots
          * for the highest priority.
          */
@@ -377,14 +371,14 @@ u8 bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos)
         /* Defines the number of consecutive slots for the strict priority */
         REG_WR(bp, PBF_REG_HIGH_PRIORITY_COS_NUM, strict_cos);
 
-        /**
-        * mapping between entry  priority to client number (0,1,2 -debug and
-        * management clients, 3 - COS0 client, 4 - COS client)(HIGHEST)
-        * 3bits client num.
-        *   PRI4    |    PRI3    |    PRI2    |    PRI1    |    PRI0
-        * dbg0-010     dbg1-001     cos1-100     cos0-011     MCP-000
-        * dbg0-010     dbg1-001     cos0-011     cos1-100     MCP-000
-        */
+        /*
+         * mapping between entry  priority to client number (0,1,2 -debug and
+         * management clients, 3 - COS0 client, 4 - COS client)(HIGHEST)
+         * 3bits client num.
+         *   PRI4    |    PRI3    |    PRI2    |    PRI1    |    PRI0
+         * dbg0-010     dbg1-001     cos1-100     cos0-011     MCP-000
+         * dbg0-010     dbg1-001     cos0-011     cos1-100     MCP-000
+         */
         val = (0 == strict_cos) ? 0x2318 : 0x22E0;
         REG_WR(bp, NIG_REG_P0_TX_ARB_PRIORITY_CLIENT, val);
 
@@ -471,7 +465,7 @@ void bnx2x_pfc_statistic(struct link_params *params, struct link_vars *vars,
 /*                      MAC/PBF section                           */
 /******************************************************************/
 static void bnx2x_emac_init(struct link_params *params,
-                           struct link_vars *vars)
+                            struct link_vars *vars)
 {
         /* reset and unreset the emac core */
         struct bnx2x *bp = params->bp;
@@ -481,10 +475,10 @@ static void bnx2x_emac_init(struct link_params *params,
         u16 timeout;
 
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
-                   (MISC_REGISTERS_RESET_REG_2_RST_EMAC0_HARD_CORE << port));
+               (MISC_REGISTERS_RESET_REG_2_RST_EMAC0_HARD_CORE << port));
         udelay(5);
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
-                   (MISC_REGISTERS_RESET_REG_2_RST_EMAC0_HARD_CORE << port));
+               (MISC_REGISTERS_RESET_REG_2_RST_EMAC0_HARD_CORE << port));
 
         /* init emac - use read-modify-write */
         /* self clear reset */
@@ -515,7 +509,7 @@ static void bnx2x_emac_init(struct link_params *params,
 }
 
 static u8 bnx2x_emac_enable(struct link_params *params,
-                          struct link_vars *vars, u8 lb)
+                            struct link_vars *vars, u8 lb)
 {
         struct bnx2x *bp = params->bp;
         u8 port = params->port;
@@ -527,55 +521,33 @@ static u8 bnx2x_emac_enable(struct link_params *params,
         /* enable emac and not bmac */
         REG_WR(bp, NIG_REG_EGRESS_EMAC0_PORT + port*4, 1);
 
-        /* for paladium */
-        if (CHIP_REV_IS_EMUL(bp)) {
-                /* Use lane 1 (of lanes 0-3) */
-                REG_WR(bp, NIG_REG_XGXS_LANE_SEL_P0 + port*4, 1);
-                REG_WR(bp, NIG_REG_XGXS_SERDES0_MODE_SEL +
-                            port*4, 1);
-        }
-        /* for fpga */
-        else
-
-        if (CHIP_REV_IS_FPGA(bp)) {
-                /* Use lane 1 (of lanes 0-3) */
-                DP(NETIF_MSG_LINK, "bnx2x_emac_enable: Setting FPGA\n");
-
-                REG_WR(bp, NIG_REG_XGXS_LANE_SEL_P0 + port*4, 1);
-                REG_WR(bp, NIG_REG_XGXS_SERDES0_MODE_SEL + port*4,
-                            0);
-        } else
         /* ASIC */
         if (vars->phy_flags & PHY_XGXS_FLAG) {
                 u32 ser_lane = ((params->lane_config &
-                            PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) >>
-                            PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);
+                                 PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) >>
+                                PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);
 
                 DP(NETIF_MSG_LINK, "XGXS\n");
                 /* select the master lanes (out of 0-3) */
-                REG_WR(bp, NIG_REG_XGXS_LANE_SEL_P0 +
-                           port*4, ser_lane);
+                REG_WR(bp, NIG_REG_XGXS_LANE_SEL_P0 + port*4, ser_lane);
                 /* select XGXS */
-                REG_WR(bp, NIG_REG_XGXS_SERDES0_MODE_SEL +
-                           port*4, 1);
+                REG_WR(bp, NIG_REG_XGXS_SERDES0_MODE_SEL + port*4, 1);
 
         } else { /* SerDes */
                 DP(NETIF_MSG_LINK, "SerDes\n");
                 /* select SerDes */
-                REG_WR(bp, NIG_REG_XGXS_SERDES0_MODE_SEL +
-                           port*4, 0);
+                REG_WR(bp, NIG_REG_XGXS_SERDES0_MODE_SEL + port*4, 0);
         }
 
         bnx2x_bits_en(bp, emac_base + EMAC_REG_EMAC_RX_MODE,
-                    EMAC_RX_MODE_RESET);
+                      EMAC_RX_MODE_RESET);
         bnx2x_bits_en(bp, emac_base + EMAC_REG_EMAC_TX_MODE,
-                    EMAC_TX_MODE_RESET);
+                      EMAC_TX_MODE_RESET);
 
         if (CHIP_REV_IS_SLOW(bp)) {
                 /* config GMII mode */
                 val = REG_RD(bp, emac_base + EMAC_REG_EMAC_MODE);
-                EMAC_WR(bp, EMAC_REG_EMAC_MODE,
-                            (val | EMAC_MODE_PORT_GMII));
+                EMAC_WR(bp, EMAC_REG_EMAC_MODE, (val | EMAC_MODE_PORT_GMII));
         } else { /* ASIC */
                 /* pause enable/disable */
                 bnx2x_bits_dis(bp, emac_base + EMAC_REG_EMAC_RX_MODE,
@@ -605,14 +577,14 @@ static u8 bnx2x_emac_enable(struct link_params *params,
         val = REG_RD(bp, emac_base + EMAC_REG_EMAC_RX_MODE);
         val |= EMAC_RX_MODE_KEEP_VLAN_TAG | EMAC_RX_MODE_PROMISCUOUS;
 
-        /**
-        * Setting this bit causes MAC control frames (except for pause
-        * frames) to be passed on for processing. This setting has no
-        * affect on the operation of the pause frames. This bit effects
-        * all packets regardless of RX Parser packet sorting logic.
-        * Turn the PFC off to make sure we are in Xon state before
-        * enabling it.
-        */
+        /*
+         * Setting this bit causes MAC control frames (except for pause
+         * frames) to be passed on for processing. This setting has no
+         * affect on the operation of the pause frames. This bit effects
+         * all packets regardless of RX Parser packet sorting logic.
+         * Turn the PFC off to make sure we are in Xon state before
+         * enabling it.
+         */
         EMAC_WR(bp, EMAC_REG_RX_PFC_MODE, 0);
         if (params->feature_config_flags & FEATURE_CONFIG_PFC_ENABLED) {
                 DP(NETIF_MSG_LINK, "PFC is enabled\n");
@@ -666,16 +638,7 @@ static u8 bnx2x_emac_enable(struct link_params *params,
         REG_WR(bp, NIG_REG_EMAC0_PAUSE_OUT_EN + port*4, val);
         REG_WR(bp, NIG_REG_EGRESS_EMAC0_OUT_EN + port*4, 0x1);
 
-        if (CHIP_REV_IS_EMUL(bp)) {
-                /* take the BigMac out of reset */
-                REG_WR(bp,
-                           GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
-                           (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
-
-                /* enable access for bmac registers */
-                REG_WR(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x1);
-        } else
-                REG_WR(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x0);
+        REG_WR(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x0);
 
         vars->mac_type = MAC_TYPE_EMAC;
         return 0;
@@ -731,8 +694,7 @@ static void bnx2x_update_pfc_bmac2(struct link_params *params,
                 val |= (1<<5);
         wb_data[0] = val;
         wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_RX_CONTROL,
-                        wb_data, 2);
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_RX_CONTROL, wb_data, 2);
         udelay(30);
 
         /* Tx control */
@@ -768,12 +730,12 @@ static void bnx2x_update_pfc_bmac2(struct link_params *params,
 
         REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_PFC_CONTROL, wb_data, 2);
 
-        /**
-        * Set Time (based unit is 512 bit time) between automatic
-        * re-sending of PP packets amd enable automatic re-send of
-        * Per-Priroity Packet as long as pp_gen is asserted and
-        * pp_disable is low.
-        */
+        /*
+         * Set Time (based unit is 512 bit time) between automatic
+         * re-sending of PP packets amd enable automatic re-send of
+         * Per-Priroity Packet as long as pp_gen is asserted and
+         * pp_disable is low.
+         */
         val = 0x8000;
         if (params->feature_config_flags & FEATURE_CONFIG_PFC_ENABLED)
                 val |= (1<<16); /* enable automatic re-send */
@@ -781,7 +743,7 @@ static void bnx2x_update_pfc_bmac2(struct link_params *params,
         wb_data[0] = val;
         wb_data[1] = 0;
         REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_TX_PAUSE_CONTROL,
-                        wb_data, 2);
+                    wb_data, 2);
 
         /* mac control */
         val = 0x3; /* Enable RX and TX */
@@ -795,8 +757,7 @@ static void bnx2x_update_pfc_bmac2(struct link_params *params,
 
         wb_data[0] = val;
         wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_BMAC_CONTROL,
-                        wb_data, 2);
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_BMAC_CONTROL, wb_data, 2);
 }
 
 static void bnx2x_update_pfc_brb(struct link_params *params,
@@ -825,17 +786,25 @@ static void bnx2x_update_pfc_brb(struct link_params *params,
                         full_xon_th =
                           PFC_BRB_MAC_FULL_XON_THRESHOLD_NON_PAUSEABLE;
                 }
-        /* The number of free blocks below which the pause signal to class 0
-           of MAC #n is asserted. n=0,1 */
+        /*
+         * The number of free blocks below which the pause signal to class 0
+         * of MAC #n is asserted. n=0,1
+         */
         REG_WR(bp, BRB1_REG_PAUSE_0_XOFF_THRESHOLD_0 , pause_xoff_th);
-        /* The number of free blocks above which the pause signal to class 0
-           of MAC #n is de-asserted. n=0,1 */
+        /*
+         * The number of free blocks above which the pause signal to class 0
+         * of MAC #n is de-asserted. n=0,1
+         */
         REG_WR(bp, BRB1_REG_PAUSE_0_XON_THRESHOLD_0 , pause_xon_th);
-        /* The number of free blocks below which the full signal to class 0
-           of MAC #n is asserted. n=0,1 */
+        /*
+         * The number of free blocks below which the full signal to class 0
+         * of MAC #n is asserted. n=0,1
+         */
         REG_WR(bp, BRB1_REG_FULL_0_XOFF_THRESHOLD_0 , full_xoff_th);
-        /* The number of free blocks above which the full signal to class 0
-           of MAC #n is de-asserted. n=0,1 */
+        /*
+         * The number of free blocks above which the full signal to class 0
+         * of MAC #n is de-asserted. n=0,1
+         */
         REG_WR(bp, BRB1_REG_FULL_0_XON_THRESHOLD_0 , full_xon_th);
 
         if (set_pfc && pfc_params) {
@@ -859,25 +828,25 @@ static void bnx2x_update_pfc_brb(struct link_params *params,
                         full_xon_th =
                           PFC_BRB_MAC_FULL_XON_THRESHOLD_NON_PAUSEABLE;
                 }
-                /**
+                /*
                  * The number of free blocks below which the pause signal to
                  * class 1 of MAC #n is asserted. n=0,1
-                 **/
+                 */
                 REG_WR(bp, BRB1_REG_PAUSE_1_XOFF_THRESHOLD_0, pause_xoff_th);
-                /**
+                /*
                  * The number of free blocks above which the pause signal to
                  * class 1 of MAC #n is de-asserted. n=0,1
-                 **/
+                 */
                 REG_WR(bp, BRB1_REG_PAUSE_1_XON_THRESHOLD_0, pause_xon_th);
-                /**
+                /*
                  * The number of free blocks below which the full signal to
                  * class 1 of MAC #n is asserted. n=0,1
-                 **/
+                 */
                 REG_WR(bp, BRB1_REG_FULL_1_XOFF_THRESHOLD_0, full_xoff_th);
-                /**
+                /*
                  * The number of free blocks above which the full signal to
                  * class 1 of MAC #n is de-asserted. n=0,1
-                 **/
+                 */
                 REG_WR(bp, BRB1_REG_FULL_1_XON_THRESHOLD_0, full_xon_th);
         }
 }
@@ -896,7 +865,7 @@ static void bnx2x_update_pfc_nig(struct link_params *params,
                 FEATURE_CONFIG_PFC_ENABLED;
         DP(NETIF_MSG_LINK, "updating pfc nig parameters\n");
 
-        /**
+        /*
          * When NIG_LLH0_XCM_MASK_REG_LLHX_XCM_MASK_BCN bit is set
          * MAC control frames (that are not pause packets)
          * will be forwarded to the XCM.
@@ -904,7 +873,7 @@ static void bnx2x_update_pfc_nig(struct link_params *params,
         xcm_mask = REG_RD(bp,
                                 port ? NIG_REG_LLH1_XCM_MASK :
                                 NIG_REG_LLH0_XCM_MASK);
-        /**
+        /*
          * nig params will override non PFC params, since it's possible to
          * do transition from PFC to SAFC
          */
@@ -994,7 +963,7 @@ void bnx2x_update_pfc(struct link_params *params,
                       struct link_vars *vars,
                       struct bnx2x_nig_brb_pfc_port_params *pfc_params)
 {
-        /**
+        /*
          * The PFC and pause are orthogonal to one another, meaning when
          * PFC is enabled, the pause are disabled, and when PFC is
          * disabled, pause are set according to the pause result.
@@ -1035,7 +1004,7 @@ void bnx2x_update_pfc(struct link_params *params,
 
 static u8 bnx2x_bmac1_enable(struct link_params *params,
                              struct link_vars *vars,
-                          u8 is_lb)
+                             u8 is_lb)
 {
         struct bnx2x *bp = params->bp;
         u8 port = params->port;
@@ -1049,9 +1018,8 @@ static u8 bnx2x_bmac1_enable(struct link_params *params,
         /* XGXS control */
         wb_data[0] = 0x3c;
         wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr +
-                      BIGMAC_REGISTER_BMAC_XGXS_CONTROL,
-                      wb_data, 2);
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_BMAC_XGXS_CONTROL,
+                    wb_data, 2);
 
         /* tx MAC SA */
         wb_data[0] = ((params->mac_addr[2] << 24) |
@@ -1060,8 +1028,7 @@ static u8 bnx2x_bmac1_enable(struct link_params *params,
                         params->mac_addr[5]);
         wb_data[1] = ((params->mac_addr[0] << 8) |
                         params->mac_addr[1]);
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_TX_SOURCE_ADDR,
-                    wb_data, 2);
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_TX_SOURCE_ADDR, wb_data, 2);
 
         /* mac control */
         val = 0x3;
@@ -1071,43 +1038,30 @@ static u8 bnx2x_bmac1_enable(struct link_params *params,
         }
         wb_data[0] = val;
         wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_BMAC_CONTROL,
-                    wb_data, 2);
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_BMAC_CONTROL, wb_data, 2);
 
         /* set rx mtu */
         wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
         wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_RX_MAX_SIZE,
-                        wb_data, 2);
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_RX_MAX_SIZE, wb_data, 2);
 
         bnx2x_update_pfc_bmac1(params, vars);
 
         /* set tx mtu */
         wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
         wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_TX_MAX_SIZE,
-                        wb_data, 2);
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_TX_MAX_SIZE, wb_data, 2);
 
         /* set cnt max size */
         wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
         wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_CNT_MAX_SIZE,
-                    wb_data, 2);
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_CNT_MAX_SIZE, wb_data, 2);
 
         /* configure safc */
         wb_data[0] = 0x1000200;
         wb_data[1] = 0;
         REG_WR_DMAE(bp, bmac_addr + BIGMAC_REGISTER_RX_LLFC_MSG_FLDS,
                     wb_data, 2);
-        /* fix for emulation */
-        if (CHIP_REV_IS_EMUL(bp)) {
-                wb_data[0] = 0xf000;
-                wb_data[1] = 0;
-                REG_WR_DMAE(bp,
-                            bmac_addr + BIGMAC_REGISTER_TX_PAUSE_THRESHOLD,
-                            wb_data, 2);
-        }
-
 
         return 0;
 }
@@ -1126,16 +1080,14 @@ static u8 bnx2x_bmac2_enable(struct link_params *params,
 
         wb_data[0] = 0;
         wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_BMAC_CONTROL,
-                        wb_data, 2);
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_BMAC_CONTROL, wb_data, 2);
         udelay(30);
 
         /* XGXS control: Reset phy HW, MDIO registers, PHY PLL and BMAC */
         wb_data[0] = 0x3c;
         wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr +
-                        BIGMAC2_REGISTER_BMAC_XGXS_CONTROL,
-                        wb_data, 2);
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_BMAC_XGXS_CONTROL,
+                    wb_data, 2);
 
         udelay(30);
 
@@ -1147,7 +1099,7 @@ static u8 bnx2x_bmac2_enable(struct link_params *params,
         wb_data[1] = ((params->mac_addr[0] << 8) |
                         params->mac_addr[1]);
         REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_TX_SOURCE_ADDR,
-                        wb_data, 2);
+                    wb_data, 2);
 
         udelay(30);
 
@@ -1155,27 +1107,24 @@ static u8 bnx2x_bmac2_enable(struct link_params *params,
         wb_data[0] = 0x1000200;
         wb_data[1] = 0;
         REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_RX_LLFC_MSG_FLDS,
-                        wb_data, 2);
+                    wb_data, 2);
         udelay(30);
 
         /* set rx mtu */
         wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
         wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_RX_MAX_SIZE,
-                        wb_data, 2);
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_RX_MAX_SIZE, wb_data, 2);
         udelay(30);
 
         /* set tx mtu */
         wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD;
         wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_TX_MAX_SIZE,
-                        wb_data, 2);
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_TX_MAX_SIZE, wb_data, 2);
         udelay(30);
         /* set cnt max size */
         wb_data[0] = ETH_MAX_JUMBO_PACKET_SIZE + ETH_OVREHEAD - 2;
         wb_data[1] = 0;
-        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_CNT_MAX_SIZE,
-                        wb_data, 2);
+        REG_WR_DMAE(bp, bmac_addr + BIGMAC2_REGISTER_CNT_MAX_SIZE, wb_data, 2);
         udelay(30);
         bnx2x_update_pfc_bmac2(params, vars, is_lb);
 
@@ -1191,11 +1140,11 @@ static u8 bnx2x_bmac_enable(struct link_params *params,
         u32 val;
         /* reset and unreset the BigMac */
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
-                     (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
+               (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
         msleep(1);
 
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
-                     (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
+               (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
 
         /* enable access for bmac registers */
         REG_WR(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x1);
@@ -1230,15 +1179,14 @@ static void bnx2x_update_mng(struct link_params *params, u32 link_status)
         struct bnx2x *bp = params->bp;
 
         REG_WR(bp, params->shmem_base +
-                   offsetof(struct shmem_region,
-                            port_mb[params->port].link_status),
-                        link_status);
+               offsetof(struct shmem_region,
+                        port_mb[params->port].link_status), link_status);
 }
 
 static void bnx2x_bmac_rx_disable(struct bnx2x *bp, u8 port)
 {
         u32 bmac_addr = port ? NIG_REG_INGRESS_BMAC1_MEM :
-                NIG_REG_INGRESS_BMAC0_MEM;
+                        NIG_REG_INGRESS_BMAC0_MEM;
         u32 wb_data[2];
         u32 nig_bmac_enable = REG_RD(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4);
 
@@ -1250,12 +1198,12 @@ static void bnx2x_bmac_rx_disable(struct bnx2x *bp, u8 port)
                 if (CHIP_IS_E2(bp)) {
                         /* Clear Rx Enable bit in BMAC_CONTROL register */
                         REG_RD_DMAE(bp, bmac_addr +
-                                        BIGMAC2_REGISTER_BMAC_CONTROL,
-                                        wb_data, 2);
+                                    BIGMAC2_REGISTER_BMAC_CONTROL,
+                                    wb_data, 2);
                         wb_data[0] &= ~BMAC_CONTROL_RX_ENABLE;
                         REG_WR_DMAE(bp, bmac_addr +
-                                        BIGMAC2_REGISTER_BMAC_CONTROL,
-                                        wb_data, 2);
+                                    BIGMAC2_REGISTER_BMAC_CONTROL,
+                                    wb_data, 2);
                 } else {
                         /* Clear Rx Enable bit in BMAC_CONTROL register */
                         REG_RD_DMAE(bp, bmac_addr +
@@ -1271,7 +1219,7 @@ static void bnx2x_bmac_rx_disable(struct bnx2x *bp, u8 port)
 }
 
 static u8 bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl,
-                         u32 line_speed)
+                           u32 line_speed)
 {
         struct bnx2x *bp = params->bp;
         u8 port = params->port;
@@ -1308,7 +1256,7 @@ static u8 bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl,
                 /* update threshold */
                 REG_WR(bp, PBF_REG_P0_ARB_THRSH + port*4, 0);
                 /* update init credit */
-                init_crd = 778;         /* (800-18-4) */
+                init_crd = 778;         /* (800-18-4) */
 
         } else {
                 u32 thresh = (ETH_MAX_JUMBO_PACKET_SIZE +
@@ -1353,6 +1301,23 @@ static u8 bnx2x_pbf_update(struct link_params *params, u32 flow_ctrl,
         return 0;
 }
 
+/*
+ * get_emac_base
+ *
+ * @param cb
+ * @param mdc_mdio_access
+ * @param port
+ *
+ * @return u32
+ *
+ * This function selects the MDC/MDIO access (through emac0 or
+ * emac1) depend on the mdc_mdio_access, port, port swapped. Each
+ * phy has a default access mode, which could also be overridden
+ * by nvram configuration. This parameter, whether this is the
+ * default phy configuration, or the nvram overrun
+ * configuration, is passed here as mdc_mdio_access and selects
+ * the emac_base for the CL45 read/writes operations
+ */
 static u32 bnx2x_get_emac_base(struct bnx2x *bp,
                                u32 mdc_mdio_access, u8 port)
 {
@@ -1385,13 +1350,16 @@ static u32 bnx2x_get_emac_base(struct bnx2x *bp,
 
 }
 
-u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
-                    u8 devad, u16 reg, u16 val)
+/******************************************************************/
+/*                      CL45 access functions                     */
+/******************************************************************/
+static u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
+                           u8 devad, u16 reg, u16 val)
 {
         u32 tmp, saved_mode;
         u8 i, rc = 0;
-
-        /* set clause 45 mode, slow down the MDIO clock to 2.5MHz
+        /*
+         * Set clause 45 mode, slow down the MDIO clock to 2.5MHz
          * (a value of 49==0x31) and make sure that the AUTO poll is off
          */
 
@@ -1414,8 +1382,7 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
         for (i = 0; i < 50; i++) {
                 udelay(10);
 
-                tmp = REG_RD(bp, phy->mdio_ctrl +
-                                   EMAC_REG_EMAC_MDIO_COMM);
+                tmp = REG_RD(bp, phy->mdio_ctrl + EMAC_REG_EMAC_MDIO_COMM);
                 if (!(tmp & EMAC_MDIO_COMM_START_BUSY)) {
                         udelay(5);
                         break;
@@ -1423,6 +1390,7 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
         }
         if (tmp & EMAC_MDIO_COMM_START_BUSY) {
                 DP(NETIF_MSG_LINK, "write phy register failed\n");
+                netdev_err(bp->dev,  "MDC/MDIO access timeout\n");
                 rc = -EFAULT;
         } else {
                 /* data */
@@ -1435,7 +1403,7 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
                         udelay(10);
 
                         tmp = REG_RD(bp, phy->mdio_ctrl +
-                                         EMAC_REG_EMAC_MDIO_COMM);
+                                     EMAC_REG_EMAC_MDIO_COMM);
                         if (!(tmp & EMAC_MDIO_COMM_START_BUSY)) {
                                 udelay(5);
                                 break;
@@ -1443,6 +1411,7 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
                 }
                 if (tmp & EMAC_MDIO_COMM_START_BUSY) {
                         DP(NETIF_MSG_LINK, "write phy register failed\n");
+                        netdev_err(bp->dev,  "MDC/MDIO access timeout\n");
                         rc = -EFAULT;
                 }
         }
@@ -1453,20 +1422,20 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,
         return rc;
 }
 
-u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,
-                   u8 devad, u16 reg, u16 *ret_val)
+static u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,
+                          u8 devad, u16 reg, u16 *ret_val)
 {
         u32 val, saved_mode;
         u16 i;
         u8 rc = 0;
-
-        /* set clause 45 mode, slow down the MDIO clock to 2.5MHz
+        /*
+         * Set clause 45 mode, slow down the MDIO clock to 2.5MHz
          * (a value of 49==0x31) and make sure that the AUTO poll is off
          */
 
         saved_mode = REG_RD(bp, phy->mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE);
         val = saved_mode & ~((EMAC_MDIO_MODE_AUTO_POLL |
-                             EMAC_MDIO_MODE_CLOCK_CNT));
+                              EMAC_MDIO_MODE_CLOCK_CNT));
         val |= (EMAC_MDIO_MODE_CLAUSE_45 |
                 (49L << EMAC_MDIO_MODE_CLOCK_CNT_BITSHIFT));
         REG_WR(bp, phy->mdio_ctrl + EMAC_REG_EMAC_MDIO_MODE, val);
@@ -1490,7 +1459,7 @@ u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,
         }
         if (val & EMAC_MDIO_COMM_START_BUSY) {
                 DP(NETIF_MSG_LINK, "read phy register failed\n");
-
+                netdev_err(bp->dev,  "MDC/MDIO access timeout\n");
                 *ret_val = 0;
                 rc = -EFAULT;
 
@@ -1505,7 +1474,7 @@ u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,
                         udelay(10);
 
                         val = REG_RD(bp, phy->mdio_ctrl +
-                                          EMAC_REG_EMAC_MDIO_COMM);
+                                     EMAC_REG_EMAC_MDIO_COMM);
                         if (!(val & EMAC_MDIO_COMM_START_BUSY)) {
                                 *ret_val = (u16)(val & EMAC_MDIO_COMM_DATA);
                                 break;
@@ -1513,7 +1482,7 @@ u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,
                 }
                 if (val & EMAC_MDIO_COMM_START_BUSY) {
                         DP(NETIF_MSG_LINK, "read phy register failed\n");
-
+                        netdev_err(bp->dev,  "MDC/MDIO access timeout\n");
                         *ret_val = 0;
                         rc = -EFAULT;
                 }
@@ -1529,7 +1498,7 @@ u8 bnx2x_phy_read(struct link_params *params, u8 phy_addr,
                   u8 devad, u16 reg, u16 *ret_val)
 {
         u8 phy_index;
-        /**
+        /*
          * Probe for the phy according to the given phy_addr, and execute
          * the read request on it
          */
@@ -1547,7 +1516,7 @@ u8 bnx2x_phy_write(struct link_params *params, u8 phy_addr,
                    u8 devad, u16 reg, u16 val)
 {
         u8 phy_index;
-        /**
+        /*
          * Probe for the phy according to the given phy_addr, and execute
          * the write request on it
          */
@@ -1573,19 +1542,18 @@ static void bnx2x_set_aer_mmd_xgxs(struct link_params *params,
 
         offset = phy->addr + ser_lane;
         if (CHIP_IS_E2(bp))
-                aer_val = 0x2800 + offset - 1;
+                aer_val = 0x3800 + offset - 1;
         else
                 aer_val = 0x3800 + offset;
-        CL45_WR_OVER_CL22(bp, phy,
-                                MDIO_REG_BANK_AER_BLOCK,
-                                MDIO_AER_BLOCK_AER_REG, aer_val);
+        CL22_WR_OVER_CL45(bp, phy, MDIO_REG_BANK_AER_BLOCK,
+                          MDIO_AER_BLOCK_AER_REG, aer_val);
 }
 static void bnx2x_set_aer_mmd_serdes(struct bnx2x *bp,
                                      struct bnx2x_phy *phy)
 {
-        CL45_WR_OVER_CL22(bp, phy,
-                                MDIO_REG_BANK_AER_BLOCK,
-                                MDIO_AER_BLOCK_AER_REG, 0x3800);
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_AER_BLOCK,
+                          MDIO_AER_BLOCK_AER_REG, 0x3800);
 }
 
 /******************************************************************/
@@ -1621,9 +1589,8 @@ static void bnx2x_serdes_deassert(struct bnx2x *bp, u8 port)
 
         bnx2x_set_serdes_access(bp, port);
 
-        REG_WR(bp, NIG_REG_SERDES0_CTRL_MD_DEVAD +
-                     port*0x10,
-                     DEFAULT_PHY_DEV_ADDR);
+        REG_WR(bp, NIG_REG_SERDES0_CTRL_MD_DEVAD + port*0x10,
+               DEFAULT_PHY_DEV_ADDR);
 }
 
 static void bnx2x_xgxs_deassert(struct link_params *params)
@@ -1641,23 +1608,22 @@ static void bnx2x_xgxs_deassert(struct link_params *params)
         udelay(500);
         REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_SET, val);
 
-        REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_ST +
-                     port*0x18, 0);
+        REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_ST + port*0x18, 0);
         REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_DEVAD + port*0x18,
-                     params->phy[INT_PHY].def_md_devad);
+               params->phy[INT_PHY].def_md_devad);
 }
 
 
 void bnx2x_link_status_update(struct link_params *params,
-                            struct link_vars   *vars)
+                              struct link_vars *vars)
 {
         struct bnx2x *bp = params->bp;
         u8 link_10g;
         u8 port = params->port;
 
         vars->link_status = REG_RD(bp, params->shmem_base +
-                                          offsetof(struct shmem_region,
-                                           port_mb[port].link_status));
+                                   offsetof(struct shmem_region,
+                                            port_mb[port].link_status));
 
         vars->link_up = (vars->link_status & LINK_STATUS_LINK_UP);
 
@@ -1667,7 +1633,7 @@ void bnx2x_link_status_update(struct link_params *params,
                 vars->phy_link_up = 1;
                 vars->duplex = DUPLEX_FULL;
                 switch (vars->link_status &
-                                        LINK_STATUS_SPEED_AND_DUPLEX_MASK) {
+                        LINK_STATUS_SPEED_AND_DUPLEX_MASK) {
                         case LINK_10THD:
                                 vars->duplex = DUPLEX_HALF;
                                 /* fall thru */
@@ -1779,20 +1745,20 @@ static void bnx2x_set_master_ln(struct link_params *params,
 {
         struct bnx2x *bp = params->bp;
         u16 new_master_ln, ser_lane;
-        ser_lane =  ((params->lane_config &
+        ser_lane = ((params->lane_config &
                      PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) >>
-                     PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);
+                    PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);
 
         /* set the master_ln for AN */
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_XGXS_BLOCK2,
-                              MDIO_XGXS_BLOCK2_TEST_MODE_LANE,
-                              &new_master_ln);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_XGXS_BLOCK2,
+                          MDIO_XGXS_BLOCK2_TEST_MODE_LANE,
+                          &new_master_ln);
 
-        CL45_WR_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_XGXS_BLOCK2 ,
-                              MDIO_XGXS_BLOCK2_TEST_MODE_LANE,
-                              (new_master_ln | ser_lane));
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_XGXS_BLOCK2 ,
+                          MDIO_XGXS_BLOCK2_TEST_MODE_LANE,
+                          (new_master_ln | ser_lane));
 }
 
 static u8 bnx2x_reset_unicore(struct link_params *params,
@@ -1802,17 +1768,16 @@ static u8 bnx2x_reset_unicore(struct link_params *params,
         struct bnx2x *bp = params->bp;
         u16 mii_control;
         u16 i;
-
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_MII_CONTROL, &mii_control);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_COMBO_IEEE0,
+                          MDIO_COMBO_IEEE0_MII_CONTROL, &mii_control);
 
         /* reset the unicore */
-        CL45_WR_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_MII_CONTROL,
-                              (mii_control |
-                               MDIO_COMBO_IEEO_MII_CONTROL_RESET));
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_COMBO_IEEE0,
+                          MDIO_COMBO_IEEE0_MII_CONTROL,
+                          (mii_control |
+                           MDIO_COMBO_IEEO_MII_CONTROL_RESET));
         if (set_serdes)
                 bnx2x_set_serdes_access(bp, params->port);
 
@@ -1821,10 +1786,10 @@ static u8 bnx2x_reset_unicore(struct link_params *params,
                 udelay(5);
 
                 /* the reset erased the previous bank value */
-                CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_MII_CONTROL,
-                              &mii_control);
+                CL22_RD_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_COMBO_IEEE0,
+                                  MDIO_COMBO_IEEE0_MII_CONTROL,
+                                  &mii_control);
 
                 if (!(mii_control & MDIO_COMBO_IEEO_MII_CONTROL_RESET)) {
                         udelay(5);
@@ -1832,6 +1797,9 @@ static u8 bnx2x_reset_unicore(struct link_params *params,
                 }
         }
 
+        netdev_err(bp->dev,  "Warning: PHY was not initialized,"
+                              " Port %d\n",
+                         params->port);
         DP(NETIF_MSG_LINK, "BUG! XGXS is still in reset!\n");
         return -EINVAL;
 
@@ -1841,43 +1809,45 @@ static void bnx2x_set_swap_lanes(struct link_params *params,
                                  struct bnx2x_phy *phy)
 {
         struct bnx2x *bp = params->bp;
-        /* Each two bits represents a lane number:
-           No swap is 0123 => 0x1b no need to enable the swap */
+        /*
+         *  Each two bits represents a lane number:
+         *  No swap is 0123 => 0x1b no need to enable the swap
+         */
         u16 ser_lane, rx_lane_swap, tx_lane_swap;
 
         ser_lane = ((params->lane_config &
-                         PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) >>
-                        PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);
+                     PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) >>
+                    PORT_HW_CFG_LANE_SWAP_CFG_MASTER_SHIFT);
         rx_lane_swap = ((params->lane_config &
-                             PORT_HW_CFG_LANE_SWAP_CFG_RX_MASK) >>
-                            PORT_HW_CFG_LANE_SWAP_CFG_RX_SHIFT);
+                         PORT_HW_CFG_LANE_SWAP_CFG_RX_MASK) >>
+                        PORT_HW_CFG_LANE_SWAP_CFG_RX_SHIFT);
         tx_lane_swap = ((params->lane_config &
-                             PORT_HW_CFG_LANE_SWAP_CFG_TX_MASK) >>
-                            PORT_HW_CFG_LANE_SWAP_CFG_TX_SHIFT);
+                         PORT_HW_CFG_LANE_SWAP_CFG_TX_MASK) >>
+                        PORT_HW_CFG_LANE_SWAP_CFG_TX_SHIFT);
 
         if (rx_lane_swap != 0x1b) {
-                CL45_WR_OVER_CL22(bp, phy,
-                                    MDIO_REG_BANK_XGXS_BLOCK2,
-                                    MDIO_XGXS_BLOCK2_RX_LN_SWAP,
-                                    (rx_lane_swap |
-                                    MDIO_XGXS_BLOCK2_RX_LN_SWAP_ENABLE |
-                                    MDIO_XGXS_BLOCK2_RX_LN_SWAP_FORCE_ENABLE));
+                CL22_WR_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_XGXS_BLOCK2,
+                                  MDIO_XGXS_BLOCK2_RX_LN_SWAP,
+                                  (rx_lane_swap |
+                                   MDIO_XGXS_BLOCK2_RX_LN_SWAP_ENABLE |
+                                   MDIO_XGXS_BLOCK2_RX_LN_SWAP_FORCE_ENABLE));
         } else {
-                CL45_WR_OVER_CL22(bp, phy,
-                                      MDIO_REG_BANK_XGXS_BLOCK2,
-                                      MDIO_XGXS_BLOCK2_RX_LN_SWAP, 0);
+                CL22_WR_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_XGXS_BLOCK2,
+                                  MDIO_XGXS_BLOCK2_RX_LN_SWAP, 0);
         }
 
         if (tx_lane_swap != 0x1b) {
-                CL45_WR_OVER_CL22(bp, phy,
-                                      MDIO_REG_BANK_XGXS_BLOCK2,
-                                      MDIO_XGXS_BLOCK2_TX_LN_SWAP,
-                                      (tx_lane_swap |
-                                       MDIO_XGXS_BLOCK2_TX_LN_SWAP_ENABLE));
+                CL22_WR_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_XGXS_BLOCK2,
+                                  MDIO_XGXS_BLOCK2_TX_LN_SWAP,
+                                  (tx_lane_swap |
+                                   MDIO_XGXS_BLOCK2_TX_LN_SWAP_ENABLE));
         } else {
-                CL45_WR_OVER_CL22(bp, phy,
-                                      MDIO_REG_BANK_XGXS_BLOCK2,
-                                      MDIO_XGXS_BLOCK2_TX_LN_SWAP, 0);
+                CL22_WR_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_XGXS_BLOCK2,
+                                  MDIO_XGXS_BLOCK2_TX_LN_SWAP, 0);
         }
 }
 
@@ -1886,66 +1856,66 @@ static void bnx2x_set_parallel_detection(struct bnx2x_phy *phy,
 {
         struct bnx2x *bp = params->bp;
         u16 control2;
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL2,
-                              &control2);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_SERDES_DIGITAL_A_1000X_CONTROL2,
+                          &control2);
         if (phy->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_1G)
                 control2 |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL2_PRL_DT_EN;
         else
                 control2 &= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL2_PRL_DT_EN;
         DP(NETIF_MSG_LINK, "phy->speed_cap_mask = 0x%x, control2 = 0x%x\n",
                 phy->speed_cap_mask, control2);
-        CL45_WR_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL2,
-                              control2);
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_SERDES_DIGITAL_A_1000X_CONTROL2,
+                          control2);
 
         if ((phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) &&
              (phy->speed_cap_mask &
                     PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)) {
                 DP(NETIF_MSG_LINK, "XGXS\n");
 
-                CL45_WR_OVER_CL22(bp, phy,
-                                MDIO_REG_BANK_10G_PARALLEL_DETECT,
-                                MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_LINK,
-                                MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_LINK_CNT);
+                CL22_WR_OVER_CL45(bp, phy,
+                                 MDIO_REG_BANK_10G_PARALLEL_DETECT,
+                                 MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_LINK,
+                                 MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_LINK_CNT);
 
-                CL45_RD_OVER_CL22(bp, phy,
-                                MDIO_REG_BANK_10G_PARALLEL_DETECT,
-                                MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_CONTROL,
-                                &control2);
+                CL22_RD_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_10G_PARALLEL_DETECT,
+                                  MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_CONTROL,
+                                  &control2);
 
 
                 control2 |=
                     MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_CONTROL_PARDET10G_EN;
 
-                CL45_WR_OVER_CL22(bp, phy,
-                                MDIO_REG_BANK_10G_PARALLEL_DETECT,
-                                MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_CONTROL,
-                                control2);
+                CL22_WR_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_10G_PARALLEL_DETECT,
+                                  MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_CONTROL,
+                                  control2);
 
                 /* Disable parallel detection of HiG */
-                CL45_WR_OVER_CL22(bp, phy,
-                                MDIO_REG_BANK_XGXS_BLOCK2,
-                                MDIO_XGXS_BLOCK2_UNICORE_MODE_10G,
-                                MDIO_XGXS_BLOCK2_UNICORE_MODE_10G_CX4_XGXS |
-                                MDIO_XGXS_BLOCK2_UNICORE_MODE_10G_HIGIG_XGXS);
+                CL22_WR_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_XGXS_BLOCK2,
+                                  MDIO_XGXS_BLOCK2_UNICORE_MODE_10G,
+                                  MDIO_XGXS_BLOCK2_UNICORE_MODE_10G_CX4_XGXS |
+                                  MDIO_XGXS_BLOCK2_UNICORE_MODE_10G_HIGIG_XGXS);
         }
 }
 
 static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
                               struct link_params *params,
-                            struct link_vars *vars,
-                            u8 enable_cl73)
+                              struct link_vars *vars,
+                              u8 enable_cl73)
 {
         struct bnx2x *bp = params->bp;
         u16 reg_val;
 
         /* CL37 Autoneg */
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_MII_CONTROL, &reg_val);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_COMBO_IEEE0,
+                          MDIO_COMBO_IEEE0_MII_CONTROL, &reg_val);
 
         /* CL37 Autoneg Enabled */
         if (vars->line_speed == SPEED_AUTO_NEG)
@@ -1954,15 +1924,15 @@ static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
                 reg_val &= ~(MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
                              MDIO_COMBO_IEEO_MII_CONTROL_RESTART_AN);
 
-        CL45_WR_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_MII_CONTROL, reg_val);
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_COMBO_IEEE0,
+                          MDIO_COMBO_IEEE0_MII_CONTROL, reg_val);
 
         /* Enable/Disable Autodetection */
 
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL1, &reg_val);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_SERDES_DIGITAL_A_1000X_CONTROL1, &reg_val);
         reg_val &= ~(MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_SIGNAL_DETECT_EN |
                     MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_INVERT_SIGNAL_DETECT);
         reg_val |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_FIBER_MODE;
@@ -1971,14 +1941,14 @@ static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
         else
                 reg_val &= ~MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET;
 
-        CL45_WR_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL1, reg_val);
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_SERDES_DIGITAL_A_1000X_CONTROL1, reg_val);
 
         /* Enable TetonII and BAM autoneg */
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_BAM_NEXT_PAGE,
-                              MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL,
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_BAM_NEXT_PAGE,
+                          MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL,
                           &reg_val);
         if (vars->line_speed == SPEED_AUTO_NEG) {
                 /* Enable BAM aneg Mode and TetonII aneg Mode */
@@ -1989,20 +1959,20 @@ static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
                 reg_val &= ~(MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL_BAM_MODE |
                              MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL_TETON_AN);
         }
-        CL45_WR_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_BAM_NEXT_PAGE,
-                              MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL,
-                              reg_val);
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_BAM_NEXT_PAGE,
+                          MDIO_BAM_NEXT_PAGE_MP5_NEXT_PAGE_CTRL,
+                          reg_val);
 
         if (enable_cl73) {
                 /* Enable Cl73 FSM status bits */
-                CL45_WR_OVER_CL22(bp, phy,
-                                      MDIO_REG_BANK_CL73_USERB0,
-                                    MDIO_CL73_USERB0_CL73_UCTRL,
-                                      0xe);
+                CL22_WR_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_CL73_USERB0,
+                                  MDIO_CL73_USERB0_CL73_UCTRL,
+                                  0xe);
 
                 /* Enable BAM Station Manager*/
-                CL45_WR_OVER_CL22(bp, phy,
+                CL22_WR_OVER_CL45(bp, phy,
                         MDIO_REG_BANK_CL73_USERB0,
                         MDIO_CL73_USERB0_CL73_BAM_CTRL1,
                         MDIO_CL73_USERB0_CL73_BAM_CTRL1_BAM_EN |
@@ -2010,10 +1980,10 @@ static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
                         MDIO_CL73_USERB0_CL73_BAM_CTRL1_BAM_NP_AFTER_BP_EN);
 
                 /* Advertise CL73 link speeds */
-                CL45_RD_OVER_CL22(bp, phy,
-                                              MDIO_REG_BANK_CL73_IEEEB1,
-                                              MDIO_CL73_IEEEB1_AN_ADV2,
-                                              &reg_val);
+                CL22_RD_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_CL73_IEEEB1,
+                                  MDIO_CL73_IEEEB1_AN_ADV2,
+                                  &reg_val);
                 if (phy->speed_cap_mask &
                     PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)
                         reg_val |= MDIO_CL73_IEEEB1_AN_ADV2_ADVR_10G_KX4;
@@ -2021,10 +1991,10 @@ static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
                     PORT_HW_CFG_SPEED_CAPABILITY_D0_1G)
                         reg_val |= MDIO_CL73_IEEEB1_AN_ADV2_ADVR_1000M_KX;
 
-                CL45_WR_OVER_CL22(bp, phy,
-                                              MDIO_REG_BANK_CL73_IEEEB1,
-                                              MDIO_CL73_IEEEB1_AN_ADV2,
-                                      reg_val);
+                CL22_WR_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_CL73_IEEEB1,
+                                  MDIO_CL73_IEEEB1_AN_ADV2,
+                                  reg_val);
 
                 /* CL73 Autoneg Enabled */
                 reg_val = MDIO_CL73_IEEEB0_CL73_AN_CONTROL_AN_EN;
@@ -2032,37 +2002,39 @@ static void bnx2x_set_autoneg(struct bnx2x_phy *phy,
         } else /* CL73 Autoneg Disabled */
                 reg_val = 0;
 
-        CL45_WR_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_CL73_IEEEB0,
-                              MDIO_CL73_IEEEB0_CL73_AN_CONTROL, reg_val);
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_CL73_IEEEB0,
+                          MDIO_CL73_IEEEB0_CL73_AN_CONTROL, reg_val);
 }
 
 /* program SerDes, forced speed */
 static void bnx2x_program_serdes(struct bnx2x_phy *phy,
                                  struct link_params *params,
-                               struct link_vars *vars)
+                                 struct link_vars *vars)
 {
         struct bnx2x *bp = params->bp;
         u16 reg_val;
 
         /* program duplex, disable autoneg and sgmii*/
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_MII_CONTROL, &reg_val);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_COMBO_IEEE0,
+                          MDIO_COMBO_IEEE0_MII_CONTROL, &reg_val);
         reg_val &= ~(MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX |
                      MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
                      MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_MASK);
         if (phy->req_duplex == DUPLEX_FULL)
                 reg_val |= MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX;
-        CL45_WR_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_MII_CONTROL, reg_val);
-
-        /* program speed
-           - needed only if the speed is greater than 1G (2.5G or 10G) */
-        CL45_RD_OVER_CL22(bp, phy,
-                                      MDIO_REG_BANK_SERDES_DIGITAL,
-                                      MDIO_SERDES_DIGITAL_MISC1, &reg_val);
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_COMBO_IEEE0,
+                          MDIO_COMBO_IEEE0_MII_CONTROL, reg_val);
+
+        /*
+         * program speed
+         *  - needed only if the speed is greater than 1G (2.5G or 10G)
+         */
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_SERDES_DIGITAL_MISC1, &reg_val);
         /* clearing the speed value before setting the right speed */
         DP(NETIF_MSG_LINK, "MDIO_REG_BANK_SERDES_DIGITAL = 0x%x\n", reg_val);
 
@@ -2083,9 +2055,9 @@ static void bnx2x_program_serdes(struct bnx2x_phy *phy,
                                 MDIO_SERDES_DIGITAL_MISC1_FORCE_SPEED_13G;
         }
 
-        CL45_WR_OVER_CL22(bp, phy,
-                                      MDIO_REG_BANK_SERDES_DIGITAL,
-                                      MDIO_SERDES_DIGITAL_MISC1, reg_val);
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_SERDES_DIGITAL_MISC1, reg_val);
 
 }
 
@@ -2102,13 +2074,13 @@ static void bnx2x_set_brcm_cl37_advertisment(struct bnx2x_phy *phy,
                 val |= MDIO_OVER_1G_UP1_2_5G;
         if (phy->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)
                 val |= MDIO_OVER_1G_UP1_10G;
-        CL45_WR_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_OVER_1G,
-                              MDIO_OVER_1G_UP1, val);
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_OVER_1G,
+                          MDIO_OVER_1G_UP1, val);
 
-        CL45_WR_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_OVER_1G,
-                              MDIO_OVER_1G_UP3, 0x400);
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_OVER_1G,
+                          MDIO_OVER_1G_UP3, 0x400);
 }
 
 static void bnx2x_calc_ieee_aneg_adv(struct bnx2x_phy *phy,
@@ -2116,22 +2088,21 @@ static void bnx2x_calc_ieee_aneg_adv(struct bnx2x_phy *phy,
 {
         struct bnx2x *bp = params->bp;
         *ieee_fc = MDIO_COMBO_IEEE0_AUTO_NEG_ADV_FULL_DUPLEX;
-        /* resolve pause mode and advertisement
-         * Please refer to Table 28B-3 of the 802.3ab-1999 spec */
+        /*
+         * Resolve pause mode and advertisement.
+         * Please refer to Table 28B-3 of the 802.3ab-1999 spec
+         */
 
         switch (phy->req_flow_ctrl) {
         case BNX2X_FLOW_CTRL_AUTO:
-                if (params->req_fc_auto_adv == BNX2X_FLOW_CTRL_BOTH) {
-                        *ieee_fc |=
-                             MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;
-                } else {
+                if (params->req_fc_auto_adv == BNX2X_FLOW_CTRL_BOTH)
+                        *ieee_fc |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH;
+                else
                         *ieee_fc |=
-                       MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
-                }
+                        MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
                 break;
         case BNX2X_FLOW_CTRL_TX:
-                *ieee_fc |=
-                       MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
+                *ieee_fc |= MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC;
                 break;
 
         case BNX2X_FLOW_CTRL_RX:
@@ -2149,23 +2120,23 @@ static void bnx2x_calc_ieee_aneg_adv(struct bnx2x_phy *phy,
 
 static void bnx2x_set_ieee_aneg_advertisment(struct bnx2x_phy *phy,
                                              struct link_params *params,
-                                           u16 ieee_fc)
+                                             u16 ieee_fc)
 {
         struct bnx2x *bp = params->bp;
         u16 val;
         /* for AN, we are always publishing full duplex */
 
-        CL45_WR_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_COMBO_IEEE0,
-                              MDIO_COMBO_IEEE0_AUTO_NEG_ADV, ieee_fc);
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_CL73_IEEEB1,
-                              MDIO_CL73_IEEEB1_AN_ADV1, &val);
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_COMBO_IEEE0,
+                          MDIO_COMBO_IEEE0_AUTO_NEG_ADV, ieee_fc);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_CL73_IEEEB1,
+                          MDIO_CL73_IEEEB1_AN_ADV1, &val);
         val &= ~MDIO_CL73_IEEEB1_AN_ADV1_PAUSE_BOTH;
         val |= ((ieee_fc<<3) & MDIO_CL73_IEEEB1_AN_ADV1_PAUSE_MASK);
-        CL45_WR_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_CL73_IEEEB1,
-                              MDIO_CL73_IEEEB1_AN_ADV1, val);
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_CL73_IEEEB1,
+                          MDIO_CL73_IEEEB1_AN_ADV1, val);
 }
 
 static void bnx2x_restart_autoneg(struct bnx2x_phy *phy,
@@ -2179,67 +2150,67 @@ static void bnx2x_restart_autoneg(struct bnx2x_phy *phy,
         /* Enable and restart BAM/CL37 aneg */
 
         if (enable_cl73) {
-                CL45_RD_OVER_CL22(bp, phy,
-                                      MDIO_REG_BANK_CL73_IEEEB0,
-                                      MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
-                                      &mii_control);
-
-                CL45_WR_OVER_CL22(bp, phy,
-                                MDIO_REG_BANK_CL73_IEEEB0,
-                                MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
-                                (mii_control |
-                                MDIO_CL73_IEEEB0_CL73_AN_CONTROL_AN_EN |
-                                MDIO_CL73_IEEEB0_CL73_AN_CONTROL_RESTART_AN));
+                CL22_RD_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_CL73_IEEEB0,
+                                  MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
+                                  &mii_control);
+
+                CL22_WR_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_CL73_IEEEB0,
+                                  MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
+                                  (mii_control |
+                                  MDIO_CL73_IEEEB0_CL73_AN_CONTROL_AN_EN |
+                                  MDIO_CL73_IEEEB0_CL73_AN_CONTROL_RESTART_AN));
         } else {
 
-                CL45_RD_OVER_CL22(bp, phy,
-                                      MDIO_REG_BANK_COMBO_IEEE0,
-                                      MDIO_COMBO_IEEE0_MII_CONTROL,
-                                      &mii_control);
+                CL22_RD_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_COMBO_IEEE0,
+                                  MDIO_COMBO_IEEE0_MII_CONTROL,
+                                  &mii_control);
                 DP(NETIF_MSG_LINK,
                          "bnx2x_restart_autoneg mii_control before = 0x%x\n",
                          mii_control);
-                CL45_WR_OVER_CL22(bp, phy,
-                                      MDIO_REG_BANK_COMBO_IEEE0,
-                                      MDIO_COMBO_IEEE0_MII_CONTROL,
-                                      (mii_control |
-                                       MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
-                                       MDIO_COMBO_IEEO_MII_CONTROL_RESTART_AN));
+                CL22_WR_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_COMBO_IEEE0,
+                                  MDIO_COMBO_IEEE0_MII_CONTROL,
+                                  (mii_control |
+                                   MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
+                                   MDIO_COMBO_IEEO_MII_CONTROL_RESTART_AN));
         }
 }
 
 static void bnx2x_initialize_sgmii_process(struct bnx2x_phy *phy,
                                            struct link_params *params,
-                                         struct link_vars *vars)
+                                           struct link_vars *vars)
 {
         struct bnx2x *bp = params->bp;
         u16 control1;
 
         /* in SGMII mode, the unicore is always slave */
 
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL1,
-                      &control1);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_SERDES_DIGITAL_A_1000X_CONTROL1,
+                          &control1);
         control1 |= MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_INVERT_SIGNAL_DETECT;
         /* set sgmii mode (and not fiber) */
         control1 &= ~(MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_FIBER_MODE |
                       MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_AUTODET |
                       MDIO_SERDES_DIGITAL_A_1000X_CONTROL1_MSTR_MODE);
-        CL45_WR_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_CONTROL1,
-                              control1);
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_SERDES_DIGITAL_A_1000X_CONTROL1,
+                          control1);
 
         /* if forced speed */
         if (!(vars->line_speed == SPEED_AUTO_NEG)) {
                 /* set speed, disable autoneg */
                 u16 mii_control;
 
-                CL45_RD_OVER_CL22(bp, phy,
-                                      MDIO_REG_BANK_COMBO_IEEE0,
-                                      MDIO_COMBO_IEEE0_MII_CONTROL,
-                                      &mii_control);
+                CL22_RD_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_COMBO_IEEE0,
+                                  MDIO_COMBO_IEEE0_MII_CONTROL,
+                                  &mii_control);
                 mii_control &= ~(MDIO_COMBO_IEEO_MII_CONTROL_AN_EN |
                                  MDIO_COMBO_IEEO_MII_CONTROL_MAN_SGMII_SP_MASK|
                                  MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX);
@@ -2267,10 +2238,10 @@ static void bnx2x_initialize_sgmii_process(struct bnx2x_phy *phy,
                 if (phy->req_duplex == DUPLEX_FULL)
                         mii_control |=
                                 MDIO_COMBO_IEEO_MII_CONTROL_FULL_DUPLEX;
-                CL45_WR_OVER_CL22(bp, phy,
-                                      MDIO_REG_BANK_COMBO_IEEE0,
-                                      MDIO_COMBO_IEEE0_MII_CONTROL,
-                                      mii_control);
+                CL22_WR_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_COMBO_IEEE0,
+                                  MDIO_COMBO_IEEE0_MII_CONTROL,
+                                  mii_control);
 
         } else { /* AN mode */
                 /* enable and restart AN */
@@ -2285,19 +2256,19 @@ static void bnx2x_initialize_sgmii_process(struct bnx2x_phy *phy,
 
 static void bnx2x_pause_resolve(struct link_vars *vars, u32 pause_result)
 {                                               /*  LD      LP   */
-        switch (pause_result) {                 /* ASYM P ASYM P */
-        case 0xb:                               /*   1  0   1  1 */
+        switch (pause_result) {                 /* ASYM P ASYM P */
+        case 0xb:                               /*   1  0   1  1 */
                 vars->flow_ctrl = BNX2X_FLOW_CTRL_TX;
                 break;
 
-        case 0xe:                               /*   1  1   1  0 */
+        case 0xe:                               /*   1  1   1  0 */
                 vars->flow_ctrl = BNX2X_FLOW_CTRL_RX;
                 break;
 
-        case 0x5:                               /*   0  1   0  1 */
-        case 0x7:                               /*   0  1   1  1 */
-        case 0xd:                               /*   1  1   0  1 */
-        case 0xf:                               /*   1  1   1  1 */
+        case 0x5:                               /*   0  1   0  1 */
+        case 0x7:                               /*   0  1   1  1 */
+        case 0xd:                               /*   1  1   0  1 */
+        case 0xf:                               /*   1  1   1  1 */
                 vars->flow_ctrl = BNX2X_FLOW_CTRL_BOTH;
                 break;
 
@@ -2317,24 +2288,24 @@ static u8 bnx2x_direct_parallel_detect_used(struct bnx2x_phy *phy,
         u16 pd_10g, status2_1000x;
         if (phy->req_line_speed != SPEED_AUTO_NEG)
                 return 0;
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_STATUS2,
-                              &status2_1000x);
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_SERDES_DIGITAL,
-                              MDIO_SERDES_DIGITAL_A_1000X_STATUS2,
-                              &status2_1000x);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_SERDES_DIGITAL_A_1000X_STATUS2,
+                          &status2_1000x);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_SERDES_DIGITAL,
+                          MDIO_SERDES_DIGITAL_A_1000X_STATUS2,
+                          &status2_1000x);
         if (status2_1000x & MDIO_SERDES_DIGITAL_A_1000X_STATUS2_AN_DISABLED) {
                 DP(NETIF_MSG_LINK, "1G parallel detect link on port %d\n",
                          params->port);
                 return 1;
         }
 
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_10G_PARALLEL_DETECT,
-                              MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_STATUS,
-                              &pd_10g);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_10G_PARALLEL_DETECT,
+                          MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_STATUS,
+                          &pd_10g);
 
         if (pd_10g & MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_STATUS_PD_LINK) {
                 DP(NETIF_MSG_LINK, "10G parallel detect link on port %d\n",
@@ -2373,14 +2344,14 @@ static void bnx2x_flow_ctrl_resolve(struct bnx2x_phy *phy,
                     (MDIO_GP_STATUS_TOP_AN_STATUS1_CL73_AUTONEG_COMPLETE |
                      MDIO_GP_STATUS_TOP_AN_STATUS1_CL73_MR_LP_NP_AN_ABLE)) {
 
-                        CL45_RD_OVER_CL22(bp, phy,
-                                              MDIO_REG_BANK_CL73_IEEEB1,
-                                              MDIO_CL73_IEEEB1_AN_ADV1,
-                                              &ld_pause);
-                        CL45_RD_OVER_CL22(bp, phy,
-                                             MDIO_REG_BANK_CL73_IEEEB1,
-                                             MDIO_CL73_IEEEB1_AN_LP_ADV1,
-                                             &lp_pause);
+                        CL22_RD_OVER_CL45(bp, phy,
+                                          MDIO_REG_BANK_CL73_IEEEB1,
+                                          MDIO_CL73_IEEEB1_AN_ADV1,
+                                          &ld_pause);
+                        CL22_RD_OVER_CL45(bp, phy,
+                                          MDIO_REG_BANK_CL73_IEEEB1,
+                                          MDIO_CL73_IEEEB1_AN_LP_ADV1,
+                                          &lp_pause);
                         pause_result = (ld_pause &
                                         MDIO_CL73_IEEEB1_AN_ADV1_PAUSE_MASK)
                                         >> 8;
@@ -2390,18 +2361,18 @@ static void bnx2x_flow_ctrl_resolve(struct bnx2x_phy *phy,
                         DP(NETIF_MSG_LINK, "pause_result CL73 0x%x\n",
                                  pause_result);
                 } else {
-                        CL45_RD_OVER_CL22(bp, phy,
-                                              MDIO_REG_BANK_COMBO_IEEE0,
-                                              MDIO_COMBO_IEEE0_AUTO_NEG_ADV,
-                                              &ld_pause);
-                        CL45_RD_OVER_CL22(bp, phy,
-                               MDIO_REG_BANK_COMBO_IEEE0,
-                               MDIO_COMBO_IEEE0_AUTO_NEG_LINK_PARTNER_ABILITY1,
-                               &lp_pause);
+                        CL22_RD_OVER_CL45(bp, phy,
+                                          MDIO_REG_BANK_COMBO_IEEE0,
+                                          MDIO_COMBO_IEEE0_AUTO_NEG_ADV,
+                                          &ld_pause);
+                        CL22_RD_OVER_CL45(bp, phy,
+                                MDIO_REG_BANK_COMBO_IEEE0,
+                                MDIO_COMBO_IEEE0_AUTO_NEG_LINK_PARTNER_ABILITY1,
+                                &lp_pause);
                         pause_result = (ld_pause &
                                 MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_MASK)>>5;
                         pause_result |= (lp_pause &
-                                 MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_MASK)>>7;
+                                MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_MASK)>>7;
                         DP(NETIF_MSG_LINK, "pause_result CL37 0x%x\n",
                                  pause_result);
                 }
@@ -2417,25 +2388,25 @@ static void bnx2x_check_fallback_to_cl37(struct bnx2x_phy *phy,
         u16 rx_status, ustat_val, cl37_fsm_recieved;
         DP(NETIF_MSG_LINK, "bnx2x_check_fallback_to_cl37\n");
         /* Step 1: Make sure signal is detected */
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_RX0,
-                              MDIO_RX0_RX_STATUS,
-                              &rx_status);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_RX0,
+                          MDIO_RX0_RX_STATUS,
+                          &rx_status);
         if ((rx_status & MDIO_RX0_RX_STATUS_SIGDET) !=
             (MDIO_RX0_RX_STATUS_SIGDET)) {
                 DP(NETIF_MSG_LINK, "Signal is not detected. Restoring CL73."
                              "rx_status(0x80b0) = 0x%x\n", rx_status);
-                CL45_WR_OVER_CL22(bp, phy,
-                                      MDIO_REG_BANK_CL73_IEEEB0,
-                                      MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
-                                      MDIO_CL73_IEEEB0_CL73_AN_CONTROL_AN_EN);
+                CL22_WR_OVER_CL45(bp, phy,
+                                  MDIO_REG_BANK_CL73_IEEEB0,
+                                  MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
+                                  MDIO_CL73_IEEEB0_CL73_AN_CONTROL_AN_EN);
                 return;
         }
         /* Step 2: Check CL73 state machine */
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_CL73_USERB0,
-                              MDIO_CL73_USERB0_CL73_USTAT1,
-                              &ustat_val);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_CL73_USERB0,
+                          MDIO_CL73_USERB0_CL73_USTAT1,
+                          &ustat_val);
         if ((ustat_val &
              (MDIO_CL73_USERB0_CL73_USTAT1_LINK_STATUS_CHECK |
               MDIO_CL73_USERB0_CL73_USTAT1_AN_GOOD_CHECK_BAM37)) !=
@@ -2445,12 +2416,14 @@ static void bnx2x_check_fallback_to_cl37(struct bnx2x_phy *phy,
                              "ustat_val(0x8371) = 0x%x\n", ustat_val);
                 return;
         }
-        /* Step 3: Check CL37 Message Pages received to indicate LP
-        supports only CL37 */
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_REMOTE_PHY,
-                              MDIO_REMOTE_PHY_MISC_RX_STATUS,
-                              &cl37_fsm_recieved);
+        /*
+         * Step 3: Check CL37 Message Pages received to indicate LP
+         * supports only CL37
+         */
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_REMOTE_PHY,
+                          MDIO_REMOTE_PHY_MISC_RX_STATUS,
+                          &cl37_fsm_recieved);
         if ((cl37_fsm_recieved &
              (MDIO_REMOTE_PHY_MISC_RX_STATUS_CL37_FSM_RECEIVED_OVER1G_MSG |
              MDIO_REMOTE_PHY_MISC_RX_STATUS_CL37_FSM_RECEIVED_BRCM_OUI_MSG)) !=
@@ -2461,14 +2434,18 @@ static void bnx2x_check_fallback_to_cl37(struct bnx2x_phy *phy,
                          cl37_fsm_recieved);
                 return;
         }
-        /* The combined cl37/cl73 fsm state information indicating that we are
-        connected to a device which does not support cl73, but does support
-        cl37 BAM. In this case we disable cl73 and restart cl37 auto-neg */
+        /*
+         * The combined cl37/cl73 fsm state information indicating that
+         * we are connected to a device which does not support cl73, but
+         * does support cl37 BAM. In this case we disable cl73 and
+         * restart cl37 auto-neg
+         */
+
         /* Disable CL73 */
-        CL45_WR_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_CL73_IEEEB0,
-                              MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
-                              0);
+        CL22_WR_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_CL73_IEEEB0,
+                          MDIO_CL73_IEEEB0_CL73_AN_CONTROL,
+                          0);
         /* Restart CL37 autoneg */
         bnx2x_restart_autoneg(phy, params, 0);
         DP(NETIF_MSG_LINK, "Disabling CL73, and restarting CL37 autoneg\n");
@@ -2493,14 +2470,14 @@ static u8 bnx2x_link_settings_status(struct bnx2x_phy *phy,
                                      struct link_vars *vars)
 {
         struct bnx2x *bp = params->bp;
-        u16 new_line_speed , gp_status;
+        u16 new_line_speed, gp_status;
         u8 rc = 0;
 
         /* Read gp_status */
-        CL45_RD_OVER_CL22(bp, phy,
-                                MDIO_REG_BANK_GP_STATUS,
-                                MDIO_GP_STATUS_TOP_AN_STATUS1,
-                                &gp_status);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_GP_STATUS,
+                          MDIO_GP_STATUS_TOP_AN_STATUS1,
+                          &gp_status);
 
         if (phy->req_line_speed == SPEED_AUTO_NEG)
                 vars->link_status |= LINK_STATUS_AUTO_NEGOTIATE_ENABLED;
@@ -2637,9 +2614,9 @@ static void bnx2x_set_gmii_tx_driver(struct link_params *params)
         u16 bank;
 
         /* read precomp */
-        CL45_RD_OVER_CL22(bp, phy,
-                              MDIO_REG_BANK_OVER_1G,
-                              MDIO_OVER_1G_LP_UP2, &lp_up2);
+        CL22_RD_OVER_CL45(bp, phy,
+                          MDIO_REG_BANK_OVER_1G,
+                          MDIO_OVER_1G_LP_UP2, &lp_up2);
 
         /* bits [10:7] at lp_up2, positioned at [15:12] */
         lp_up2 = (((lp_up2 & MDIO_OVER_1G_LP_UP2_PREEMPHASIS_MASK) >>
@@ -2651,18 +2628,18 @@ static void bnx2x_set_gmii_tx_driver(struct link_params *params)
 
         for (bank = MDIO_REG_BANK_TX0; bank <= MDIO_REG_BANK_TX3;
               bank += (MDIO_REG_BANK_TX1 - MDIO_REG_BANK_TX0)) {
-                CL45_RD_OVER_CL22(bp, phy,
-                                      bank,
-                                      MDIO_TX0_TX_DRIVER, &tx_driver);
+                CL22_RD_OVER_CL45(bp, phy,
+                                  bank,
+                                  MDIO_TX0_TX_DRIVER, &tx_driver);
 
                 /* replace tx_driver bits [15:12] */
                 if (lp_up2 !=
                     (tx_driver & MDIO_TX0_TX_DRIVER_PREEMPHASIS_MASK)) {
                         tx_driver &= ~MDIO_TX0_TX_DRIVER_PREEMPHASIS_MASK;
                         tx_driver |= lp_up2;
-                        CL45_WR_OVER_CL22(bp, phy,
-                                              bank,
-                                              MDIO_TX0_TX_DRIVER, tx_driver);
+                        CL22_WR_OVER_CL45(bp, phy,
+                                          bank,
+                                          MDIO_TX0_TX_DRIVER, tx_driver);
                 }
         }
 }
@@ -2676,10 +2653,10 @@ static u8 bnx2x_emac_program(struct link_params *params,
 
         DP(NETIF_MSG_LINK, "setting link speed & duplex\n");
         bnx2x_bits_dis(bp, GRCBASE_EMAC0 + port*0x400 +
-                     EMAC_REG_EMAC_MODE,
-                     (EMAC_MODE_25G_MODE |
-                     EMAC_MODE_PORT_MII_10M |
-                     EMAC_MODE_HALF_DUPLEX));
+                       EMAC_REG_EMAC_MODE,
+                       (EMAC_MODE_25G_MODE |
+                        EMAC_MODE_PORT_MII_10M |
+                        EMAC_MODE_HALF_DUPLEX));
         switch (vars->line_speed) {
         case SPEED_10:
                 mode |= EMAC_MODE_PORT_MII_10M;
@@ -2707,8 +2684,8 @@ static u8 bnx2x_emac_program(struct link_params *params,
         if (vars->duplex == DUPLEX_HALF)
                 mode |= EMAC_MODE_HALF_DUPLEX;
         bnx2x_bits_en(bp,
-                    GRCBASE_EMAC0 + port*0x400 + EMAC_REG_EMAC_MODE,
-                    mode);
+                      GRCBASE_EMAC0 + port*0x400 + EMAC_REG_EMAC_MODE,
+                      mode);
 
         bnx2x_set_led(params, vars, LED_MODE_OPER, vars->line_speed);
         return 0;
@@ -2723,7 +2700,7 @@ static void bnx2x_set_preemphasis(struct bnx2x_phy *phy,
 
         for (bank = MDIO_REG_BANK_RX0, i = 0; bank <= MDIO_REG_BANK_RX3;
               bank += (MDIO_REG_BANK_RX1-MDIO_REG_BANK_RX0), i++) {
-                        CL45_WR_OVER_CL22(bp, phy,
+                        CL22_WR_OVER_CL45(bp, phy,
                                           bank,
                                           MDIO_RX0_RX_EQ_BOOST,
                                           phy->rx_preemphasis[i]);
@@ -2731,7 +2708,7 @@ static void bnx2x_set_preemphasis(struct bnx2x_phy *phy,
 
         for (bank = MDIO_REG_BANK_TX0, i = 0; bank <= MDIO_REG_BANK_TX3;
                       bank += (MDIO_REG_BANK_TX1 - MDIO_REG_BANK_TX0), i++) {
-                        CL45_WR_OVER_CL22(bp, phy,
+                        CL22_WR_OVER_CL45(bp, phy,
                                           bank,
                                           MDIO_TX0_TX_DRIVER,
                                           phy->tx_preemphasis[i]);
@@ -2754,7 +2731,7 @@ static void bnx2x_init_internal_phy(struct bnx2x_phy *phy,
                 /* forced speed requested? */
                 if (vars->line_speed != SPEED_AUTO_NEG ||
                     (SINGLE_MEDIA_DIRECT(params) &&
-                          params->loopback_mode == LOOPBACK_EXT)) {
+                     params->loopback_mode == LOOPBACK_EXT)) {
                         DP(NETIF_MSG_LINK, "not SGMII, no AN\n");
 
                         /* disable autoneg */
@@ -2771,7 +2748,7 @@ static void bnx2x_init_internal_phy(struct bnx2x_phy *phy,
 
                         /* program duplex & pause advertisement (for aneg) */
                         bnx2x_set_ieee_aneg_advertisment(phy, params,
-                                                       vars->ieee_fc);
+                                                         vars->ieee_fc);
 
                         /* enable autoneg */
                         bnx2x_set_autoneg(phy, params, vars, enable_cl73);
@@ -2842,7 +2819,8 @@ static u8 bnx2x_init_xgxs(struct bnx2x_phy *phy,
 }
 
 static u16 bnx2x_wait_reset_complete(struct bnx2x *bp,
-                                     struct bnx2x_phy *phy)
+                                     struct bnx2x_phy *phy,
+                                     struct link_params *params)
 {
         u16 cnt, ctrl;
         /* Wait for soft reset to get cleared upto 1 sec */
@@ -2853,6 +2831,11 @@ static u16 bnx2x_wait_reset_complete(struct bnx2x *bp,
                         break;
                 msleep(1);
         }
+
+        if (cnt == 1000)
+                netdev_err(bp->dev,  "Warning: PHY was not initialized,"
+                                      " Port %d\n",
+                         params->port);
         DP(NETIF_MSG_LINK, "control reg 0x%x (after %d ms)\n", ctrl, cnt);
         return cnt;
 }
@@ -2863,9 +2846,7 @@ static void bnx2x_link_int_enable(struct link_params *params)
         u32 mask;
         struct bnx2x *bp = params->bp;
 
-        /* setting the status to report on link up
-           for either XGXS or SerDes */
-
+        /* Setting the status to report on link up for either XGXS or SerDes */
         if (params->switch_cfg == SWITCH_CFG_10G) {
                 mask = (NIG_MASK_XGXS0_LINK10G |
                         NIG_MASK_XGXS0_LINK_STATUS);
@@ -2908,7 +2889,7 @@ static void bnx2x_rearm_latch_signal(struct bnx2x *bp, u8 port,
 {
         u32 latch_status = 0;
 
-        /**
+        /*
          * Disable the MI INT ( external phy int ) by writing 1 to the
          * status register. Link down indication is high-active-signal,
          * so in this case we need to write the status to clear the XOR
@@ -2933,27 +2914,30 @@ static void bnx2x_rearm_latch_signal(struct bnx2x *bp, u8 port,
 
                 /* For all latched-signal=up : Re-Arm Latch signals */
                 REG_WR(bp, NIG_REG_LATCH_STATUS_0 + port*8,
-                             (latch_status & 0xfffe) | (latch_status & 1));
+                       (latch_status & 0xfffe) | (latch_status & 1));
         }
         /* For all latched-signal=up,Write original_signal to status */
 }
 
 static void bnx2x_link_int_ack(struct link_params *params,
-                             struct link_vars *vars, u8 is_10g)
+                               struct link_vars *vars, u8 is_10g)
 {
         struct bnx2x *bp = params->bp;
         u8 port = params->port;
 
-        /* first reset all status
-         * we assume only one line will be change at a time */
+        /*
+         * First reset all status we assume only one line will be
+         * change at a time
+         */
         bnx2x_bits_dis(bp, NIG_REG_STATUS_INTERRUPT_PORT0 + port*4,
-                     (NIG_STATUS_XGXS0_LINK10G |
-                      NIG_STATUS_XGXS0_LINK_STATUS |
-                      NIG_STATUS_SERDES0_LINK_STATUS));
+                       (NIG_STATUS_XGXS0_LINK10G |
+                        NIG_STATUS_XGXS0_LINK_STATUS |
+                        NIG_STATUS_SERDES0_LINK_STATUS));
         if (vars->phy_link_up) {
                 if (is_10g) {
-                        /* Disable the 10G link interrupt
-                         * by writing 1 to the status register
+                        /*
+                         * Disable the 10G link interrupt by writing 1 to the
+                         * status register
                          */
                         DP(NETIF_MSG_LINK, "10G XGXS phy link up\n");
                         bnx2x_bits_en(bp,
@@ -2961,9 +2945,9 @@ static void bnx2x_link_int_ack(struct link_params *params,
                                       NIG_STATUS_XGXS0_LINK10G);
 
                 } else if (params->switch_cfg == SWITCH_CFG_10G) {
-                        /* Disable the link interrupt
-                         * by writing 1 to the relevant lane
-                         * in the status register
+                        /*
+                         * Disable the link interrupt by writing 1 to the
+                         * relevant lane in the status register
                          */
                         u32 ser_lane = ((params->lane_config &
                                     PORT_HW_CFG_LANE_SWAP_CFG_MASTER_MASK) >>
@@ -2978,8 +2962,9 @@ static void bnx2x_link_int_ack(struct link_params *params,
 
                 } else { /* SerDes */
                         DP(NETIF_MSG_LINK, "SerDes phy link up\n");
-                        /* Disable the link interrupt
-                         * by writing 1 to the status register
+                        /*
+                         * Disable the link interrupt by writing 1 to the status
+                         * register
                          */
                         bnx2x_bits_en(bp,
                                       NIG_REG_STATUS_INTERRUPT_PORT0 + port*4,
@@ -3059,8 +3044,7 @@ u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded,
         }
         if ((params->num_phys == MAX_PHYS) &&
             (params->phy[EXT_PHY2].ver_addr != 0)) {
-                spirom_ver = REG_RD(bp,
-                                          params->phy[EXT_PHY2].ver_addr);
+                spirom_ver = REG_RD(bp, params->phy[EXT_PHY2].ver_addr);
                 if (params->phy[EXT_PHY2].format_fw_ver) {
                         *ver_p = '/';
                         ver_p++;
@@ -3089,29 +3073,27 @@ static void bnx2x_set_xgxs_loopback(struct bnx2x_phy *phy,
 
                 /* change the uni_phy_addr in the nig */
                 md_devad = REG_RD(bp, (NIG_REG_XGXS0_CTRL_MD_DEVAD +
-                                          port*0x18));
+                                       port*0x18));
 
                 REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_DEVAD + port*0x18, 0x5);
 
                 bnx2x_cl45_write(bp, phy,
-                               5,
-                               (MDIO_REG_BANK_AER_BLOCK +
-                                (MDIO_AER_BLOCK_AER_REG & 0xf)),
-                               0x2800);
+                                 5,
+                                 (MDIO_REG_BANK_AER_BLOCK +
+                                  (MDIO_AER_BLOCK_AER_REG & 0xf)),
+                                 0x2800);
 
                 bnx2x_cl45_write(bp, phy,
-                               5,
-                               (MDIO_REG_BANK_CL73_IEEEB0 +
-                                (MDIO_CL73_IEEEB0_CL73_AN_CONTROL & 0xf)),
-                               0x6041);
+                                 5,
+                                 (MDIO_REG_BANK_CL73_IEEEB0 +
+                                  (MDIO_CL73_IEEEB0_CL73_AN_CONTROL & 0xf)),
+                                 0x6041);
                 msleep(200);
                 /* set aer mmd back */
                 bnx2x_set_aer_mmd_xgxs(params, phy);
 
                 /* and md_devad */
-                REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_DEVAD + port*0x18,
-                            md_devad);
-
+                REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_DEVAD + port*0x18, md_devad);
         } else {
                 u16 mii_ctrl;
                 DP(NETIF_MSG_LINK, "XGXS 1G loopback enable\n");
@@ -3152,56 +3134,71 @@ u8 bnx2x_set_led(struct link_params *params,
         case LED_MODE_OFF:
                 REG_WR(bp, NIG_REG_LED_10G_P0 + port*4, 0);
                 REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4,
-                           SHARED_HW_CFG_LED_MAC1);
+                       SHARED_HW_CFG_LED_MAC1);
 
                 tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
                 EMAC_WR(bp, EMAC_REG_EMAC_LED, (tmp | EMAC_LED_OVERRIDE));
                 break;
 
         case LED_MODE_OPER:
-                /**
+                /*
                  * For all other phys, OPER mode is same as ON, so in case
                  * link is down, do nothing
-                 **/
+                 */
                 if (!vars->link_up)
                         break;
         case LED_MODE_ON:
-                if (SINGLE_MEDIA_DIRECT(params)) {
-                        /**
-                        * This is a work-around for HW issue found when link
-                        * is up in CL73
-                        */
+                if (params->phy[EXT_PHY1].type ==
+                    PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727 &&
+                    CHIP_IS_E2(bp) && params->num_phys == 2) {
+                        /*
+                         * This is a work-around for E2+8727 Configurations
+                         */
+                        if (mode == LED_MODE_ON ||
+                                speed == SPEED_10000){
+                                REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, 0);
+                                REG_WR(bp, NIG_REG_LED_10G_P0 + port*4, 1);
+
+                                tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
+                                EMAC_WR(bp, EMAC_REG_EMAC_LED,
+                                        (tmp | EMAC_LED_OVERRIDE));
+                                return rc;
+                        }
+                } else if (SINGLE_MEDIA_DIRECT(params)) {
+                        /*
+                         * This is a work-around for HW issue found when link
+                         * is up in CL73
+                         */
                         REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, 0);
                         REG_WR(bp, NIG_REG_LED_10G_P0 + port*4, 1);
                 } else {
-                        REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4,
-                                   hw_led_mode);
+                        REG_WR(bp, NIG_REG_LED_MODE_P0 + port*4, hw_led_mode);
                 }
 
-                REG_WR(bp, NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0 +
-                           port*4, 0);
+                REG_WR(bp, NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0 + port*4, 0);
                 /* Set blinking rate to ~15.9Hz */
                 REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_RATE_P0 + port*4,
-                           LED_BLINK_RATE_VAL);
+                       LED_BLINK_RATE_VAL);
                 REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_RATE_ENA_P0 +
-                           port*4, 1);
+                       port*4, 1);
                 tmp = EMAC_RD(bp, EMAC_REG_EMAC_LED);
-                EMAC_WR(bp, EMAC_REG_EMAC_LED,
-                            (tmp & (~EMAC_LED_OVERRIDE)));
+                EMAC_WR(bp, EMAC_REG_EMAC_LED, (tmp & (~EMAC_LED_OVERRIDE)));
 
                 if (CHIP_IS_E1(bp) &&
                     ((speed == SPEED_2500) ||
                      (speed == SPEED_1000) ||
                      (speed == SPEED_100) ||
                      (speed == SPEED_10))) {
-                        /* On Everest 1 Ax chip versions for speeds less than
-                        10G LED scheme is different */
+                        /*
+                         * On Everest 1 Ax chip versions for speeds less than
+                         * 10G LED scheme is different
+                         */
                         REG_WR(bp, NIG_REG_LED_CONTROL_OVERRIDE_TRAFFIC_P0
-                                   + port*4, 1);
+                               + port*4, 1);
                         REG_WR(bp, NIG_REG_LED_CONTROL_TRAFFIC_P0 +
-                                   port*4, 0);
+                               port*4, 0);
                         REG_WR(bp, NIG_REG_LED_CONTROL_BLINK_TRAFFIC_P0 +
-                                   port*4, 1);
+                               port*4, 1);
                 }
                 break;
 
@@ -3215,7 +3212,7 @@ u8 bnx2x_set_led(struct link_params *params,
 
 }
 
-/**
+/*
  * This function comes to reflect the actual link state read DIRECTLY from the
  * HW
  */
@@ -3227,10 +3224,10 @@ u8 bnx2x_test_link(struct link_params *params, struct link_vars *vars,
         u8 ext_phy_link_up = 0, serdes_phy_type;
         struct link_vars temp_vars;
 
-        CL45_RD_OVER_CL22(bp, &params->phy[INT_PHY],
-                              MDIO_REG_BANK_GP_STATUS,
-                              MDIO_GP_STATUS_TOP_AN_STATUS1,
-                              &gp_status);
+        CL22_RD_OVER_CL45(bp, &params->phy[INT_PHY],
+                          MDIO_REG_BANK_GP_STATUS,
+                          MDIO_GP_STATUS_TOP_AN_STATUS1,
+                          &gp_status);
         /* link is up only if both local phy and external phy are up */
         if (!(gp_status & MDIO_GP_STATUS_TOP_AN_STATUS1_LINK_STATUS))
                 return -ESRCH;
@@ -3274,15 +3271,15 @@ static u8 bnx2x_link_initialize(struct link_params *params,
         u8 rc = 0;
         u8 phy_index, non_ext_phy;
         struct bnx2x *bp = params->bp;
-        /**
-        * In case of external phy existence, the line speed would be the
-        * line speed linked up by the external phy. In case it is direct
-        * only, then the line_speed during initialization will be
-        * equal to the req_line_speed
-        */
+        /*
+         * In case of external phy existence, the line speed would be the
+         * line speed linked up by the external phy. In case it is direct
+         * only, then the line_speed during initialization will be
+         * equal to the req_line_speed
+         */
         vars->line_speed = params->phy[INT_PHY].req_line_speed;
 
-        /**
+        /*
          * Initialize the internal phy in case this is a direct board
          * (no external phys), or this board has external phy which requires
          * to first.
@@ -3310,17 +3307,16 @@ static u8 bnx2x_link_initialize(struct link_params *params,
         if (!non_ext_phy)
                 for (phy_index = EXT_PHY1; phy_index < params->num_phys;
                       phy_index++) {
-                        /**
+                        /*
                          * No need to initialize second phy in case of first
                          * phy only selection. In case of second phy, we do
                          * need to initialize the first phy, since they are
                          * connected.
-                         **/
+                         */
                         if (phy_index == EXT_PHY2 &&
                             (bnx2x_phy_selection(params) ==
                              PORT_HW_CFG_PHY_SELECTION_FIRST_PHY)) {
-                                DP(NETIF_MSG_LINK, "Not initializing"
-                                                   "second phy\n");
+                                DP(NETIF_MSG_LINK, "Ignoring second phy\n");
                                 continue;
                         }
                         params->phy[phy_index].config_init(
@@ -3342,9 +3338,8 @@ static void bnx2x_int_link_reset(struct bnx2x_phy *phy,
                                  struct link_params *params)
 {
         /* reset the SerDes/XGXS */
-        REG_WR(params->bp, GRCBASE_MISC +
-                     MISC_REGISTERS_RESET_REG_3_CLEAR,
-                     (0x1ff << (params->port*16)));
+        REG_WR(params->bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_CLEAR,
+               (0x1ff << (params->port*16)));
 }
 
 static void bnx2x_common_ext_link_reset(struct bnx2x_phy *phy,
@@ -3358,11 +3353,11 @@ static void bnx2x_common_ext_link_reset(struct bnx2x_phy *phy,
         else
                 gpio_port = params->port;
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW,
-                            gpio_port);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW,
+                       gpio_port);
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW,
-                            gpio_port);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW,
+                       gpio_port);
         DP(NETIF_MSG_LINK, "reset external PHY\n");
 }
 
@@ -3393,9 +3388,8 @@ static u8 bnx2x_update_link_down(struct link_params *params,
 
         /* reset BigMac */
         bnx2x_bmac_rx_disable(bp, params->port);
-        REG_WR(bp, GRCBASE_MISC +
-                   MISC_REGISTERS_RESET_REG_2_CLEAR,
-                   (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
+        REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_CLEAR,
+               (MISC_REGISTERS_RESET_REG_2_RST_BMAC0 << port));
         return 0;
 }
 
@@ -3446,7 +3440,7 @@ static u8 bnx2x_update_link_up(struct link_params *params,
         msleep(20);
         return rc;
 }
-/**
+/*
  * The bnx2x_link_update function should be called upon link
  * interrupt.
  * Link is considered up as follows:
@@ -3485,12 +3479,11 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                  REG_RD(bp, NIG_REG_STATUS_INTERRUPT_PORT0 + port*4));
 
         is_mi_int = (u8)(REG_RD(bp, NIG_REG_EMAC0_STATUS_MISC_MI_INT +
-                                    port*0x18) > 0);
+                                port*0x18) > 0);
         DP(NETIF_MSG_LINK, "int_mask 0x%x MI_INT %x, SERDES_LINK %x\n",
                  REG_RD(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4),
                  is_mi_int,
-                 REG_RD(bp,
-                            NIG_REG_SERDES0_STATUS_LINK_STATUS + port*0x3c));
+                 REG_RD(bp, NIG_REG_SERDES0_STATUS_LINK_STATUS + port*0x3c));
 
         DP(NETIF_MSG_LINK, " 10G %x, XGXS_LINK %x\n",
           REG_RD(bp, NIG_REG_XGXS0_STATUS_LINK10G + port*0x68),
@@ -3499,14 +3492,14 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
         /* disable emac */
         REG_WR(bp, NIG_REG_NIG_EMAC0_EN + port*4, 0);
 
-        /**
-        * Step 1:
-        * Check external link change only for external phys, and apply
-        * priority selection between them in case the link on both phys
-        * is up. Note that the instead of the common vars, a temporary
-        * vars argument is used since each phy may have different link/
-        * speed/duplex result
-        */
+        /*
+         * Step 1:
+         * Check external link change only for external phys, and apply
+         * priority selection between them in case the link on both phys
+         * is up. Note that the instead of the common vars, a temporary
+         * vars argument is used since each phy may have different link/
+         * speed/duplex result
+         */
         for (phy_index = EXT_PHY1; phy_index < params->num_phys;
               phy_index++) {
                 struct bnx2x_phy *phy = &params->phy[phy_index];
@@ -3531,22 +3524,22 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                         switch (bnx2x_phy_selection(params)) {
                         case PORT_HW_CFG_PHY_SELECTION_HARDWARE_DEFAULT:
                         case PORT_HW_CFG_PHY_SELECTION_FIRST_PHY_PRIORITY:
-                        /**
+                        /*
                          * In this option, the first PHY makes sure to pass the
                          * traffic through itself only.
                          * Its not clear how to reset the link on the second phy
-                         **/
+                         */
                                 active_external_phy = EXT_PHY1;
                                 break;
                         case PORT_HW_CFG_PHY_SELECTION_SECOND_PHY_PRIORITY:
-                        /**
+                        /*
                          * In this option, the first PHY makes sure to pass the
                          * traffic through the second PHY.
-                         **/
+                         */
                                 active_external_phy = EXT_PHY2;
                                 break;
                         default:
-                        /**
+                        /*
                          * Link indication on both PHYs with the following cases
                          * is invalid:
                          * - FIRST_PHY means that second phy wasn't initialized,
@@ -3554,7 +3547,7 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                          * - SECOND_PHY means that first phy should not be able
                          * to link up by itself (using configuration)
                          * - DEFAULT should be overriden during initialiazation
-                         **/
+                         */
                                 DP(NETIF_MSG_LINK, "Invalid link indication"
                                            "mpc=0x%x. DISABLING LINK !!!\n",
                                            params->multi_phy_config);
@@ -3564,18 +3557,18 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                 }
         }
         prev_line_speed = vars->line_speed;
-        /**
-        * Step 2:
-        * Read the status of the internal phy. In case of
-        * DIRECT_SINGLE_MEDIA board, this link is the external link,
-        * otherwise this is the link between the 577xx and the first
-        * external phy
-        */
+        /*
+         * Step 2:
+         * Read the status of the internal phy. In case of
+         * DIRECT_SINGLE_MEDIA board, this link is the external link,
+         * otherwise this is the link between the 577xx and the first
+         * external phy
+         */
         if (params->phy[INT_PHY].read_status)
                 params->phy[INT_PHY].read_status(
                         &params->phy[INT_PHY],
                         params, vars);
-        /**
+        /*
          * The INT_PHY flow control reside in the vars. This include the
          * case where the speed or flow control are not set to AUTO.
          * Otherwise, the active external phy flow control result is set
@@ -3585,13 +3578,13 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
          */
         if (active_external_phy > INT_PHY) {
                 vars->flow_ctrl = phy_vars[active_external_phy].flow_ctrl;
-                /**
+                /*
                  * Link speed is taken from the XGXS. AN and FC result from
                  * the external phy.
                  */
                 vars->link_status |= phy_vars[active_external_phy].link_status;
 
-                /**
+                /*
                  * if active_external_phy is first PHY and link is up - disable
                  * disable TX on second external PHY
                  */
@@ -3627,7 +3620,7 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
         DP(NETIF_MSG_LINK, "vars->flow_ctrl = 0x%x, vars->link_status = 0x%x,"
                    " ext_phy_line_speed = %d\n", vars->flow_ctrl,
                    vars->link_status, ext_phy_line_speed);
-        /**
+        /*
          * Upon link speed change set the NIG into drain mode. Comes to
          * deals with possible FIFO glitch due to clk change when speed
          * is decreased without link down indicator
@@ -3642,8 +3635,8 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                                    ext_phy_line_speed);
                         vars->phy_link_up = 0;
                 } else if (prev_line_speed != vars->line_speed) {
-                        REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE
-                                     + params->port*4, 0);
+                        REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4,
+                               0);
                         msleep(1);
                 }
         }
@@ -3658,14 +3651,14 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
 
         bnx2x_link_int_ack(params, vars, link_10g);
 
-        /**
-        * In case external phy link is up, and internal link is down
-        * (not initialized yet probably after link initialization, it
-        * needs to be initialized.
-        * Note that after link down-up as result of cable plug, the xgxs
-        * link would probably become up again without the need
-        * initialize it
-        */
+        /*
+         * In case external phy link is up, and internal link is down
+         * (not initialized yet probably after link initialization, it
+         * needs to be initialized.
+         * Note that after link down-up as result of cable plug, the xgxs
+         * link would probably become up again without the need
+         * initialize it
+         */
         if (!(SINGLE_MEDIA_DIRECT(params))) {
                 DP(NETIF_MSG_LINK, "ext_phy_link_up = %d, int_link_up = %d,"
                            " init_preceding = %d\n", ext_phy_link_up,
@@ -3685,9 +3678,9 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
                                                 vars);
                 }
         }
-        /**
-         *  Link is up only if both local phy and external phy (in case of
-         *  non-direct board) are up
+        /*
+         * Link is up only if both local phy and external phy (in case of
+         * non-direct board) are up
          */
         vars->link_up = (vars->phy_link_up &&
                          (ext_phy_link_up ||
@@ -3708,10 +3701,10 @@ u8 bnx2x_link_update(struct link_params *params, struct link_vars *vars)
 void bnx2x_ext_phy_hw_reset(struct bnx2x *bp, u8 port)
 {
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
         msleep(1);
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, port);
+                       MISC_REGISTERS_GPIO_OUTPUT_HIGH, port);
 }
 
 static void bnx2x_save_spirom_version(struct bnx2x *bp, u8 port,
@@ -3731,9 +3724,9 @@ static void bnx2x_save_bcm_spirom_ver(struct bnx2x *bp,
         u16 fw_ver1, fw_ver2;
 
         bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_ROM_VER1, &fw_ver1);
+                        MDIO_PMA_REG_ROM_VER1, &fw_ver1);
         bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_ROM_VER2, &fw_ver2);
+                        MDIO_PMA_REG_ROM_VER2, &fw_ver2);
         bnx2x_save_spirom_version(bp, port, (u32)(fw_ver1<<16 | fw_ver2),
                                   phy->ver_addr);
 }
@@ -3754,7 +3747,7 @@ static void bnx2x_ext_phy_set_pause(struct link_params *params,
         if ((vars->ieee_fc &
             MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC) ==
             MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_ASYMMETRIC) {
-                val |=  MDIO_AN_REG_ADV_PAUSE_ASYMMETRIC;
+                val |= MDIO_AN_REG_ADV_PAUSE_ASYMMETRIC;
         }
         if ((vars->ieee_fc &
             MDIO_COMBO_IEEE0_AUTO_NEG_ADV_PAUSE_BOTH) ==
@@ -3785,11 +3778,11 @@ static u8 bnx2x_ext_phy_resolve_fc(struct bnx2x_phy *phy,
         else if (vars->link_status & LINK_STATUS_AUTO_NEGOTIATE_COMPLETE) {
                 ret = 1;
                 bnx2x_cl45_read(bp, phy,
-                              MDIO_AN_DEVAD,
-                              MDIO_AN_REG_ADV_PAUSE, &ld_pause);
+                                MDIO_AN_DEVAD,
+                                MDIO_AN_REG_ADV_PAUSE, &ld_pause);
                 bnx2x_cl45_read(bp, phy,
-                              MDIO_AN_DEVAD,
-                              MDIO_AN_REG_LP_AUTO_NEG, &lp_pause);
+                                MDIO_AN_DEVAD,
+                                MDIO_AN_REG_LP_AUTO_NEG, &lp_pause);
                 pause_result = (ld_pause &
                                 MDIO_AN_REG_ADV_PAUSE_MASK) >> 8;
                 pause_result |= (lp_pause &
@@ -3854,90 +3847,82 @@ static void bnx2x_8073_resolve_fc(struct bnx2x_phy *phy,
                            pause_result);
         }
 }
-
-static void bnx2x_8073_8727_external_rom_boot(struct bnx2x *bp,
+static u8 bnx2x_8073_8727_external_rom_boot(struct bnx2x *bp,
                                               struct bnx2x_phy *phy,
                                               u8 port)
 {
+        u32 count = 0;
+        u16 fw_ver1, fw_msgout;
+        u8 rc = 0;
+
         /* Boot port from external ROM  */
         /* EDC grst */
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_GEN_CTRL,
-                       0x0001);
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_GEN_CTRL,
+                         0x0001);
 
         /* ucode reboot and rst */
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_GEN_CTRL,
-                       0x008c);
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_GEN_CTRL,
+                         0x008c);
 
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_MISC_CTRL1, 0x0001);
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_MISC_CTRL1, 0x0001);
 
         /* Reset internal microprocessor */
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_GEN_CTRL,
-                       MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET);
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_GEN_CTRL,
+                         MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET);
 
         /* Release srst bit */
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_GEN_CTRL,
-                       MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP);
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_GEN_CTRL,
+                         MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP);
 
-        /* wait for 120ms for code download via SPI port */
-        msleep(120);
+        /* Delay 100ms per the PHY specifications */
+        msleep(100);
 
-        /* Clear ser_boot_ctl bit */
-        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_MISC_CTRL1, 0x0000);
-        bnx2x_save_bcm_spirom_ver(bp, phy, port);
-}
+        /* 8073 sometimes taking longer to download */
+        do {
+                count++;
+                if (count > 300) {
+                        DP(NETIF_MSG_LINK,
+                                 "bnx2x_8073_8727_external_rom_boot port %x:"
+                                 "Download failed. fw version = 0x%x\n",
+                                 port, fw_ver1);
+                        rc = -EINVAL;
+                        break;
+                }
 
-static void bnx2x_8073_set_xaui_low_power_mode(struct bnx2x *bp,
-                                               struct bnx2x_phy *phy)
-{
-        u16 val;
-        bnx2x_cl45_read(bp, phy,
-                        MDIO_PMA_DEVAD, MDIO_PMA_REG_8073_CHIP_REV, &val);
+                bnx2x_cl45_read(bp, phy,
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_ROM_VER1, &fw_ver1);
+                bnx2x_cl45_read(bp, phy,
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_M8051_MSGOUT_REG, &fw_msgout);
 
-        if (val == 0) {
-                /* Mustn't set low power mode in 8073 A0 */
-                return;
-        }
+                msleep(1);
+        } while (fw_ver1 == 0 || fw_ver1 == 0x4321 ||
+                        ((fw_msgout & 0xff) != 0x03 && (phy->type ==
+                        PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073)));
 
-        /* Disable PLL sequencer (use read-modify-write to clear bit 13) */
-        bnx2x_cl45_read(bp, phy,
-                        MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, &val);
-        val &= ~(1<<13);
+        /* Clear ser_boot_ctl bit */
         bnx2x_cl45_write(bp, phy,
-                       MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, val);
-
-        /* PLL controls */
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805E, 0x1077);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805D, 0x0000);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805C, 0x030B);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805B, 0x1240);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x805A, 0x2490);
-
-        /* Tx Controls */
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80A7, 0x0C74);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80A6, 0x9041);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80A5, 0x4640);
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_MISC_CTRL1, 0x0000);
+        bnx2x_save_bcm_spirom_ver(bp, phy, port);
 
-        /* Rx Controls */
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80FE, 0x01C4);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80FD, 0x9249);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, 0x80FC, 0x2015);
+        DP(NETIF_MSG_LINK,
+                 "bnx2x_8073_8727_external_rom_boot port %x:"
+                 "Download complete. fw version = 0x%x\n",
+                 port, fw_ver1);
 
-        /* Enable PLL sequencer  (use read-modify-write to set bit 13) */
-        bnx2x_cl45_read(bp, phy, MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, &val);
-        val |= (1<<13);
-        bnx2x_cl45_write(bp, phy, MDIO_XS_DEVAD, MDIO_XS_PLL_SEQUENCER, val);
+        return rc;
 }
 
 /******************************************************************/
@@ -3950,8 +3935,8 @@ static u8 bnx2x_8073_is_snr_needed(struct bnx2x *bp, struct bnx2x_phy *phy)
 
         /* Read 8073 HW revision*/
         bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_8073_CHIP_REV, &val);
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_8073_CHIP_REV, &val);
 
         if (val != 1) {
                 /* No need to workaround in 8073 A1 */
@@ -3959,8 +3944,8 @@ static u8 bnx2x_8073_is_snr_needed(struct bnx2x *bp, struct bnx2x_phy *phy)
         }
 
         bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_ROM_VER2, &val);
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_ROM_VER2, &val);
 
         /* SNR should be applied only for version 0x102 */
         if (val != 0x102)
@@ -3974,8 +3959,8 @@ static u8 bnx2x_8073_xaui_wa(struct bnx2x *bp, struct bnx2x_phy *phy)
         u16 val, cnt, cnt1 ;
 
         bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_8073_CHIP_REV, &val);
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_8073_CHIP_REV, &val);
 
         if (val > 0) {
                 /* No need to workaround in 8073 A1 */
@@ -3983,26 +3968,32 @@ static u8 bnx2x_8073_xaui_wa(struct bnx2x *bp, struct bnx2x_phy *phy)
         }
         /* XAUI workaround in 8073 A0: */
 
-        /* After loading the boot ROM and restarting Autoneg,
-        poll Dev1, Reg $C820: */
+        /*
+         * After loading the boot ROM and restarting Autoneg, poll
+         * Dev1, Reg $C820:
+         */
 
         for (cnt = 0; cnt < 1000; cnt++) {
                 bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_8073_SPEED_LINK_STATUS,
-                              &val);
-                  /* If bit [14] = 0 or bit [13] = 0, continue on with
-                   system initialization (XAUI work-around not required,
-                    as these bits indicate 2.5G or 1G link up). */
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_8073_SPEED_LINK_STATUS,
+                                &val);
+                  /*
+                   * If bit [14] = 0 or bit [13] = 0, continue on with
+                   * system initialization (XAUI work-around not required, as
+                   * these bits indicate 2.5G or 1G link up).
+                   */
                 if (!(val & (1<<14)) || !(val & (1<<13))) {
                         DP(NETIF_MSG_LINK, "XAUI work-around not required\n");
                         return 0;
                 } else if (!(val & (1<<15))) {
-                        DP(NETIF_MSG_LINK, "clc bit 15 went off\n");
-                         /* If bit 15 is 0, then poll Dev1, Reg $C841 until
-                          it's MSB (bit 15) goes to 1 (indicating that the
-                          XAUI workaround has completed),
-                          then continue on with system initialization.*/
+                        DP(NETIF_MSG_LINK, "bit 15 went off\n");
+                        /*
+                         * If bit 15 is 0, then poll Dev1, Reg $C841 until it's
+                         * MSB (bit15) goes to 1 (indicating that the XAUI
+                         * workaround has completed), then continue on with
+                         * system initialization.
+                         */
                         for (cnt1 = 0; cnt1 < 1000; cnt1++) {
                                 bnx2x_cl45_read(bp, phy,
                                         MDIO_PMA_DEVAD,
@@ -4085,10 +4076,10 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
                 gpio_port = params->port;
         /* Restore normal power mode*/
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, gpio_port);
+                       MISC_REGISTERS_GPIO_OUTPUT_HIGH, gpio_port);
 
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, gpio_port);
+                       MISC_REGISTERS_GPIO_OUTPUT_HIGH, gpio_port);
 
         /* enable LASI */
         bnx2x_cl45_write(bp, phy,
@@ -4098,8 +4089,6 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
 
         bnx2x_8073_set_pause_cl37(params, phy, vars);
 
-        bnx2x_8073_set_xaui_low_power_mode(bp, phy);
-
         bnx2x_cl45_read(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_REG_M8051_MSGOUT_REG, &tmp1);
 
@@ -4108,6 +4097,21 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
 
         DP(NETIF_MSG_LINK, "Before rom RX_ALARM(port1): 0x%x\n", tmp1);
 
+        /* Swap polarity if required - Must be done only in non-1G mode */
+        if (params->lane_config & PORT_HW_CFG_SWAP_PHY_POLARITY_ENABLED) {
+                /* Configure the 8073 to swap _P and _N of the KR lines */
+                DP(NETIF_MSG_LINK, "Swapping polarity for the 8073\n");
+                /* 10G Rx/Tx and 1G Tx signal polarity swap */
+                bnx2x_cl45_read(bp, phy,
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_8073_OPT_DIGITAL_CTRL, &val);
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_PMA_DEVAD,
+                                 MDIO_PMA_REG_8073_OPT_DIGITAL_CTRL,
+                                 (val | (3<<9)));
+        }
+
+
         /* Enable CL37 BAM */
         if (REG_RD(bp, params->shmem_base +
                          offsetof(struct shmem_region, dev_info.
@@ -4135,8 +4139,10 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
                         val = (1<<7);
                 } else if (phy->req_line_speed ==  SPEED_2500) {
                         val = (1<<5);
-                        /* Note that 2.5G works only
-                        when used with 1G advertisment */
+                        /*
+                         * Note that 2.5G works only when used with 1G
+                         * advertisment
+                         */
                 } else
                         val = (1<<5);
         } else {
@@ -4145,8 +4151,7 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
                         PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)
                         val |= (1<<7);
 
-                /* Note that 2.5G works only when
-                used with 1G advertisment */
+                /* Note that 2.5G works only when used with 1G advertisment */
                 if (phy->speed_cap_mask &
                         (PORT_HW_CFG_SPEED_CAPABILITY_D0_1G |
                          PORT_HW_CFG_SPEED_CAPABILITY_D0_2_5G))
@@ -4186,9 +4191,11 @@ static u8 bnx2x_8073_config_init(struct bnx2x_phy *phy,
         /* Add support for CL37 (passive mode) III */
         bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x1000);
 
-        /* The SNR will improve about 2db by changing
-        BW and FEE main tap. Rest commands are executed
-        after link is up*/
+        /*
+         * The SNR will improve about 2db by changing BW and FEE main
+         * tap. Rest commands are executed after link is up
+         * Change FFE main cursor to 5 in EDC register
+         */
         if (bnx2x_8073_is_snr_needed(bp, phy))
                 bnx2x_cl45_write(bp, phy,
                                  MDIO_PMA_DEVAD, MDIO_PMA_REG_EDC_FFE_MAIN,
@@ -4272,12 +4279,11 @@ static u8 bnx2x_8073_read_status(struct bnx2x_phy *phy,
 
         link_up = (((val1 & 4) == 4) || (an1000_status & (1<<1)));
         if (link_up && bnx2x_8073_is_snr_needed(bp, phy)) {
-                /* The SNR will improve about 2dbby
-                changing the BW and FEE main tap.*/
-                /* The 1st write to change FFE main
-                tap is set before restart AN */
-                /* Change PLL Bandwidth in EDC
-                register */
+                /*
+                 * The SNR will improve about 2dbby changing the BW and FEE main
+                 * tap. The 1st write to change FFE main tap is set before
+                 * restart AN. Change PLL Bandwidth in EDC register
+                 */
                 bnx2x_cl45_write(bp, phy,
                                  MDIO_PMA_DEVAD, MDIO_PMA_REG_PLL_BANDWIDTH,
                                  0x26BC);
@@ -4314,8 +4320,32 @@ static u8 bnx2x_8073_read_status(struct bnx2x_phy *phy,
         }
 
         if (link_up) {
+                /* Swap polarity if required */
+                if (params->lane_config &
+                    PORT_HW_CFG_SWAP_PHY_POLARITY_ENABLED) {
+                        /* Configure the 8073 to swap P and N of the KR lines */
+                        bnx2x_cl45_read(bp, phy,
+                                        MDIO_XS_DEVAD,
+                                        MDIO_XS_REG_8073_RX_CTRL_PCIE, &val1);
+                        /*
+                         * Set bit 3 to invert Rx in 1G mode and clear this bit
+                         * when it`s in 10G mode.
+                         */
+                        if (vars->line_speed == SPEED_1000) {
+                                DP(NETIF_MSG_LINK, "Swapping 1G polarity for"
+                                              "the 8073\n");
+                                val1 |= (1<<3);
+                        } else
+                                val1 &= ~(1<<3);
+
+                        bnx2x_cl45_write(bp, phy,
+                                         MDIO_XS_DEVAD,
+                                         MDIO_XS_REG_8073_RX_CTRL_PCIE,
+                                         val1);
+                }
                 bnx2x_ext_phy_10G_an_resolve(bp, phy, vars);
                 bnx2x_8073_resolve_fc(phy, params, vars);
+                vars->duplex = DUPLEX_FULL;
         }
         return link_up;
 }
@@ -4332,8 +4362,8 @@ static void bnx2x_8073_link_reset(struct bnx2x_phy *phy,
         DP(NETIF_MSG_LINK, "Setting 8073 port %d into low power mode\n",
            gpio_port);
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW,
-                            gpio_port);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW,
+                       gpio_port);
 }
 
 /******************************************************************/
@@ -4347,11 +4377,11 @@ static u8 bnx2x_8705_config_init(struct bnx2x_phy *phy,
         DP(NETIF_MSG_LINK, "init 8705\n");
         /* Restore normal power mode*/
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
+                       MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
         /* HW reset */
         bnx2x_ext_phy_hw_reset(bp, params->port);
         bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 0xa040);
-        bnx2x_wait_reset_complete(bp, phy);
+        bnx2x_wait_reset_complete(bp, phy, params);
 
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD, MDIO_PMA_REG_MISC_CTRL, 0x8288);
@@ -4402,35 +4432,79 @@ static u8 bnx2x_8705_read_status(struct bnx2x_phy *phy,
 /******************************************************************/
 /*                      SFP+ module Section                       */
 /******************************************************************/
-static void bnx2x_sfp_set_transmitter(struct bnx2x *bp,
+static u8 bnx2x_get_gpio_port(struct link_params *params)
+{
+        u8 gpio_port;
+        u32 swap_val, swap_override;
+        struct bnx2x *bp = params->bp;
+        if (CHIP_IS_E2(bp))
+                gpio_port = BP_PATH(bp);
+        else
+                gpio_port = params->port;
+        swap_val = REG_RD(bp, NIG_REG_PORT_SWAP);
+        swap_override = REG_RD(bp, NIG_REG_STRAP_OVERRIDE);
+        return gpio_port ^ (swap_val && swap_override);
+}
+static void bnx2x_sfp_set_transmitter(struct link_params *params,
                                       struct bnx2x_phy *phy,
-                                      u8 port,
                                       u8 tx_en)
 {
         u16 val;
+        u8 port = params->port;
+        struct bnx2x *bp = params->bp;
+        u32 tx_en_mode;
 
-        DP(NETIF_MSG_LINK, "Setting transmitter tx_en=%x for port %x\n",
-                 tx_en, port);
         /* Disable/Enable transmitter ( TX laser of the SFP+ module.)*/
-        bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_PHY_IDENTIFIER,
-                      &val);
+        tx_en_mode = REG_RD(bp, params->shmem_base +
+                            offsetof(struct shmem_region,
+                                     dev_info.port_hw_config[port].sfp_ctrl)) &
+                PORT_HW_CFG_TX_LASER_MASK;
+        DP(NETIF_MSG_LINK, "Setting transmitter tx_en=%x for port %x "
+                           "mode = %x\n", tx_en, port, tx_en_mode);
+        switch (tx_en_mode) {
+        case PORT_HW_CFG_TX_LASER_MDIO:
 
-        if (tx_en)
-                val &= ~(1<<15);
-        else
-                val |= (1<<15);
+                bnx2x_cl45_read(bp, phy,
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_PHY_IDENTIFIER,
+                                &val);
 
-        bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_PHY_IDENTIFIER,
-                       val);
+                if (tx_en)
+                        val &= ~(1<<15);
+                else
+                        val |= (1<<15);
+
+                bnx2x_cl45_write(bp, phy,
+                                 MDIO_PMA_DEVAD,
+                                 MDIO_PMA_REG_PHY_IDENTIFIER,
+                                 val);
+        break;
+        case PORT_HW_CFG_TX_LASER_GPIO0:
+        case PORT_HW_CFG_TX_LASER_GPIO1:
+        case PORT_HW_CFG_TX_LASER_GPIO2:
+        case PORT_HW_CFG_TX_LASER_GPIO3:
+        {
+                u16 gpio_pin;
+                u8 gpio_port, gpio_mode;
+                if (tx_en)
+                        gpio_mode = MISC_REGISTERS_GPIO_OUTPUT_HIGH;
+                else
+                        gpio_mode = MISC_REGISTERS_GPIO_OUTPUT_LOW;
+
+                gpio_pin = tx_en_mode - PORT_HW_CFG_TX_LASER_GPIO0;
+                gpio_port = bnx2x_get_gpio_port(params);
+                bnx2x_set_gpio(bp, gpio_pin, gpio_mode, gpio_port);
+                break;
+        }
+        default:
+                DP(NETIF_MSG_LINK, "Invalid TX_LASER_MDIO 0x%x\n", tx_en_mode);
+                break;
+        }
 }
 
 static u8 bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                                             struct link_params *params,
-                                          u16 addr, u8 byte_cnt, u8 *o_buf)
+                                            u16 addr, u8 byte_cnt, u8 *o_buf)
 {
         struct bnx2x *bp = params->bp;
         u16 val = 0;
@@ -4443,23 +4517,23 @@ static u8 bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
         /* Set the read command byte count */
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD, MDIO_PMA_REG_SFP_TWO_WIRE_BYTE_CNT,
-                       (byte_cnt | 0xa000));
+                         (byte_cnt | 0xa000));
 
         /* Set the read command address */
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD, MDIO_PMA_REG_SFP_TWO_WIRE_MEM_ADDR,
-                       addr);
+                         addr);
 
         /* Activate read command */
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD, MDIO_PMA_REG_SFP_TWO_WIRE_CTRL,
-                       0x2c0f);
+                         0x2c0f);
 
         /* Wait up to 500us for command complete status */
         for (i = 0; i < 100; i++) {
                 bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
                 if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) ==
                     MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_COMPLETE)
                         break;
@@ -4477,15 +4551,15 @@ static u8 bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
         /* Read the buffer */
         for (i = 0; i < byte_cnt; i++) {
                 bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_8726_TWO_WIRE_DATA_BUF + i, &val);
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_8726_TWO_WIRE_DATA_BUF + i, &val);
                 o_buf[i] = (u8)(val & MDIO_PMA_REG_8726_TWO_WIRE_DATA_MASK);
         }
 
         for (i = 0; i < 100; i++) {
                 bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
                 if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) ==
                     MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_IDLE)
                         return 0;
@@ -4496,7 +4570,7 @@ static u8 bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
 
 static u8 bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                                             struct link_params *params,
-                                          u16 addr, u8 byte_cnt, u8 *o_buf)
+                                            u16 addr, u8 byte_cnt, u8 *o_buf)
 {
         struct bnx2x *bp = params->bp;
         u16 val, i;
@@ -4509,41 +4583,43 @@ static u8 bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
 
         /* Need to read from 1.8000 to clear it */
         bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_SFP_TWO_WIRE_CTRL,
-                      &val);
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_SFP_TWO_WIRE_CTRL,
+                        &val);
 
         /* Set the read command byte count */
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_SFP_TWO_WIRE_BYTE_CNT,
-                       ((byte_cnt < 2) ? 2 : byte_cnt));
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_SFP_TWO_WIRE_BYTE_CNT,
+                         ((byte_cnt < 2) ? 2 : byte_cnt));
 
         /* Set the read command address */
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_SFP_TWO_WIRE_MEM_ADDR,
-                       addr);
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_SFP_TWO_WIRE_MEM_ADDR,
+                         addr);
         /* Set the destination address */
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       0x8004,
-                       MDIO_PMA_REG_8727_TWO_WIRE_DATA_BUF);
+                         MDIO_PMA_DEVAD,
+                         0x8004,
+                         MDIO_PMA_REG_8727_TWO_WIRE_DATA_BUF);
 
         /* Activate read command */
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_SFP_TWO_WIRE_CTRL,
-                       0x8002);
-        /* Wait appropriate time for two-wire command to finish before
-        polling the status register */
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_SFP_TWO_WIRE_CTRL,
+                         0x8002);
+        /*
+         * Wait appropriate time for two-wire command to finish before
+         * polling the status register
+         */
         msleep(1);
 
         /* Wait up to 500us for command complete status */
         for (i = 0; i < 100; i++) {
                 bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
                 if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) ==
                     MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_COMPLETE)
                         break;
@@ -4555,21 +4631,21 @@ static u8 bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
                 DP(NETIF_MSG_LINK,
                          "Got bad status 0x%x when reading from SFP+ EEPROM\n",
                          (val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK));
-                return -EINVAL;
+                return -EFAULT;
         }
 
         /* Read the buffer */
         for (i = 0; i < byte_cnt; i++) {
                 bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_8727_TWO_WIRE_DATA_BUF + i, &val);
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_8727_TWO_WIRE_DATA_BUF + i, &val);
                 o_buf[i] = (u8)(val & MDIO_PMA_REG_8727_TWO_WIRE_DATA_MASK);
         }
 
         for (i = 0; i < 100; i++) {
                 bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
                 if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) ==
                     MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_IDLE)
                         return 0;
@@ -4579,22 +4655,22 @@ static u8 bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
         return -EINVAL;
 }
 
-static u8 bnx2x_read_sfp_module_eeprom(struct bnx2x_phy *phy,
-                                       struct link_params *params, u16 addr,
-                                       u8 byte_cnt, u8 *o_buf)
+u8 bnx2x_read_sfp_module_eeprom(struct bnx2x_phy *phy,
+                                struct link_params *params, u16 addr,
+                                u8 byte_cnt, u8 *o_buf)
 {
         if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726)
                 return bnx2x_8726_read_sfp_module_eeprom(phy, params, addr,
-                                                       byte_cnt, o_buf);
+                                                         byte_cnt, o_buf);
         else if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727)
                 return bnx2x_8727_read_sfp_module_eeprom(phy, params, addr,
-                                                       byte_cnt, o_buf);
+                                                         byte_cnt, o_buf);
         return -EINVAL;
 }
 
 static u8 bnx2x_get_edc_mode(struct bnx2x_phy *phy,
                              struct link_params *params,
-                                  u16 *edc_mode)
+                             u16 *edc_mode)
 {
         struct bnx2x *bp = params->bp;
         u8 val, check_limiting_mode = 0;
@@ -4615,8 +4691,10 @@ static u8 bnx2x_get_edc_mode(struct bnx2x_phy *phy,
         {
                 u8 copper_module_type;
 
-                /* Check if its active cable( includes SFP+ module)
-                of passive cable*/
+                /*
+                 * Check if its active cable (includes SFP+ module)
+                 * of passive cable
+                 */
                 if (bnx2x_read_sfp_module_eeprom(phy,
                                                params,
                                                SFP_EEPROM_FC_TX_TECH_ADDR,
@@ -4675,8 +4753,10 @@ static u8 bnx2x_get_edc_mode(struct bnx2x_phy *phy,
         DP(NETIF_MSG_LINK, "EDC mode is set to 0x%x\n", *edc_mode);
         return 0;
 }
-/* This function read the relevant field from the module ( SFP+ ),
-        and verify it is compliant with this board */
+/*
+ * This function read the relevant field from the module (SFP+), and verify it
+ * is compliant with this board
+ */
 static u8 bnx2x_verify_sfp_module(struct bnx2x_phy *phy,
                                   struct link_params *params)
 {
@@ -4725,24 +4805,24 @@ static u8 bnx2x_verify_sfp_module(struct bnx2x_phy *phy,
         /* format the warning message */
         if (bnx2x_read_sfp_module_eeprom(phy,
                                          params,
-                                       SFP_EEPROM_VENDOR_NAME_ADDR,
-                                       SFP_EEPROM_VENDOR_NAME_SIZE,
-                                       (u8 *)vendor_name))
+                                         SFP_EEPROM_VENDOR_NAME_ADDR,
+                                         SFP_EEPROM_VENDOR_NAME_SIZE,
+                                         (u8 *)vendor_name))
                 vendor_name[0] = '\0';
         else
                 vendor_name[SFP_EEPROM_VENDOR_NAME_SIZE] = '\0';
         if (bnx2x_read_sfp_module_eeprom(phy,
                                          params,
-                                       SFP_EEPROM_PART_NO_ADDR,
-                                       SFP_EEPROM_PART_NO_SIZE,
-                                       (u8 *)vendor_pn))
+                                         SFP_EEPROM_PART_NO_ADDR,
+                                         SFP_EEPROM_PART_NO_SIZE,
+                                         (u8 *)vendor_pn))
                 vendor_pn[0] = '\0';
         else
                 vendor_pn[SFP_EEPROM_PART_NO_SIZE] = '\0';
 
-        netdev_info(bp->dev, "Warning: Unqualified SFP+ module detected,"
-                             " Port %d from %s part number %s\n",
-                    params->port, vendor_name, vendor_pn);
+        netdev_err(bp->dev,  "Warning: Unqualified SFP+ module detected,"
+                              " Port %d from %s part number %s\n",
+                         params->port, vendor_name, vendor_pn);
         phy->flags |= FLAGS_SFP_NOT_APPROVED;
         return -EINVAL;
 }
@@ -4754,8 +4834,11 @@ static u8 bnx2x_wait_for_sfp_module_initialized(struct bnx2x_phy *phy,
         u8 val;
         struct bnx2x *bp = params->bp;
         u16 timeout;
-        /* Initialization time after hot-plug may take up to 300ms for some
-        phys type ( e.g. JDSU ) */
+        /*
+         * Initialization time after hot-plug may take up to 300ms for
+         * some phys type ( e.g. JDSU )
+         */
+
         for (timeout = 0; timeout < 60; timeout++) {
                 if (bnx2x_read_sfp_module_eeprom(phy, params, 1, 1, &val)
                     == 0) {
@@ -4774,16 +4857,14 @@ static void bnx2x_8727_power_module(struct bnx2x *bp,
         /* Make sure GPIOs are not using for LED mode */
         u16 val;
         /*
-         * In the GPIO register, bit 4 is use to detemine if the GPIOs are
+         * In the GPIO register, bit 4 is use to determine if the GPIOs are
          * operating as INPUT or as OUTPUT. Bit 1 is for input, and 0 for
          * output
          * Bits 0-1 determine the gpios value for OUTPUT in case bit 4 val is 0
          * Bits 8-9 determine the gpios value for INPUT in case bit 4 val is 1
          * where the 1st bit is the over-current(only input), and 2nd bit is
          * for power( only output )
-        */
-
-        /*
+         *
          * In case of NOC feature is disabled and power is up, set GPIO control
          *  as input to enable listening of over-current indication
          */
@@ -4812,15 +4893,14 @@ static u8 bnx2x_8726_set_limiting_mode(struct bnx2x *bp,
         u16 cur_limiting_mode;
 
         bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_ROM_VER2,
-                      &cur_limiting_mode);
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_ROM_VER2,
+                        &cur_limiting_mode);
         DP(NETIF_MSG_LINK, "Current Limiting mode is 0x%x\n",
                  cur_limiting_mode);
 
         if (edc_mode == EDC_MODE_LIMITING) {
-                DP(NETIF_MSG_LINK,
-                         "Setting LIMITING MODE\n");
+                DP(NETIF_MSG_LINK, "Setting LIMITING MODE\n");
                 bnx2x_cl45_write(bp, phy,
                                  MDIO_PMA_DEVAD,
                                  MDIO_PMA_REG_ROM_VER2,
@@ -4829,62 +4909,63 @@ static u8 bnx2x_8726_set_limiting_mode(struct bnx2x *bp,
 
                 DP(NETIF_MSG_LINK, "Setting LRM MODE\n");
 
-                /* Changing to LRM mode takes quite few seconds.
-                So do it only if current mode is limiting
-                ( default is LRM )*/
+                /*
+                 * Changing to LRM mode takes quite few seconds. So do it only
+                 * if current mode is limiting (default is LRM)
+                 */
                 if (cur_limiting_mode != EDC_MODE_LIMITING)
                         return 0;
 
                 bnx2x_cl45_write(bp, phy,
-                               MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_LRM_MODE,
-                               0);
+                                 MDIO_PMA_DEVAD,
+                                 MDIO_PMA_REG_LRM_MODE,
+                                 0);
                 bnx2x_cl45_write(bp, phy,
-                               MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_ROM_VER2,
-                               0x128);
+                                 MDIO_PMA_DEVAD,
+                                 MDIO_PMA_REG_ROM_VER2,
+                                 0x128);
                 bnx2x_cl45_write(bp, phy,
-                               MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_MISC_CTRL0,
-                               0x4008);
+                                 MDIO_PMA_DEVAD,
+                                 MDIO_PMA_REG_MISC_CTRL0,
+                                 0x4008);
                 bnx2x_cl45_write(bp, phy,
-                               MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_LRM_MODE,
-                               0xaaaa);
+                                 MDIO_PMA_DEVAD,
+                                 MDIO_PMA_REG_LRM_MODE,
+                                 0xaaaa);
         }
         return 0;
 }
 
 static u8 bnx2x_8727_set_limiting_mode(struct bnx2x *bp,
                                        struct bnx2x_phy *phy,
-                                        u16 edc_mode)
+                                       u16 edc_mode)
 {
         u16 phy_identifier;
         u16 rom_ver2_val;
         bnx2x_cl45_read(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_PHY_IDENTIFIER,
-                       &phy_identifier);
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_PHY_IDENTIFIER,
+                        &phy_identifier);
 
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_PHY_IDENTIFIER,
-                       (phy_identifier & ~(1<<9)));
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_PHY_IDENTIFIER,
+                         (phy_identifier & ~(1<<9)));
 
         bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_ROM_VER2,
-                      &rom_ver2_val);
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_ROM_VER2,
+                        &rom_ver2_val);
         /* Keep the MSB 8-bits, and set the LSB 8-bits with the edc_mode */
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_ROM_VER2,
-                       (rom_ver2_val & 0xff00) | (edc_mode & 0x00ff));
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_ROM_VER2,
+                         (rom_ver2_val & 0xff00) | (edc_mode & 0x00ff));
 
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_PHY_IDENTIFIER,
-                       (phy_identifier | (1<<9)));
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_PHY_IDENTIFIER,
+                         (phy_identifier | (1<<9)));
 
         return 0;
 }
@@ -4897,11 +4978,11 @@ static void bnx2x_8727_specific_func(struct bnx2x_phy *phy,
 
         switch (action) {
         case DISABLE_TX:
-                bnx2x_sfp_set_transmitter(bp, phy, params->port, 0);
+                bnx2x_sfp_set_transmitter(params, phy, 0);
                 break;
         case ENABLE_TX:
                 if (!(phy->flags & FLAGS_SFP_NOT_APPROVED))
-                        bnx2x_sfp_set_transmitter(bp, phy, params->port, 1);
+                        bnx2x_sfp_set_transmitter(params, phy, 1);
                 break;
         default:
                 DP(NETIF_MSG_LINK, "Function 0x%x not supported by 8727\n",
@@ -4910,6 +4991,38 @@ static void bnx2x_8727_specific_func(struct bnx2x_phy *phy,
         }
 }
 
+static void bnx2x_set_sfp_module_fault_led(struct link_params *params,
+                                           u8 gpio_mode)
+{
+        struct bnx2x *bp = params->bp;
+
+        u32 fault_led_gpio = REG_RD(bp, params->shmem_base +
+                            offsetof(struct shmem_region,
+                        dev_info.port_hw_config[params->port].sfp_ctrl)) &
+                PORT_HW_CFG_FAULT_MODULE_LED_MASK;
+        switch (fault_led_gpio) {
+        case PORT_HW_CFG_FAULT_MODULE_LED_DISABLED:
+                return;
+        case PORT_HW_CFG_FAULT_MODULE_LED_GPIO0:
+        case PORT_HW_CFG_FAULT_MODULE_LED_GPIO1:
+        case PORT_HW_CFG_FAULT_MODULE_LED_GPIO2:
+        case PORT_HW_CFG_FAULT_MODULE_LED_GPIO3:
+        {
+                u8 gpio_port = bnx2x_get_gpio_port(params);
+                u16 gpio_pin = fault_led_gpio -
+                        PORT_HW_CFG_FAULT_MODULE_LED_GPIO0;
+                DP(NETIF_MSG_LINK, "Set fault module-detected led "
+                                   "pin %x port %x mode %x\n",
+                               gpio_pin, gpio_port, gpio_mode);
+                bnx2x_set_gpio(bp, gpio_pin, gpio_mode, gpio_port);
+        }
+        break;
+        default:
+                DP(NETIF_MSG_LINK, "Error: Invalid fault led mode 0x%x\n",
+                               fault_led_gpio);
+        }
+}
+
 static u8 bnx2x_sfp_module_detection(struct bnx2x_phy *phy,
                                      struct link_params *params)
 {
@@ -4927,15 +5040,14 @@ static u8 bnx2x_sfp_module_detection(struct bnx2x_phy *phy,
         if (bnx2x_get_edc_mode(phy, params, &edc_mode) != 0) {
                 DP(NETIF_MSG_LINK, "Failed to get valid module type\n");
                 return -EINVAL;
-        } else if (bnx2x_verify_sfp_module(phy, params) !=
-                   0) {
+        } else if (bnx2x_verify_sfp_module(phy, params) != 0) {
                 /* check SFP+ module compatibility */
                 DP(NETIF_MSG_LINK, "Module verification failed!!\n");
                 rc = -EINVAL;
                 /* Turn on fault module-detected led */
-                bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
-                                  MISC_REGISTERS_GPIO_HIGH,
-                                  params->port);
+                bnx2x_set_sfp_module_fault_led(params,
+                                               MISC_REGISTERS_GPIO_HIGH);
+
                 if ((phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727) &&
                     ((val & PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_MASK) ==
                      PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_POWER_DOWN)) {
@@ -4946,18 +5058,17 @@ static u8 bnx2x_sfp_module_detection(struct bnx2x_phy *phy,
                 }
         } else {
                 /* Turn off fault module-detected led */
-                DP(NETIF_MSG_LINK, "Turn off fault module-detected led\n");
-                bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
-                                          MISC_REGISTERS_GPIO_LOW,
-                                          params->port);
+                bnx2x_set_sfp_module_fault_led(params, MISC_REGISTERS_GPIO_LOW);
         }
 
         /* power up the SFP module */
         if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727)
                 bnx2x_8727_power_module(bp, phy, 1);
 
-        /* Check and set limiting mode / LRM mode on 8726.
-        On 8727 it is done automatically */
+        /*
+         * Check and set limiting mode / LRM mode on 8726. On 8727 it
+         * is done automatically
+         */
         if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726)
                 bnx2x_8726_set_limiting_mode(bp, phy, edc_mode);
         else
@@ -4969,9 +5080,9 @@ static u8 bnx2x_sfp_module_detection(struct bnx2x_phy *phy,
         if (rc == 0 ||
             (val & PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_MASK) !=
             PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_DISABLE_TX_LASER)
-                bnx2x_sfp_set_transmitter(bp, phy, params->port, 1);
+                bnx2x_sfp_set_transmitter(params, phy, 1);
         else
-                bnx2x_sfp_set_transmitter(bp, phy, params->port, 0);
+                bnx2x_sfp_set_transmitter(params, phy, 0);
 
         return rc;
 }
@@ -4984,11 +5095,9 @@ void bnx2x_handle_module_detect_int(struct link_params *params)
         u8 port = params->port;
 
         /* Set valid module led off */
-        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
-                          MISC_REGISTERS_GPIO_HIGH,
-                          params->port);
+        bnx2x_set_sfp_module_fault_led(params, MISC_REGISTERS_GPIO_HIGH);
 
-        /* Get current gpio val refelecting module plugged in / out*/
+        /* Get current gpio val reflecting module plugged in / out*/
         gpio_val = bnx2x_get_gpio(bp, MISC_REGISTERS_GPIO_3, port);
 
         /* Call the handling function in case module is detected */
@@ -5004,18 +5113,20 @@ void bnx2x_handle_module_detect_int(struct link_params *params)
                         DP(NETIF_MSG_LINK, "SFP+ module is not initialized\n");
         } else {
                 u32 val = REG_RD(bp, params->shmem_base +
-                                     offsetof(struct shmem_region, dev_info.
-                                              port_feature_config[params->port].
-                                              config));
+                                 offsetof(struct shmem_region, dev_info.
+                                          port_feature_config[params->port].
+                                          config));
 
                 bnx2x_set_gpio_int(bp, MISC_REGISTERS_GPIO_3,
                                    MISC_REGISTERS_GPIO_INT_OUTPUT_SET,
                                    port);
-                /* Module was plugged out. */
-                /* Disable transmit for this module */
+                /*
+                 * Module was plugged out.
+                 * Disable transmit for this module
+                 */
                 if ((val & PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_MASK) ==
                     PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_DISABLE_TX_LASER)
-                        bnx2x_sfp_set_transmitter(bp, phy, params->port, 0);
+                        bnx2x_sfp_set_transmitter(params, phy, 0);
         }
 }
 
@@ -5051,9 +5162,9 @@ static u8 bnx2x_8706_8726_read_status(struct bnx2x_phy *phy,
 
         DP(NETIF_MSG_LINK, "8706/8726 rx_sd 0x%x pcs_status 0x%x 1Gbps"
                         " link_status 0x%x\n", rx_sd, pcs_status, val2);
-        /* link is up if both bit 0 of pmd_rx_sd and
-         * bit 0 of pcs_status are set, or if the autoneg bit
-         * 1 is set
+        /*
+         * link is up if both bit 0 of pmd_rx_sd and bit 0 of pcs_status
+         * are set, or if the autoneg bit 1 is set
          */
         link_up = ((rx_sd & pcs_status & 0x1) || (val2 & (1<<1)));
         if (link_up) {
@@ -5062,6 +5173,7 @@ static u8 bnx2x_8706_8726_read_status(struct bnx2x_phy *phy,
                 else
                         vars->line_speed = SPEED_10000;
                 bnx2x_ext_phy_resolve_fc(phy, params, vars);
+                vars->duplex = DUPLEX_FULL;
         }
         return link_up;
 }
@@ -5073,14 +5185,15 @@ static u8 bnx2x_8706_config_init(struct bnx2x_phy *phy,
                                  struct link_params *params,
                                  struct link_vars *vars)
 {
-        u16 cnt, val;
+        u32 tx_en_mode;
+        u16 cnt, val, tmp1;
         struct bnx2x *bp = params->bp;
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
+                       MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
         /* HW reset */
         bnx2x_ext_phy_hw_reset(bp, params->port);
         bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 0xa040);
-        bnx2x_wait_reset_complete(bp, phy);
+        bnx2x_wait_reset_complete(bp, phy, params);
 
         /* Wait until fw is loaded */
         for (cnt = 0; cnt < 100; cnt++) {
@@ -5147,6 +5260,26 @@ static u8 bnx2x_8706_config_init(struct bnx2x_phy *phy,
                                  0x0004);
         }
         bnx2x_save_bcm_spirom_ver(bp, phy, params->port);
+
+        /*
+         * If TX Laser is controlled by GPIO_0, do not let PHY go into low
+         * power mode, if TX Laser is disabled
+         */
+
+        tx_en_mode = REG_RD(bp, params->shmem_base +
+                            offsetof(struct shmem_region,
+                                dev_info.port_hw_config[params->port].sfp_ctrl))
+                        & PORT_HW_CFG_TX_LASER_MASK;
+
+        if (tx_en_mode == PORT_HW_CFG_TX_LASER_GPIO0) {
+                DP(NETIF_MSG_LINK, "Enabling TXONOFF_PWRDN_DIS\n");
+                bnx2x_cl45_read(bp, phy,
+                        MDIO_PMA_DEVAD, MDIO_PMA_REG_DIGITAL_CTRL, &tmp1);
+                tmp1 |= 0x1;
+                bnx2x_cl45_write(bp, phy,
+                        MDIO_PMA_DEVAD, MDIO_PMA_REG_DIGITAL_CTRL, tmp1);
+        }
+
         return 0;
 }
 
@@ -5181,26 +5314,26 @@ static void bnx2x_8726_external_rom_boot(struct bnx2x_phy *phy,
 
         /* Set soft reset */
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_GEN_CTRL,
-                       MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET);
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_GEN_CTRL,
+                         MDIO_PMA_REG_GEN_CTRL_ROM_MICRO_RESET);
 
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_MISC_CTRL1, 0x0001);
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_MISC_CTRL1, 0x0001);
 
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_GEN_CTRL,
-                       MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP);
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_GEN_CTRL,
+                         MDIO_PMA_REG_GEN_CTRL_ROM_RESET_INTERNAL_MP);
 
         /* wait for 150ms for microcode load */
         msleep(150);
 
         /* Disable serial boot control, tristates pins SS_N, SCK, MOSI, MISO */
         bnx2x_cl45_write(bp, phy,
-                       MDIO_PMA_DEVAD,
-                       MDIO_PMA_REG_MISC_CTRL1, 0x0000);
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_MISC_CTRL1, 0x0000);
 
         msleep(200);
         bnx2x_save_bcm_spirom_ver(bp, phy, params->port);
@@ -5235,23 +5368,18 @@ static u8 bnx2x_8726_config_init(struct bnx2x_phy *phy,
         u32 val;
         u32 swap_val, swap_override, aeu_gpio_mask, offset;
         DP(NETIF_MSG_LINK, "Initializing BCM8726\n");
-        /* Restore normal power mode*/
-        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
-
-        bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
 
         bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 1<<15);
-        bnx2x_wait_reset_complete(bp, phy);
+        bnx2x_wait_reset_complete(bp, phy, params);
 
         bnx2x_8726_external_rom_boot(phy, params);
 
-        /* Need to call module detected on initialization since
-        the module detection triggered by actual module
-        insertion might occur before driver is loaded, and when
-        driver is loaded, it reset all registers, including the
-        transmitter */
+        /*
+         * Need to call module detected on initialization since the module
+         * detection triggered by actual module insertion might occur before
+         * driver is loaded, and when driver is loaded, it reset all
+         * registers, including the transmitter
+         */
         bnx2x_sfp_module_detection(phy, params);
 
         if (phy->req_line_speed == SPEED_1000) {
@@ -5284,8 +5412,10 @@ static u8 bnx2x_8726_config_init(struct bnx2x_phy *phy,
                                  MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x1000);
                 bnx2x_cl45_write(bp, phy,
                                 MDIO_AN_DEVAD, MDIO_AN_REG_CTRL, 0x1200);
-                /* Enable RX-ALARM control to receive
-                interrupt for 1G speed change */
+                /*
+                 * Enable RX-ALARM control to receive interrupt for 1G speed
+                 * change
+                 */
                 bnx2x_cl45_write(bp, phy,
                                  MDIO_PMA_DEVAD, MDIO_PMA_REG_LASI_CTRL, 0x4);
                 bnx2x_cl45_write(bp, phy,
@@ -5317,7 +5447,7 @@ static u8 bnx2x_8726_config_init(struct bnx2x_phy *phy,
 
         /* Set GPIO3 to trigger SFP+ module insertion/removal */
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_3,
-                            MISC_REGISTERS_GPIO_INPUT_HI_Z, params->port);
+                       MISC_REGISTERS_GPIO_INPUT_HI_Z, params->port);
 
         /* The GPIO should be swapped if the swap register is set and active */
         swap_val = REG_RD(bp, NIG_REG_PORT_SWAP);
@@ -5408,7 +5538,7 @@ static void bnx2x_8727_hw_reset(struct bnx2x_phy *phy,
                                 struct link_params *params) {
         u32 swap_val, swap_override;
         u8 port;
-        /**
+        /*
          * The PHY reset is controlled by GPIO 1. Fake the port number
          * to cancel the swap done in set_gpio()
          */
@@ -5417,20 +5547,21 @@ static void bnx2x_8727_hw_reset(struct bnx2x_phy *phy,
         swap_override = REG_RD(bp, NIG_REG_STRAP_OVERRIDE);
         port = (swap_val && swap_override) ^ 1;
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
 }
 
 static u8 bnx2x_8727_config_init(struct bnx2x_phy *phy,
                                  struct link_params *params,
                                  struct link_vars *vars)
 {
-        u16 tmp1, val, mod_abs;
+        u32 tx_en_mode;
+        u16 tmp1, val, mod_abs, tmp2;
         u16 rx_alarm_ctrl_val;
         u16 lasi_ctrl_val;
         struct bnx2x *bp = params->bp;
         /* Enable PMD link, MOD_ABS_FLT, and 1G link alarm */
 
-        bnx2x_wait_reset_complete(bp, phy);
+        bnx2x_wait_reset_complete(bp, phy, params);
         rx_alarm_ctrl_val = (1<<2) | (1<<5) ;
         lasi_ctrl_val = 0x0004;
 
@@ -5443,14 +5574,17 @@ static u8 bnx2x_8727_config_init(struct bnx2x_phy *phy,
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD, MDIO_PMA_REG_LASI_CTRL, lasi_ctrl_val);
 
-        /* Initially configure  MOD_ABS to interrupt when
-        module is presence( bit 8) */
+        /*
+         * Initially configure MOD_ABS to interrupt when module is
+         * presence( bit 8)
+         */
         bnx2x_cl45_read(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_REG_PHY_IDENTIFIER, &mod_abs);
-        /* Set EDC off by setting OPTXLOS signal input to low
-        (bit 9).
-        When the EDC is off it locks onto a reference clock and
-        avoids becoming 'lost'.*/
+        /*
+         * Set EDC off by setting OPTXLOS signal input to low (bit 9).
+         * When the EDC is off it locks onto a reference clock and avoids
+         * becoming 'lost'
+         */
         mod_abs &= ~(1<<8);
         if (!(phy->flags & FLAGS_NOC))
                 mod_abs &= ~(1<<9);
@@ -5465,7 +5599,7 @@ static u8 bnx2x_8727_config_init(struct bnx2x_phy *phy,
         if (phy->flags & FLAGS_NOC)
                 val |= (3<<5);
 
-        /**
+        /*
          * Set 8727 GPIOs to input to allow reading from the 8727 GPIO0
          * status which reflect SFP+ module over-current
          */
@@ -5492,7 +5626,7 @@ static u8 bnx2x_8727_config_init(struct bnx2x_phy *phy,
                 bnx2x_cl45_read(bp, phy,
                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_10G_CTRL2, &tmp1);
                 DP(NETIF_MSG_LINK, "1.7 = 0x%x\n", tmp1);
-                /**
+                /*
                  * Power down the XAUI until link is up in case of dual-media
                  * and 1G
                  */
@@ -5518,7 +5652,7 @@ static u8 bnx2x_8727_config_init(struct bnx2x_phy *phy,
                 bnx2x_cl45_write(bp, phy,
                                  MDIO_AN_DEVAD, MDIO_AN_REG_CL37_AN, 0x1300);
         } else {
-                /**
+                /*
                  * Since the 8727 has only single reset pin, need to set the 10G
                  * registers although it is default
                  */
@@ -5534,7 +5668,8 @@ static u8 bnx2x_8727_config_init(struct bnx2x_phy *phy,
                                  0x0008);
         }
 
-        /* Set 2-wire transfer rate of SFP+ module EEPROM
+        /*
+         * Set 2-wire transfer rate of SFP+ module EEPROM
          * to 100Khz since some DACs(direct attached cables) do
          * not work at 400Khz.
          */
@@ -5557,6 +5692,26 @@ static u8 bnx2x_8727_config_init(struct bnx2x_phy *phy,
                                  phy->tx_preemphasis[1]);
         }
 
+        /*
+         * If TX Laser is controlled by GPIO_0, do not let PHY go into low
+         * power mode, if TX Laser is disabled
+         */
+        tx_en_mode = REG_RD(bp, params->shmem_base +
+                            offsetof(struct shmem_region,
+                                dev_info.port_hw_config[params->port].sfp_ctrl))
+                        & PORT_HW_CFG_TX_LASER_MASK;
+
+        if (tx_en_mode == PORT_HW_CFG_TX_LASER_GPIO0) {
+
+                DP(NETIF_MSG_LINK, "Enabling TXONOFF_PWRDN_DIS\n");
+                bnx2x_cl45_read(bp, phy,
+                        MDIO_PMA_DEVAD, MDIO_PMA_REG_8727_OPT_CFG_REG, &tmp2);
+                tmp2 |= 0x1000;
+                tmp2 &= 0xFFEF;
+                bnx2x_cl45_write(bp, phy,
+                        MDIO_PMA_DEVAD, MDIO_PMA_REG_8727_OPT_CFG_REG, tmp2);
+        }
+
         return 0;
 }
 
@@ -5570,46 +5725,49 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,
                                       port_feature_config[params->port].
                                       config));
         bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_PHY_IDENTIFIER, &mod_abs);
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_PHY_IDENTIFIER, &mod_abs);
         if (mod_abs & (1<<8)) {
 
                 /* Module is absent */
                 DP(NETIF_MSG_LINK, "MOD_ABS indication "
                             "show module is absent\n");
 
-                /* 1. Set mod_abs to detect next module
-                presence event
-                   2. Set EDC off by setting OPTXLOS signal input to low
-                        (bit 9).
-                        When the EDC is off it locks onto a reference clock and
-                        avoids becoming 'lost'.*/
+                /*
+                 * 1. Set mod_abs to detect next module
+                 *    presence event
+                 * 2. Set EDC off by setting OPTXLOS signal input to low
+                 *    (bit 9).
+                 *    When the EDC is off it locks onto a reference clock and
+                 *    avoids becoming 'lost'.
+                 */
                 mod_abs &= ~(1<<8);
                 if (!(phy->flags & FLAGS_NOC))
                         mod_abs &= ~(1<<9);
                 bnx2x_cl45_write(bp, phy,
-                               MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_PHY_IDENTIFIER, mod_abs);
+                                 MDIO_PMA_DEVAD,
+                                 MDIO_PMA_REG_PHY_IDENTIFIER, mod_abs);
 
-                /* Clear RX alarm since it stays up as long as
-                the mod_abs wasn't changed */
+                /*
+                 * Clear RX alarm since it stays up as long as
+                 * the mod_abs wasn't changed
+                 */
                 bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_RX_ALARM, &rx_alarm_status);
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_RX_ALARM, &rx_alarm_status);
 
         } else {
                 /* Module is present */
                 DP(NETIF_MSG_LINK, "MOD_ABS indication "
                             "show module is present\n");
-                /* First thing, disable transmitter,
-                and if the module is ok, the
-                module_detection will enable it*/
-
-                /* 1. Set mod_abs to detect next module
-                absent event ( bit 8)
-                   2. Restore the default polarity of the OPRXLOS signal and
-                this signal will then correctly indicate the presence or
-                absence of the Rx signal. (bit 9) */
+                /*
+                 * First disable transmitter, and if the module is ok, the
+                 * module_detection will enable it
+                 * 1. Set mod_abs to detect next module absent event ( bit 8)
+                 * 2. Restore the default polarity of the OPRXLOS signal and
+                 * this signal will then correctly indicate the presence or
+                 * absence of the Rx signal. (bit 9)
+                 */
                 mod_abs |= (1<<8);
                 if (!(phy->flags & FLAGS_NOC))
                         mod_abs |= (1<<9);
@@ -5617,10 +5775,12 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,
                                  MDIO_PMA_DEVAD,
                                  MDIO_PMA_REG_PHY_IDENTIFIER, mod_abs);
 
-                /* Clear RX alarm since it stays up as long as
-                the mod_abs wasn't changed. This is need to be done
-                before calling the module detection, otherwise it will clear
-                the link update alarm */
+                /*
+                 * Clear RX alarm since it stays up as long as the mod_abs
+                 * wasn't changed. This is need to be done before calling the
+                 * module detection, otherwise it will clear* the link update
+                 * alarm
+                 */
                 bnx2x_cl45_read(bp, phy,
                                 MDIO_PMA_DEVAD,
                                 MDIO_PMA_REG_RX_ALARM, &rx_alarm_status);
@@ -5628,7 +5788,7 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,
 
                 if ((val & PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_MASK) ==
                     PORT_FEAT_CFG_OPT_MDL_ENFRCMNT_DISABLE_TX_LASER)
-                        bnx2x_sfp_set_transmitter(bp, phy, params->port, 0);
+                        bnx2x_sfp_set_transmitter(params, phy, 0);
 
                 if (bnx2x_wait_for_sfp_module_initialized(phy, params) == 0)
                         bnx2x_sfp_module_detection(phy, params);
@@ -5637,9 +5797,8 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,
         }
 
         DP(NETIF_MSG_LINK, "8727 RX_ALARM_STATUS 0x%x\n",
-                 rx_alarm_status);
-        /* No need to check link status in case of
-        module plugged in/out */
+                   rx_alarm_status);
+        /* No need to check link status in case of module plugged in/out */
 }
 
 static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
@@ -5675,7 +5834,7 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
         bnx2x_cl45_read(bp, phy,
                         MDIO_PMA_DEVAD, MDIO_PMA_REG_M8051_MSGOUT_REG, &val1);
 
-        /**
+        /*
          * If a module is present and there is need to check
          * for over current
          */
@@ -5695,12 +5854,8 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
                                             " Please remove the SFP+ module and"
                                             " restart the system to clear this"
                                             " error.\n",
-                                   params->port);
-
-                        /*
-                         * Disable all RX_ALARMs except for
-                         * mod_abs
-                         */
+                         params->port);
+                        /* Disable all RX_ALARMs except for mod_abs */
                         bnx2x_cl45_write(bp, phy,
                                          MDIO_PMA_DEVAD,
                                          MDIO_PMA_REG_RX_ALARM_CTRL, (1<<5));
@@ -5743,11 +5898,15 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
                         MDIO_PMA_DEVAD,
                         MDIO_PMA_REG_8073_SPEED_LINK_STATUS, &link_status);
 
-        /* Bits 0..2 --> speed detected,
-           bits 13..15--> link is down */
+        /*
+         * Bits 0..2 --> speed detected,
+         * Bits 13..15--> link is down
+         */
         if ((link_status & (1<<2)) && (!(link_status & (1<<15)))) {
                 link_up = 1;
                 vars->line_speed = SPEED_10000;
+                DP(NETIF_MSG_LINK, "port %x: External link up in 10G\n",
+                           params->port);
         } else if ((link_status & (1<<0)) && (!(link_status & (1<<13)))) {
                 link_up = 1;
                 vars->line_speed = SPEED_1000;
@@ -5758,15 +5917,18 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
                 DP(NETIF_MSG_LINK, "port %x: External link is down\n",
                            params->port);
         }
-        if (link_up)
+        if (link_up) {
                 bnx2x_ext_phy_resolve_fc(phy, params, vars);
+                vars->duplex = DUPLEX_FULL;
+                DP(NETIF_MSG_LINK, "duplex = 0x%x\n", vars->duplex);
+        }
 
         if ((DUAL_MEDIA(params)) &&
             (phy->req_line_speed == SPEED_1000)) {
                 bnx2x_cl45_read(bp, phy,
                                 MDIO_PMA_DEVAD,
                                 MDIO_PMA_REG_8727_PCS_GP, &val1);
-                /**
+                /*
                  * In case of dual-media board and 1G, power up the XAUI side,
                  * otherwise power it down. For 10G it is done automatically
                  */
@@ -5786,7 +5948,7 @@ static void bnx2x_8727_link_reset(struct bnx2x_phy *phy,
 {
         struct bnx2x *bp = params->bp;
         /* Disable Transmitter */
-        bnx2x_sfp_set_transmitter(bp, phy, params->port, 0);
+        bnx2x_sfp_set_transmitter(params, phy, 0);
         /* Clear LASI */
         bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, MDIO_PMA_REG_LASI_CTRL, 0);
 
@@ -5798,19 +5960,23 @@ static void bnx2x_8727_link_reset(struct bnx2x_phy *phy,
 static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy,
                                            struct link_params *params)
 {
-        u16 val, fw_ver1, fw_ver2, cnt;
+        u16 val, fw_ver1, fw_ver2, cnt, adj;
         struct bnx2x *bp = params->bp;
 
+        adj = 0;
+        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)
+                adj = -1;
+
         /* For the 32 bits registers in 848xx, access via MDIO2ARM interface.*/
         /* (1) set register 0xc200_0014(SPI_BRIDGE_CTRL_2) to 0x03000000 */
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819, 0x0014);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A, 0xc200);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81B, 0x0000);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81C, 0x0300);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817, 0x0009);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819 + adj, 0x0014);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A + adj, 0xc200);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81B + adj, 0x0000);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81C + adj, 0x0300);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817 + adj, 0x0009);
 
         for (cnt = 0; cnt < 100; cnt++) {
-                bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818, &val);
+                bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818 + adj, &val);
                 if (val & 1)
                         break;
                 udelay(5);
@@ -5824,11 +5990,11 @@ static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy,
 
 
         /* 2) read register 0xc200_0000 (SPI_FW_STATUS) */
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819, 0x0000);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A, 0xc200);
-        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817, 0x000A);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA819 + adj, 0x0000);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA81A + adj, 0xc200);
+        bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, 0xA817 + adj, 0x000A);
         for (cnt = 0; cnt < 100; cnt++) {
-                bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818, &val);
+                bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA818 + adj, &val);
                 if (val & 1)
                         break;
                 udelay(5);
@@ -5841,9 +6007,9 @@ static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy,
         }
 
         /* lower 16 bits of the register SPI_FW_STATUS */
-        bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81B, &fw_ver1);
+        bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81B + adj, &fw_ver1);
         /* upper 16 bits of register SPI_FW_STATUS */
-        bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81C, &fw_ver2);
+        bnx2x_cl45_read(bp, phy, MDIO_PMA_DEVAD, 0xA81C + adj, &fw_ver2);
 
         bnx2x_save_spirom_version(bp, params->port, (fw_ver2<<16) | fw_ver1,
                                   phy->ver_addr);
@@ -5852,33 +6018,53 @@ static void bnx2x_save_848xx_spirom_version(struct bnx2x_phy *phy,
 static void bnx2x_848xx_set_led(struct bnx2x *bp,
                                 struct bnx2x_phy *phy)
 {
-        u16 val;
+        u16 val, adj;
+
+        adj = 0;
+        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)
+                adj = -1;
 
         /* PHYC_CTL_LED_CTL */
         bnx2x_cl45_read(bp, phy,
                         MDIO_PMA_DEVAD,
-                        MDIO_PMA_REG_8481_LINK_SIGNAL, &val);
+                        MDIO_PMA_REG_8481_LINK_SIGNAL + adj, &val);
         val &= 0xFE00;
         val |= 0x0092;
 
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD,
-                         MDIO_PMA_REG_8481_LINK_SIGNAL, val);
+                         MDIO_PMA_REG_8481_LINK_SIGNAL + adj, val);
 
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD,
-                         MDIO_PMA_REG_8481_LED1_MASK,
+                         MDIO_PMA_REG_8481_LED1_MASK + adj,
                          0x80);
 
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD,
-                         MDIO_PMA_REG_8481_LED2_MASK,
+                         MDIO_PMA_REG_8481_LED2_MASK + adj,
                          0x18);
 
+        /* Select activity source by Tx and Rx, as suggested by PHY AE */
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD,
-                         MDIO_PMA_REG_8481_LED3_MASK,
-                         0x0040);
+                         MDIO_PMA_REG_8481_LED3_MASK + adj,
+                         0x0006);
+
+        /* Select the closest activity blink rate to that in 10/100/1000 */
+        bnx2x_cl45_write(bp, phy,
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_8481_LED3_BLINK + adj,
+                        0);
+
+        bnx2x_cl45_read(bp, phy,
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_84823_CTL_LED_CTL_1 + adj, &val);
+        val |= MDIO_PMA_REG_84823_LED3_STRETCH_EN; /* stretch_en for LED3*/
+
+        bnx2x_cl45_write(bp, phy,
+                         MDIO_PMA_DEVAD,
+                         MDIO_PMA_REG_84823_CTL_LED_CTL_1 + adj, val);
 
         /* 'Interrupt Mask' */
         bnx2x_cl45_write(bp, phy,
@@ -5892,7 +6078,11 @@ static u8 bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy,
 {
         struct bnx2x *bp = params->bp;
         u16 autoneg_val, an_1000_val, an_10_100_val;
-
+        /*
+         * This phy uses the NIG latch mechanism since link indication
+         * arrives through its LED4 and not via its LASI signal, so we
+         * get steady signal instead of clear on read
+         */
         bnx2x_bits_en(bp, NIG_REG_LATCH_BC_0 + params->port*4,
                       1 << NIG_LATCH_BC_ENABLE_MI_INT);
 
@@ -6017,11 +6207,11 @@ static u8 bnx2x_8481_config_init(struct bnx2x_phy *phy,
         struct bnx2x *bp = params->bp;
         /* Restore normal power mode*/
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
+                       MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
 
         /* HW reset */
         bnx2x_ext_phy_hw_reset(bp, params->port);
-        bnx2x_wait_reset_complete(bp, phy);
+        bnx2x_wait_reset_complete(bp, phy, params);
 
         bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 1<<15);
         return bnx2x_848xx_cmn_config_init(phy, params, vars);
@@ -6033,12 +6223,15 @@ static u8 bnx2x_848x3_config_init(struct bnx2x_phy *phy,
 {
         struct bnx2x *bp = params->bp;
         u8 port, initialize = 1;
-        u16 val;
+        u16 val, adj;
         u16 temp;
-        u32 actual_phy_selection;
+        u32 actual_phy_selection, cms_enable;
         u8 rc = 0;
 
         /* This is just for MDIO_CTL_REG_84823_MEDIA register. */
+        adj = 0;
+        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)
+                adj = 3;
 
         msleep(1);
         if (CHIP_IS_E2(bp))
@@ -6048,11 +6241,12 @@ static u8 bnx2x_848x3_config_init(struct bnx2x_phy *phy,
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_3,
                        MISC_REGISTERS_GPIO_OUTPUT_HIGH,
                        port);
-        bnx2x_wait_reset_complete(bp, phy);
+        bnx2x_wait_reset_complete(bp, phy, params);
         /* Wait for GPHY to come out of reset */
         msleep(50);
-        /* BCM84823 requires that XGXS links up first @ 10G for normal
-        behavior */
+        /*
+         * BCM84823 requires that XGXS links up first @ 10G for normal behavior
+         */
         temp = vars->line_speed;
         vars->line_speed = SPEED_10000;
         bnx2x_set_autoneg(&params->phy[INT_PHY], params, vars, 0);
@@ -6062,7 +6256,7 @@ static u8 bnx2x_848x3_config_init(struct bnx2x_phy *phy,
         /* Set dual-media configuration according to configuration */
 
         bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD,
-                        MDIO_CTL_REG_84823_MEDIA, &val);
+                        MDIO_CTL_REG_84823_MEDIA + adj, &val);
         val &= ~(MDIO_CTL_REG_84823_MEDIA_MAC_MASK |
                  MDIO_CTL_REG_84823_MEDIA_LINE_MASK |
                  MDIO_CTL_REG_84823_MEDIA_COPPER_CORE_DOWN |
@@ -6095,7 +6289,7 @@ static u8 bnx2x_848x3_config_init(struct bnx2x_phy *phy,
                 val |= MDIO_CTL_REG_84823_MEDIA_FIBER_1G;
 
         bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,
-                         MDIO_CTL_REG_84823_MEDIA, val);
+                         MDIO_CTL_REG_84823_MEDIA + adj, val);
         DP(NETIF_MSG_LINK, "Multi_phy config = 0x%x, Media control = 0x%x\n",
                    params->multi_phy_config, val);
 
@@ -6103,29 +6297,50 @@ static u8 bnx2x_848x3_config_init(struct bnx2x_phy *phy,
                 rc = bnx2x_848xx_cmn_config_init(phy, params, vars);
         else
                 bnx2x_save_848xx_spirom_version(phy, params);
+        cms_enable = REG_RD(bp, params->shmem_base +
+                        offsetof(struct shmem_region,
+                        dev_info.port_hw_config[params->port].default_cfg)) &
+                        PORT_HW_CFG_ENABLE_CMS_MASK;
+
+        bnx2x_cl45_read(bp, phy, MDIO_CTL_DEVAD,
+                MDIO_CTL_REG_84823_USER_CTRL_REG, &val);
+        if (cms_enable)
+                val |= MDIO_CTL_REG_84823_USER_CTRL_CMS;
+        else
+                val &= ~MDIO_CTL_REG_84823_USER_CTRL_CMS;
+        bnx2x_cl45_write(bp, phy, MDIO_CTL_DEVAD,
+                MDIO_CTL_REG_84823_USER_CTRL_REG, val);
+
+
         return rc;
 }
 
 static u8 bnx2x_848xx_read_status(struct bnx2x_phy *phy,
-                                       struct link_params *params,
-                                       struct link_vars *vars)
+                                  struct link_params *params,
+                                  struct link_vars *vars)
 {
         struct bnx2x *bp = params->bp;
-        u16 val, val1, val2;
+        u16 val, val1, val2, adj;
         u8 link_up = 0;
 
+        /* Reg offset adjustment for 84833 */
+        adj = 0;
+        if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833)
+                adj = -1;
+
         /* Check 10G-BaseT link status */
         /* Check PMD signal ok */
         bnx2x_cl45_read(bp, phy,
                         MDIO_AN_DEVAD, 0xFFFA, &val1);
         bnx2x_cl45_read(bp, phy,
-                        MDIO_PMA_DEVAD, MDIO_PMA_REG_8481_PMD_SIGNAL,
+                        MDIO_PMA_DEVAD, MDIO_PMA_REG_8481_PMD_SIGNAL + adj,
                         &val2);
         DP(NETIF_MSG_LINK, "BCM848xx: PMD_SIGNAL 1.a811 = 0x%x\n", val2);
 
         /* Check link 10G */
         if (val2 & (1<<11)) {
                 vars->line_speed = SPEED_10000;
+                vars->duplex = DUPLEX_FULL;
                 link_up = 1;
                 bnx2x_ext_phy_10G_an_resolve(bp, phy, vars);
         } else { /* Check Legacy speed link */
@@ -6203,9 +6418,9 @@ static void bnx2x_8481_hw_reset(struct bnx2x_phy *phy,
                                 struct link_params *params)
 {
         bnx2x_set_gpio(params->bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW, 0);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW, 0);
         bnx2x_set_gpio(params->bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW, 1);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW, 1);
 }
 
 static void bnx2x_8481_link_reset(struct bnx2x_phy *phy,
@@ -6227,8 +6442,8 @@ static void bnx2x_848x3_link_reset(struct bnx2x_phy *phy,
         else
                 port = params->port;
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_3,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW,
-                            port);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW,
+                       port);
 }
 
 static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,
@@ -6283,24 +6498,24 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,
 
                         /* Set LED masks */
                         bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED1_MASK,
-                                        0x0);
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LED1_MASK,
+                                         0x0);
 
                         bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED2_MASK,
-                                        0x0);
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LED2_MASK,
+                                         0x0);
 
                         bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED3_MASK,
-                                        0x0);
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LED3_MASK,
+                                         0x0);
 
                         bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED5_MASK,
-                                        0x20);
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LED5_MASK,
+                                         0x20);
 
                 } else {
                         bnx2x_cl45_write(bp, phy,
@@ -6324,35 +6539,35 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,
                         val |= 0x2492;
 
                         bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LINK_SIGNAL,
-                                        val);
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LINK_SIGNAL,
+                                         val);
 
                         /* Set LED masks */
                         bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED1_MASK,
-                                        0x0);
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LED1_MASK,
+                                         0x0);
 
                         bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED2_MASK,
-                                        0x20);
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LED2_MASK,
+                                         0x20);
 
                         bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED3_MASK,
-                                        0x20);
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LED3_MASK,
+                                         0x20);
 
                         bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED5_MASK,
-                                        0x0);
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LED5_MASK,
+                                         0x0);
                 } else {
                         bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED1_MASK,
-                                        0x20);
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LED1_MASK,
+                                         0x20);
                 }
                 break;
 
@@ -6370,9 +6585,9 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,
                                         &val);
 
                         if (!((val &
-                              MDIO_PMA_REG_8481_LINK_SIGNAL_LED4_ENABLE_MASK)
-                           >> MDIO_PMA_REG_8481_LINK_SIGNAL_LED4_ENABLE_SHIFT)){
-                                DP(NETIF_MSG_LINK, "Seting LINK_SIGNAL\n");
+                               MDIO_PMA_REG_8481_LINK_SIGNAL_LED4_ENABLE_MASK)
+                          >> MDIO_PMA_REG_8481_LINK_SIGNAL_LED4_ENABLE_SHIFT)) {
+                                DP(NETIF_MSG_LINK, "Setting LINK_SIGNAL\n");
                                 bnx2x_cl45_write(bp, phy,
                                                  MDIO_PMA_DEVAD,
                                                  MDIO_PMA_REG_8481_LINK_SIGNAL,
@@ -6381,30 +6596,42 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,
 
                         /* Set LED masks */
                         bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED1_MASK,
-                                        0x10);
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LED1_MASK,
+                                         0x10);
 
                         bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED2_MASK,
-                                        0x80);
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LED2_MASK,
+                                         0x80);
 
                         bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED3_MASK,
-                                        0x98);
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LED3_MASK,
+                                         0x98);
 
                         bnx2x_cl45_write(bp, phy,
-                                        MDIO_PMA_DEVAD,
-                                        MDIO_PMA_REG_8481_LED5_MASK,
-                                        0x40);
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LED5_MASK,
+                                         0x40);
 
                 } else {
                         bnx2x_cl45_write(bp, phy,
                                          MDIO_PMA_DEVAD,
                                          MDIO_PMA_REG_8481_LED1_MASK,
                                          0x80);
+
+                        /* Tell LED3 to blink on source */
+                        bnx2x_cl45_read(bp, phy,
+                                        MDIO_PMA_DEVAD,
+                                        MDIO_PMA_REG_8481_LINK_SIGNAL,
+                                        &val);
+                        val &= ~(7<<6);
+                        val |= (1<<6); /* A83B[8:6]= 1 */
+                        bnx2x_cl45_write(bp, phy,
+                                         MDIO_PMA_DEVAD,
+                                         MDIO_PMA_REG_8481_LINK_SIGNAL,
+                                         val);
                 }
                 break;
         }
@@ -6431,10 +6658,10 @@ static u8 bnx2x_7101_config_init(struct bnx2x_phy *phy,
 
         /* Restore normal power mode*/
         bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
+                       MISC_REGISTERS_GPIO_OUTPUT_HIGH, params->port);
         /* HW reset */
         bnx2x_ext_phy_hw_reset(bp, params->port);
-        bnx2x_wait_reset_complete(bp, phy);
+        bnx2x_wait_reset_complete(bp, phy, params);
 
         bnx2x_cl45_write(bp, phy,
                          MDIO_PMA_DEVAD, MDIO_PMA_REG_LASI_CTRL, 0x1);
@@ -6481,14 +6708,13 @@ static u8 bnx2x_7101_read_status(struct bnx2x_phy *phy,
         DP(NETIF_MSG_LINK, "10G-base-T PMA status 0x%x->0x%x\n",
                    val2, val1);
         link_up = ((val1 & 4) == 4);
-        /* if link is up
-         * print the AN outcome of the SFX7101 PHY
-         */
+        /* if link is up print the AN outcome of the SFX7101 PHY */
         if (link_up) {
                 bnx2x_cl45_read(bp, phy,
                                 MDIO_AN_DEVAD, MDIO_AN_REG_MASTER_STATUS,
                                 &val2);
                 vars->line_speed = SPEED_10000;
+                vars->duplex = DUPLEX_FULL;
                 DP(NETIF_MSG_LINK, "SFX7101 AN status 0x%x->Master=%x\n",
                            val2, (val2 & (1<<14)));
                 bnx2x_ext_phy_10G_an_resolve(bp, phy, vars);
@@ -6516,20 +6742,20 @@ void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, struct bnx2x_phy *phy)
         u16 val, cnt;
 
         bnx2x_cl45_read(bp, phy,
-                      MDIO_PMA_DEVAD,
-                      MDIO_PMA_REG_7101_RESET, &val);
+                        MDIO_PMA_DEVAD,
+                        MDIO_PMA_REG_7101_RESET, &val);
 
         for (cnt = 0; cnt < 10; cnt++) {
                 msleep(50);
                 /* Writes a self-clearing reset */
                 bnx2x_cl45_write(bp, phy,
-                               MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_7101_RESET,
-                               (val | (1<<15)));
+                                 MDIO_PMA_DEVAD,
+                                 MDIO_PMA_REG_7101_RESET,
+                                 (val | (1<<15)));
                 /* Wait for clear */
                 bnx2x_cl45_read(bp, phy,
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_7101_RESET, &val);
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_7101_RESET, &val);
 
                 if ((val & (1<<15)) == 0)
                         break;
@@ -6540,10 +6766,10 @@ static void bnx2x_7101_hw_reset(struct bnx2x_phy *phy,
                                 struct link_params *params) {
         /* Low power mode is controlled by GPIO 2 */
         bnx2x_set_gpio(params->bp, MISC_REGISTERS_GPIO_2,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW, params->port);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW, params->port);
         /* The PHY reset is controlled by GPIO 1 */
         bnx2x_set_gpio(params->bp, MISC_REGISTERS_GPIO_1,
-                            MISC_REGISTERS_GPIO_OUTPUT_LOW, params->port);
+                       MISC_REGISTERS_GPIO_OUTPUT_LOW, params->port);
 }
 
 static void bnx2x_7101_set_link_led(struct bnx2x_phy *phy,
@@ -6585,9 +6811,9 @@ static struct bnx2x_phy phy_null = {
         .supported      = 0,
         .media_type     = ETH_PHY_NOT_PRESENT,
         .ver_addr       = 0,
-        .req_flow_ctrl  = 0,
-        .req_line_speed = 0,
-        .speed_cap_mask = 0,
+        .req_flow_ctrl  = 0,
+        .req_line_speed = 0,
+        .speed_cap_mask = 0,
         .req_duplex     = 0,
         .rsrv           = 0,
         .config_init    = (config_init_t)NULL,
@@ -6622,8 +6848,8 @@ static struct bnx2x_phy phy_serdes = {
         .media_type     = ETH_PHY_UNSPECIFIED,
         .ver_addr       = 0,
         .req_flow_ctrl  = 0,
-        .req_line_speed = 0,
-        .speed_cap_mask = 0,
+        .req_line_speed = 0,
+        .speed_cap_mask = 0,
         .req_duplex     = 0,
         .rsrv           = 0,
         .config_init    = (config_init_t)bnx2x_init_serdes,
@@ -6659,8 +6885,8 @@ static struct bnx2x_phy phy_xgxs = {
         .media_type     = ETH_PHY_UNSPECIFIED,
         .ver_addr       = 0,
         .req_flow_ctrl  = 0,
-        .req_line_speed = 0,
-        .speed_cap_mask = 0,
+        .req_line_speed = 0,
+        .speed_cap_mask = 0,
         .req_duplex     = 0,
         .rsrv           = 0,
         .config_init    = (config_init_t)bnx2x_init_xgxs,
@@ -6690,8 +6916,8 @@ static struct bnx2x_phy phy_7101 = {
         .media_type     = ETH_PHY_BASE_T,
         .ver_addr       = 0,
         .req_flow_ctrl  = 0,
-        .req_line_speed = 0,
-        .speed_cap_mask = 0,
+        .req_line_speed = 0,
+        .speed_cap_mask = 0,
         .req_duplex     = 0,
         .rsrv           = 0,
         .config_init    = (config_init_t)bnx2x_7101_config_init,
@@ -6721,9 +6947,9 @@ static struct bnx2x_phy phy_8073 = {
                            SUPPORTED_Asym_Pause),
         .media_type     = ETH_PHY_UNSPECIFIED,
         .ver_addr       = 0,
-        .req_flow_ctrl  = 0,
-        .req_line_speed = 0,
-        .speed_cap_mask = 0,
+        .req_flow_ctrl  = 0,
+        .req_line_speed = 0,
+        .speed_cap_mask = 0,
         .req_duplex     = 0,
         .rsrv           = 0,
         .config_init    = (config_init_t)bnx2x_8073_config_init,
@@ -6932,6 +7158,43 @@ static struct bnx2x_phy phy_84823 = {
         .phy_specific_func = (phy_specific_func_t)NULL
 };
 
+static struct bnx2x_phy phy_84833 = {
+        .type           = PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833,
+        .addr           = 0xff,
+        .flags          = FLAGS_FAN_FAILURE_DET_REQ |
+                            FLAGS_REARM_LATCH_SIGNAL,
+        .def_md_devad   = 0,
+        .reserved       = 0,
+        .rx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
+        .tx_preemphasis = {0xffff, 0xffff, 0xffff, 0xffff},
+        .mdio_ctrl      = 0,
+        .supported      = (SUPPORTED_10baseT_Half |
+                           SUPPORTED_10baseT_Full |
+                           SUPPORTED_100baseT_Half |
+                           SUPPORTED_100baseT_Full |
+                           SUPPORTED_1000baseT_Full |
+                           SUPPORTED_10000baseT_Full |
+                           SUPPORTED_TP |
+                           SUPPORTED_Autoneg |
+                           SUPPORTED_Pause |
+                           SUPPORTED_Asym_Pause),
+        .media_type     = ETH_PHY_BASE_T,
+        .ver_addr       = 0,
+        .req_flow_ctrl  = 0,
+        .req_line_speed = 0,
+        .speed_cap_mask = 0,
+        .req_duplex     = 0,
+        .rsrv           = 0,
+        .config_init    = (config_init_t)bnx2x_848x3_config_init,
+        .read_status    = (read_status_t)bnx2x_848xx_read_status,
+        .link_reset     = (link_reset_t)bnx2x_848x3_link_reset,
+        .config_loopback = (config_loopback_t)NULL,
+        .format_fw_ver  = (format_fw_ver_t)bnx2x_848xx_format_ver,
+        .hw_reset       = (hw_reset_t)NULL,
+        .set_link_led   = (set_link_led_t)bnx2x_848xx_set_link_led,
+        .phy_specific_func = (phy_specific_func_t)NULL
+};
+
 /*****************************************************************/
 /*                                                               */
 /* Populate the phy according. Main function: bnx2x_populate_phy   */
@@ -6945,7 +7208,7 @@ static void bnx2x_populate_preemphasis(struct bnx2x *bp, u32 shmem_base,
         /* Get the 4 lanes xgxs config rx and tx */
         u32 rx = 0, tx = 0, i;
         for (i = 0; i < 2; i++) {
-                /**
+                /*
                  * INT_PHY and EXT_PHY1 share the same value location in the
                  * shmem. When num_phys is greater than 1, than this value
                  * applies only to EXT_PHY1
@@ -6953,19 +7216,19 @@ static void bnx2x_populate_preemphasis(struct bnx2x *bp, u32 shmem_base,
                 if (phy_index == INT_PHY || phy_index == EXT_PHY1) {
                         rx = REG_RD(bp, shmem_base +
                                     offsetof(struct shmem_region,
-                           dev_info.port_hw_config[port].xgxs_config_rx[i<<1]));
+                          dev_info.port_hw_config[port].xgxs_config_rx[i<<1]));
 
                         tx = REG_RD(bp, shmem_base +
                                     offsetof(struct shmem_region,
-                           dev_info.port_hw_config[port].xgxs_config_tx[i<<1]));
+                          dev_info.port_hw_config[port].xgxs_config_tx[i<<1]));
                 } else {
                         rx = REG_RD(bp, shmem_base +
                                     offsetof(struct shmem_region,
-                          dev_info.port_hw_config[port].xgxs_config2_rx[i<<1]));
+                         dev_info.port_hw_config[port].xgxs_config2_rx[i<<1]));
 
                         tx = REG_RD(bp, shmem_base +
                                     offsetof(struct shmem_region,
-                          dev_info.port_hw_config[port].xgxs_config2_rx[i<<1]));
+                         dev_info.port_hw_config[port].xgxs_config2_rx[i<<1]));
                 }
 
                 phy->rx_preemphasis[i << 1] = ((rx>>16) & 0xffff);
@@ -7085,6 +7348,9 @@ static u8 bnx2x_populate_ext_phy(struct bnx2x *bp,
         case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823:
                 *phy = phy_84823;
                 break;
+        case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84833:
+                *phy = phy_84833;
+                break;
         case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:
                 *phy = phy_7101;
                 break;
@@ -7099,21 +7365,21 @@ static u8 bnx2x_populate_ext_phy(struct bnx2x *bp,
         phy->addr = XGXS_EXT_PHY_ADDR(ext_phy_config);
         bnx2x_populate_preemphasis(bp, shmem_base, phy, port, phy_index);
 
-        /**
-        * The shmem address of the phy version is located on different
-        * structures. In case this structure is too old, do not set
-        * the address
-        */
+        /*
+         * The shmem address of the phy version is located on different
+         * structures. In case this structure is too old, do not set
+         * the address
+         */
         config2 = REG_RD(bp, shmem_base + offsetof(struct shmem_region,
                                         dev_info.shared_hw_config.config2));
         if (phy_index == EXT_PHY1) {
                 phy->ver_addr = shmem_base + offsetof(struct shmem_region,
                                 port_mb[port].ext_phy_fw_version);
 
-        /* Check specific mdc mdio settings */
-        if (config2 & SHARED_HW_CFG_MDC_MDIO_ACCESS1_MASK)
-                mdc_mdio_access = config2 &
-                SHARED_HW_CFG_MDC_MDIO_ACCESS1_MASK;
+                /* Check specific mdc mdio settings */
+                if (config2 & SHARED_HW_CFG_MDC_MDIO_ACCESS1_MASK)
+                        mdc_mdio_access = config2 &
+                        SHARED_HW_CFG_MDC_MDIO_ACCESS1_MASK;
         } else {
                 u32 size = REG_RD(bp, shmem2_base);
 
@@ -7132,7 +7398,7 @@ static u8 bnx2x_populate_ext_phy(struct bnx2x *bp,
         }
         phy->mdio_ctrl = bnx2x_get_emac_base(bp, mdc_mdio_access, port);
 
-        /**
+        /*
          * In case mdc/mdio_access of the external phy is different than the
          * mdc/mdio access of the XGXS, a HW lock must be taken in each access
          * to prevent one port interfere with another port's CL45 operations.
@@ -7167,18 +7433,20 @@ static void bnx2x_phy_def_cfg(struct link_params *params,
         /* Populate the default phy configuration for MF mode */
         if (phy_index == EXT_PHY2) {
                 link_config = REG_RD(bp, params->shmem_base +
-                                         offsetof(struct shmem_region, dev_info.
+                                     offsetof(struct shmem_region, dev_info.
                         port_feature_config[params->port].link_config2));
                 phy->speed_cap_mask = REG_RD(bp, params->shmem_base +
-                                        offsetof(struct shmem_region, dev_info.
+                                             offsetof(struct shmem_region,
+                                                      dev_info.
                         port_hw_config[params->port].speed_capability_mask2));
         } else {
                 link_config = REG_RD(bp, params->shmem_base +
-                                offsetof(struct shmem_region, dev_info.
+                                     offsetof(struct shmem_region, dev_info.
                                 port_feature_config[params->port].link_config));
                 phy->speed_cap_mask = REG_RD(bp, params->shmem_base +
-                                offsetof(struct shmem_region, dev_info.
-                           port_hw_config[params->port].speed_capability_mask));
+                                             offsetof(struct shmem_region,
+                                                      dev_info.
+                        port_hw_config[params->port].speed_capability_mask));
         }
         DP(NETIF_MSG_LINK, "Default config phy idx %x cfg 0x%x speed_cap_mask"
                        " 0x%x\n", phy_index, link_config, phy->speed_cap_mask);
@@ -7325,7 +7593,7 @@ static void set_phy_vars(struct link_params *params)
                         else if (phy_index == EXT_PHY2)
                                 actual_phy_idx = EXT_PHY1;
                 }
-                params->phy[actual_phy_idx].req_flow_ctrl  =
+                params->phy[actual_phy_idx].req_flow_ctrl =
                         params->req_flow_ctrl[link_cfg_idx];
 
                 params->phy[actual_phy_idx].req_line_speed =
@@ -7378,57 +7646,6 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
         set_phy_vars(params);
 
         DP(NETIF_MSG_LINK, "Num of phys on board: %d\n", params->num_phys);
-        if (CHIP_REV_IS_FPGA(bp)) {
-
-                vars->link_up = 1;
-                vars->line_speed = SPEED_10000;
-                vars->duplex = DUPLEX_FULL;
-                vars->flow_ctrl = BNX2X_FLOW_CTRL_NONE;
-                vars->link_status = (LINK_STATUS_LINK_UP | LINK_10GTFD);
-                /* enable on E1.5 FPGA */
-                if (CHIP_IS_E1H(bp)) {
-                        vars->flow_ctrl |=
-                                        (BNX2X_FLOW_CTRL_TX |
-                                         BNX2X_FLOW_CTRL_RX);
-                        vars->link_status |=
-                                        (LINK_STATUS_TX_FLOW_CONTROL_ENABLED |
-                                         LINK_STATUS_RX_FLOW_CONTROL_ENABLED);
-                }
-
-                bnx2x_emac_enable(params, vars, 0);
-                if (!(CHIP_IS_E2(bp)))
-                        bnx2x_pbf_update(params, vars->flow_ctrl,
-                                         vars->line_speed);
-                /* disable drain */
-                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0);
-
-                /* update shared memory */
-                bnx2x_update_mng(params, vars->link_status);
-
-                return 0;
-
-        } else
-        if (CHIP_REV_IS_EMUL(bp)) {
-
-                vars->link_up = 1;
-                vars->line_speed = SPEED_10000;
-                vars->duplex = DUPLEX_FULL;
-                vars->flow_ctrl = BNX2X_FLOW_CTRL_NONE;
-                vars->link_status = (LINK_STATUS_LINK_UP | LINK_10GTFD);
-
-                bnx2x_bmac_enable(params, vars, 0);
-
-                bnx2x_pbf_update(params, vars->flow_ctrl, vars->line_speed);
-                /* Disable drain */
-                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE
-                                    + params->port*4, 0);
-
-                /* update shared memory */
-                bnx2x_update_mng(params, vars->link_status);
-
-                return 0;
-
-        } else
         if (params->loopback_mode == LOOPBACK_BMAC) {
 
                 vars->link_up = 1;
@@ -7444,8 +7661,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                 /* set bmac loopback */
                 bnx2x_bmac_enable(params, vars, 1);
 
-                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE +
-                    params->port*4, 0);
+                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0);
 
         } else if (params->loopback_mode == LOOPBACK_EMAC) {
 
@@ -7461,8 +7677,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                 /* set bmac loopback */
                 bnx2x_emac_enable(params, vars, 1);
                 bnx2x_emac_program(params, vars);
-                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE +
-                    params->port*4, 0);
+                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0);
 
         } else if ((params->loopback_mode == LOOPBACK_XGXS) ||
                    (params->loopback_mode == LOOPBACK_EXT_PHY)) {
@@ -7485,8 +7700,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                         bnx2x_emac_program(params, vars);
                         bnx2x_emac_enable(params, vars, 0);
                 } else
-                bnx2x_bmac_enable(params, vars, 0);
-
+                        bnx2x_bmac_enable(params, vars, 0);
                 if (params->loopback_mode == LOOPBACK_XGXS) {
                         /* set 10G XGXS loopback */
                         params->phy[INT_PHY].config_loopback(
@@ -7504,9 +7718,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
                                                 params);
                         }
                 }
-
-                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE +
-                            params->port*4, 0);
+                REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + params->port*4, 0);
 
                 bnx2x_set_led(params, vars,
                               LED_MODE_OPER, vars->line_speed);
@@ -7525,7 +7737,7 @@ u8 bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
         return 0;
 }
 u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
-                  u8 reset_ext_phy)
+                    u8 reset_ext_phy)
 {
         struct bnx2x *bp = params->bp;
         u8 phy_index, port = params->port, clear_latch_ind = 0;
@@ -7534,10 +7746,10 @@ u8 bnx2x_link_reset(struct link_params *params, struct link_vars *vars,
         vars->link_status = 0;
         bnx2x_update_mng(params, vars->link_status);
         bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 + port*4,
-                     (NIG_MASK_XGXS0_LINK_STATUS |
-                      NIG_MASK_XGXS0_LINK10G |
-                      NIG_MASK_SERDES0_LINK_STATUS |
-                      NIG_MASK_MI_INT));
+                       (NIG_MASK_XGXS0_LINK_STATUS |
+                        NIG_MASK_XGXS0_LINK10G |
+                        NIG_MASK_SERDES0_LINK_STATUS |
+                        NIG_MASK_MI_INT));
 
         /* activate nig drain */
         REG_WR(bp, NIG_REG_EGRESS_DRAIN0_MODE + port*4, 1);
@@ -7605,10 +7817,13 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
         struct bnx2x_phy phy[PORT_MAX];
         struct bnx2x_phy *phy_blk[PORT_MAX];
         u16 val;
-        s8 port;
+        s8 port = 0;
         s8 port_of_path = 0;
-
-        bnx2x_ext_phy_hw_reset(bp, 0);
+        u32 swap_val, swap_override;
+        swap_val = REG_RD(bp,  NIG_REG_PORT_SWAP);
+        swap_override = REG_RD(bp,  NIG_REG_STRAP_OVERRIDE);
+        port ^= (swap_val && swap_override);
+        bnx2x_ext_phy_hw_reset(bp, port);
         /* PART1 - Reset both phys */
         for (port = PORT_MAX - 1; port >= PORT_0; port--) {
                 u32 shmem_base, shmem2_base;
@@ -7633,21 +7848,22 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
                 /* disable attentions */
                 bnx2x_bits_dis(bp, NIG_REG_MASK_INTERRUPT_PORT0 +
                                port_of_path*4,
-                             (NIG_MASK_XGXS0_LINK_STATUS |
-                              NIG_MASK_XGXS0_LINK10G |
-                              NIG_MASK_SERDES0_LINK_STATUS |
-                              NIG_MASK_MI_INT));
+                               (NIG_MASK_XGXS0_LINK_STATUS |
+                                NIG_MASK_XGXS0_LINK10G |
+                                NIG_MASK_SERDES0_LINK_STATUS |
+                                NIG_MASK_MI_INT));
 
                 /* Need to take the phy out of low power mode in order
                         to write to access its registers */
                 bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                                  MISC_REGISTERS_GPIO_OUTPUT_HIGH, port);
+                               MISC_REGISTERS_GPIO_OUTPUT_HIGH,
+                               port);
 
                 /* Reset the phy */
                 bnx2x_cl45_write(bp, &phy[port],
-                               MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_CTRL,
-                               1<<15);
+                                 MDIO_PMA_DEVAD,
+                                 MDIO_PMA_REG_CTRL,
+                                 1<<15);
         }
 
         /* Add delay of 150ms after reset */
@@ -7663,7 +7879,6 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
 
         /* PART2 - Download firmware to both phys */
         for (port = PORT_MAX - 1; port >= PORT_0; port--) {
-                u16 fw_ver1;
                 if (CHIP_IS_E2(bp))
                         port_of_path = 0;
                 else
@@ -7671,34 +7886,26 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
 
                 DP(NETIF_MSG_LINK, "Loading spirom for phy address 0x%x\n",
                            phy_blk[port]->addr);
-                bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
-                                                  port_of_path);
-
-                bnx2x_cl45_read(bp, phy_blk[port],
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_ROM_VER1, &fw_ver1);
-                if (fw_ver1 == 0 || fw_ver1 == 0x4321) {
-                        DP(NETIF_MSG_LINK,
-                                 "bnx2x_8073_common_init_phy port %x:"
-                                 "Download failed. fw version = 0x%x\n",
-                                 port, fw_ver1);
+                if (bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
+                                                      port_of_path))
                         return -EINVAL;
-                }
 
                 /* Only set bit 10 = 1 (Tx power down) */
                 bnx2x_cl45_read(bp, phy_blk[port],
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_TX_POWER_DOWN, &val);
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_TX_POWER_DOWN, &val);
 
                 /* Phase1 of TX_POWER_DOWN reset */
                 bnx2x_cl45_write(bp, phy_blk[port],
-                               MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_TX_POWER_DOWN,
-                               (val | 1<<10));
+                                 MDIO_PMA_DEVAD,
+                                 MDIO_PMA_REG_TX_POWER_DOWN,
+                                 (val | 1<<10));
         }
 
-        /* Toggle Transmitter: Power down and then up with 600ms
-           delay between */
+        /*
+         * Toggle Transmitter: Power down and then up with 600ms delay
+         * between
+         */
         msleep(600);
 
         /* PART3 - complete TX_POWER_DOWN process, and set GPIO2 back to low */
@@ -7706,25 +7913,25 @@ static u8 bnx2x_8073_common_init_phy(struct bnx2x *bp,
                 /* Phase2 of POWER_DOWN_RESET */
                 /* Release bit 10 (Release Tx power down) */
                 bnx2x_cl45_read(bp, phy_blk[port],
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_TX_POWER_DOWN, &val);
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_TX_POWER_DOWN, &val);
 
                 bnx2x_cl45_write(bp, phy_blk[port],
-                               MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_TX_POWER_DOWN, (val & (~(1<<10))));
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_TX_POWER_DOWN, (val & (~(1<<10))));
                 msleep(15);
 
                 /* Read modify write the SPI-ROM version select register */
                 bnx2x_cl45_read(bp, phy_blk[port],
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_EDC_FFE_MAIN, &val);
+                                MDIO_PMA_DEVAD,
+                                MDIO_PMA_REG_EDC_FFE_MAIN, &val);
                 bnx2x_cl45_write(bp, phy_blk[port],
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_EDC_FFE_MAIN, (val | (1<<12)));
+                                 MDIO_PMA_DEVAD,
+                                 MDIO_PMA_REG_EDC_FFE_MAIN, (val | (1<<12)));
 
                 /* set GPIO2 back to LOW */
                 bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_2,
-                                  MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
+                               MISC_REGISTERS_GPIO_OUTPUT_LOW, port);
         }
         return 0;
 }
@@ -7771,32 +7978,90 @@ static u8 bnx2x_8726_common_init_phy(struct bnx2x *bp,
 
                 /* Set fault module detected LED on */
                 bnx2x_set_gpio(bp, MISC_REGISTERS_GPIO_0,
-                                  MISC_REGISTERS_GPIO_HIGH,
-                                  port);
+                               MISC_REGISTERS_GPIO_HIGH,
+                               port);
         }
 
         return 0;
 }
+static void bnx2x_get_ext_phy_reset_gpio(struct bnx2x *bp, u32 shmem_base,
+                                         u8 *io_gpio, u8 *io_port)
+{
+
+        u32 phy_gpio_reset = REG_RD(bp, shmem_base +
+                                          offsetof(struct shmem_region,
+                                dev_info.port_hw_config[PORT_0].default_cfg));
+        switch (phy_gpio_reset) {
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO0_P0:
+                *io_gpio = 0;
+                *io_port = 0;
+                break;
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO1_P0:
+                *io_gpio = 1;
+                *io_port = 0;
+                break;
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO2_P0:
+                *io_gpio = 2;
+                *io_port = 0;
+                break;
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO3_P0:
+                *io_gpio = 3;
+                *io_port = 0;
+                break;
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO0_P1:
+                *io_gpio = 0;
+                *io_port = 1;
+                break;
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO1_P1:
+                *io_gpio = 1;
+                *io_port = 1;
+                break;
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO2_P1:
+                *io_gpio = 2;
+                *io_port = 1;
+                break;
+        case PORT_HW_CFG_EXT_PHY_GPIO_RST_GPIO3_P1:
+                *io_gpio = 3;
+                *io_port = 1;
+                break;
+        default:
+                /* Don't override the io_gpio and io_port */
+                break;
+        }
+}
 static u8 bnx2x_8727_common_init_phy(struct bnx2x *bp,
                                      u32 shmem_base_path[],
                                      u32 shmem2_base_path[], u8 phy_index,
                                      u32 chip_id)
 {
-        s8 port;
+        s8 port, reset_gpio;
         u32 swap_val, swap_override;
         struct bnx2x_phy phy[PORT_MAX];
         struct bnx2x_phy *phy_blk[PORT_MAX];
         s8 port_of_path;
-        swap_val = REG_RD(bp,  NIG_REG_PORT_SWAP);
-        swap_override = REG_RD(bp,  NIG_REG_STRAP_OVERRIDE);
+        swap_val = REG_RD(bp, NIG_REG_PORT_SWAP);
+        swap_override = REG_RD(bp, NIG_REG_STRAP_OVERRIDE);
 
+        reset_gpio = MISC_REGISTERS_GPIO_1;
         port = 1;
 
-        bnx2x_ext_phy_hw_reset(bp, port ^ (swap_val && swap_override));
+        /*
+         * Retrieve the reset gpio/port which control the reset.
+         * Default is GPIO1, PORT1
+         */
+        bnx2x_get_ext_phy_reset_gpio(bp, shmem_base_path[0],
+                                     (u8 *)&reset_gpio, (u8 *)&port);
 
         /* Calculate the port based on port swap */
         port ^= (swap_val && swap_override);
 
+        /* Initiate PHY reset*/
+        bnx2x_set_gpio(bp, reset_gpio, MISC_REGISTERS_GPIO_OUTPUT_LOW,
+                       port);
+        msleep(1);
+        bnx2x_set_gpio(bp, reset_gpio, MISC_REGISTERS_GPIO_OUTPUT_HIGH,
+                       port);
+
         msleep(5);
 
         /* PART1 - Reset both phys */
@@ -7832,9 +8097,7 @@ static u8 bnx2x_8727_common_init_phy(struct bnx2x *bp,
 
                 /* Reset the phy */
                 bnx2x_cl45_write(bp, &phy[port],
-                               MDIO_PMA_DEVAD,
-                               MDIO_PMA_REG_CTRL,
-                               1<<15);
+                                 MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 1<<15);
         }
 
         /* Add delay of 150ms after reset */
@@ -7848,27 +8111,17 @@ static u8 bnx2x_8727_common_init_phy(struct bnx2x *bp,
         }
         /* PART2 - Download firmware to both phys */
         for (port = PORT_MAX - 1; port >= PORT_0; port--) {
-                u16 fw_ver1;
-                 if (CHIP_IS_E2(bp))
+                if (CHIP_IS_E2(bp))
                         port_of_path = 0;
                 else
                         port_of_path = port;
                 DP(NETIF_MSG_LINK, "Loading spirom for phy address 0x%x\n",
                            phy_blk[port]->addr);
-                bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
-                                                  port_of_path);
-                bnx2x_cl45_read(bp, phy_blk[port],
-                              MDIO_PMA_DEVAD,
-                              MDIO_PMA_REG_ROM_VER1, &fw_ver1);
-                if (fw_ver1 == 0 || fw_ver1 == 0x4321) {
-                        DP(NETIF_MSG_LINK,
-                                 "bnx2x_8727_common_init_phy port %x:"
-                                 "Download failed. fw version = 0x%x\n",
-                                 port, fw_ver1);
+                if (bnx2x_8073_8727_external_rom_boot(bp, phy_blk[port],
+                                                      port_of_path))
                         return -EINVAL;
-                }
-        }
 
+        }
         return 0;
 }
 
@@ -7893,8 +8146,10 @@ static u8 bnx2x_ext_phy_common_init(struct bnx2x *bp, u32 shmem_base_path[],
                 break;
 
         case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8726:
-                /* GPIO1 affects both ports, so there's need to pull
-                it for single port alone */
+                /*
+                 * GPIO1 affects both ports, so there's need to pull
+                 * it for single port alone
+                 */
                 rc = bnx2x_8726_common_init_phy(bp, shmem_base_path,
                                                 shmem2_base_path,
                                                 phy_index, chip_id);
@@ -7904,11 +8159,15 @@ static u8 bnx2x_ext_phy_common_init(struct bnx2x *bp, u32 shmem_base_path[],
                 break;
         default:
                 DP(NETIF_MSG_LINK,
-                         "bnx2x_common_init_phy: ext_phy 0x%x not required\n",
-                         ext_phy_type);
+                           "ext_phy 0x%x common init not required\n",
+                           ext_phy_type);
                 break;
         }
 
+        if (rc != 0)
+                netdev_err(bp->dev,  "Warning: PHY was not initialized,"
+                                      " Port %d\n",
+                         0);
         return rc;
 }
 
@@ -7916,12 +8175,20 @@ u8 bnx2x_common_init_phy(struct bnx2x *bp, u32 shmem_base_path[],
                          u32 shmem2_base_path[], u32 chip_id)
 {
         u8 rc = 0;
+        u32 phy_ver;
         u8 phy_index;
         u32 ext_phy_type, ext_phy_config;
         DP(NETIF_MSG_LINK, "Begin common phy init\n");
 
-        if (CHIP_REV_IS_EMUL(bp))
+        /* Check if common init was already done */
+        phy_ver = REG_RD(bp, shmem_base_path[0] +
+                         offsetof(struct shmem_region,
+                                  port_mb[PORT_0].ext_phy_fw_version));
+        if (phy_ver) {
+                DP(NETIF_MSG_LINK, "Not doing common init; phy ver is 0x%x\n",
+                               phy_ver);
                 return 0;
+        }
 
         /* Read the ext_phy_type for arbitrary port(0) */
         for (phy_index = EXT_PHY1; phy_index < MAX_PHYS;
diff --git a/drivers/net/bnx2x/bnx2x_link.h b/drivers/net/bnx2x/bnx2x_link.h
index bedab1a942c..92f36b6950d 100644
--- a/drivers/net/bnx2x/bnx2x_link.h
+++ b/drivers/net/bnx2x/bnx2x_link.h
@@ -1,4 +1,4 @@
-/* Copyright 2008-2010 Broadcom Corporation
+/* Copyright 2008-2011 Broadcom Corporation
  *
  * Unless you and Broadcom execute a separate written software license
  * agreement governing use of this software, this software is licensed to you
@@ -33,7 +33,7 @@
 #define BNX2X_FLOW_CTRL_BOTH            PORT_FEATURE_FLOW_CONTROL_BOTH
 #define BNX2X_FLOW_CTRL_NONE            PORT_FEATURE_FLOW_CONTROL_NONE
 
-#define SPEED_AUTO_NEG      0
+#define SPEED_AUTO_NEG          0
 #define SPEED_12000             12000
 #define SPEED_12500             12500
 #define SPEED_13000             13000
@@ -44,8 +44,8 @@
 #define SFP_EEPROM_VENDOR_NAME_SIZE             16
 #define SFP_EEPROM_VENDOR_OUI_ADDR              0x25
 #define SFP_EEPROM_VENDOR_OUI_SIZE              3
-#define SFP_EEPROM_PART_NO_ADDR                 0x28
-#define SFP_EEPROM_PART_NO_SIZE         16
+#define SFP_EEPROM_PART_NO_ADDR                 0x28
+#define SFP_EEPROM_PART_NO_SIZE                 16
 #define PWR_FLT_ERR_MSG_LEN                     250
 
 #define XGXS_EXT_PHY_TYPE(ext_phy_config) \
@@ -62,7 +62,7 @@
 #define SINGLE_MEDIA(params)            (params->num_phys == 2)
 /* Dual Media board contains two external phy with different media */
 #define DUAL_MEDIA(params)              (params->num_phys == 3)
-#define FW_PARAM_MDIO_CTRL_OFFSET 16
+#define FW_PARAM_MDIO_CTRL_OFFSET               16
 #define FW_PARAM_SET(phy_addr, phy_type, mdio_access) \
         (phy_addr | phy_type | mdio_access << FW_PARAM_MDIO_CTRL_OFFSET)
 
@@ -201,12 +201,14 @@ struct link_params {
 
         /* Default / User Configuration */
         u8 loopback_mode;
-#define LOOPBACK_NONE   0
-#define LOOPBACK_EMAC   1
-#define LOOPBACK_BMAC   2
+#define LOOPBACK_NONE           0
+#define LOOPBACK_EMAC           1
+#define LOOPBACK_BMAC           2
 #define LOOPBACK_XGXS           3
 #define LOOPBACK_EXT_PHY        4
-#define LOOPBACK_EXT    5
+#define LOOPBACK_EXT            5
+#define LOOPBACK_UMAC           6
+#define LOOPBACK_XMAC           7
 
         /* Device parameters */
         u8 mac_addr[6];
@@ -230,10 +232,11 @@ struct link_params {
         /* Phy register parameter */
         u32 chip_id;
 
+        /* features */
         u32 feature_config_flags;
-#define FEATURE_CONFIG_OVERRIDE_PREEMPHASIS_ENABLED (1<<0)
-#define FEATURE_CONFIG_PFC_ENABLED              (1<<1)
-#define FEATURE_CONFIG_BC_SUPPORTS_OPT_MDL_VRFY (1<<2)
+#define FEATURE_CONFIG_OVERRIDE_PREEMPHASIS_ENABLED     (1<<0)
+#define FEATURE_CONFIG_PFC_ENABLED                      (1<<1)
+#define FEATURE_CONFIG_BC_SUPPORTS_OPT_MDL_VRFY         (1<<2)
 #define FEATURE_CONFIG_BC_SUPPORTS_DUAL_PHY_OPT_MDL_VRFY        (1<<3)
         /* Will be populated during common init */
         struct bnx2x_phy phy[MAX_PHYS];
@@ -334,6 +337,11 @@ void bnx2x_ext_phy_hw_reset(struct bnx2x *bp, u8 port);
 /* Reset the external of SFX7101 */
 void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, struct bnx2x_phy *phy);
 
+/* Read "byte_cnt" bytes from address "addr" from the SFP+ EEPROM */
+u8 bnx2x_read_sfp_module_eeprom(struct bnx2x_phy *phy,
+                                struct link_params *params, u16 addr,
+                                u8 byte_cnt, u8 *o_buf);
+
 void bnx2x_hw_reset_phy(struct link_params *params);
 
 /* Checks if HW lock is required for this phy/board type */
@@ -379,7 +387,7 @@ void bnx2x_ets_disabled(struct link_params *params);
 
 /* Used to configure the ETS to BW limited */
 void bnx2x_ets_bw_limit(const struct link_params *params, const u32 cos0_bw,
-                                                const u32 cos1_bw);
+                        const u32 cos1_bw);
 
 /* Used to configure the ETS to strict */
 u8 bnx2x_ets_strict(const struct link_params *params, const u8 strict_cos);
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 8cdcf5b39d1..32e64cc85d2 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -145,13 +145,6 @@ static struct {
         { "Broadcom NetXtreme II BCM57712E XGb" }
 };
 
-#ifndef PCI_DEVICE_ID_NX2_57712
-#define PCI_DEVICE_ID_NX2_57712         0x1662
-#endif
-#ifndef PCI_DEVICE_ID_NX2_57712E
-#define PCI_DEVICE_ID_NX2_57712E        0x1663
-#endif
-
 static DEFINE_PCI_DEVICE_TABLE(bnx2x_pci_tbl) = {
         { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57710), BCM57710 },
         { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711), BCM57711 },
@@ -586,7 +579,7 @@ static int bnx2x_issue_dmae_with_comp(struct bnx2x *bp,
            bp->slowpath->wb_data[2], bp->slowpath->wb_data[3]);
 
         /* lock the dmae channel */
-        mutex_lock(&bp->dmae_mutex);
+        spin_lock_bh(&bp->dmae_lock);
 
         /* reset completion */
         *wb_comp = 0;
@@ -617,7 +610,7 @@ static int bnx2x_issue_dmae_with_comp(struct bnx2x *bp,
            bp->slowpath->wb_data[2], bp->slowpath->wb_data[3]);
 
 unlock:
-        mutex_unlock(&bp->dmae_mutex);
+        spin_unlock_bh(&bp->dmae_lock);
         return rc;
 }
 
@@ -1397,7 +1390,7 @@ void bnx2x_sp_event(struct bnx2x_fastpath *fp,
         }
 
         smp_mb__before_atomic_inc();
-        atomic_inc(&bp->spq_left);
+        atomic_inc(&bp->cq_spq_left);
         /* push the change in fp->state and towards the memory */
         smp_wmb();
 
@@ -1974,13 +1967,22 @@ static void bnx2x_init_vn_minmax(struct bnx2x *bp, int vn)
                 vn_max_rate = 0;
 
         } else {
+                u32 maxCfg = bnx2x_extract_max_cfg(bp, vn_cfg);
+
                 vn_min_rate = ((vn_cfg & FUNC_MF_CFG_MIN_BW_MASK) >>
                                 FUNC_MF_CFG_MIN_BW_SHIFT) * 100;
-                /* If min rate is zero - set it to 1 */
+                /* If fairness is enabled (not all min rates are zeroes) and
+                   if current min rate is zero - set it to 1.
+                   This is a requirement of the algorithm. */
                 if (bp->vn_weight_sum && (vn_min_rate == 0))
                         vn_min_rate = DEF_MIN_RATE;
-                vn_max_rate = ((vn_cfg & FUNC_MF_CFG_MAX_BW_MASK) >>
-                                FUNC_MF_CFG_MAX_BW_SHIFT) * 100;
+
+                if (IS_MF_SI(bp))
+                        /* maxCfg in percents of linkspeed */
+                        vn_max_rate = (bp->link_vars.line_speed * maxCfg) / 100;
+                else
+                        /* maxCfg is absolute in 100Mb units */
+                        vn_max_rate = maxCfg * 100;
         }
 
         DP(NETIF_MSG_IFUP,
@@ -2006,7 +2008,8 @@ static void bnx2x_init_vn_minmax(struct bnx2x *bp, int vn)
                 m_fair_vn.vn_credit_delta =
                         max_t(u32, (vn_min_rate * (T_FAIR_COEF /
                                                    (8 * bp->vn_weight_sum))),
-                              (bp->cmng.fair_vars.fair_threshold * 2));
+                              (bp->cmng.fair_vars.fair_threshold +
+                                                        MIN_ABOVE_THRESH));
                 DP(NETIF_MSG_IFUP, "m_fair_vn.vn_credit_delta %d\n",
                    m_fair_vn.vn_credit_delta);
         }
@@ -2082,8 +2085,9 @@ static void bnx2x_cmng_fns_init(struct bnx2x *bp, u8 read_cfg, u8 cmng_type)
                 bnx2x_calc_vn_weight_sum(bp);
 
                 /* calculate and set min-max rate for each vn */
-                for (vn = VN_0; vn < E1HVN_MAX; vn++)
-                        bnx2x_init_vn_minmax(bp, vn);
+                if (bp->port.pmf)
+                        for (vn = VN_0; vn < E1HVN_MAX; vn++)
+                                bnx2x_init_vn_minmax(bp, vn);
 
                 /* always enable rate shaping and fairness */
                 bp->cmng.flags.cmng_enables |=
@@ -2152,13 +2156,6 @@ static void bnx2x_link_attn(struct bnx2x *bp)
                         bnx2x_stats_handle(bp, STATS_EVENT_LINK_UP);
         }
 
-        /* indicate link status only if link status actually changed */
-        if (prev_link_status != bp->link_vars.link_status)
-                bnx2x_link_report(bp);
-
-        if (IS_MF(bp))
-                bnx2x_link_sync_notify(bp);
-
         if (bp->link_vars.link_up && bp->link_vars.line_speed) {
                 int cmng_fns = bnx2x_get_cmng_fns_mode(bp);
 
@@ -2170,6 +2167,13 @@ static void bnx2x_link_attn(struct bnx2x *bp)
                         DP(NETIF_MSG_IFUP,
                            "single function mode without fairness\n");
         }
+
+        if (IS_MF(bp))
+                bnx2x_link_sync_notify(bp);
+
+        /* indicate link status only if link status actually changed */
+        if (prev_link_status != bp->link_vars.link_status)
+                bnx2x_link_report(bp);
 }
 
 void bnx2x__link_status_update(struct bnx2x *bp)
@@ -2301,15 +2305,10 @@ static void bnx2x_rxq_set_mac_filters(struct bnx2x *bp, u16 cl_id, u32 filters)
                 /* accept matched ucast */
                 drop_all_ucast = 0;
         }
-        if (filters & BNX2X_ACCEPT_MULTICAST) {
+        if (filters & BNX2X_ACCEPT_MULTICAST)
                 /* accept matched mcast */
                 drop_all_mcast = 0;
-                if (IS_MF_SI(bp))
-                        /* since mcast addresses won't arrive with ovlan,
-                         * fw needs to accept all of them in
-                         * switch-independent mode */
-                        accp_all_mcast = 1;
-        }
+
         if (filters & BNX2X_ACCEPT_ALL_UNICAST) {
                 /* accept all mcast */
                 drop_all_ucast = 0;
@@ -2478,8 +2477,14 @@ static void bnx2x_pf_rx_cl_prep(struct bnx2x *bp,
         rxq_init->sge_map = fp->rx_sge_mapping;
         rxq_init->rcq_map = fp->rx_comp_mapping;
         rxq_init->rcq_np_map = fp->rx_comp_mapping + BCM_PAGE_SIZE;
-        rxq_init->mtu = bp->dev->mtu;
-        rxq_init->buf_sz = bp->rx_buf_size;
+
+        /* Always use mini-jumbo MTU for FCoE L2 ring */
+        if (IS_FCOE_FP(fp))
+                rxq_init->mtu = BNX2X_FCOE_MINI_JUMBO_MTU;
+        else
+                rxq_init->mtu = bp->dev->mtu;
+
+        rxq_init->buf_sz = fp->rx_buf_size;
         rxq_init->cl_qzone_id = fp->cl_qzone_id;
         rxq_init->cl_id = fp->cl_id;
         rxq_init->spcl_id = fp->cl_id;
@@ -2731,11 +2736,18 @@ int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,
 
         spin_lock_bh(&bp->spq_lock);
 
-        if (!atomic_read(&bp->spq_left)) {
-                BNX2X_ERR("BUG! SPQ ring full!\n");
-                spin_unlock_bh(&bp->spq_lock);
-                bnx2x_panic();
-                return -EBUSY;
+        if (common) {
+                if (!atomic_read(&bp->eq_spq_left)) {
+                        BNX2X_ERR("BUG! EQ ring full!\n");
+                        spin_unlock_bh(&bp->spq_lock);
+                        bnx2x_panic();
+                        return -EBUSY;
+                }
+        } else if (!atomic_read(&bp->cq_spq_left)) {
+                        BNX2X_ERR("BUG! SPQ ring full!\n");
+                        spin_unlock_bh(&bp->spq_lock);
+                        bnx2x_panic();
+                        return -EBUSY;
         }
 
         spe = bnx2x_sp_get_next(bp);
@@ -2766,20 +2778,26 @@ int bnx2x_sp_post(struct bnx2x *bp, int command, int cid,
         spe->data.update_data_addr.lo = cpu_to_le32(data_lo);
 
         /* stats ramrod has it's own slot on the spq */
-        if (command != RAMROD_CMD_ID_COMMON_STAT_QUERY)
+        if (command != RAMROD_CMD_ID_COMMON_STAT_QUERY) {
                 /* It's ok if the actual decrement is issued towards the memory
                  * somewhere between the spin_lock and spin_unlock. Thus no
                  * more explict memory barrier is needed.
                  */
-                atomic_dec(&bp->spq_left);
+                if (common)
+                        atomic_dec(&bp->eq_spq_left);
+                else
+                        atomic_dec(&bp->cq_spq_left);
+        }
+
 
         DP(BNX2X_MSG_SP/*NETIF_MSG_TIMER*/,
            "SPQE[%x] (%x:%x)  command %d  hw_cid %x  data (%x:%x) "
-           "type(0x%x) left %x\n",
+           "type(0x%x) left (ETH, COMMON) (%x,%x)\n",
            bp->spq_prod_idx, (u32)U64_HI(bp->spq_mapping),
            (u32)(U64_LO(bp->spq_mapping) +
            (void *)bp->spq_prod_bd - (void *)bp->spq), command,
-           HW_CID(bp, cid), data_hi, data_lo, type, atomic_read(&bp->spq_left));
+           HW_CID(bp, cid), data_hi, data_lo, type,
+           atomic_read(&bp->cq_spq_left), atomic_read(&bp->eq_spq_left));
 
         bnx2x_sp_prod_update(bp);
         spin_unlock_bh(&bp->spq_lock);
@@ -3691,8 +3709,8 @@ static void bnx2x_eq_int(struct bnx2x *bp)
         sw_cons = bp->eq_cons;
         sw_prod = bp->eq_prod;
 
-        DP(BNX2X_MSG_SP, "EQ:  hw_cons %u  sw_cons %u bp->spq_left %u\n",
-                        hw_cons, sw_cons, atomic_read(&bp->spq_left));
+        DP(BNX2X_MSG_SP, "EQ:  hw_cons %u  sw_cons %u bp->cq_spq_left %u\n",
+                        hw_cons, sw_cons, atomic_read(&bp->eq_spq_left));
 
         for (; sw_cons != hw_cons;
               sw_prod = NEXT_EQ_IDX(sw_prod), sw_cons = NEXT_EQ_IDX(sw_cons)) {
@@ -3757,13 +3775,15 @@ static void bnx2x_eq_int(struct bnx2x *bp)
                 case (EVENT_RING_OPCODE_SET_MAC | BNX2X_STATE_OPEN):
                 case (EVENT_RING_OPCODE_SET_MAC | BNX2X_STATE_DIAG):
                         DP(NETIF_MSG_IFUP, "got set mac ramrod\n");
-                        bp->set_mac_pending = 0;
+                        if (elem->message.data.set_mac_event.echo)
+                                bp->set_mac_pending = 0;
                         break;
 
                 case (EVENT_RING_OPCODE_SET_MAC |
                       BNX2X_STATE_CLOSING_WAIT4_HALT):
                         DP(NETIF_MSG_IFDOWN, "got (un)set mac ramrod\n");
-                        bp->set_mac_pending = 0;
+                        if (elem->message.data.set_mac_event.echo)
+                                bp->set_mac_pending = 0;
                         break;
                 default:
                         /* unknown event log error and continue */
@@ -3775,7 +3795,7 @@ next_spqe:
         } /* for */
 
         smp_mb__before_atomic_inc();
-        atomic_add(spqe_cnt, &bp->spq_left);
+        atomic_add(spqe_cnt, &bp->eq_spq_left);
 
         bp->eq_cons = sw_cons;
         bp->eq_prod = sw_prod;
@@ -4202,13 +4222,13 @@ void bnx2x_update_coalesce(struct bnx2x *bp)
 
         for_each_eth_queue(bp, i)
                 bnx2x_update_coalesce_sb(bp, bp->fp[i].fw_sb_id,
-                                         bp->rx_ticks, bp->tx_ticks);
+                                         bp->tx_ticks, bp->rx_ticks);
 }
 
 static void bnx2x_init_sp_ring(struct bnx2x *bp)
 {
         spin_lock_init(&bp->spq_lock);
-        atomic_set(&bp->spq_left, MAX_SPQ_PENDING);
+        atomic_set(&bp->cq_spq_left, MAX_SPQ_PENDING);
 
         bp->spq_prod_idx = 0;
         bp->dsb_sp_prod = BNX2X_SP_DSB_INDEX;
@@ -4233,9 +4253,12 @@ static void bnx2x_init_eq_ring(struct bnx2x *bp)
         bp->eq_cons = 0;
         bp->eq_prod = NUM_EQ_DESC;
         bp->eq_cons_sb = BNX2X_EQ_INDEX;
+        /* we want a warning message before it gets rought... */
+        atomic_set(&bp->eq_spq_left,
+                min_t(int, MAX_SP_DESC_CNT - MAX_SPQ_PENDING, NUM_EQ_DESC) - 1);
 }
 
-static void bnx2x_init_ind_table(struct bnx2x *bp)
+void bnx2x_push_indir_table(struct bnx2x *bp)
 {
         int func = BP_FUNC(bp);
         int i;
@@ -4243,13 +4266,20 @@ static void bnx2x_init_ind_table(struct bnx2x *bp)
         if (bp->multi_mode == ETH_RSS_MODE_DISABLED)
                 return;
 
-        DP(NETIF_MSG_IFUP,
-           "Initializing indirection table  multi_mode %d\n", bp->multi_mode);
         for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
                 REG_WR8(bp, BAR_TSTRORM_INTMEM +
                         TSTORM_INDIRECTION_TABLE_OFFSET(func) + i,
-                        bp->fp->cl_id + (i % (bp->num_queues -
-                                NONE_ETH_CONTEXT_USE)));
+                        bp->fp->cl_id + bp->rx_indir_table[i]);
+}
+
+static void bnx2x_init_ind_table(struct bnx2x *bp)
+{
+        int i;
+
+        for (i = 0; i < TSTORM_INDIRECTION_TABLE_SIZE; i++)
+                bp->rx_indir_table[i] = i % BNX2X_NUM_ETH_QUEUES(bp);
+
+        bnx2x_push_indir_table(bp);
 }
 
 void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
@@ -4281,9 +4311,12 @@ void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
                 def_q_filters |= BNX2X_ACCEPT_UNICAST | BNX2X_ACCEPT_BROADCAST |
                                 BNX2X_ACCEPT_MULTICAST;
 #ifdef BCM_CNIC
-                cl_id = bnx2x_fcoe(bp, cl_id);
-                bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_UNICAST |
-                                          BNX2X_ACCEPT_MULTICAST);
+                if (!NO_FCOE(bp)) {
+                        cl_id = bnx2x_fcoe(bp, cl_id);
+                        bnx2x_rxq_set_mac_filters(bp, cl_id,
+                                                  BNX2X_ACCEPT_UNICAST |
+                                                  BNX2X_ACCEPT_MULTICAST);
+                }
 #endif
                 break;
 
@@ -4291,18 +4324,29 @@ void bnx2x_set_storm_rx_mode(struct bnx2x *bp)
                 def_q_filters |= BNX2X_ACCEPT_UNICAST | BNX2X_ACCEPT_BROADCAST |
                                 BNX2X_ACCEPT_ALL_MULTICAST;
 #ifdef BCM_CNIC
-                cl_id = bnx2x_fcoe(bp, cl_id);
-                bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_UNICAST |
-                                          BNX2X_ACCEPT_MULTICAST);
+                /*
+                 *  Prevent duplication of multicast packets by configuring FCoE
+                 *  L2 Client to receive only matched unicast frames.
+                 */
+                if (!NO_FCOE(bp)) {
+                        cl_id = bnx2x_fcoe(bp, cl_id);
+                        bnx2x_rxq_set_mac_filters(bp, cl_id,
+                                                  BNX2X_ACCEPT_UNICAST);
+                }
 #endif
                 break;
 
         case BNX2X_RX_MODE_PROMISC:
                 def_q_filters |= BNX2X_PROMISCUOUS_MODE;
 #ifdef BCM_CNIC
-                cl_id = bnx2x_fcoe(bp, cl_id);
-                bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_UNICAST |
-                                          BNX2X_ACCEPT_MULTICAST);
+                /*
+                 *  Prevent packets duplication by configuring DROP_ALL for FCoE
+                 *  L2 Client.
+                 */
+                if (!NO_FCOE(bp)) {
+                        cl_id = bnx2x_fcoe(bp, cl_id);
+                        bnx2x_rxq_set_mac_filters(bp, cl_id, BNX2X_ACCEPT_NONE);
+                }
 #endif
                 /* pass management unicast packets as well */
                 llh_mask |= NIG_LLH0_BRB1_DRV_MASK_REG_LLH0_BRB1_DRV_MASK_UNCST;
@@ -5296,10 +5340,6 @@ static int bnx2x_init_hw_common(struct bnx2x *bp, u32 load_code)
                 }
         }
 
-        bp->port.need_hw_lock = bnx2x_hw_lock_required(bp,
-                                                       bp->common.shmem_base,
-                                                       bp->common.shmem2_base);
-
         bnx2x_setup_fan_failure_detection(bp);
 
         /* clear PXP2 attentions */
@@ -5503,9 +5543,6 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)
 
         bnx2x_init_block(bp, MCP_BLOCK, init_stage);
         bnx2x_init_block(bp, DMAE_BLOCK, init_stage);
-        bp->port.need_hw_lock = bnx2x_hw_lock_required(bp,
-                                                       bp->common.shmem_base,
-                                                       bp->common.shmem2_base);
         if (bnx2x_fan_failure_det_req(bp, bp->common.shmem_base,
                                       bp->common.shmem2_base, port)) {
                 u32 reg_addr = (port ? MISC_REG_AEU_ENABLE1_FUNC_1_OUT_0 :
@@ -5838,7 +5875,7 @@ int bnx2x_init_hw(struct bnx2x *bp, u32 load_code)
            BP_ABS_FUNC(bp), load_code);
 
         bp->dmae_ready = 0;
-        mutex_init(&bp->dmae_mutex);
+        spin_lock_init(&bp->dmae_lock);
         rc = bnx2x_gunzip_init(bp);
         if (rc)
                 return rc;
@@ -5990,6 +6027,8 @@ void bnx2x_free_mem(struct bnx2x *bp)
         BNX2X_PCI_FREE(bp->eq_ring, bp->eq_mapping,
                        BCM_PAGE_SIZE * NUM_EQ_PAGES);
 
+        BNX2X_FREE(bp->rx_indir_table);
+
 #undef BNX2X_PCI_FREE
 #undef BNX2X_KFREE
 }
@@ -6120,6 +6159,9 @@ int bnx2x_alloc_mem(struct bnx2x *bp)
         /* EQ */
         BNX2X_PCI_ALLOC(bp->eq_ring, &bp->eq_mapping,
                         BCM_PAGE_SIZE * NUM_EQ_PAGES);
+
+        BNX2X_ALLOC(bp->rx_indir_table, sizeof(bp->rx_indir_table[0]) *
+                    TSTORM_INDIRECTION_TABLE_SIZE);
         return 0;
 
 alloc_mem_err:
@@ -6173,12 +6215,14 @@ static void bnx2x_set_mac_addr_gen(struct bnx2x *bp, int set, const u8 *mac,
         int ramrod_flags = WAIT_RAMROD_COMMON;
 
         bp->set_mac_pending = 1;
-        smp_wmb();
 
         config->hdr.length = 1;
         config->hdr.offset = cam_offset;
         config->hdr.client_id = 0xff;
-        config->hdr.reserved1 = 0;
+        /* Mark the single MAC configuration ramrod as opposed to a
+         * UC/MC list configuration).
+         */
+        config->hdr.echo = 1;
 
         /* primary MAC */
         config->config_table[0].msb_mac_addr =
@@ -6210,6 +6254,8 @@ static void bnx2x_set_mac_addr_gen(struct bnx2x *bp, int set, const u8 *mac,
            config->config_table[0].middle_mac_addr,
            config->config_table[0].lsb_mac_addr, BP_FUNC(bp), cl_bit_vec);
 
+        mb();
+
         bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_SET_MAC, 0,
                       U64_HI(bnx2x_sp_mapping(bp, mac_config)),
                       U64_LO(bnx2x_sp_mapping(bp, mac_config)), 1);
@@ -6274,20 +6320,15 @@ static u8 bnx2x_e1h_cam_offset(struct bnx2x *bp, u8 rel_offset)
         if (CHIP_IS_E1H(bp))
                 return E1H_FUNC_MAX * rel_offset + BP_FUNC(bp);
         else if (CHIP_MODE_IS_4_PORT(bp))
-                return BP_FUNC(bp) * 32  + rel_offset;
+                return E2_FUNC_MAX * rel_offset + BP_FUNC(bp);
         else
-                return BP_VN(bp) * 32  + rel_offset;
+                return E2_FUNC_MAX * rel_offset + BP_VN(bp);
 }
 
 /**
  *  LLH CAM line allocations: currently only iSCSI and ETH macs are
  *  relevant. In addition, current implementation is tuned for a
  *  single ETH MAC.
- *
- *  When multiple unicast ETH MACs PF configuration in switch
- *  independent mode is required (NetQ, multiple netdev MACs,
- *  etc.), consider better utilisation of 16 per function MAC
- *  entries in the LLH memory.
  */
 enum {
         LLH_CAM_ISCSI_ETH_LINE = 0,
@@ -6362,14 +6403,37 @@ void bnx2x_set_eth_mac(struct bnx2x *bp, int set)
                 bnx2x_set_mac_addr_gen(bp, set, bcast, 0, cam_offset + 1, 1);
         }
 }
-static void bnx2x_set_e1_mc_list(struct bnx2x *bp, u8 offset)
+
+static inline u8 bnx2x_e1_cam_mc_offset(struct bnx2x *bp)
+{
+        return CHIP_REV_IS_SLOW(bp) ?
+                (BNX2X_MAX_EMUL_MULTI * (1 + BP_PORT(bp))) :
+                (BNX2X_MAX_MULTICAST * (1 + BP_PORT(bp)));
+}
+
+/* set mc list, do not wait as wait implies sleep and
+ * set_rx_mode can be invoked from non-sleepable context.
+ *
+ * Instead we use the same ramrod data buffer each time we need
+ * to configure a list of addresses, and use the fact that the
+ * list of MACs is changed in an incremental way and that the
+ * function is called under the netif_addr_lock. A temporary
+ * inconsistent CAM configuration (possible in case of a very fast
+ * sequence of add/del/add on the host side) will shortly be
+ * restored by the handler of the last ramrod.
+ */
+static int bnx2x_set_e1_mc_list(struct bnx2x *bp)
 {
         int i = 0, old;
         struct net_device *dev = bp->dev;
+        u8 offset = bnx2x_e1_cam_mc_offset(bp);
         struct netdev_hw_addr *ha;
         struct mac_configuration_cmd *config_cmd = bnx2x_sp(bp, mcast_config);
         dma_addr_t config_cmd_map = bnx2x_sp_mapping(bp, mcast_config);
 
+        if (netdev_mc_count(dev) > BNX2X_MAX_MULTICAST)
+                return -EINVAL;
+
         netdev_for_each_mc_addr(ha, dev) {
                 /* copy mac */
                 config_cmd->config_table[i].msb_mac_addr =
@@ -6410,32 +6474,47 @@ static void bnx2x_set_e1_mc_list(struct bnx2x *bp, u8 offset)
                 }
         }
 
+        wmb();
+
         config_cmd->hdr.length = i;
         config_cmd->hdr.offset = offset;
         config_cmd->hdr.client_id = 0xff;
-        config_cmd->hdr.reserved1 = 0;
+        /* Mark that this ramrod doesn't use bp->set_mac_pending for
+         * synchronization.
+         */
+        config_cmd->hdr.echo = 0;
 
-        bp->set_mac_pending = 1;
-        smp_wmb();
+        mb();
 
-        bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_SET_MAC, 0,
+        return bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_SET_MAC, 0,
                    U64_HI(config_cmd_map), U64_LO(config_cmd_map), 1);
 }
-static void bnx2x_invlidate_e1_mc_list(struct bnx2x *bp)
+
+void bnx2x_invalidate_e1_mc_list(struct bnx2x *bp)
 {
         int i;
         struct mac_configuration_cmd *config_cmd = bnx2x_sp(bp, mcast_config);
         dma_addr_t config_cmd_map = bnx2x_sp_mapping(bp, mcast_config);
         int ramrod_flags = WAIT_RAMROD_COMMON;
+        u8 offset = bnx2x_e1_cam_mc_offset(bp);
 
-        bp->set_mac_pending = 1;
-        smp_wmb();
-
-        for (i = 0; i < config_cmd->hdr.length; i++)
+        for (i = 0; i < BNX2X_MAX_MULTICAST; i++)
                 SET_FLAG(config_cmd->config_table[i].flags,
                         MAC_CONFIGURATION_ENTRY_ACTION_TYPE,
                         T_ETH_MAC_COMMAND_INVALIDATE);
 
+        wmb();
+
+        config_cmd->hdr.length = BNX2X_MAX_MULTICAST;
+        config_cmd->hdr.offset = offset;
+        config_cmd->hdr.client_id = 0xff;
+        /* We'll wait for a completion this time... */
+        config_cmd->hdr.echo = 1;
+
+        bp->set_mac_pending = 1;
+
+        mb();
+
         bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_SET_MAC, 0,
                       U64_HI(config_cmd_map), U64_LO(config_cmd_map), 1);
 
@@ -6445,6 +6524,44 @@ static void bnx2x_invlidate_e1_mc_list(struct bnx2x *bp)
 
 }
 
+/* Accept one or more multicasts */
+static int bnx2x_set_e1h_mc_list(struct bnx2x *bp)
+{
+        struct net_device *dev = bp->dev;
+        struct netdev_hw_addr *ha;
+        u32 mc_filter[MC_HASH_SIZE];
+        u32 crc, bit, regidx;
+        int i;
+
+        memset(mc_filter, 0, 4 * MC_HASH_SIZE);
+
+        netdev_for_each_mc_addr(ha, dev) {
+                DP(NETIF_MSG_IFUP, "Adding mcast MAC: %pM\n",
+                   bnx2x_mc_addr(ha));
+
+                crc = crc32c_le(0, bnx2x_mc_addr(ha),
+                                ETH_ALEN);
+                bit = (crc >> 24) & 0xff;
+                regidx = bit >> 5;
+                bit &= 0x1f;
+                mc_filter[regidx] |= (1 << bit);
+        }
+
+        for (i = 0; i < MC_HASH_SIZE; i++)
+                REG_WR(bp, MC_HASH_OFFSET(bp, i),
+                       mc_filter[i]);
+
+        return 0;
+}
+
+void bnx2x_invalidate_e1h_mc_list(struct bnx2x *bp)
+{
+        int i;
+
+        for (i = 0; i < MC_HASH_SIZE; i++)
+                REG_WR(bp, MC_HASH_OFFSET(bp, i), 0);
+}
+
 #ifdef BCM_CNIC
 /**
  * Set iSCSI MAC(s) at the next enties in the CAM after the ETH
@@ -6463,12 +6580,13 @@ static int bnx2x_set_iscsi_eth_mac_addr(struct bnx2x *bp, int set)
         u32 iscsi_l2_cl_id = BNX2X_ISCSI_ETH_CL_ID +
                 BP_E1HVN(bp) * NONE_ETH_CONTEXT_USE;
         u32 cl_bit_vec = (1 << iscsi_l2_cl_id);
+        u8 *iscsi_mac = bp->cnic_eth_dev.iscsi_mac;
 
         /* Send a SET_MAC ramrod */
-        bnx2x_set_mac_addr_gen(bp, set, bp->iscsi_mac, cl_bit_vec,
+        bnx2x_set_mac_addr_gen(bp, set, iscsi_mac, cl_bit_vec,
                                cam_offset, 0);
 
-        bnx2x_set_mac_in_nig(bp, set, bp->iscsi_mac, LLH_CAM_ISCSI_ETH_LINE);
+        bnx2x_set_mac_in_nig(bp, set, iscsi_mac, LLH_CAM_ISCSI_ETH_LINE);
 
         return 0;
 }
@@ -7110,20 +7228,15 @@ void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode)
         /* Give HW time to discard old tx messages */
         msleep(1);
 
-        if (CHIP_IS_E1(bp)) {
-                /* invalidate mc list,
-                 * wait and poll (interrupts are off)
-                 */
-                bnx2x_invlidate_e1_mc_list(bp);
-                bnx2x_set_eth_mac(bp, 0);
+        bnx2x_set_eth_mac(bp, 0);
 
-        } else {
-                REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 0);
+        bnx2x_invalidate_uc_list(bp);
 
-                bnx2x_set_eth_mac(bp, 0);
-
-                for (i = 0; i < MC_HASH_SIZE; i++)
-                        REG_WR(bp, MC_HASH_OFFSET(bp, i), 0);
+        if (CHIP_IS_E1(bp))
+                bnx2x_invalidate_e1_mc_list(bp);
+        else {
+                bnx2x_invalidate_e1h_mc_list(bp);
+                REG_WR(bp, NIG_REG_LLH0_FUNC_EN + port*8, 0);
         }
 
 #ifdef BCM_CNIC
@@ -8379,13 +8492,60 @@ static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp)
                  (ext_phy_type != PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN))
                 bp->mdio.prtad =
                         XGXS_EXT_PHY_ADDR(ext_phy_config);
+
+        /*
+         * Check if hw lock is required to access MDC/MDIO bus to the PHY(s)
+         * In MF mode, it is set to cover self test cases
+         */
+        if (IS_MF(bp))
+                bp->port.need_hw_lock = 1;
+        else
+                bp->port.need_hw_lock = bnx2x_hw_lock_required(bp,
+                                                        bp->common.shmem_base,
+                                                        bp->common.shmem2_base);
+}
+
+#ifdef BCM_CNIC
+static void __devinit bnx2x_get_cnic_info(struct bnx2x *bp)
+{
+        u32 max_iscsi_conn = FW_ENCODE_32BIT_PATTERN ^ SHMEM_RD(bp,
+                                drv_lic_key[BP_PORT(bp)].max_iscsi_conn);
+        u32 max_fcoe_conn = FW_ENCODE_32BIT_PATTERN ^ SHMEM_RD(bp,
+                                drv_lic_key[BP_PORT(bp)].max_fcoe_conn);
+
+        /* Get the number of maximum allowed iSCSI and FCoE connections */
+        bp->cnic_eth_dev.max_iscsi_conn =
+                (max_iscsi_conn & BNX2X_MAX_ISCSI_INIT_CONN_MASK) >>
+                BNX2X_MAX_ISCSI_INIT_CONN_SHIFT;
+
+        bp->cnic_eth_dev.max_fcoe_conn =
+                (max_fcoe_conn & BNX2X_MAX_FCOE_INIT_CONN_MASK) >>
+                BNX2X_MAX_FCOE_INIT_CONN_SHIFT;
+
+        BNX2X_DEV_INFO("max_iscsi_conn 0x%x max_fcoe_conn 0x%x\n",
+                       bp->cnic_eth_dev.max_iscsi_conn,
+                       bp->cnic_eth_dev.max_fcoe_conn);
+
+        /* If mamimum allowed number of connections is zero -
+         * disable the feature.
+         */
+        if (!bp->cnic_eth_dev.max_iscsi_conn)
+                bp->flags |= NO_ISCSI_OOO_FLAG | NO_ISCSI_FLAG;
+
+        if (!bp->cnic_eth_dev.max_fcoe_conn)
+                bp->flags |= NO_FCOE_FLAG;
 }
+#endif
 
 static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
 {
         u32 val, val2;
         int func = BP_ABS_FUNC(bp);
         int port = BP_PORT(bp);
+#ifdef BCM_CNIC
+        u8 *iscsi_mac = bp->cnic_eth_dev.iscsi_mac;
+        u8 *fip_mac = bp->fip_mac;
+#endif
 
         if (BP_NOMCP(bp)) {
                 BNX2X_ERROR("warning: random MAC workaround active\n");
@@ -8398,7 +8558,9 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
                         bnx2x_set_mac_buf(bp->dev->dev_addr, val, val2);
 
 #ifdef BCM_CNIC
-                /* iSCSI NPAR MAC */
+                /* iSCSI and FCoE NPAR MACs: if there is no either iSCSI or
+                 * FCoE MAC then the appropriate feature should be disabled.
+                 */
                 if (IS_MF_SI(bp)) {
                         u32 cfg = MF_CFG_RD(bp, func_ext_config[func].func_cfg);
                         if (cfg & MACP_FUNC_CFG_FLAGS_ISCSI_OFFLOAD) {
@@ -8406,8 +8568,39 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
                                                      iscsi_mac_addr_upper);
                                 val = MF_CFG_RD(bp, func_ext_config[func].
                                                     iscsi_mac_addr_lower);
-                                bnx2x_set_mac_buf(bp->iscsi_mac, val, val2);
-                        }
+                                BNX2X_DEV_INFO("Read iSCSI MAC: "
+                                               "0x%x:0x%04x\n", val2, val);
+                                bnx2x_set_mac_buf(iscsi_mac, val, val2);
+
+                                /* Disable iSCSI OOO if MAC configuration is
+                                 * invalid.
+                                 */
+                                if (!is_valid_ether_addr(iscsi_mac)) {
+                                        bp->flags |= NO_ISCSI_OOO_FLAG |
+                                                     NO_ISCSI_FLAG;
+                                        memset(iscsi_mac, 0, ETH_ALEN);
+                                }
+                        } else
+                                bp->flags |= NO_ISCSI_OOO_FLAG | NO_ISCSI_FLAG;
+
+                        if (cfg & MACP_FUNC_CFG_FLAGS_FCOE_OFFLOAD) {
+                                val2 = MF_CFG_RD(bp, func_ext_config[func].
+                                                     fcoe_mac_addr_upper);
+                                val = MF_CFG_RD(bp, func_ext_config[func].
+                                                    fcoe_mac_addr_lower);
+                                BNX2X_DEV_INFO("Read FCoE MAC to "
+                                               "0x%x:0x%04x\n", val2, val);
+                                bnx2x_set_mac_buf(fip_mac, val, val2);
+
+                                /* Disable FCoE if MAC configuration is
+                                 * invalid.
+                                 */
+                                if (!is_valid_ether_addr(fip_mac)) {
+                                        bp->flags |= NO_FCOE_FLAG;
+                                        memset(bp->fip_mac, 0, ETH_ALEN);
+                                }
+                        } else
+                                bp->flags |= NO_FCOE_FLAG;
                 }
 #endif
         } else {
@@ -8421,7 +8614,7 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
                                     iscsi_mac_upper);
                 val = SHMEM_RD(bp, dev_info.port_hw_config[port].
                                    iscsi_mac_lower);
-                bnx2x_set_mac_buf(bp->iscsi_mac, val, val2);
+                bnx2x_set_mac_buf(iscsi_mac, val, val2);
 #endif
         }
 
@@ -8429,14 +8622,12 @@ static void __devinit bnx2x_get_mac_hwinfo(struct bnx2x *bp)
         memcpy(bp->dev->perm_addr, bp->dev->dev_addr, ETH_ALEN);
 
 #ifdef BCM_CNIC
-        /* Inform the upper layers about FCoE MAC */
+        /* Set the FCoE MAC in modes other then MF_SI */
         if (!CHIP_IS_E1x(bp)) {
                 if (IS_MF_SD(bp))
-                        memcpy(bp->fip_mac, bp->dev->dev_addr,
-                               sizeof(bp->fip_mac));
-                else
-                        memcpy(bp->fip_mac, bp->iscsi_mac,
-                               sizeof(bp->fip_mac));
+                        memcpy(fip_mac, bp->dev->dev_addr, ETH_ALEN);
+                else if (!IS_MF(bp))
+                        memcpy(fip_mac, iscsi_mac, ETH_ALEN);
         }
 #endif
 }
@@ -8599,6 +8790,10 @@ static int __devinit bnx2x_get_hwinfo(struct bnx2x *bp)
         /* Get MAC addresses */
         bnx2x_get_mac_hwinfo(bp);
 
+#ifdef BCM_CNIC
+        bnx2x_get_cnic_info(bp);
+#endif
+
         return rc;
 }
 
@@ -8813,12 +9008,197 @@ static int bnx2x_close(struct net_device *dev)
         return 0;
 }
 
+#define E1_MAX_UC_LIST  29
+#define E1H_MAX_UC_LIST 30
+#define E2_MAX_UC_LIST  14
+static inline u8 bnx2x_max_uc_list(struct bnx2x *bp)
+{
+        if (CHIP_IS_E1(bp))
+                return E1_MAX_UC_LIST;
+        else if (CHIP_IS_E1H(bp))
+                return E1H_MAX_UC_LIST;
+        else
+                return E2_MAX_UC_LIST;
+}
+
+
+static inline u8 bnx2x_uc_list_cam_offset(struct bnx2x *bp)
+{
+        if (CHIP_IS_E1(bp))
+                /* CAM Entries for Port0:
+                 *      0 - prim ETH MAC
+                 *      1 - BCAST MAC
+                 *      2 - iSCSI L2 ring ETH MAC
+                 *      3-31 - UC MACs
+                 *
+                 * Port1 entries are allocated the same way starting from
+                 * entry 32.
+                 */
+                return 3 + 32 * BP_PORT(bp);
+        else if (CHIP_IS_E1H(bp)) {
+                /* CAM Entries:
+                 *      0-7  - prim ETH MAC for each function
+                 *      8-15 - iSCSI L2 ring ETH MAC for each function
+                 *      16 till 255 UC MAC lists for each function
+                 *
+                 * Remark: There is no FCoE support for E1H, thus FCoE related
+                 *         MACs are not considered.
+                 */
+                return E1H_FUNC_MAX * (CAM_ISCSI_ETH_LINE + 1) +
+                        bnx2x_max_uc_list(bp) * BP_FUNC(bp);
+        } else {
+                /* CAM Entries (there is a separate CAM per engine):
+                 *      0-4  - prim ETH MAC for each function
+                 *      4-7 - iSCSI L2 ring ETH MAC for each function
+                 *      8-11 - FIP ucast L2 MAC for each function
+                 *      12-15 - ALL_ENODE_MACS mcast MAC for each function
+                 *      16 till 71 UC MAC lists for each function
+                 */
+                u8 func_idx =
+                        (CHIP_MODE_IS_4_PORT(bp) ? BP_FUNC(bp) : BP_VN(bp));
+
+                return E2_FUNC_MAX * (CAM_MAX_PF_LINE + 1) +
+                        bnx2x_max_uc_list(bp) * func_idx;
+        }
+}
+
+/* set uc list, do not wait as wait implies sleep and
+ * set_rx_mode can be invoked from non-sleepable context.
+ *
+ * Instead we use the same ramrod data buffer each time we need
+ * to configure a list of addresses, and use the fact that the
+ * list of MACs is changed in an incremental way and that the
+ * function is called under the netif_addr_lock. A temporary
+ * inconsistent CAM configuration (possible in case of very fast
+ * sequence of add/del/add on the host side) will shortly be
+ * restored by the handler of the last ramrod.
+ */
+static int bnx2x_set_uc_list(struct bnx2x *bp)
+{
+        int i = 0, old;
+        struct net_device *dev = bp->dev;
+        u8 offset = bnx2x_uc_list_cam_offset(bp);
+        struct netdev_hw_addr *ha;
+        struct mac_configuration_cmd *config_cmd = bnx2x_sp(bp, uc_mac_config);
+        dma_addr_t config_cmd_map = bnx2x_sp_mapping(bp, uc_mac_config);
+
+        if (netdev_uc_count(dev) > bnx2x_max_uc_list(bp))
+                return -EINVAL;
+
+        netdev_for_each_uc_addr(ha, dev) {
+                /* copy mac */
+                config_cmd->config_table[i].msb_mac_addr =
+                        swab16(*(u16 *)&bnx2x_uc_addr(ha)[0]);
+                config_cmd->config_table[i].middle_mac_addr =
+                        swab16(*(u16 *)&bnx2x_uc_addr(ha)[2]);
+                config_cmd->config_table[i].lsb_mac_addr =
+                        swab16(*(u16 *)&bnx2x_uc_addr(ha)[4]);
+
+                config_cmd->config_table[i].vlan_id = 0;
+                config_cmd->config_table[i].pf_id = BP_FUNC(bp);
+                config_cmd->config_table[i].clients_bit_vector =
+                        cpu_to_le32(1 << BP_L_ID(bp));
+
+                SET_FLAG(config_cmd->config_table[i].flags,
+                        MAC_CONFIGURATION_ENTRY_ACTION_TYPE,
+                        T_ETH_MAC_COMMAND_SET);
+
+                DP(NETIF_MSG_IFUP,
+                   "setting UCAST[%d] (%04x:%04x:%04x)\n", i,
+                   config_cmd->config_table[i].msb_mac_addr,
+                   config_cmd->config_table[i].middle_mac_addr,
+                   config_cmd->config_table[i].lsb_mac_addr);
+
+                i++;
+
+                /* Set uc MAC in NIG */
+                bnx2x_set_mac_in_nig(bp, 1, bnx2x_uc_addr(ha),
+                                     LLH_CAM_ETH_LINE + i);
+        }
+        old = config_cmd->hdr.length;
+        if (old > i) {
+                for (; i < old; i++) {
+                        if (CAM_IS_INVALID(config_cmd->
+                                           config_table[i])) {
+                                /* already invalidated */
+                                break;
+                        }
+                        /* invalidate */
+                        SET_FLAG(config_cmd->config_table[i].flags,
+                                MAC_CONFIGURATION_ENTRY_ACTION_TYPE,
+                                T_ETH_MAC_COMMAND_INVALIDATE);
+                }
+        }
+
+        wmb();
+
+        config_cmd->hdr.length = i;
+        config_cmd->hdr.offset = offset;
+        config_cmd->hdr.client_id = 0xff;
+        /* Mark that this ramrod doesn't use bp->set_mac_pending for
+         * synchronization.
+         */
+        config_cmd->hdr.echo = 0;
+
+        mb();
+
+        return bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_SET_MAC, 0,
+                   U64_HI(config_cmd_map), U64_LO(config_cmd_map), 1);
+
+}
+
+void bnx2x_invalidate_uc_list(struct bnx2x *bp)
+{
+        int i;
+        struct mac_configuration_cmd *config_cmd = bnx2x_sp(bp, uc_mac_config);
+        dma_addr_t config_cmd_map = bnx2x_sp_mapping(bp, uc_mac_config);
+        int ramrod_flags = WAIT_RAMROD_COMMON;
+        u8 offset = bnx2x_uc_list_cam_offset(bp);
+        u8 max_list_size = bnx2x_max_uc_list(bp);
+
+        for (i = 0; i < max_list_size; i++) {
+                SET_FLAG(config_cmd->config_table[i].flags,
+                        MAC_CONFIGURATION_ENTRY_ACTION_TYPE,
+                        T_ETH_MAC_COMMAND_INVALIDATE);
+                bnx2x_set_mac_in_nig(bp, 0, NULL, LLH_CAM_ETH_LINE + 1 + i);
+        }
+
+        wmb();
+
+        config_cmd->hdr.length = max_list_size;
+        config_cmd->hdr.offset = offset;
+        config_cmd->hdr.client_id = 0xff;
+        /* We'll wait for a completion this time... */
+        config_cmd->hdr.echo = 1;
+
+        bp->set_mac_pending = 1;
+
+        mb();
+
+        bnx2x_sp_post(bp, RAMROD_CMD_ID_COMMON_SET_MAC, 0,
+                      U64_HI(config_cmd_map), U64_LO(config_cmd_map), 1);
+
+        /* Wait for a completion */
+        bnx2x_wait_ramrod(bp, 0, 0, &bp->set_mac_pending,
+                                ramrod_flags);
+
+}
+
+static inline int bnx2x_set_mc_list(struct bnx2x *bp)
+{
+        /* some multicasts */
+        if (CHIP_IS_E1(bp)) {
+                return bnx2x_set_e1_mc_list(bp);
+        } else { /* E1H and newer */
+                return bnx2x_set_e1h_mc_list(bp);
+        }
+}
+
 /* called with netif_tx_lock from dev_mcast.c */
 void bnx2x_set_rx_mode(struct net_device *dev)
 {
         struct bnx2x *bp = netdev_priv(dev);
         u32 rx_mode = BNX2X_RX_MODE_NORMAL;
-        int port = BP_PORT(bp);
 
         if (bp->state != BNX2X_STATE_OPEN) {
                 DP(NETIF_MSG_IFUP, "state is %x, returning\n", bp->state);
@@ -8829,47 +9209,16 @@ void bnx2x_set_rx_mode(struct net_device *dev)
 
         if (dev->flags & IFF_PROMISC)
                 rx_mode = BNX2X_RX_MODE_PROMISC;
-        else if ((dev->flags & IFF_ALLMULTI) ||
-                 ((netdev_mc_count(dev) > BNX2X_MAX_MULTICAST) &&
-                  CHIP_IS_E1(bp)))
+        else if (dev->flags & IFF_ALLMULTI)
                 rx_mode = BNX2X_RX_MODE_ALLMULTI;
-        else { /* some multicasts */
-                if (CHIP_IS_E1(bp)) {
-                        /*
-                         * set mc list, do not wait as wait implies sleep
-                         * and set_rx_mode can be invoked from non-sleepable
-                         * context
-                         */
-                        u8 offset = (CHIP_REV_IS_SLOW(bp) ?
-                                     BNX2X_MAX_EMUL_MULTI*(1 + port) :
-                                     BNX2X_MAX_MULTICAST*(1 + port));
-
-                        bnx2x_set_e1_mc_list(bp, offset);
-                } else { /* E1H */
-                        /* Accept one or more multicasts */
-                        struct netdev_hw_addr *ha;
-                        u32 mc_filter[MC_HASH_SIZE];
-                        u32 crc, bit, regidx;
-                        int i;
-
-                        memset(mc_filter, 0, 4 * MC_HASH_SIZE);
-
-                        netdev_for_each_mc_addr(ha, dev) {
-                                DP(NETIF_MSG_IFUP, "Adding mcast MAC: %pM\n",
-                                   bnx2x_mc_addr(ha));
-
-                                crc = crc32c_le(0, bnx2x_mc_addr(ha),
-                                                ETH_ALEN);
-                                bit = (crc >> 24) & 0xff;
-                                regidx = bit >> 5;
-                                bit &= 0x1f;
-                                mc_filter[regidx] |= (1 << bit);
-                        }
+        else {
+                /* some multicasts */
+                if (bnx2x_set_mc_list(bp))
+                        rx_mode = BNX2X_RX_MODE_ALLMULTI;
 
-                        for (i = 0; i < MC_HASH_SIZE; i++)
-                                REG_WR(bp, MC_HASH_OFFSET(bp, i),
-                                       mc_filter[i]);
-                }
+                /* some unicasts */
+                if (bnx2x_set_uc_list(bp))
+                        rx_mode = BNX2X_RX_MODE_PROMISC;
         }
 
         bp->rx_mode = rx_mode;
@@ -8950,7 +9299,7 @@ static const struct net_device_ops bnx2x_netdev_ops = {
         .ndo_stop               = bnx2x_close,
         .ndo_start_xmit         = bnx2x_start_xmit,
         .ndo_select_queue       = bnx2x_select_queue,
-        .ndo_set_multicast_list = bnx2x_set_rx_mode,
+        .ndo_set_rx_mode        = bnx2x_set_rx_mode,
         .ndo_set_mac_address    = bnx2x_change_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_do_ioctl           = bnx2x_ioctl,
@@ -9096,7 +9445,7 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
         dev->vlan_features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);
         dev->vlan_features |= NETIF_F_TSO6;
 
-#ifdef BCM_DCB
+#ifdef BCM_DCBNL
         dev->dcbnl_ops = &bnx2x_dcbnl_ops;
 #endif
 
@@ -9503,6 +9852,11 @@ static void __devexit bnx2x_remove_one(struct pci_dev *pdev)
         }
 #endif
 
+#ifdef BCM_DCBNL
+        /* Delete app tlvs from dcbnl */
+        bnx2x_dcbnl_update_applist(bp, true);
+#endif
+
         unregister_netdev(dev);
 
         /* Delete all NAPI objects */
@@ -9776,15 +10130,21 @@ static void bnx2x_cnic_sp_post(struct bnx2x *bp, int count)
                                         HW_CID(bp, BNX2X_ISCSI_ETH_CID));
                 }
 
-                /* There may be not more than 8 L2 and COMMON SPEs and not more
-                 * than 8 L5 SPEs in the air.
+                /* There may be not more than 8 L2 and not more than 8 L5 SPEs
+                 * We also check that the number of outstanding
+                 * COMMON ramrods is not more than the EQ and SPQ can
+                 * accommodate.
                  */
-                if ((type == NONE_CONNECTION_TYPE) ||
-                    (type == ETH_CONNECTION_TYPE)) {
-                        if (!atomic_read(&bp->spq_left))
+                if (type == ETH_CONNECTION_TYPE) {
+                        if (!atomic_read(&bp->cq_spq_left))
                                 break;
                         else
-                                atomic_dec(&bp->spq_left);
+                                atomic_dec(&bp->cq_spq_left);
+                } else if (type == NONE_CONNECTION_TYPE) {
+                        if (!atomic_read(&bp->eq_spq_left))
+                                break;
+                        else
+                                atomic_dec(&bp->eq_spq_left);
                 } else if ((type == ISCSI_CONNECTION_TYPE) ||
                            (type == FCOE_CONNECTION_TYPE)) {
                         if (bp->cnic_spq_pending >=
@@ -9862,7 +10222,8 @@ static int bnx2x_cnic_ctl_send(struct bnx2x *bp, struct cnic_ctl_info *ctl)
         int rc = 0;
 
         mutex_lock(&bp->cnic_mutex);
-        c_ops = bp->cnic_ops;
+        c_ops = rcu_dereference_protected(bp->cnic_ops,
+                                          lockdep_is_held(&bp->cnic_mutex));
         if (c_ops)
                 rc = c_ops->cnic_ctl(bp->cnic_data, ctl);
         mutex_unlock(&bp->cnic_mutex);
@@ -9976,7 +10337,7 @@ static int bnx2x_drv_ctl(struct net_device *dev, struct drv_ctl_info *ctl)
                 int count = ctl->data.credit.credit_count;
 
                 smp_mb__before_atomic_inc();
-                atomic_add(count, &bp->spq_left);
+                atomic_add(count, &bp->cq_spq_left);
                 smp_mb__after_atomic_inc();
                 break;
         }
@@ -10072,6 +10433,13 @@ struct cnic_eth_dev *bnx2x_cnic_probe(struct net_device *dev)
         struct bnx2x *bp = netdev_priv(dev);
         struct cnic_eth_dev *cp = &bp->cnic_eth_dev;
 
+        /* If both iSCSI and FCoE are disabled - return NULL in
+         * order to indicate CNIC that it should not try to work
+         * with this device.
+         */
+        if (NO_ISCSI(bp) && NO_FCOE(bp))
+                return NULL;
+
         cp->drv_owner = THIS_MODULE;
         cp->chip_id = CHIP_ID(bp);
         cp->pdev = bp->pdev;
@@ -10092,6 +10460,15 @@ struct cnic_eth_dev *bnx2x_cnic_probe(struct net_device *dev)
                 BP_E1HVN(bp) * NONE_ETH_CONTEXT_USE;
         cp->iscsi_l2_cid = BNX2X_ISCSI_ETH_CID;
 
+        if (NO_ISCSI_OOO(bp))
+                cp->drv_state |= CNIC_DRV_STATE_NO_ISCSI_OOO;
+
+        if (NO_ISCSI(bp))
+                cp->drv_state |= CNIC_DRV_STATE_NO_ISCSI;
+
+        if (NO_FCOE(bp))
+                cp->drv_state |= CNIC_DRV_STATE_NO_FCOE;
+
         DP(BNX2X_MSG_SP, "page_size %d, tbl_offset %d, tbl_lines %d, "
                          "starting cid %d\n",
            cp->ctx_blk_size,
diff --git a/drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/bnx2x/bnx2x_reg.h
index c939683e3d6..1c89f19a442 100644
--- a/drivers/net/bnx2x/bnx2x_reg.h
+++ b/drivers/net/bnx2x/bnx2x_reg.h
@@ -6083,6 +6083,7 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_PMA_REG_8727_PCS_OPT_CTRL          0xc808
 #define MDIO_PMA_REG_8727_GPIO_CTRL             0xc80e
 #define MDIO_PMA_REG_8727_PCS_GP                0xc842
+#define MDIO_PMA_REG_8727_OPT_CFG_REG           0xc8e4
 
 #define MDIO_AN_REG_8727_MISC_CTRL              0x8309
 
@@ -6194,7 +6195,11 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_CTL_REG_84823_MEDIA_PRIORITY_COPPER        0x0000
 #define MDIO_CTL_REG_84823_MEDIA_PRIORITY_FIBER         0x0100
 #define MDIO_CTL_REG_84823_MEDIA_FIBER_1G                       0x1000
+#define MDIO_CTL_REG_84823_USER_CTRL_REG                0x4005
+#define MDIO_CTL_REG_84823_USER_CTRL_CMS                0x0080
 
+#define MDIO_PMA_REG_84823_CTL_LED_CTL_1                0xa8e3
+#define MDIO_PMA_REG_84823_LED3_STRETCH_EN              0x0080
 
 #define IGU_FUNC_BASE                   0x0400
 
diff --git a/drivers/net/bnx2x/bnx2x_stats.c b/drivers/net/bnx2x/bnx2x_stats.c
index bda60d590fa..3445ded6674 100644
--- a/drivers/net/bnx2x/bnx2x_stats.c
+++ b/drivers/net/bnx2x/bnx2x_stats.c
@@ -1239,14 +1239,14 @@ void bnx2x_stats_handle(struct bnx2x *bp, enum bnx2x_stats_event event)
         if (unlikely(bp->panic))
                 return;
 
+        bnx2x_stats_stm[bp->stats_state][event].action(bp);
+
         /* Protect a state change flow */
         spin_lock_bh(&bp->stats_lock);
         state = bp->stats_state;
         bp->stats_state = bnx2x_stats_stm[state][event].next_state;
         spin_unlock_bh(&bp->stats_lock);
 
-        bnx2x_stats_stm[state][event].action(bp);
-
         if ((event != STATS_EVENT_UPDATE) || netif_msg_timer(bp))
                 DP(BNX2X_MSG_STATS, "state %d -> event %d -> state %d\n",
                    state, event, bp->stats_state);
diff --git a/drivers/net/bonding/Makefile b/drivers/net/bonding/Makefile
index 0e2737eac8b..3c5c014e82b 100644
--- a/drivers/net/bonding/Makefile
+++ b/drivers/net/bonding/Makefile
@@ -6,6 +6,9 @@ obj-$(CONFIG_BONDING) += bonding.o
 
 bonding-objs := bond_main.o bond_3ad.o bond_alb.o bond_sysfs.o bond_debugfs.o
 
+proc-$(CONFIG_PROC_FS) += bond_procfs.o
+bonding-objs += $(proc-y)
+
 ipv6-$(subst m,y,$(CONFIG_IPV6)) += bond_ipv6.o
 bonding-objs += $(ipv6-y)
 
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 171782e2bb3..494bf960442 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -246,7 +246,7 @@ static inline void __enable_port(struct port *port)
  */
 static inline int __port_is_enabled(struct port *port)
 {
-        return port->slave->state == BOND_STATE_ACTIVE;
+        return bond_is_active_slave(port->slave);
 }
 
 /**
@@ -281,23 +281,23 @@ static inline int __check_agg_selection_timer(struct port *port)
 }
 
 /**
- * __get_rx_machine_lock - lock the port's RX machine
+ * __get_state_machine_lock - lock the port's state machines
  * @port: the port we're looking at
  *
  */
-static inline void __get_rx_machine_lock(struct port *port)
+static inline void __get_state_machine_lock(struct port *port)
 {
-        spin_lock_bh(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));
+        spin_lock_bh(&(SLAVE_AD_INFO(port->slave).state_machine_lock));
 }
 
 /**
- * __release_rx_machine_lock - unlock the port's RX machine
+ * __release_state_machine_lock - unlock the port's state machines
  * @port: the port we're looking at
  *
  */
-static inline void __release_rx_machine_lock(struct port *port)
+static inline void __release_state_machine_lock(struct port *port)
 {
-        spin_unlock_bh(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));
+        spin_unlock_bh(&(SLAVE_AD_INFO(port->slave).state_machine_lock));
 }
 
 /**
@@ -388,14 +388,14 @@ static u8 __get_duplex(struct port *port)
 }
 
 /**
- * __initialize_port_locks - initialize a port's RX machine spinlock
+ * __initialize_port_locks - initialize a port's STATE machine spinlock
  * @port: the port we're looking at
  *
  */
 static inline void __initialize_port_locks(struct port *port)
 {
         // make sure it isn't called twice
-        spin_lock_init(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));
+        spin_lock_init(&(SLAVE_AD_INFO(port->slave).state_machine_lock));
 }
 
 //conversions
@@ -1025,9 +1025,6 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
 {
         rx_states_t last_state;
 
-        // Lock to prevent 2 instances of this function to run simultaneously(rx interrupt and periodic machine callback)
-        __get_rx_machine_lock(port);
-
         // keep current State Machine state to compare later if it was changed
         last_state = port->sm_rx_state;
 
@@ -1133,7 +1130,6 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
                                 pr_err("%s: An illegal loopback occurred on adapter (%s).\n"
                                        "Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n",
                                        port->slave->dev->master->name, port->slave->dev->name);
-                                __release_rx_machine_lock(port);
                                 return;
                         }
                         __update_selected(lacpdu, port);
@@ -1153,7 +1149,6 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
                         break;
                 }
         }
-        __release_rx_machine_lock(port);
 }
 
 /**
@@ -2155,6 +2150,12 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
                         goto re_arm;
                 }
 
+                /* Lock around state machines to protect data accessed
+                 * by all (e.g., port->sm_vars).  ad_rx_machine may run
+                 * concurrently due to incoming LACPDU.
+                 */
+                __get_state_machine_lock(port);
+
                 ad_rx_machine(NULL, port);
                 ad_periodic_machine(port);
                 ad_port_selection_logic(port);
@@ -2164,6 +2165,8 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
                 // turn off the BEGIN bit, since we already handled it
                 if (port->sm_vars & AD_PORT_BEGIN)
                         port->sm_vars &= ~AD_PORT_BEGIN;
+
+                __release_state_machine_lock(port);
         }
 
 re_arm:
@@ -2200,7 +2203,10 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
                 case AD_TYPE_LACPDU:
                         pr_debug("Received LACPDU on port %d\n",
                                  port->actor_port_number);
+                        /* Protect against concurrent state machines */
+                        __get_state_machine_lock(port);
                         ad_rx_machine(lacpdu, port);
+                        __release_state_machine_lock(port);
                         break;
 
                 case AD_TYPE_MARKER:
@@ -2470,6 +2476,10 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac
         if (!(dev->flags & IFF_MASTER))
                 goto out;
 
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (!skb)
+                goto out;
+
         if (!pskb_may_pull(skb, sizeof(struct lacpdu)))
                 goto out;
 
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
index 2c46a154f2c..b28baff7086 100644
--- a/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@ -264,7 +264,8 @@ struct ad_bond_info {
 struct ad_slave_info {
         struct aggregator aggregator;       // 802.3ad aggregator structure
         struct port port;                   // 802.3ad port structure
-        spinlock_t rx_machine_lock; // To avoid race condition between callback and receive interrupt
+        spinlock_t state_machine_lock; /* mutex state machines vs.
+                                          incoming LACPDU */
         u16 id;
 };
 
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index f4e638c6512..9bc5de3e04a 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -326,6 +326,10 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
                 goto out;
         }
 
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (!skb)
+                goto out;
+
         if (!pskb_may_pull(skb, arp_hdr_len(bond_dev)))
                 goto out;
 
@@ -600,7 +604,7 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon
 
         _lock_rx_hashtbl(bond);
 
-        hash_index = _simple_hash((u8 *)&arp->ip_dst, sizeof(arp->ip_src));
+        hash_index = _simple_hash((u8 *)&arp->ip_dst, sizeof(arp->ip_dst));
         client_info = &(bond_info->rx_hashtbl[hash_index]);
 
         if (client_info->assigned) {
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index b1025b85acf..16d6fe95469 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -59,15 +59,12 @@
 #include <linux/uaccess.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
-#include <linux/netpoll.h>
 #include <linux/inetdevice.h>
 #include <linux/igmp.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
 #include <linux/rtnetlink.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
 #include <linux/smp.h>
 #include <linux/if_ether.h>
 #include <net/arp.h>
@@ -174,9 +171,6 @@ MODULE_PARM_DESC(resend_igmp, "Number of IGMP membership reports to send on link
 atomic_t netpoll_block_tx = ATOMIC_INIT(0);
 #endif
 
-static const char * const version =
-        DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n";
-
 int bond_net_id __read_mostly;
 
 static __be32 arp_target[BOND_MAX_ARP_TARGETS];
@@ -246,7 +240,7 @@ static void bond_uninit(struct net_device *bond_dev);
 
 /*---------------------------- General routines -----------------------------*/
 
-static const char *bond_mode_name(int mode)
+const char *bond_mode_name(int mode)
 {
         static const char *names[] = {
                 [BOND_MODE_ROUNDROBIN] = "load balancing (round-robin)",
@@ -424,15 +418,9 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,
 {
         skb->dev = slave_dev;
         skb->priority = 1;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        if (unlikely(bond->dev->priv_flags & IFF_IN_NETPOLL)) {
-                struct netpoll *np = bond->dev->npinfo->netpoll;
-                slave_dev->npinfo = bond->dev->npinfo;
-                slave_dev->priv_flags |= IFF_IN_NETPOLL;
-                netpoll_send_skb_on_dev(np, skb, slave_dev);
-                slave_dev->priv_flags &= ~IFF_IN_NETPOLL;
-        } else
-#endif
+        if (unlikely(netpoll_tx_running(slave_dev)))
+                bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb);
+        else
                 dev_queue_xmit(skb);
 
         return 0;
@@ -1288,63 +1276,103 @@ static void bond_detach_slave(struct bonding *bond, struct slave *slave)
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * You must hold read lock on bond->lock before calling this.
- */
-static bool slaves_support_netpoll(struct net_device *bond_dev)
+static inline int slave_enable_netpoll(struct slave *slave)
 {
-        struct bonding *bond = netdev_priv(bond_dev);
-        struct slave *slave;
-        int i = 0;
-        bool ret = true;
+        struct netpoll *np;
+        int err = 0;
 
-        bond_for_each_slave(bond, slave, i) {
-                if ((slave->dev->priv_flags & IFF_DISABLE_NETPOLL) ||
-                    !slave->dev->netdev_ops->ndo_poll_controller)
-                        ret = false;
+        np = kzalloc(sizeof(*np), GFP_KERNEL);
+        err = -ENOMEM;
+        if (!np)
+                goto out;
+
+        np->dev = slave->dev;
+        err = __netpoll_setup(np);
+        if (err) {
+                kfree(np);
+                goto out;
         }
-        return i != 0 && ret;
+        slave->np = np;
+out:
+        return err;
+}
+static inline void slave_disable_netpoll(struct slave *slave)
+{
+        struct netpoll *np = slave->np;
+
+        if (!np)
+                return;
+
+        slave->np = NULL;
+        synchronize_rcu_bh();
+        __netpoll_cleanup(np);
+        kfree(np);
+}
+static inline bool slave_dev_support_netpoll(struct net_device *slave_dev)
+{
+        if (slave_dev->priv_flags & IFF_DISABLE_NETPOLL)
+                return false;
+        if (!slave_dev->netdev_ops->ndo_poll_controller)
+                return false;
+        return true;
 }
 
 static void bond_poll_controller(struct net_device *bond_dev)
 {
-        struct bonding *bond = netdev_priv(bond_dev);
+}
+
+static void __bond_netpoll_cleanup(struct bonding *bond)
+{
         struct slave *slave;
         int i;
 
-        bond_for_each_slave(bond, slave, i) {
-                if (slave->dev && IS_UP(slave->dev))
-                        netpoll_poll_dev(slave->dev);
-        }
+        bond_for_each_slave(bond, slave, i)
+                if (IS_UP(slave->dev))
+                        slave_disable_netpoll(slave);
 }
-
 static void bond_netpoll_cleanup(struct net_device *bond_dev)
 {
         struct bonding *bond = netdev_priv(bond_dev);
+
+        read_lock(&bond->lock);
+        __bond_netpoll_cleanup(bond);
+        read_unlock(&bond->lock);
+}
+
+static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni)
+{
+        struct bonding *bond = netdev_priv(dev);
         struct slave *slave;
-        const struct net_device_ops *ops;
-        int i;
+        int i, err = 0;
 
         read_lock(&bond->lock);
-        bond_dev->npinfo = NULL;
         bond_for_each_slave(bond, slave, i) {
-                if (slave->dev) {
-                        ops = slave->dev->netdev_ops;
-                        if (ops->ndo_netpoll_cleanup)
-                                ops->ndo_netpoll_cleanup(slave->dev);
-                        else
-                                slave->dev->npinfo = NULL;
+                err = slave_enable_netpoll(slave);
+                if (err) {
+                        __bond_netpoll_cleanup(bond);
+                        break;
                 }
         }
         read_unlock(&bond->lock);
+        return err;
 }
 
-#else
+static struct netpoll_info *bond_netpoll_info(struct bonding *bond)
+{
+        return bond->dev->npinfo;
+}
 
+#else
+static inline int slave_enable_netpoll(struct slave *slave)
+{
+        return 0;
+}
+static inline void slave_disable_netpoll(struct slave *slave)
+{
+}
 static void bond_netpoll_cleanup(struct net_device *bond_dev)
 {
 }
-
 #endif
 
 /*---------------------------------- IOCTL ----------------------------------*/
@@ -1372,8 +1400,8 @@ static int bond_compute_features(struct bonding *bond)
 {
         struct slave *slave;
         struct net_device *bond_dev = bond->dev;
-        unsigned long features = bond_dev->features;
-        unsigned long vlan_features = 0;
+        u32 features = bond_dev->features;
+        u32 vlan_features = 0;
         unsigned short max_hard_header_len = max((u16)ETH_HLEN,
                                                 bond_dev->hard_header_len);
         int i;
@@ -1400,8 +1428,8 @@ static int bond_compute_features(struct bonding *bond)
 
 done:
         features |= (bond_dev->features & BOND_VLAN_FEATURES);
-        bond_dev->features = netdev_fix_features(features, NULL);
-        bond_dev->vlan_features = netdev_fix_features(vlan_features, NULL);
+        bond_dev->features = netdev_fix_features(bond_dev, features);
+        bond_dev->vlan_features = netdev_fix_features(bond_dev, vlan_features);
         bond_dev->hard_header_len = max_hard_header_len;
 
         return 0;
@@ -1423,6 +1451,72 @@ static void bond_setup_by_slave(struct net_device *bond_dev,
         bond->setup_by_slave = 1;
 }
 
+/* On bonding slaves other than the currently active slave, suppress
+ * duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and
+ * ARP on active-backup slaves with arp_validate enabled.
+ */
+static bool bond_should_deliver_exact_match(struct sk_buff *skb,
+                                            struct slave *slave,
+                                            struct bonding *bond)
+{
+        if (bond_is_slave_inactive(slave)) {
+                if (slave_do_arp_validate(bond, slave) &&
+                    skb->protocol == __cpu_to_be16(ETH_P_ARP))
+                        return false;
+
+                if (bond->params.mode == BOND_MODE_ALB &&
+                    skb->pkt_type != PACKET_BROADCAST &&
+                    skb->pkt_type != PACKET_MULTICAST)
+                                return false;
+
+                if (bond->params.mode == BOND_MODE_8023AD &&
+                    skb->protocol == __cpu_to_be16(ETH_P_SLOW))
+                        return false;
+
+                return true;
+        }
+        return false;
+}
+
+static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
+{
+        struct sk_buff *skb = *pskb;
+        struct slave *slave;
+        struct bonding *bond;
+
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (unlikely(!skb))
+                return RX_HANDLER_CONSUMED;
+
+        *pskb = skb;
+
+        slave = bond_slave_get_rcu(skb->dev);
+        bond = slave->bond;
+
+        if (bond->params.arp_interval)
+                slave->dev->last_rx = jiffies;
+
+        if (bond_should_deliver_exact_match(skb, slave, bond)) {
+                return RX_HANDLER_EXACT;
+        }
+
+        skb->dev = bond->dev;
+
+        if (bond->params.mode == BOND_MODE_ALB &&
+            bond->dev->priv_flags & IFF_BRIDGE_PORT &&
+            skb->pkt_type == PACKET_HOST) {
+
+                if (unlikely(skb_cow_head(skb,
+                                          skb->data - skb_mac_header(skb)))) {
+                        kfree_skb(skb);
+                        return RX_HANDLER_CONSUMED;
+                }
+                memcpy(eth_hdr(skb)->h_dest, bond->dev->dev_addr, ETH_ALEN);
+        }
+
+        return RX_HANDLER_ANOTHER;
+}
+
 /* enslave device <slave> to bond device <master> */
 int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 {
@@ -1594,11 +1688,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 }
         }
 
-        res = netdev_set_master(slave_dev, bond_dev);
+        res = netdev_set_bond_master(slave_dev, bond_dev);
         if (res) {
-                pr_debug("Error %d calling netdev_set_master\n", res);
+                pr_debug("Error %d calling netdev_set_bond_master\n", res);
                 goto err_restore_mac;
         }
+
         /* open the slave since the application closed it */
         res = dev_open(slave_dev);
         if (res) {
@@ -1606,6 +1701,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 goto err_unset_master;
         }
 
+        new_slave->bond = bond;
         new_slave->dev = slave_dev;
         slave_dev->priv_flags |= IFF_BONDING;
 
@@ -1757,7 +1853,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 break;
         case BOND_MODE_TLB:
         case BOND_MODE_ALB:
-                new_slave->state = BOND_STATE_ACTIVE;
+                bond_set_active_slave(new_slave);
                 bond_set_slave_inactive_flags(new_slave);
                 bond_select_active_slave(bond);
                 break;
@@ -1765,7 +1861,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 pr_debug("This slave is always active in trunk mode\n");
 
                 /* always active in trunk mode */
-                new_slave->state = BOND_STATE_ACTIVE;
+                bond_set_active_slave(new_slave);
 
                 /* In trunking mode there is little meaning to curr_active_slave
                  * anyway (it holds no special properties of the bond device),
@@ -1782,37 +1878,49 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
         bond_set_carrier(bond);
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-        if (slaves_support_netpoll(bond_dev)) {
-                bond_dev->priv_flags &= ~IFF_DISABLE_NETPOLL;
-                if (bond_dev->npinfo)
-                        slave_dev->npinfo = bond_dev->npinfo;
-        } else if (!(bond_dev->priv_flags & IFF_DISABLE_NETPOLL)) {
-                bond_dev->priv_flags |= IFF_DISABLE_NETPOLL;
-                pr_info("New slave device %s does not support netpoll\n",
-                        slave_dev->name);
-                pr_info("Disabling netpoll support for %s\n", bond_dev->name);
+        slave_dev->npinfo = bond_netpoll_info(bond);
+        if (slave_dev->npinfo) {
+                if (slave_enable_netpoll(new_slave)) {
+                        read_unlock(&bond->lock);
+                        pr_info("Error, %s: master_dev is using netpoll, "
+                                 "but new slave device does not support netpoll.\n",
+                                 bond_dev->name);
+                        res = -EBUSY;
+                        goto err_close;
+                }
         }
 #endif
+
         read_unlock(&bond->lock);
 
         res = bond_create_slave_symlinks(bond_dev, slave_dev);
         if (res)
                 goto err_close;
 
+        res = netdev_rx_handler_register(slave_dev, bond_handle_frame,
+                                         new_slave);
+        if (res) {
+                pr_debug("Error %d calling netdev_rx_handler_register\n", res);
+                goto err_dest_symlinks;
+        }
+
         pr_info("%s: enslaving %s as a%s interface with a%s link.\n",
                 bond_dev->name, slave_dev->name,
-                new_slave->state == BOND_STATE_ACTIVE ? "n active" : " backup",
+                bond_is_active_slave(new_slave) ? "n active" : " backup",
                 new_slave->link != BOND_LINK_DOWN ? "n up" : " down");
 
         /* enslave is successful */
         return 0;
 
 /* Undo stages on error */
+err_dest_symlinks:
+        bond_destroy_slave_symlinks(bond_dev, slave_dev);
+
 err_close:
         dev_close(slave_dev);
 
 err_unset_master:
-        netdev_set_master(slave_dev, NULL);
+        netdev_set_bond_master(slave_dev, NULL);
 
 err_restore_mac:
         if (!bond->params.fail_over_mac) {
@@ -1876,6 +1984,14 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 return -EINVAL;
         }
 
+        /* unregister rx_handler early so bond_handle_frame wouldn't be called
+         * for this slave anymore.
+         */
+        netdev_rx_handler_unregister(slave_dev);
+        write_unlock_bh(&bond->lock);
+        synchronize_net();
+        write_lock_bh(&bond->lock);
+
         if (!bond->params.fail_over_mac) {
                 if (!compare_ether_addr(bond_dev->dev_addr, slave->perm_hwaddr) &&
                     bond->slave_cnt > 1)
@@ -1895,7 +2011,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
 
         pr_info("%s: releasing %s interface %s\n",
                 bond_dev->name,
-                (slave->state == BOND_STATE_ACTIVE) ? "active" : "backup",
+                bond_is_active_slave(slave) ? "active" : "backup",
                 slave_dev->name);
 
         oldcurrent = bond->curr_active_slave;
@@ -1992,19 +2108,9 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 netif_addr_unlock_bh(bond_dev);
         }
 
-        netdev_set_master(slave_dev, NULL);
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        read_lock_bh(&bond->lock);
+        netdev_set_bond_master(slave_dev, NULL);
 
-        if (slaves_support_netpoll(bond_dev))
-                bond_dev->priv_flags &= ~IFF_DISABLE_NETPOLL;
-        read_unlock_bh(&bond->lock);
-        if (slave_dev->netdev_ops->ndo_netpoll_cleanup)
-                slave_dev->netdev_ops->ndo_netpoll_cleanup(slave_dev);
-        else
-                slave_dev->npinfo = NULL;
-#endif
+        slave_disable_netpoll(slave);
 
         /* close slave before restoring its mac address */
         dev_close(slave_dev);
@@ -2018,9 +2124,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
 
         dev_set_mtu(slave_dev, slave->original_mtu);
 
-        slave_dev->priv_flags &= ~(IFF_MASTER_8023AD | IFF_MASTER_ALB |
-                                   IFF_SLAVE_INACTIVE | IFF_BONDING |
-                                   IFF_SLAVE_NEEDARP);
+        slave_dev->priv_flags &= ~IFF_BONDING;
 
         kfree(slave);
 
@@ -2028,7 +2132,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
 }
 
 /*
-* First release a slave and than destroy the bond if no more slaves are left.
+* First release a slave and then destroy the bond if no more slaves are left.
 * Must be under rtnl_lock when this function is called.
 */
 static int  bond_release_and_destroy(struct net_device *bond_dev,
@@ -2039,6 +2143,7 @@ static int  bond_release_and_destroy(struct net_device *bond_dev,
 
         ret = bond_release(bond_dev, slave_dev);
         if ((ret == 0) && (bond->slave_cnt == 0)) {
+                bond_dev->priv_flags |= IFF_DISABLE_NETPOLL;
                 pr_info("%s: destroying bond %s.\n",
                         bond_dev->name, bond_dev->name);
                 unregister_netdevice(bond_dev);
@@ -2083,6 +2188,12 @@ static int bond_release_all(struct net_device *bond_dev)
                  */
                 write_unlock_bh(&bond->lock);
 
+                /* unregister rx_handler early so bond_handle_frame wouldn't
+                 * be called for this slave anymore.
+                 */
+                netdev_rx_handler_unregister(slave_dev);
+                synchronize_net();
+
                 if (bond_is_lb(bond)) {
                         /* must be called only after the slave
                          * has been detached from the list
@@ -2114,7 +2225,9 @@ static int bond_release_all(struct net_device *bond_dev)
                         netif_addr_unlock_bh(bond_dev);
                 }
 
-                netdev_set_master(slave_dev, NULL);
+                netdev_set_bond_master(slave_dev, NULL);
+
+                slave_disable_netpoll(slave);
 
                 /* close slave before restoring its mac address */
                 dev_close(slave_dev);
@@ -2126,9 +2239,6 @@ static int bond_release_all(struct net_device *bond_dev)
                         dev_set_mac_address(slave_dev, &addr);
                 }
 
-                slave_dev->priv_flags &= ~(IFF_MASTER_8023AD | IFF_MASTER_ALB |
-                                           IFF_SLAVE_INACTIVE);
-
                 kfree(slave);
 
                 /* re-acquire the lock before getting the next slave */
@@ -2242,7 +2352,7 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in
                         res = 0;
                         strcpy(info->slave_name, slave->dev->name);
                         info->link = slave->link;
-                        info->state = slave->state;
+                        info->state = bond_slave_state(slave);
                         info->link_failure_count = slave->link_failure_count;
                         break;
                 }
@@ -2281,7 +2391,7 @@ static int bond_miimon_inspect(struct bonding *bond)
                                         bond->dev->name,
                                         (bond->params.mode ==
                                          BOND_MODE_ACTIVEBACKUP) ?
-                                        ((slave->state == BOND_STATE_ACTIVE) ?
+                                        (bond_is_active_slave(slave) ?
                                          "active " : "backup ") : "",
                                         slave->dev->name,
                                         bond->params.downdelay * bond->params.miimon);
@@ -2372,13 +2482,13 @@ static void bond_miimon_commit(struct bonding *bond)
 
                         if (bond->params.mode == BOND_MODE_8023AD) {
                                 /* prevent it from being the active one */
-                                slave->state = BOND_STATE_BACKUP;
+                                bond_set_backup_slave(slave);
                         } else if (bond->params.mode != BOND_MODE_ACTIVEBACKUP) {
                                 /* make it immediately active */
-                                slave->state = BOND_STATE_ACTIVE;
+                                bond_set_active_slave(slave);
                         } else if (slave != bond->primary_slave) {
                                 /* prevent it from being the active one */
-                                slave->state = BOND_STATE_BACKUP;
+                                bond_set_backup_slave(slave);
                         }
 
                         bond_update_speed_duplex(slave);
@@ -2571,11 +2681,10 @@ static void bond_arp_send(struct net_device *slave_dev, int arp_op, __be32 dest_
 
 static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
 {
-        int i, vlan_id, rv;
+        int i, vlan_id;
         __be32 *targets = bond->params.arp_targets;
         struct vlan_entry *vlan;
         struct net_device *vlan_dev;
-        struct flowi fl;
         struct rtable *rt;
 
         for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
@@ -2594,15 +2703,12 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
                  * determine which VLAN interface would be used, so we
                  * can tag the ARP with the proper VLAN tag.
                  */
-                memset(&fl, 0, sizeof(fl));
-                fl.fl4_dst = targets[i];
-                fl.fl4_tos = RTO_ONLINK;
-
-                rv = ip_route_output_key(dev_net(bond->dev), &rt, &fl);
-                if (rv) {
+                rt = ip_route_output(dev_net(bond->dev), targets[i], 0,
+                                     RTO_ONLINK, 0);
+                if (IS_ERR(rt)) {
                         if (net_ratelimit()) {
                                 pr_warning("%s: no route to arp_ip_target %pI4\n",
-                                           bond->dev->name, &fl.fl4_dst);
+                                           bond->dev->name, &targets[i]);
                         }
                         continue;
                 }
@@ -2638,7 +2744,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
 
                 if (net_ratelimit()) {
                         pr_warning("%s: no path to arp_ip_target %pI4 via rt.dev %s\n",
-                                   bond->dev->name, &fl.fl4_dst,
+                                   bond->dev->name, &targets[i],
                                    rt->dst.dev ? rt->dst.dev->name : "NULL");
                 }
                 ip_rt_put(rt);
@@ -2733,6 +2839,10 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
         if (!slave || !slave_do_arp_validate(bond, slave))
                 goto out_unlock;
 
+        skb = skb_share_check(skb, GFP_ATOMIC);
+        if (!skb)
+                goto out_unlock;
+
         if (!pskb_may_pull(skb, arp_hdr_len(dev)))
                 goto out_unlock;
 
@@ -2752,7 +2862,7 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
         memcpy(&tip, arp_ptr, 4);
 
         pr_debug("bond_arp_rcv: %s %s/%d av %d sv %d sip %pI4 tip %pI4\n",
-                 bond->dev->name, slave->dev->name, slave->state,
+                 bond->dev->name, slave->dev->name, bond_slave_state(slave),
                  bond->params.arp_validate, slave_do_arp_validate(bond, slave),
                  &sip, &tip);
 
@@ -2764,7 +2874,7 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
          * the active, through one switch, the router, then the other
          * switch before reaching the backup.
          */
-        if (slave->state == BOND_STATE_ACTIVE)
+        if (bond_is_active_slave(slave))
                 bond_validate_arp(bond, slave, sip, tip);
         else
                 bond_validate_arp(bond, slave, tip, sip);
@@ -2826,7 +2936,7 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
                                 slave->dev->last_rx + delta_in_ticks)) {
 
                                 slave->link  = BOND_LINK_UP;
-                                slave->state = BOND_STATE_ACTIVE;
+                                bond_set_active_slave(slave);
 
                                 /* primary_slave has no meaning in round-robin
                                  * mode. the window of a slave being up and
@@ -2859,7 +2969,7 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
                                 slave->dev->last_rx + 2 * delta_in_ticks)) {
 
                                 slave->link  = BOND_LINK_DOWN;
-                                slave->state = BOND_STATE_BACKUP;
+                                bond_set_backup_slave(slave);
 
                                 if (slave->link_failure_count < UINT_MAX)
                                         slave->link_failure_count++;
@@ -2953,7 +3063,7 @@ static int bond_ab_arp_inspect(struct bonding *bond, int delta_in_ticks)
                  * gives each slave a chance to tx/rx traffic
                  * before being taken out
                  */
-                if (slave->state == BOND_STATE_BACKUP &&
+                if (!bond_is_active_slave(slave) &&
                     !bond->current_arp_slave &&
                     !time_in_range(jiffies,
                         slave_last_rx(bond, slave) - delta_in_ticks,
@@ -2970,7 +3080,7 @@ static int bond_ab_arp_inspect(struct bonding *bond, int delta_in_ticks)
                  *    the bond has an IP address)
                  */
                 trans_start = dev_trans_start(slave->dev);
-                if ((slave->state == BOND_STATE_ACTIVE) &&
+                if (bond_is_active_slave(slave) &&
                     (!time_in_range(jiffies,
                         trans_start - delta_in_ticks,
                         trans_start + 2 * delta_in_ticks) ||
@@ -3178,299 +3288,6 @@ out:
         read_unlock(&bond->lock);
 }
 
-/*------------------------------ proc/seq_file-------------------------------*/
-
-#ifdef CONFIG_PROC_FS
-
-static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)
-        __acquires(RCU)
-        __acquires(&bond->lock)
-{
-        struct bonding *bond = seq->private;
-        loff_t off = 0;
-        struct slave *slave;
-        int i;
-
-        /* make sure the bond won't be taken away */
-        rcu_read_lock();
-        read_lock(&bond->lock);
-
-        if (*pos == 0)
-                return SEQ_START_TOKEN;
-
-        bond_for_each_slave(bond, slave, i) {
-                if (++off == *pos)
-                        return slave;
-        }
-
-        return NULL;
-}
-
-static void *bond_info_seq_next(struct seq_file *seq, void *v, loff_t *pos)
-{
-        struct bonding *bond = seq->private;
-        struct slave *slave = v;
-
-        ++*pos;
-        if (v == SEQ_START_TOKEN)
-                return bond->first_slave;
-
-        slave = slave->next;
-
-        return (slave == bond->first_slave) ? NULL : slave;
-}
-
-static void bond_info_seq_stop(struct seq_file *seq, void *v)
-        __releases(&bond->lock)
-        __releases(RCU)
-{
-        struct bonding *bond = seq->private;
-
-        read_unlock(&bond->lock);
-        rcu_read_unlock();
-}
-
-static void bond_info_show_master(struct seq_file *seq)
-{
-        struct bonding *bond = seq->private;
-        struct slave *curr;
-        int i;
-
-        read_lock(&bond->curr_slave_lock);
-        curr = bond->curr_active_slave;
-        read_unlock(&bond->curr_slave_lock);
-
-        seq_printf(seq, "Bonding Mode: %s",
-                   bond_mode_name(bond->params.mode));
-
-        if (bond->params.mode == BOND_MODE_ACTIVEBACKUP &&
-            bond->params.fail_over_mac)
-                seq_printf(seq, " (fail_over_mac %s)",
-                   fail_over_mac_tbl[bond->params.fail_over_mac].modename);
-
-        seq_printf(seq, "\n");
-
-        if (bond->params.mode == BOND_MODE_XOR ||
-                bond->params.mode == BOND_MODE_8023AD) {
-                seq_printf(seq, "Transmit Hash Policy: %s (%d)\n",
-                        xmit_hashtype_tbl[bond->params.xmit_policy].modename,
-                        bond->params.xmit_policy);
-        }
-
-        if (USES_PRIMARY(bond->params.mode)) {
-                seq_printf(seq, "Primary Slave: %s",
-                           (bond->primary_slave) ?
-                           bond->primary_slave->dev->name : "None");
-                if (bond->primary_slave)
-                        seq_printf(seq, " (primary_reselect %s)",
-                   pri_reselect_tbl[bond->params.primary_reselect].modename);
-
-                seq_printf(seq, "\nCurrently Active Slave: %s\n",
-                           (curr) ? curr->dev->name : "None");
-        }
-
-        seq_printf(seq, "MII Status: %s\n", netif_carrier_ok(bond->dev) ?
-                   "up" : "down");
-        seq_printf(seq, "MII Polling Interval (ms): %d\n", bond->params.miimon);
-        seq_printf(seq, "Up Delay (ms): %d\n",
-                   bond->params.updelay * bond->params.miimon);
-        seq_printf(seq, "Down Delay (ms): %d\n",
-                   bond->params.downdelay * bond->params.miimon);
-
-
-        /* ARP information */
-        if (bond->params.arp_interval > 0) {
-                int printed = 0;
-                seq_printf(seq, "ARP Polling Interval (ms): %d\n",
-                                bond->params.arp_interval);
-
-                seq_printf(seq, "ARP IP target/s (n.n.n.n form):");
-
-                for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
-                        if (!bond->params.arp_targets[i])
-                                break;
-                        if (printed)
-                                seq_printf(seq, ",");
-                        seq_printf(seq, " %pI4", &bond->params.arp_targets[i]);
-                        printed = 1;
-                }
-                seq_printf(seq, "\n");
-        }
-
-        if (bond->params.mode == BOND_MODE_8023AD) {
-                struct ad_info ad_info;
-
-                seq_puts(seq, "\n802.3ad info\n");
-                seq_printf(seq, "LACP rate: %s\n",
-                           (bond->params.lacp_fast) ? "fast" : "slow");
-                seq_printf(seq, "Aggregator selection policy (ad_select): %s\n",
-                           ad_select_tbl[bond->params.ad_select].modename);
-
-                if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
-                        seq_printf(seq, "bond %s has no active aggregator\n",
-                                   bond->dev->name);
-                } else {
-                        seq_printf(seq, "Active Aggregator Info:\n");
-
-                        seq_printf(seq, "\tAggregator ID: %d\n",
-                                   ad_info.aggregator_id);
-                        seq_printf(seq, "\tNumber of ports: %d\n",
-                                   ad_info.ports);
-                        seq_printf(seq, "\tActor Key: %d\n",
-                                   ad_info.actor_key);
-                        seq_printf(seq, "\tPartner Key: %d\n",
-                                   ad_info.partner_key);
-                        seq_printf(seq, "\tPartner Mac Address: %pM\n",
-                                   ad_info.partner_system);
-                }
-        }
-}
-
-static void bond_info_show_slave(struct seq_file *seq,
-                                 const struct slave *slave)
-{
-        struct bonding *bond = seq->private;
-
-        seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
-        seq_printf(seq, "MII Status: %s\n",
-                   (slave->link == BOND_LINK_UP) ?  "up" : "down");
-        seq_printf(seq, "Speed: %d Mbps\n", slave->speed);
-        seq_printf(seq, "Duplex: %s\n", slave->duplex ? "full" : "half");
-        seq_printf(seq, "Link Failure Count: %u\n",
-                   slave->link_failure_count);
-
-        seq_printf(seq, "Permanent HW addr: %pM\n", slave->perm_hwaddr);
-
-        if (bond->params.mode == BOND_MODE_8023AD) {
-                const struct aggregator *agg
-                        = SLAVE_AD_INFO(slave).port.aggregator;
-
-                if (agg)
-                        seq_printf(seq, "Aggregator ID: %d\n",
-                                   agg->aggregator_identifier);
-                else
-                        seq_puts(seq, "Aggregator ID: N/A\n");
-        }
-        seq_printf(seq, "Slave queue ID: %d\n", slave->queue_id);
-}
-
-static int bond_info_seq_show(struct seq_file *seq, void *v)
-{
-        if (v == SEQ_START_TOKEN) {
-                seq_printf(seq, "%s\n", version);
-                bond_info_show_master(seq);
-        } else
-                bond_info_show_slave(seq, v);
-
-        return 0;
-}
-
-static const struct seq_operations bond_info_seq_ops = {
-        .start = bond_info_seq_start,
-        .next  = bond_info_seq_next,
-        .stop  = bond_info_seq_stop,
-        .show  = bond_info_seq_show,
-};
-
-static int bond_info_open(struct inode *inode, struct file *file)
-{
-        struct seq_file *seq;
-        struct proc_dir_entry *proc;
-        int res;
-
-        res = seq_open(file, &bond_info_seq_ops);
-        if (!res) {
-                /* recover the pointer buried in proc_dir_entry data */
-                seq = file->private_data;
-                proc = PDE(inode);
-                seq->private = proc->data;
-        }
-
-        return res;
-}
-
-static const struct file_operations bond_info_fops = {
-        .owner   = THIS_MODULE,
-        .open    = bond_info_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release,
-};
-
-static void bond_create_proc_entry(struct bonding *bond)
-{
-        struct net_device *bond_dev = bond->dev;
-        struct bond_net *bn = net_generic(dev_net(bond_dev), bond_net_id);
-
-        if (bn->proc_dir) {
-                bond->proc_entry = proc_create_data(bond_dev->name,
-                                                    S_IRUGO, bn->proc_dir,
-                                                    &bond_info_fops, bond);
-                if (bond->proc_entry == NULL)
-                        pr_warning("Warning: Cannot create /proc/net/%s/%s\n",
-                                   DRV_NAME, bond_dev->name);
-                else
-                        memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ);
-        }
-}
-
-static void bond_remove_proc_entry(struct bonding *bond)
-{
-        struct net_device *bond_dev = bond->dev;
-        struct bond_net *bn = net_generic(dev_net(bond_dev), bond_net_id);
-
-        if (bn->proc_dir && bond->proc_entry) {
-                remove_proc_entry(bond->proc_file_name, bn->proc_dir);
-                memset(bond->proc_file_name, 0, IFNAMSIZ);
-                bond->proc_entry = NULL;
-        }
-}
-
-/* Create the bonding directory under /proc/net, if doesn't exist yet.
- * Caller must hold rtnl_lock.
- */
-static void __net_init bond_create_proc_dir(struct bond_net *bn)
-{
-        if (!bn->proc_dir) {
-                bn->proc_dir = proc_mkdir(DRV_NAME, bn->net->proc_net);
-                if (!bn->proc_dir)
-                        pr_warning("Warning: cannot create /proc/net/%s\n",
-                                   DRV_NAME);
-        }
-}
-
-/* Destroy the bonding directory under /proc/net, if empty.
- * Caller must hold rtnl_lock.
- */
-static void __net_exit bond_destroy_proc_dir(struct bond_net *bn)
-{
-        if (bn->proc_dir) {
-                remove_proc_entry(DRV_NAME, bn->net->proc_net);
-                bn->proc_dir = NULL;
-        }
-}
-
-#else /* !CONFIG_PROC_FS */
-
-static void bond_create_proc_entry(struct bonding *bond)
-{
-}
-
-static void bond_remove_proc_entry(struct bonding *bond)
-{
-}
-
-static inline void bond_create_proc_dir(struct bond_net *bn)
-{
-}
-
-static inline void bond_destroy_proc_dir(struct bond_net *bn)
-{
-}
-
-#endif /* CONFIG_PROC_FS */
-
-
 /*-------------------------- netdev event handling --------------------------*/
 
 /*
@@ -4327,7 +4144,7 @@ static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev
         bond_for_each_slave_from(bond, slave, i, start_at) {
                 if (IS_UP(slave->dev) &&
                     (slave->link == BOND_LINK_UP) &&
-                    (slave->state == BOND_STATE_ACTIVE)) {
+                    bond_is_active_slave(slave)) {
                         res = bond_dev_queue_xmit(bond, skb, slave->dev);
                         break;
                 }
@@ -4404,7 +4221,7 @@ static int bond_xmit_xor(struct sk_buff *skb, struct net_device *bond_dev)
         bond_for_each_slave_from(bond, slave, i, start_at) {
                 if (IS_UP(slave->dev) &&
                     (slave->link == BOND_LINK_UP) &&
-                    (slave->state == BOND_STATE_ACTIVE)) {
+                    bond_is_active_slave(slave)) {
                         res = bond_dev_queue_xmit(bond, skb, slave->dev);
                         break;
                 }
@@ -4445,7 +4262,7 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
         bond_for_each_slave_from(bond, slave, i, start_at) {
                 if (IS_UP(slave->dev) &&
                     (slave->link == BOND_LINK_UP) &&
-                    (slave->state == BOND_STATE_ACTIVE)) {
+                    bond_is_active_slave(slave)) {
                         if (tx_dev) {
                                 struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
                                 if (!skb2) {
@@ -4533,11 +4350,18 @@ static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb)
 {
         /*
          * This helper function exists to help dev_pick_tx get the correct
-         * destination queue.  Using a helper function skips the a call to
+         * destination queue.  Using a helper function skips a call to
          * skb_tx_hash and will put the skbs in the queue we expect on their
          * way down to the bonding driver.
          */
-        return skb->queue_mapping;
+        u16 txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) : 0;
+
+        if (unlikely(txq >= dev->real_num_tx_queues)) {
+                do
+                        txq -= dev->real_num_tx_queues;
+                while (txq >= dev->real_num_tx_queues);
+        }
+        return txq;
 }
 
 static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -4599,11 +4423,9 @@ void bond_set_mode_ops(struct bonding *bond, int mode)
         case BOND_MODE_BROADCAST:
                 break;
         case BOND_MODE_8023AD:
-                bond_set_master_3ad_flags(bond);
                 bond_set_xmit_hash_policy(bond);
                 break;
         case BOND_MODE_ALB:
-                bond_set_master_alb_flags(bond);
                 /* FALLTHRU */
         case BOND_MODE_TLB:
                 break;
@@ -4650,9 +4472,12 @@ static const struct net_device_ops bond_netdev_ops = {
         .ndo_vlan_rx_add_vid    = bond_vlan_rx_add_vid,
         .ndo_vlan_rx_kill_vid   = bond_vlan_rx_kill_vid,
 #ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_netpoll_setup      = bond_netpoll_setup,
         .ndo_netpoll_cleanup    = bond_netpoll_cleanup,
         .ndo_poll_controller    = bond_poll_controller,
 #endif
+        .ndo_add_slave          = bond_enslave,
+        .ndo_del_slave          = bond_release,
 };
 
 static void bond_destructor(struct net_device *bond_dev)
@@ -4691,9 +4516,6 @@ static void bond_setup(struct net_device *bond_dev)
         bond_dev->priv_flags |= IFF_BONDING;
         bond_dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
 
-        if (bond->params.arp_interval)
-                bond_dev->priv_flags |= IFF_MASTER_ARPMON;
-
         /* At first, we block adding VLANs. That's the only way to
          * prevent problems that occur when adding VLANs over an
          * empty bond. The block will be removed once non-challenged
@@ -5162,8 +4984,6 @@ static int bond_init(struct net_device *bond_dev)
 
         bond_set_lockdep_class(bond_dev);
 
-        netif_carrier_off(bond_dev);
-
         bond_create_proc_entry(bond);
         list_add_tail(&bond->bond_list, &bn->dev_list);
 
@@ -5233,6 +5053,8 @@ int bond_create(struct net *net, const char *name)
 
         res = register_netdevice(bond_dev);
 
+        netif_carrier_off(bond_dev);
+
 out:
         rtnl_unlock();
         if (res < 0)
@@ -5271,7 +5093,7 @@ static int __init bonding_init(void)
         int i;
         int res;
 
-        pr_info("%s", version);
+        pr_info("%s", bond_version);
 
         res = bond_check_params(&bonding_defaults);
         if (res)
diff --git a/drivers/net/bonding/bond_procfs.c b/drivers/net/bonding/bond_procfs.c
new file mode 100644
index 00000000000..c32ff55a34c
--- /dev/null
+++ b/drivers/net/bonding/bond_procfs.c
@@ -0,0 +1,275 @@
+#include <linux/proc_fs.h>
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
+#include "bonding.h"
+
+
+extern const char *bond_mode_name(int mode);
+
+static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)
+        __acquires(RCU)
+        __acquires(&bond->lock)
+{
+        struct bonding *bond = seq->private;
+        loff_t off = 0;
+        struct slave *slave;
+        int i;
+
+        /* make sure the bond won't be taken away */
+        rcu_read_lock();
+        read_lock(&bond->lock);
+
+        if (*pos == 0)
+                return SEQ_START_TOKEN;
+
+        bond_for_each_slave(bond, slave, i) {
+                if (++off == *pos)
+                        return slave;
+        }
+
+        return NULL;
+}
+
+static void *bond_info_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+        struct bonding *bond = seq->private;
+        struct slave *slave = v;
+
+        ++*pos;
+        if (v == SEQ_START_TOKEN)
+                return bond->first_slave;
+
+        slave = slave->next;
+
+        return (slave == bond->first_slave) ? NULL : slave;
+}
+
+static void bond_info_seq_stop(struct seq_file *seq, void *v)
+        __releases(&bond->lock)
+        __releases(RCU)
+{
+        struct bonding *bond = seq->private;
+
+        read_unlock(&bond->lock);
+        rcu_read_unlock();
+}
+
+static void bond_info_show_master(struct seq_file *seq)
+{
+        struct bonding *bond = seq->private;
+        struct slave *curr;
+        int i;
+
+        read_lock(&bond->curr_slave_lock);
+        curr = bond->curr_active_slave;
+        read_unlock(&bond->curr_slave_lock);
+
+        seq_printf(seq, "Bonding Mode: %s",
+                   bond_mode_name(bond->params.mode));
+
+        if (bond->params.mode == BOND_MODE_ACTIVEBACKUP &&
+            bond->params.fail_over_mac)
+                seq_printf(seq, " (fail_over_mac %s)",
+                   fail_over_mac_tbl[bond->params.fail_over_mac].modename);
+
+        seq_printf(seq, "\n");
+
+        if (bond->params.mode == BOND_MODE_XOR ||
+                bond->params.mode == BOND_MODE_8023AD) {
+                seq_printf(seq, "Transmit Hash Policy: %s (%d)\n",
+                        xmit_hashtype_tbl[bond->params.xmit_policy].modename,
+                        bond->params.xmit_policy);
+        }
+
+        if (USES_PRIMARY(bond->params.mode)) {
+                seq_printf(seq, "Primary Slave: %s",
+                           (bond->primary_slave) ?
+                           bond->primary_slave->dev->name : "None");
+                if (bond->primary_slave)
+                        seq_printf(seq, " (primary_reselect %s)",
+                   pri_reselect_tbl[bond->params.primary_reselect].modename);
+
+                seq_printf(seq, "\nCurrently Active Slave: %s\n",
+                           (curr) ? curr->dev->name : "None");
+        }
+
+        seq_printf(seq, "MII Status: %s\n", netif_carrier_ok(bond->dev) ?
+                   "up" : "down");
+        seq_printf(seq, "MII Polling Interval (ms): %d\n", bond->params.miimon);
+        seq_printf(seq, "Up Delay (ms): %d\n",
+                   bond->params.updelay * bond->params.miimon);
+        seq_printf(seq, "Down Delay (ms): %d\n",
+                   bond->params.downdelay * bond->params.miimon);
+
+
+        /* ARP information */
+        if (bond->params.arp_interval > 0) {
+                int printed = 0;
+                seq_printf(seq, "ARP Polling Interval (ms): %d\n",
+                                bond->params.arp_interval);
+
+                seq_printf(seq, "ARP IP target/s (n.n.n.n form):");
+
+                for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
+                        if (!bond->params.arp_targets[i])
+                                break;
+                        if (printed)
+                                seq_printf(seq, ",");
+                        seq_printf(seq, " %pI4", &bond->params.arp_targets[i]);
+                        printed = 1;
+                }
+                seq_printf(seq, "\n");
+        }
+
+        if (bond->params.mode == BOND_MODE_8023AD) {
+                struct ad_info ad_info;
+
+                seq_puts(seq, "\n802.3ad info\n");
+                seq_printf(seq, "LACP rate: %s\n",
+                           (bond->params.lacp_fast) ? "fast" : "slow");
+                seq_printf(seq, "Aggregator selection policy (ad_select): %s\n",
+                           ad_select_tbl[bond->params.ad_select].modename);
+
+                if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
+                        seq_printf(seq, "bond %s has no active aggregator\n",
+                                   bond->dev->name);
+                } else {
+                        seq_printf(seq, "Active Aggregator Info:\n");
+
+                        seq_printf(seq, "\tAggregator ID: %d\n",
+                                   ad_info.aggregator_id);
+                        seq_printf(seq, "\tNumber of ports: %d\n",
+                                   ad_info.ports);
+                        seq_printf(seq, "\tActor Key: %d\n",
+                                   ad_info.actor_key);
+                        seq_printf(seq, "\tPartner Key: %d\n",
+                                   ad_info.partner_key);
+                        seq_printf(seq, "\tPartner Mac Address: %pM\n",
+                                   ad_info.partner_system);
+                }
+        }
+}
+
+static void bond_info_show_slave(struct seq_file *seq,
+                                 const struct slave *slave)
+{
+        struct bonding *bond = seq->private;
+
+        seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
+        seq_printf(seq, "MII Status: %s\n",
+                   (slave->link == BOND_LINK_UP) ?  "up" : "down");
+        seq_printf(seq, "Speed: %d Mbps\n", slave->speed);
+        seq_printf(seq, "Duplex: %s\n", slave->duplex ? "full" : "half");
+        seq_printf(seq, "Link Failure Count: %u\n",
+                   slave->link_failure_count);
+
+        seq_printf(seq, "Permanent HW addr: %pM\n", slave->perm_hwaddr);
+
+        if (bond->params.mode == BOND_MODE_8023AD) {
+                const struct aggregator *agg
+                        = SLAVE_AD_INFO(slave).port.aggregator;
+
+                if (agg)
+                        seq_printf(seq, "Aggregator ID: %d\n",
+                                   agg->aggregator_identifier);
+                else
+                        seq_puts(seq, "Aggregator ID: N/A\n");
+        }
+        seq_printf(seq, "Slave queue ID: %d\n", slave->queue_id);
+}
+
+static int bond_info_seq_show(struct seq_file *seq, void *v)
+{
+        if (v == SEQ_START_TOKEN) {
+                seq_printf(seq, "%s\n", bond_version);
+                bond_info_show_master(seq);
+        } else
+                bond_info_show_slave(seq, v);
+
+        return 0;
+}
+
+static const struct seq_operations bond_info_seq_ops = {
+        .start = bond_info_seq_start,
+        .next  = bond_info_seq_next,
+        .stop  = bond_info_seq_stop,
+        .show  = bond_info_seq_show,
+};
+
+static int bond_info_open(struct inode *inode, struct file *file)
+{
+        struct seq_file *seq;
+        struct proc_dir_entry *proc;
+        int res;
+
+        res = seq_open(file, &bond_info_seq_ops);
+        if (!res) {
+                /* recover the pointer buried in proc_dir_entry data */
+                seq = file->private_data;
+                proc = PDE(inode);
+                seq->private = proc->data;
+        }
+
+        return res;
+}
+
+static const struct file_operations bond_info_fops = {
+        .owner   = THIS_MODULE,
+        .open    = bond_info_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release,
+};
+
+void bond_create_proc_entry(struct bonding *bond)
+{
+        struct net_device *bond_dev = bond->dev;
+        struct bond_net *bn = net_generic(dev_net(bond_dev), bond_net_id);
+
+        if (bn->proc_dir) {
+                bond->proc_entry = proc_create_data(bond_dev->name,
+                                                    S_IRUGO, bn->proc_dir,
+                                                    &bond_info_fops, bond);
+                if (bond->proc_entry == NULL)
+                        pr_warning("Warning: Cannot create /proc/net/%s/%s\n",
+                                   DRV_NAME, bond_dev->name);
+                else
+                        memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ);
+        }
+}
+
+void bond_remove_proc_entry(struct bonding *bond)
+{
+        struct net_device *bond_dev = bond->dev;
+        struct bond_net *bn = net_generic(dev_net(bond_dev), bond_net_id);
+
+        if (bn->proc_dir && bond->proc_entry) {
+                remove_proc_entry(bond->proc_file_name, bn->proc_dir);
+                memset(bond->proc_file_name, 0, IFNAMSIZ);
+                bond->proc_entry = NULL;
+        }
+}
+
+/* Create the bonding directory under /proc/net, if doesn't exist yet.
+ * Caller must hold rtnl_lock.
+ */
+void __net_init bond_create_proc_dir(struct bond_net *bn)
+{
+        if (!bn->proc_dir) {
+                bn->proc_dir = proc_mkdir(DRV_NAME, bn->net->proc_net);
+                if (!bn->proc_dir)
+                        pr_warning("Warning: cannot create /proc/net/%s\n",
+                                   DRV_NAME);
+        }
+}
+
+/* Destroy the bonding directory under /proc/net, if empty.
+ * Caller must hold rtnl_lock.
+ */
+void __net_exit bond_destroy_proc_dir(struct bond_net *bn)
+{
+        if (bn->proc_dir) {
+                remove_proc_entry(DRV_NAME, bn->net->proc_net);
+                bn->proc_dir = NULL;
+        }
+}
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 8fd0174c538..de87aea6d01 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -118,7 +118,10 @@ static ssize_t bonding_store_bonds(struct class *cls,
                 pr_info("%s is being created...\n", ifname);
                 rv = bond_create(net, ifname);
                 if (rv) {
-                        pr_info("Bond creation failed.\n");
+                        if (rv == -EEXIST)
+                                pr_info("%s already exists.\n", ifname);
+                        else
+                                pr_info("%s creation failed.\n", ifname);
                         res = rv;
                 }
         } else if (command[0] == '-') {
@@ -322,11 +325,6 @@ static ssize_t bonding_store_mode(struct device *d,
                 ret = -EINVAL;
                 goto out;
         }
-        if (bond->params.mode == BOND_MODE_8023AD)
-                bond_unset_master_3ad_flags(bond);
-
-        if (bond->params.mode == BOND_MODE_ALB)
-                bond_unset_master_alb_flags(bond);
 
         bond->params.mode = new_value;
         bond_set_mode_ops(bond, bond->params.mode);
@@ -527,8 +525,6 @@ static ssize_t bonding_store_arp_interval(struct device *d,
         pr_info("%s: Setting ARP monitoring interval to %d.\n",
                 bond->dev->name, new_value);
         bond->params.arp_interval = new_value;
-        if (bond->params.arp_interval)
-                bond->dev->priv_flags |= IFF_MASTER_ARPMON;
         if (bond->params.miimon) {
                 pr_info("%s: ARP monitoring cannot be used with MII monitoring. %s Disabling MII monitoring.\n",
                         bond->dev->name, bond->dev->name);
@@ -1004,7 +1000,6 @@ static ssize_t bonding_store_miimon(struct device *d,
                         pr_info("%s: MII monitoring cannot be used with ARP monitoring. Disabling ARP monitoring...\n",
                                 bond->dev->name);
                         bond->params.arp_interval = 0;
-                        bond->dev->priv_flags &= ~IFF_MASTER_ARPMON;
                         if (bond->params.arp_validate) {
                                 bond_unregister_arp(bond);
                                 bond->params.arp_validate =
@@ -1198,7 +1193,7 @@ static ssize_t bonding_store_carrier(struct device *d,
                         bond->dev->name, new_value);
         }
 out:
-        return count;
+        return ret;
 }
 static DEVICE_ATTR(use_carrier, S_IRUGO | S_IWUSR,
                    bonding_show_carrier, bonding_store_carrier);
@@ -1587,15 +1582,15 @@ static ssize_t bonding_store_slaves_active(struct device *d,
         }
 
         bond_for_each_slave(bond, slave, i) {
-                if (slave->state == BOND_STATE_BACKUP) {
+                if (!bond_is_active_slave(slave)) {
                         if (new_value)
-                                slave->dev->priv_flags &= ~IFF_SLAVE_INACTIVE;
+                                slave->inactive = 0;
                         else
-                                slave->dev->priv_flags |= IFF_SLAVE_INACTIVE;
+                                slave->inactive = 1;
                 }
         }
 out:
-        return count;
+        return ret;
 }
 static DEVICE_ATTR(all_slaves_active, S_IRUGO | S_IWUSR,
                    bonding_show_slaves_active, bonding_store_slaves_active);
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 31fe980e4e2..90736cb4d97 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -20,6 +20,7 @@
 #include <linux/if_bonding.h>
 #include <linux/cpumask.h>
 #include <linux/in6.h>
+#include <linux/netpoll.h>
 #include "bond_3ad.h"
 #include "bond_alb.h"
 
@@ -28,6 +29,8 @@
 #define DRV_NAME        "bonding"
 #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
 
+#define bond_version DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n"
+
 #define BOND_MAX_ARP_TARGETS    16
 
 #define IS_UP(dev)                                         \
@@ -52,7 +55,7 @@
                     (((slave)->dev->flags & IFF_UP)  && \
                      netif_running((slave)->dev)     && \
                      ((slave)->link == BOND_LINK_UP) && \
-                     ((slave)->state == BOND_STATE_ACTIVE))
+                     bond_is_active_slave(slave))
 
 
 #define USES_PRIMARY(mode)                              \
@@ -132,7 +135,7 @@ static inline void unblock_netpoll_tx(void)
 
 static inline int is_netpoll_tx_blocked(struct net_device *dev)
 {
-        if (unlikely(dev->priv_flags & IFF_IN_NETPOLL))
+        if (unlikely(netpoll_tx_running(dev)))
                 return atomic_read(&netpoll_block_tx);
         return 0;
 }
@@ -184,12 +187,15 @@ struct slave {
         struct net_device *dev; /* first - useful for panic debug */
         struct slave *next;
         struct slave *prev;
+        struct bonding *bond; /* our master */
         int    delay;
         unsigned long jiffies;
         unsigned long last_arp_rx;
         s8     link;    /* one of BOND_LINK_XXXX */
         s8     new_link;
-        s8     state;   /* one of BOND_STATE_XXXX */
+        u8     backup:1,   /* indicates backup slave. Value corresponds with
+                              BOND_STATE_ACTIVE and BOND_STATE_BACKUP */
+               inactive:1; /* indicates inactive slave */
         u32    original_mtu;
         u32    link_failure_count;
         u8     perm_hwaddr[ETH_ALEN];
@@ -198,6 +204,9 @@ struct slave {
         u16    queue_id;
         struct ad_slave_info ad_info; /* HUGE - better to dynamically alloc */
         struct tlb_slave_info tlb_info;
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        struct netpoll *np;
+#endif
 };
 
 /*
@@ -260,12 +269,16 @@ struct bonding {
 #endif /* CONFIG_DEBUG_FS */
 };
 
+#define bond_slave_get_rcu(dev) \
+        ((struct slave *) rcu_dereference(dev->rx_handler_data))
+
 /**
  * Returns NULL if the net_device does not belong to any of the bond's slaves
  *
  * Caller must hold bond lock for read
  */
-static inline struct slave *bond_get_slave_by_dev(struct bonding *bond, struct net_device *slave_dev)
+static inline struct slave *bond_get_slave_by_dev(struct bonding *bond,
+                                                  struct net_device *slave_dev)
 {
         struct slave *slave = NULL;
         int i;
@@ -276,7 +289,7 @@ static inline struct slave *bond_get_slave_by_dev(struct bonding *bond, struct n
                 }
         }
 
-        return 0;
+        return NULL;
 }
 
 static inline struct bonding *bond_get_bond_by_slave(struct slave *slave)
@@ -294,6 +307,26 @@ static inline bool bond_is_lb(const struct bonding *bond)
                 bond->params.mode == BOND_MODE_ALB);
 }
 
+static inline void bond_set_active_slave(struct slave *slave)
+{
+        slave->backup = 0;
+}
+
+static inline void bond_set_backup_slave(struct slave *slave)
+{
+        slave->backup = 1;
+}
+
+static inline int bond_slave_state(struct slave *slave)
+{
+        return slave->backup;
+}
+
+static inline bool bond_is_active_slave(struct slave *slave)
+{
+        return !bond_slave_state(slave);
+}
+
 #define BOND_PRI_RESELECT_ALWAYS        0
 #define BOND_PRI_RESELECT_BETTER        1
 #define BOND_PRI_RESELECT_FAILURE       2
@@ -311,7 +344,7 @@ static inline bool bond_is_lb(const struct bonding *bond)
 static inline int slave_do_arp_validate(struct bonding *bond,
                                         struct slave *slave)
 {
-        return bond->params.arp_validate & (1 << slave->state);
+        return bond->params.arp_validate & (1 << bond_slave_state(slave));
 }
 
 static inline unsigned long slave_last_rx(struct bonding *bond,
@@ -323,41 +356,40 @@ static inline unsigned long slave_last_rx(struct bonding *bond,
         return slave->dev->last_rx;
 }
 
-static inline void bond_set_slave_inactive_flags(struct slave *slave)
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static inline void bond_netpoll_send_skb(const struct slave *slave,
+                                         struct sk_buff *skb)
 {
-        struct bonding *bond = netdev_priv(slave->dev->master);
-        if (!bond_is_lb(bond))
-                slave->state = BOND_STATE_BACKUP;
-        if (!bond->params.all_slaves_active)
-                slave->dev->priv_flags |= IFF_SLAVE_INACTIVE;
-        if (slave_do_arp_validate(bond, slave))
-                slave->dev->priv_flags |= IFF_SLAVE_NEEDARP;
-}
+        struct netpoll *np = slave->np;
 
-static inline void bond_set_slave_active_flags(struct slave *slave)
-{
-        slave->state = BOND_STATE_ACTIVE;
-        slave->dev->priv_flags &= ~(IFF_SLAVE_INACTIVE | IFF_SLAVE_NEEDARP);
+        if (np)
+                netpoll_send_skb(np, skb);
 }
-
-static inline void bond_set_master_3ad_flags(struct bonding *bond)
+#else
+static inline void bond_netpoll_send_skb(const struct slave *slave,
+                                         struct sk_buff *skb)
 {
-        bond->dev->priv_flags |= IFF_MASTER_8023AD;
 }
+#endif
 
-static inline void bond_unset_master_3ad_flags(struct bonding *bond)
+static inline void bond_set_slave_inactive_flags(struct slave *slave)
 {
-        bond->dev->priv_flags &= ~IFF_MASTER_8023AD;
+        struct bonding *bond = netdev_priv(slave->dev->master);
+        if (!bond_is_lb(bond))
+                bond_set_backup_slave(slave);
+        if (!bond->params.all_slaves_active)
+                slave->inactive = 1;
 }
 
-static inline void bond_set_master_alb_flags(struct bonding *bond)
+static inline void bond_set_slave_active_flags(struct slave *slave)
 {
-        bond->dev->priv_flags |= IFF_MASTER_ALB;
+        bond_set_active_slave(slave);
+        slave->inactive = 0;
 }
 
-static inline void bond_unset_master_alb_flags(struct bonding *bond)
+static inline bool bond_is_slave_inactive(struct slave *slave)
 {
-        bond->dev->priv_flags &= ~IFF_MASTER_ALB;
+        return slave->inactive;
 }
 
 struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr);
@@ -393,6 +425,30 @@ struct bond_net {
 #endif
 };
 
+#ifdef CONFIG_PROC_FS
+void bond_create_proc_entry(struct bonding *bond);
+void bond_remove_proc_entry(struct bonding *bond);
+void bond_create_proc_dir(struct bond_net *bn);
+void bond_destroy_proc_dir(struct bond_net *bn);
+#else
+static inline void bond_create_proc_entry(struct bonding *bond)
+{
+}
+
+static inline void bond_remove_proc_entry(struct bonding *bond)
+{
+}
+
+static inline void bond_create_proc_dir(struct bond_net *bn)
+{
+}
+
+static inline void bond_destroy_proc_dir(struct bond_net *bn)
+{
+}
+#endif
+
+
 /* exported from bond_main.c */
 extern int bond_net_id;
 extern const struct bond_parm_tbl bond_lacp_tbl[];
diff --git a/drivers/net/caif/Makefile b/drivers/net/caif/Makefile
index b38d987da67..9560b9d624b 100644
--- a/drivers/net/caif/Makefile
+++ b/drivers/net/caif/Makefile
@@ -1,6 +1,4 @@
-ifeq ($(CONFIG_CAIF_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_CAIF_DEBUG) := -DDEBUG
 
 # Serial interface
 obj-$(CONFIG_CAIF_TTY) += caif_serial.o
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index d5a9db60ade..1d699e3df54 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -23,7 +23,7 @@ config CAN_SLCAN
 
           As only the sending and receiving of CAN frames is implemented, this
           driver should work with the (serial/USB) CAN hardware from:
-          www.canusb.com / www.can232.com / www.mictronic.com / www.canhack.de
+          www.canusb.com / www.can232.com / www.mictronics.de / www.canhack.de
 
           Userspace tools to attach the SLCAN line discipline (slcan_attach,
           slcand) can be found in the can-utils at the SocketCAN SVN, see
@@ -115,8 +115,12 @@ source "drivers/net/can/mscan/Kconfig"
 
 source "drivers/net/can/sja1000/Kconfig"
 
+source "drivers/net/can/c_can/Kconfig"
+
 source "drivers/net/can/usb/Kconfig"
 
+source "drivers/net/can/softing/Kconfig"
+
 config CAN_DEBUG_DEVICES
         bool "CAN devices debugging messages"
         depends on CAN
diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile
index 07ca159ba3f..24ebfe8d758 100644
--- a/drivers/net/can/Makefile
+++ b/drivers/net/can/Makefile
@@ -9,9 +9,11 @@ obj-$(CONFIG_CAN_DEV)		+= can-dev.o
 can-dev-y                       := dev.o
 
 obj-y                           += usb/
+obj-y                           += softing/
 
 obj-$(CONFIG_CAN_SJA1000)       += sja1000/
 obj-$(CONFIG_CAN_MSCAN)         += mscan/
+obj-$(CONFIG_CAN_C_CAN)         += c_can/
 obj-$(CONFIG_CAN_AT91)          += at91_can.o
 obj-$(CONFIG_CAN_TI_HECC)       += ti_hecc.o
 obj-$(CONFIG_CAN_MCP251X)       += mcp251x.o
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 7ef83d06f7e..57d2ffbbb43 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -2,7 +2,7 @@
  * at91_can.c - CAN network driver for AT91 SoC CAN controller
  *
  * (C) 2007 by Hans J. Koch <hjk@hansjkoch.de>
- * (C) 2008, 2009, 2010 by Marc Kleine-Budde <kernel@pengutronix.de>
+ * (C) 2008, 2009, 2010, 2011 by Marc Kleine-Budde <kernel@pengutronix.de>
  *
  * This software may be distributed under the terms of the GNU General
  * Public License ("GPL") version 2 as distributed in the 'COPYING'
@@ -30,6 +30,7 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/platform_device.h>
+#include <linux/rtnetlink.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
@@ -40,22 +41,23 @@
 
 #include <mach/board.h>
 
-#define AT91_NAPI_WEIGHT        12
+#define AT91_NAPI_WEIGHT        11
 
 /*
  * RX/TX Mailbox split
  * don't dare to touch
  */
-#define AT91_MB_RX_NUM          12
+#define AT91_MB_RX_NUM          11
 #define AT91_MB_TX_SHIFT        2
 
-#define AT91_MB_RX_FIRST        0
+#define AT91_MB_RX_FIRST        1
 #define AT91_MB_RX_LAST         (AT91_MB_RX_FIRST + AT91_MB_RX_NUM - 1)
 
 #define AT91_MB_RX_MASK(i)      ((1 << (i)) - 1)
 #define AT91_MB_RX_SPLIT        8
 #define AT91_MB_RX_LOW_LAST     (AT91_MB_RX_SPLIT - 1)
-#define AT91_MB_RX_LOW_MASK     (AT91_MB_RX_MASK(AT91_MB_RX_SPLIT))
+#define AT91_MB_RX_LOW_MASK     (AT91_MB_RX_MASK(AT91_MB_RX_SPLIT) & \
+                                 ~AT91_MB_RX_MASK(AT91_MB_RX_FIRST))
 
 #define AT91_MB_TX_NUM          (1 << AT91_MB_TX_SHIFT)
 #define AT91_MB_TX_FIRST        (AT91_MB_RX_LAST + 1)
@@ -168,6 +170,8 @@ struct at91_priv {
 
         struct clk              *clk;
         struct at91_can_data    *pdata;
+
+        canid_t                 mb0_id;
 };
 
 static struct can_bittiming_const at91_bittiming_const = {
@@ -220,6 +224,18 @@ static inline void set_mb_mode(const struct at91_priv *priv, unsigned int mb,
         set_mb_mode_prio(priv, mb, mode, 0);
 }
 
+static inline u32 at91_can_id_to_reg_mid(canid_t can_id)
+{
+        u32 reg_mid;
+
+        if (can_id & CAN_EFF_FLAG)
+                reg_mid = (can_id & CAN_EFF_MASK) | AT91_MID_MIDE;
+        else
+                reg_mid = (can_id & CAN_SFF_MASK) << 18;
+
+        return reg_mid;
+}
+
 /*
  * Swtich transceiver on or off
  */
@@ -233,12 +249,22 @@ static void at91_setup_mailboxes(struct net_device *dev)
 {
         struct at91_priv *priv = netdev_priv(dev);
         unsigned int i;
+        u32 reg_mid;
 
         /*
-         * The first 12 mailboxes are used as a reception FIFO. The
-         * last mailbox is configured with overwrite option. The
-         * overwrite flag indicates a FIFO overflow.
+         * Due to a chip bug (errata 50.2.6.3 & 50.3.5.3) the first
+         * mailbox is disabled. The next 11 mailboxes are used as a
+         * reception FIFO. The last mailbox is configured with
+         * overwrite option. The overwrite flag indicates a FIFO
+         * overflow.
          */
+        reg_mid = at91_can_id_to_reg_mid(priv->mb0_id);
+        for (i = 0; i < AT91_MB_RX_FIRST; i++) {
+                set_mb_mode(priv, i, AT91_MB_MODE_DISABLED);
+                at91_write(priv, AT91_MID(i), reg_mid);
+                at91_write(priv, AT91_MCR(i), 0x0);     /* clear dlc */
+        }
+
         for (i = AT91_MB_RX_FIRST; i < AT91_MB_RX_LAST; i++)
                 set_mb_mode(priv, i, AT91_MB_MODE_RX);
         set_mb_mode(priv, AT91_MB_RX_LAST, AT91_MB_MODE_RX_OVRWR);
@@ -254,7 +280,8 @@ static void at91_setup_mailboxes(struct net_device *dev)
                 set_mb_mode_prio(priv, i, AT91_MB_MODE_TX, 0);
 
         /* Reset tx and rx helper pointers */
-        priv->tx_next = priv->tx_echo = priv->rx_next = 0;
+        priv->tx_next = priv->tx_echo = 0;
+        priv->rx_next = AT91_MB_RX_FIRST;
 }
 
 static int at91_set_bittiming(struct net_device *dev)
@@ -372,12 +399,7 @@ static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 netdev_err(dev, "BUG! TX buffer full when queue awake!\n");
                 return NETDEV_TX_BUSY;
         }
-
-        if (cf->can_id & CAN_EFF_FLAG)
-                reg_mid = (cf->can_id & CAN_EFF_MASK) | AT91_MID_MIDE;
-        else
-                reg_mid = (cf->can_id & CAN_SFF_MASK) << 18;
-
+        reg_mid = at91_can_id_to_reg_mid(cf->can_id);
         reg_mcr = ((cf->can_id & CAN_RTR_FLAG) ? AT91_MCR_MRTR : 0) |
                 (cf->can_dlc << 16) | AT91_MCR_MTCR;
 
@@ -539,27 +561,31 @@ static void at91_read_msg(struct net_device *dev, unsigned int mb)
  *
  * Theory of Operation:
  *
- * 12 of the 16 mailboxes on the chip are reserved for RX. we split
- * them into 2 groups. The lower group holds 8 and upper 4 mailboxes.
+ * 11 of the 16 mailboxes on the chip are reserved for RX. we split
+ * them into 2 groups. The lower group holds 7 and upper 4 mailboxes.
  *
  * Like it or not, but the chip always saves a received CAN message
  * into the first free mailbox it finds (starting with the
  * lowest). This makes it very difficult to read the messages in the
  * right order from the chip. This is how we work around that problem:
  *
- * The first message goes into mb nr. 0 and issues an interrupt. All
+ * The first message goes into mb nr. 1 and issues an interrupt. All
  * rx ints are disabled in the interrupt handler and a napi poll is
  * scheduled. We read the mailbox, but do _not_ reenable the mb (to
  * receive another message).
  *
  *    lower mbxs      upper
- *   ______^______    __^__
- *  /             \  /     \
+ *     ____^______    __^__
+ *    /           \  /     \
  * +-+-+-+-+-+-+-+-++-+-+-+-+
- * |x|x|x|x|x|x|x|x|| | | | |
+ * | |x|x|x|x|x|x|x|| | | | |
  * +-+-+-+-+-+-+-+-++-+-+-+-+
  *  0 0 0 0 0 0  0 0 0 0 1 1  \ mail
  *  0 1 2 3 4 5  6 7 8 9 0 1  / box
+ *  ^
+ *  |
+ *   \
+ *     unused, due to chip bug
  *
  * The variable priv->rx_next points to the next mailbox to read a
  * message from. As long we're in the lower mailboxes we just read the
@@ -590,10 +616,10 @@ static int at91_poll_rx(struct net_device *dev, int quota)
                         "order of incoming frames cannot be guaranteed\n");
 
  again:
-        for (mb = find_next_bit(addr, AT91_MB_RX_NUM, priv->rx_next);
-             mb < AT91_MB_RX_NUM && quota > 0;
+        for (mb = find_next_bit(addr, AT91_MB_RX_LAST + 1, priv->rx_next);
+             mb < AT91_MB_RX_LAST + 1 && quota > 0;
              reg_sr = at91_read(priv, AT91_SR),
-             mb = find_next_bit(addr, AT91_MB_RX_NUM, ++priv->rx_next)) {
+             mb = find_next_bit(addr, AT91_MB_RX_LAST + 1, ++priv->rx_next)) {
                 at91_read_msg(dev, mb);
 
                 /* reactivate mailboxes */
@@ -610,8 +636,8 @@ static int at91_poll_rx(struct net_device *dev, int quota)
 
         /* upper group completed, look again in lower */
         if (priv->rx_next > AT91_MB_RX_LOW_LAST &&
-            quota > 0 && mb >= AT91_MB_RX_NUM) {
-                priv->rx_next = 0;
+            quota > 0 && mb > AT91_MB_RX_LAST) {
+                priv->rx_next = AT91_MB_RX_FIRST;
                 goto again;
         }
 
@@ -1037,6 +1063,64 @@ static const struct net_device_ops at91_netdev_ops = {
         .ndo_start_xmit = at91_start_xmit,
 };
 
+static ssize_t at91_sysfs_show_mb0_id(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct at91_priv *priv = netdev_priv(to_net_dev(dev));
+
+        if (priv->mb0_id & CAN_EFF_FLAG)
+                return snprintf(buf, PAGE_SIZE, "0x%08x\n", priv->mb0_id);
+        else
+                return snprintf(buf, PAGE_SIZE, "0x%03x\n", priv->mb0_id);
+}
+
+static ssize_t at91_sysfs_set_mb0_id(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct at91_priv *priv = netdev_priv(ndev);
+        unsigned long can_id;
+        ssize_t ret;
+        int err;
+
+        rtnl_lock();
+
+        if (ndev->flags & IFF_UP) {
+                ret = -EBUSY;
+                goto out;
+        }
+
+        err = strict_strtoul(buf, 0, &can_id);
+        if (err) {
+                ret = err;
+                goto out;
+        }
+
+        if (can_id & CAN_EFF_FLAG)
+                can_id &= CAN_EFF_MASK | CAN_EFF_FLAG;
+        else
+                can_id &= CAN_SFF_MASK;
+
+        priv->mb0_id = can_id;
+        ret = count;
+
+ out:
+        rtnl_unlock();
+        return ret;
+}
+
+static DEVICE_ATTR(mb0_id, S_IWUSR | S_IRUGO,
+        at91_sysfs_show_mb0_id, at91_sysfs_set_mb0_id);
+
+static struct attribute *at91_sysfs_attrs[] = {
+        &dev_attr_mb0_id.attr,
+        NULL,
+};
+
+static struct attribute_group at91_sysfs_attr_group = {
+        .attrs = at91_sysfs_attrs,
+};
+
 static int __devinit at91_can_probe(struct platform_device *pdev)
 {
         struct net_device *dev;
@@ -1082,6 +1166,7 @@ static int __devinit at91_can_probe(struct platform_device *pdev)
         dev->netdev_ops = &at91_netdev_ops;
         dev->irq = irq;
         dev->flags |= IFF_ECHO;
+        dev->sysfs_groups[0] = &at91_sysfs_attr_group;
 
         priv = netdev_priv(dev);
         priv->can.clock.freq = clk_get_rate(clk);
@@ -1093,6 +1178,7 @@ static int __devinit at91_can_probe(struct platform_device *pdev)
         priv->dev = dev;
         priv->clk = clk;
         priv->pdata = pdev->dev.platform_data;
+        priv->mb0_id = 0x7ff;
 
         netif_napi_add(dev, &priv->napi, at91_poll, AT91_NAPI_WEIGHT);
 
diff --git a/drivers/net/can/c_can/Kconfig b/drivers/net/can/c_can/Kconfig
new file mode 100644
index 00000000000..ffb9773d102
--- /dev/null
+++ b/drivers/net/can/c_can/Kconfig
@@ -0,0 +1,15 @@
+menuconfig CAN_C_CAN
+        tristate "Bosch C_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"
+        ---help---
+          This driver adds support for the C_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.
+endif
diff --git a/drivers/net/can/c_can/Makefile b/drivers/net/can/c_can/Makefile
new file mode 100644
index 00000000000..9273f6d5c4b
--- /dev/null
+++ b/drivers/net/can/c_can/Makefile
@@ -0,0 +1,8 @@
+#
+#  Makefile for the Bosch C_CAN controller drivers.
+#
+
+obj-$(CONFIG_CAN_C_CAN) += c_can.o
+obj-$(CONFIG_CAN_C_CAN_PLATFORM) += c_can_platform.o
+
+ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c
new file mode 100644
index 00000000000..31552959aed
--- /dev/null
+++ b/drivers/net/can/c_can/c_can.c
@@ -0,0 +1,1152 @@
+/*
+ * CAN bus driver for Bosch C_CAN controller
+ *
+ * Copyright (C) 2010 ST Microelectronics
+ * Bhupesh Sharma <bhupesh.sharma@st.com>
+ *
+ * Borrowed heavily from the C_CAN driver originally written by:
+ * Copyright (C) 2007
+ * - Sascha Hauer, Marc Kleine-Budde, Pengutronix <s.hauer@pengutronix.de>
+ * - Simon Kallweit, intefo AG <simon.kallweit@intefo.ch>
+ *
+ * TX and RX NAPI implementation has been borrowed from at91 CAN driver
+ * written by:
+ * Copyright
+ * (C) 2007 by Hans J. Koch <hjk@hansjkoch.de>
+ * (C) 2008, 2009 by Marc Kleine-Budde <kernel@pengutronix.de>
+ *
+ * Bosch C_CAN controller is compliant to CAN protocol version 2.0 part A and B.
+ * Bosch C_CAN user manual can be obtained from:
+ * http://www.semiconductors.bosch.de/media/en/pdf/ipmodules_1/c_can/
+ * users_manual_c_can.pdf
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/if_ether.h>
+#include <linux/list.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+
+#include <linux/can.h>
+#include <linux/can/dev.h>
+#include <linux/can/error.h>
+
+#include "c_can.h"
+
+/* control register */
+#define CONTROL_TEST            BIT(7)
+#define CONTROL_CCE             BIT(6)
+#define CONTROL_DISABLE_AR      BIT(5)
+#define CONTROL_ENABLE_AR       (0 << 5)
+#define CONTROL_EIE             BIT(3)
+#define CONTROL_SIE             BIT(2)
+#define CONTROL_IE              BIT(1)
+#define CONTROL_INIT            BIT(0)
+
+/* test register */
+#define TEST_RX                 BIT(7)
+#define TEST_TX1                BIT(6)
+#define TEST_TX2                BIT(5)
+#define TEST_LBACK              BIT(4)
+#define TEST_SILENT             BIT(3)
+#define TEST_BASIC              BIT(2)
+
+/* status register */
+#define STATUS_BOFF             BIT(7)
+#define STATUS_EWARN            BIT(6)
+#define STATUS_EPASS            BIT(5)
+#define STATUS_RXOK             BIT(4)
+#define STATUS_TXOK             BIT(3)
+
+/* error counter register */
+#define ERR_CNT_TEC_MASK        0xff
+#define ERR_CNT_TEC_SHIFT       0
+#define ERR_CNT_REC_SHIFT       8
+#define ERR_CNT_REC_MASK        (0x7f << ERR_CNT_REC_SHIFT)
+#define ERR_CNT_RP_SHIFT        15
+#define ERR_CNT_RP_MASK         (0x1 << ERR_CNT_RP_SHIFT)
+
+/* bit-timing register */
+#define BTR_BRP_MASK            0x3f
+#define BTR_BRP_SHIFT           0
+#define BTR_SJW_SHIFT           6
+#define BTR_SJW_MASK            (0x3 << BTR_SJW_SHIFT)
+#define BTR_TSEG1_SHIFT         8
+#define BTR_TSEG1_MASK          (0xf << BTR_TSEG1_SHIFT)
+#define BTR_TSEG2_SHIFT         12
+#define BTR_TSEG2_MASK          (0x7 << BTR_TSEG2_SHIFT)
+
+/* brp extension register */
+#define BRP_EXT_BRPE_MASK       0x0f
+#define BRP_EXT_BRPE_SHIFT      0
+
+/* IFx command request */
+#define IF_COMR_BUSY            BIT(15)
+
+/* IFx command mask */
+#define IF_COMM_WR              BIT(7)
+#define IF_COMM_MASK            BIT(6)
+#define IF_COMM_ARB             BIT(5)
+#define IF_COMM_CONTROL         BIT(4)
+#define IF_COMM_CLR_INT_PND     BIT(3)
+#define IF_COMM_TXRQST          BIT(2)
+#define IF_COMM_DATAA           BIT(1)
+#define IF_COMM_DATAB           BIT(0)
+#define IF_COMM_ALL             (IF_COMM_MASK | IF_COMM_ARB | \
+                                IF_COMM_CONTROL | IF_COMM_TXRQST | \
+                                IF_COMM_DATAA | IF_COMM_DATAB)
+
+/* IFx arbitration */
+#define IF_ARB_MSGVAL           BIT(15)
+#define IF_ARB_MSGXTD           BIT(14)
+#define IF_ARB_TRANSMIT         BIT(13)
+
+/* IFx message control */
+#define IF_MCONT_NEWDAT         BIT(15)
+#define IF_MCONT_MSGLST         BIT(14)
+#define IF_MCONT_CLR_MSGLST     (0 << 14)
+#define IF_MCONT_INTPND         BIT(13)
+#define IF_MCONT_UMASK          BIT(12)
+#define IF_MCONT_TXIE           BIT(11)
+#define IF_MCONT_RXIE           BIT(10)
+#define IF_MCONT_RMTEN          BIT(9)
+#define IF_MCONT_TXRQST         BIT(8)
+#define IF_MCONT_EOB            BIT(7)
+#define IF_MCONT_DLC_MASK       0xf
+
+/*
+ * IFx register masks:
+ * allow easy operation on 16-bit registers when the
+ * argument is 32-bit instead
+ */
+#define IFX_WRITE_LOW_16BIT(x)  ((x) & 0xFFFF)
+#define IFX_WRITE_HIGH_16BIT(x) (((x) & 0xFFFF0000) >> 16)
+
+/* message object split */
+#define C_CAN_NO_OF_OBJECTS     32
+#define C_CAN_MSG_OBJ_RX_NUM    16
+#define C_CAN_MSG_OBJ_TX_NUM    16
+
+#define C_CAN_MSG_OBJ_RX_FIRST  1
+#define C_CAN_MSG_OBJ_RX_LAST   (C_CAN_MSG_OBJ_RX_FIRST + \
+                                C_CAN_MSG_OBJ_RX_NUM - 1)
+
+#define C_CAN_MSG_OBJ_TX_FIRST  (C_CAN_MSG_OBJ_RX_LAST + 1)
+#define C_CAN_MSG_OBJ_TX_LAST   (C_CAN_MSG_OBJ_TX_FIRST + \
+                                C_CAN_MSG_OBJ_TX_NUM - 1)
+
+#define C_CAN_MSG_OBJ_RX_SPLIT  9
+#define C_CAN_MSG_RX_LOW_LAST   (C_CAN_MSG_OBJ_RX_SPLIT - 1)
+
+#define C_CAN_NEXT_MSG_OBJ_MASK (C_CAN_MSG_OBJ_TX_NUM - 1)
+#define RECEIVE_OBJECT_BITS     0x0000ffff
+
+/* status interrupt */
+#define STATUS_INTERRUPT        0x8000
+
+/* global interrupt masks */
+#define ENABLE_ALL_INTERRUPTS   1
+#define DISABLE_ALL_INTERRUPTS  0
+
+/* minimum timeout for checking BUSY status */
+#define MIN_TIMEOUT_VALUE       6
+
+/* napi related */
+#define C_CAN_NAPI_WEIGHT       C_CAN_MSG_OBJ_RX_NUM
+
+/* c_can lec values */
+enum c_can_lec_type {
+        LEC_NO_ERROR = 0,
+        LEC_STUFF_ERROR,
+        LEC_FORM_ERROR,
+        LEC_ACK_ERROR,
+        LEC_BIT1_ERROR,
+        LEC_BIT0_ERROR,
+        LEC_CRC_ERROR,
+        LEC_UNUSED,
+};
+
+/*
+ * c_can error types:
+ * Bus errors (BUS_OFF, ERROR_WARNING, ERROR_PASSIVE) are supported
+ */
+enum c_can_bus_error_types {
+        C_CAN_NO_ERROR = 0,
+        C_CAN_BUS_OFF,
+        C_CAN_ERROR_WARNING,
+        C_CAN_ERROR_PASSIVE,
+};
+
+static struct can_bittiming_const c_can_bittiming_const = {
+        .name = KBUILD_MODNAME,
+        .tseg1_min = 2,         /* Time segment 1 = prop_seg + phase_seg1 */
+        .tseg1_max = 16,
+        .tseg2_min = 1,         /* Time segment 2 = phase_seg2 */
+        .tseg2_max = 8,
+        .sjw_max = 4,
+        .brp_min = 1,
+        .brp_max = 1024,        /* 6-bit BRP field + 4-bit BRPE field*/
+        .brp_inc = 1,
+};
+
+static inline int get_tx_next_msg_obj(const struct c_can_priv *priv)
+{
+        return (priv->tx_next & C_CAN_NEXT_MSG_OBJ_MASK) +
+                        C_CAN_MSG_OBJ_TX_FIRST;
+}
+
+static inline int get_tx_echo_msg_obj(const struct c_can_priv *priv)
+{
+        return (priv->tx_echo & C_CAN_NEXT_MSG_OBJ_MASK) +
+                        C_CAN_MSG_OBJ_TX_FIRST;
+}
+
+static u32 c_can_read_reg32(struct c_can_priv *priv, void *reg)
+{
+        u32 val = priv->read_reg(priv, reg);
+        val |= ((u32) priv->read_reg(priv, reg + 2)) << 16;
+        return val;
+}
+
+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);
+
+        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);
+}
+
+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) &
+                                IF_COMR_BUSY) {
+                count--;
+                udelay(1);
+        }
+
+        if (!count)
+                return 1;
+
+        return 0;
+}
+
+static inline void c_can_object_get(struct net_device *dev,
+                                        int iface, int objno, int mask)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        /*
+         * As per specs, after writting the message object number in the
+         * IF command request register the transfer b/w interface
+         * register and message RAM must be complete in 6 CAN-CLK
+         * period.
+         */
+        priv->write_reg(priv, &priv->regs->ifregs[iface].com_mask,
+                        IFX_WRITE_LOW_16BIT(mask));
+        priv->write_reg(priv, &priv->regs->ifregs[iface].com_req,
+                        IFX_WRITE_LOW_16BIT(objno));
+
+        if (c_can_msg_obj_is_busy(priv, iface))
+                netdev_err(dev, "timed out in object get\n");
+}
+
+static inline void c_can_object_put(struct net_device *dev,
+                                        int iface, int objno, int mask)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        /*
+         * As per specs, after writting the message object number in the
+         * IF command request register the transfer b/w interface
+         * register and message RAM must be complete in 6 CAN-CLK
+         * period.
+         */
+        priv->write_reg(priv, &priv->regs->ifregs[iface].com_mask,
+                        (IF_COMM_WR | IFX_WRITE_LOW_16BIT(mask)));
+        priv->write_reg(priv, &priv->regs->ifregs[iface].com_req,
+                        IFX_WRITE_LOW_16BIT(objno));
+
+        if (c_can_msg_obj_is_busy(priv, iface))
+                netdev_err(dev, "timed out in object put\n");
+}
+
+static void c_can_write_msg_object(struct net_device *dev,
+                        int iface, struct can_frame *frame, int objno)
+{
+        int i;
+        u16 flags = 0;
+        unsigned int id;
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        if (!(frame->can_id & CAN_RTR_FLAG))
+                flags |= IF_ARB_TRANSMIT;
+
+        if (frame->can_id & CAN_EFF_FLAG) {
+                id = frame->can_id & CAN_EFF_MASK;
+                flags |= IF_ARB_MSGXTD;
+        } else
+                id = ((frame->can_id & CAN_SFF_MASK) << 18);
+
+        flags |= IF_ARB_MSGVAL;
+
+        priv->write_reg(priv, &priv->regs->ifregs[iface].arb1,
+                                IFX_WRITE_LOW_16BIT(id));
+        priv->write_reg(priv, &priv->regs->ifregs[iface].arb2, 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],
+                                frame->data[i] | (frame->data[i + 1] << 8));
+        }
+
+        /* enable interrupt for this message object */
+        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+                        IF_MCONT_TXIE | IF_MCONT_TXRQST | IF_MCONT_EOB |
+                        frame->can_dlc);
+        c_can_object_put(dev, iface, objno, IF_COMM_ALL);
+}
+
+static inline void c_can_mark_rx_msg_obj(struct net_device *dev,
+                                                int iface, int ctrl_mask,
+                                                int obj)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+                        ctrl_mask & ~(IF_MCONT_MSGLST | IF_MCONT_INTPND));
+        c_can_object_put(dev, iface, obj, IF_COMM_CONTROL);
+
+}
+
+static inline void c_can_activate_all_lower_rx_msg_obj(struct net_device *dev,
+                                                int iface,
+                                                int ctrl_mask)
+{
+        int i;
+        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,
+                                ctrl_mask & ~(IF_MCONT_MSGLST |
+                                        IF_MCONT_INTPND | IF_MCONT_NEWDAT));
+                c_can_object_put(dev, iface, i, IF_COMM_CONTROL);
+        }
+}
+
+static inline void c_can_activate_rx_msg_obj(struct net_device *dev,
+                                                int iface, int ctrl_mask,
+                                                int obj)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+                        ctrl_mask & ~(IF_MCONT_MSGLST |
+                                IF_MCONT_INTPND | IF_MCONT_NEWDAT));
+        c_can_object_put(dev, iface, obj, IF_COMM_CONTROL);
+}
+
+static void c_can_handle_lost_msg_obj(struct net_device *dev,
+                                        int iface, int objno)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        struct net_device_stats *stats = &dev->stats;
+        struct sk_buff *skb;
+        struct can_frame *frame;
+
+        netdev_err(dev, "msg lost in buffer %d\n", objno);
+
+        c_can_object_get(dev, iface, objno, IF_COMM_ALL & ~IF_COMM_TXRQST);
+
+        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl,
+                        IF_MCONT_CLR_MSGLST);
+
+        c_can_object_put(dev, 0, objno, IF_COMM_CONTROL);
+
+        /* create an error msg */
+        skb = alloc_can_err_skb(dev, &frame);
+        if (unlikely(!skb))
+                return;
+
+        frame->can_id |= CAN_ERR_CRTL;
+        frame->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
+        stats->rx_errors++;
+        stats->rx_over_errors++;
+
+        netif_receive_skb(skb);
+}
+
+static int c_can_read_msg_object(struct net_device *dev, int iface, int ctrl)
+{
+        u16 flags, data;
+        int i;
+        unsigned int val;
+        struct c_can_priv *priv = netdev_priv(dev);
+        struct net_device_stats *stats = &dev->stats;
+        struct sk_buff *skb;
+        struct can_frame *frame;
+
+        skb = alloc_can_skb(dev, &frame);
+        if (!skb) {
+                stats->rx_dropped++;
+                return -ENOMEM;
+        }
+
+        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 << 16);
+
+        if (flags & IF_ARB_MSGXTD)
+                frame->can_id = (val & CAN_EFF_MASK) | CAN_EFF_FLAG;
+        else
+                frame->can_id = (val >> 18) & CAN_SFF_MASK;
+
+        if (flags & IF_ARB_TRANSMIT)
+                frame->can_id |= CAN_RTR_FLAG;
+        else {
+                for (i = 0; i < frame->can_dlc; i += 2) {
+                        data = priv->read_reg(priv,
+                                &priv->regs->ifregs[iface].data[i / 2]);
+                        frame->data[i] = data;
+                        frame->data[i + 1] = data >> 8;
+                }
+        }
+
+        netif_receive_skb(skb);
+
+        stats->rx_packets++;
+        stats->rx_bytes += frame->can_dlc;
+
+        return 0;
+}
+
+static void c_can_setup_receive_object(struct net_device *dev, int iface,
+                                        int objno, unsigned int mask,
+                                        unsigned int id, unsigned int mcont)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        priv->write_reg(priv, &priv->regs->ifregs[iface].mask1,
+                        IFX_WRITE_LOW_16BIT(mask));
+        priv->write_reg(priv, &priv->regs->ifregs[iface].mask2,
+                        IFX_WRITE_HIGH_16BIT(mask));
+
+        priv->write_reg(priv, &priv->regs->ifregs[iface].arb1,
+                        IFX_WRITE_LOW_16BIT(id));
+        priv->write_reg(priv, &priv->regs->ifregs[iface].arb2,
+                        (IF_ARB_MSGVAL | IFX_WRITE_HIGH_16BIT(id)));
+
+        priv->write_reg(priv, &priv->regs->ifregs[iface].msg_cntrl, 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));
+}
+
+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);
+
+        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));
+}
+
+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);
+
+        /*
+         * as transmission request register's bit n-1 corresponds to
+         * message object n, we need to handle the same properly.
+         */
+        if (val & (1 << (objno - 1)))
+                return 1;
+
+        return 0;
+}
+
+static netdev_tx_t c_can_start_xmit(struct sk_buff *skb,
+                                        struct net_device *dev)
+{
+        u32 msg_obj_no;
+        struct c_can_priv *priv = netdev_priv(dev);
+        struct can_frame *frame = (struct can_frame *)skb->data;
+
+        if (can_dropped_invalid_skb(dev, skb))
+                return NETDEV_TX_OK;
+
+        msg_obj_no = get_tx_next_msg_obj(priv);
+
+        /* prepare message object for transmission */
+        c_can_write_msg_object(dev, 0, frame, msg_obj_no);
+        can_put_echo_skb(skb, dev, msg_obj_no - C_CAN_MSG_OBJ_TX_FIRST);
+
+        /*
+         * we have to stop the queue in case of a wrap around or
+         * if the next TX message object is still in use
+         */
+        priv->tx_next++;
+        if (c_can_is_next_tx_obj_busy(priv, get_tx_next_msg_obj(priv)) ||
+                        (priv->tx_next & C_CAN_NEXT_MSG_OBJ_MASK) == 0)
+                netif_stop_queue(dev);
+
+        return NETDEV_TX_OK;
+}
+
+static int c_can_set_bittiming(struct net_device *dev)
+{
+        unsigned int reg_btr, reg_brpe, ctrl_save;
+        u8 brp, brpe, sjw, tseg1, tseg2;
+        u32 ten_bit_brp;
+        struct c_can_priv *priv = netdev_priv(dev);
+        const struct can_bittiming *bt = &priv->can.bittiming;
+
+        /* c_can provides a 6-bit brp and 4-bit brpe fields */
+        ten_bit_brp = bt->brp - 1;
+        brp = ten_bit_brp & BTR_BRP_MASK;
+        brpe = ten_bit_brp >> 6;
+
+        sjw = bt->sjw - 1;
+        tseg1 = bt->prop_seg + bt->phase_seg1 - 1;
+        tseg2 = bt->phase_seg2 - 1;
+        reg_btr = brp | (sjw << BTR_SJW_SHIFT) | (tseg1 << BTR_TSEG1_SHIFT) |
+                        (tseg2 << BTR_TSEG2_SHIFT);
+        reg_brpe = brpe & BRP_EXT_BRPE_MASK;
+
+        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 | 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);
+
+        return 0;
+}
+
+/*
+ * Configure C_CAN message objects for Tx and Rx purposes:
+ * C_CAN provides a total of 32 message objects that can be configured
+ * either for Tx or Rx purposes. Here the first 16 message objects are used as
+ * a reception FIFO. The end of reception FIFO is signified by the EoB bit
+ * being SET. The remaining 16 message objects are kept aside for Tx purposes.
+ * See user guide document for further details on configuring message
+ * objects.
+ */
+static void c_can_configure_msg_objects(struct net_device *dev)
+{
+        int i;
+
+        /* first invalidate all message objects */
+        for (i = C_CAN_MSG_OBJ_RX_FIRST; i <= C_CAN_NO_OF_OBJECTS; i++)
+                c_can_inval_msg_object(dev, 0, i);
+
+        /* setup receive message objects */
+        for (i = C_CAN_MSG_OBJ_RX_FIRST; i < C_CAN_MSG_OBJ_RX_LAST; i++)
+                c_can_setup_receive_object(dev, 0, i, 0, 0,
+                        (IF_MCONT_RXIE | IF_MCONT_UMASK) & ~IF_MCONT_EOB);
+
+        c_can_setup_receive_object(dev, 0, C_CAN_MSG_OBJ_RX_LAST, 0, 0,
+                        IF_MCONT_EOB | IF_MCONT_RXIE | IF_MCONT_UMASK);
+}
+
+/*
+ * Configure C_CAN chip:
+ * - enable/disable auto-retransmission
+ * - set operating mode
+ * - configure message objects
+ */
+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,
+                        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 |
+                                CONTROL_SIE | CONTROL_IE | CONTROL_TEST);
+                priv->write_reg(priv, &priv->regs->test,
+                                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 |
+                                CONTROL_SIE | CONTROL_IE | CONTROL_TEST);
+                priv->write_reg(priv, &priv->regs->test, TEST_LBACK);
+        } else if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) {
+                /* silent mode : bus-monitoring mode */
+                priv->write_reg(priv, &priv->regs->control, CONTROL_EIE |
+                                CONTROL_SIE | CONTROL_IE | CONTROL_TEST);
+                priv->write_reg(priv, &priv->regs->test, TEST_SILENT);
+        } else
+                /* normal mode*/
+                priv->write_reg(priv, &priv->regs->control,
+                                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);
+
+        /* set bittiming params */
+        c_can_set_bittiming(dev);
+}
+
+static void c_can_start(struct net_device *dev)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        /* basic c_can configuration */
+        c_can_chip_config(dev);
+
+        priv->can.state = CAN_STATE_ERROR_ACTIVE;
+
+        /* reset tx helper pointers */
+        priv->tx_next = priv->tx_echo = 0;
+
+        /* enable status change, error and module interrupts */
+        c_can_enable_all_interrupts(priv, ENABLE_ALL_INTERRUPTS);
+}
+
+static void c_can_stop(struct net_device *dev)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        /* disable all interrupts */
+        c_can_enable_all_interrupts(priv, DISABLE_ALL_INTERRUPTS);
+
+        /* set the state as STOPPED */
+        priv->can.state = CAN_STATE_STOPPED;
+}
+
+static int c_can_set_mode(struct net_device *dev, enum can_mode mode)
+{
+        switch (mode) {
+        case CAN_MODE_START:
+                c_can_start(dev);
+                netif_wake_queue(dev);
+                break;
+        default:
+                return -EOPNOTSUPP;
+        }
+
+        return 0;
+}
+
+static int c_can_get_berr_counter(const struct net_device *dev,
+                                        struct can_berr_counter *bec)
+{
+        unsigned int reg_err_counter;
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        reg_err_counter = priv->read_reg(priv, &priv->regs->err_cnt);
+        bec->rxerr = (reg_err_counter & ERR_CNT_REC_MASK) >>
+                                ERR_CNT_REC_SHIFT;
+        bec->txerr = reg_err_counter & ERR_CNT_TEC_MASK;
+
+        return 0;
+}
+
+/*
+ * theory of operation:
+ *
+ * priv->tx_echo holds the number of the oldest can_frame put for
+ * transmission into the hardware, but not yet ACKed by the CAN tx
+ * complete IRQ.
+ *
+ * We iterate from priv->tx_echo to priv->tx_next and check if the
+ * packet has been transmitted, echo it back to the CAN framework.
+ * If we discover a not yet transmitted package, stop looking for more.
+ */
+static void c_can_do_tx(struct net_device *dev)
+{
+        u32 val;
+        u32 msg_obj_no;
+        struct c_can_priv *priv = netdev_priv(dev);
+        struct net_device_stats *stats = &dev->stats;
+
+        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);
+                if (!(val & (1 << msg_obj_no))) {
+                        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)
+                                        & IF_MCONT_DLC_MASK;
+                        stats->tx_packets++;
+                        c_can_inval_msg_object(dev, 0, msg_obj_no);
+                }
+        }
+
+        /* restart queue if wrap-up or if queue stalled on last pkt */
+        if (((priv->tx_next & C_CAN_NEXT_MSG_OBJ_MASK) != 0) ||
+                        ((priv->tx_echo & C_CAN_NEXT_MSG_OBJ_MASK) == 0))
+                netif_wake_queue(dev);
+}
+
+/*
+ * theory of operation:
+ *
+ * c_can core saves a received CAN message into the first free message
+ * object it finds free (starting with the lowest). Bits NEWDAT and
+ * INTPND are set for this message object indicating that a new message
+ * has arrived. To work-around this issue, we keep two groups of message
+ * objects whose partitioning is defined by C_CAN_MSG_OBJ_RX_SPLIT.
+ *
+ * To ensure in-order frame reception we use the following
+ * approach while re-activating a message object to receive further
+ * frames:
+ * - if the current message object number is lower than
+ *   C_CAN_MSG_RX_LOW_LAST, do not clear the NEWDAT bit while clearing
+ *   the INTPND bit.
+ * - if the current message object number is equal to
+ *   C_CAN_MSG_RX_LOW_LAST then clear the NEWDAT bit of all lower
+ *   receive message objects.
+ * - if the current message object number is greater than
+ *   C_CAN_MSG_RX_LOW_LAST then clear the NEWDAT bit of
+ *   only this message object.
+ */
+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);
+
+        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),
+                        msg_obj++) {
+                /*
+                 * as interrupt pending register's bit n-1 corresponds to
+                 * message object n, we need to handle the same properly.
+                 */
+                if (val & (1 << (msg_obj - 1))) {
+                        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);
+
+                        if (msg_ctrl_save & IF_MCONT_EOB)
+                                return num_rx_pkts;
+
+                        if (msg_ctrl_save & IF_MCONT_MSGLST) {
+                                c_can_handle_lost_msg_obj(dev, 0, msg_obj);
+                                num_rx_pkts++;
+                                quota--;
+                                continue;
+                        }
+
+                        if (!(msg_ctrl_save & IF_MCONT_NEWDAT))
+                                continue;
+
+                        /* read the data from the message object */
+                        c_can_read_msg_object(dev, 0, msg_ctrl_save);
+
+                        if (msg_obj < C_CAN_MSG_RX_LOW_LAST)
+                                c_can_mark_rx_msg_obj(dev, 0,
+                                                msg_ctrl_save, msg_obj);
+                        else if (msg_obj > C_CAN_MSG_RX_LOW_LAST)
+                                /* activate this msg obj */
+                                c_can_activate_rx_msg_obj(dev, 0,
+                                                msg_ctrl_save, msg_obj);
+                        else if (msg_obj == C_CAN_MSG_RX_LOW_LAST)
+                                /* activate all lower message objects */
+                                c_can_activate_all_lower_rx_msg_obj(dev,
+                                                0, msg_ctrl_save);
+
+                        num_rx_pkts++;
+                        quota--;
+                }
+        }
+
+        return num_rx_pkts;
+}
+
+static inline int c_can_has_and_handle_berr(struct c_can_priv *priv)
+{
+        return (priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING) &&
+                (priv->current_status & LEC_UNUSED);
+}
+
+static int c_can_handle_state_change(struct net_device *dev,
+                                enum c_can_bus_error_types error_type)
+{
+        unsigned int reg_err_counter;
+        unsigned int rx_err_passive;
+        struct c_can_priv *priv = netdev_priv(dev);
+        struct net_device_stats *stats = &dev->stats;
+        struct can_frame *cf;
+        struct sk_buff *skb;
+        struct can_berr_counter bec;
+
+        /* propogate the error condition to the CAN stack */
+        skb = alloc_can_err_skb(dev, &cf);
+        if (unlikely(!skb))
+                return 0;
+
+        c_can_get_berr_counter(dev, &bec);
+        reg_err_counter = priv->read_reg(priv, &priv->regs->err_cnt);
+        rx_err_passive = (reg_err_counter & ERR_CNT_RP_MASK) >>
+                                ERR_CNT_RP_SHIFT;
+
+        switch (error_type) {
+        case C_CAN_ERROR_WARNING:
+                /* error warning state */
+                priv->can.can_stats.error_warning++;
+                priv->can.state = CAN_STATE_ERROR_WARNING;
+                cf->can_id |= CAN_ERR_CRTL;
+                cf->data[1] = (bec.txerr > bec.rxerr) ?
+                        CAN_ERR_CRTL_TX_WARNING :
+                        CAN_ERR_CRTL_RX_WARNING;
+                cf->data[6] = bec.txerr;
+                cf->data[7] = bec.rxerr;
+
+                break;
+        case C_CAN_ERROR_PASSIVE:
+                /* error passive state */
+                priv->can.can_stats.error_passive++;
+                priv->can.state = CAN_STATE_ERROR_PASSIVE;
+                cf->can_id |= CAN_ERR_CRTL;
+                if (rx_err_passive)
+                        cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;
+                if (bec.txerr > 127)
+                        cf->data[1] |= CAN_ERR_CRTL_TX_PASSIVE;
+
+                cf->data[6] = bec.txerr;
+                cf->data[7] = bec.rxerr;
+                break;
+        case C_CAN_BUS_OFF:
+                /* bus-off state */
+                priv->can.state = CAN_STATE_BUS_OFF;
+                cf->can_id |= CAN_ERR_BUSOFF;
+                /*
+                 * disable all interrupts in bus-off mode to ensure that
+                 * the CPU is not hogged down
+                 */
+                c_can_enable_all_interrupts(priv, DISABLE_ALL_INTERRUPTS);
+                can_bus_off(dev);
+                break;
+        default:
+                break;
+        }
+
+        netif_receive_skb(skb);
+        stats->rx_packets++;
+        stats->rx_bytes += cf->can_dlc;
+
+        return 1;
+}
+
+static int c_can_handle_bus_err(struct net_device *dev,
+                                enum c_can_lec_type lec_type)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+        struct net_device_stats *stats = &dev->stats;
+        struct can_frame *cf;
+        struct sk_buff *skb;
+
+        /*
+         * early exit if no lec update or no error.
+         * no lec update means that no CAN bus event has been detected
+         * since CPU wrote 0x7 value to status reg.
+         */
+        if (lec_type == LEC_UNUSED || lec_type == LEC_NO_ERROR)
+                return 0;
+
+        /* propogate the error condition to the CAN stack */
+        skb = alloc_can_err_skb(dev, &cf);
+        if (unlikely(!skb))
+                return 0;
+
+        /*
+         * check for 'last error code' which tells us the
+         * type of the last error to occur on the CAN bus
+         */
+
+        /* common for all type of bus errors */
+        priv->can.can_stats.bus_error++;
+        stats->rx_errors++;
+        cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
+        cf->data[2] |= CAN_ERR_PROT_UNSPEC;
+
+        switch (lec_type) {
+        case LEC_STUFF_ERROR:
+                netdev_dbg(dev, "stuff error\n");
+                cf->data[2] |= CAN_ERR_PROT_STUFF;
+                break;
+        case LEC_FORM_ERROR:
+                netdev_dbg(dev, "form error\n");
+                cf->data[2] |= CAN_ERR_PROT_FORM;
+                break;
+        case LEC_ACK_ERROR:
+                netdev_dbg(dev, "ack error\n");
+                cf->data[2] |= (CAN_ERR_PROT_LOC_ACK |
+                                CAN_ERR_PROT_LOC_ACK_DEL);
+                break;
+        case LEC_BIT1_ERROR:
+                netdev_dbg(dev, "bit1 error\n");
+                cf->data[2] |= CAN_ERR_PROT_BIT1;
+                break;
+        case LEC_BIT0_ERROR:
+                netdev_dbg(dev, "bit0 error\n");
+                cf->data[2] |= CAN_ERR_PROT_BIT0;
+                break;
+        case LEC_CRC_ERROR:
+                netdev_dbg(dev, "CRC error\n");
+                cf->data[2] |= (CAN_ERR_PROT_LOC_CRC_SEQ |
+                                CAN_ERR_PROT_LOC_CRC_DEL);
+                break;
+        default:
+                break;
+        }
+
+        /* set a `lec` value so that we can check for updates later */
+        priv->write_reg(priv, &priv->regs->status, LEC_UNUSED);
+
+        netif_receive_skb(skb);
+        stats->rx_packets++;
+        stats->rx_bytes += cf->can_dlc;
+
+        return 1;
+}
+
+static int c_can_poll(struct napi_struct *napi, int quota)
+{
+        u16 irqstatus;
+        int lec_type = 0;
+        int work_done = 0;
+        struct net_device *dev = napi->dev;
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        irqstatus = priv->read_reg(priv, &priv->regs->interrupt);
+        if (!irqstatus)
+                goto end;
+
+        /* status events have the highest priority */
+        if (irqstatus == STATUS_INTERRUPT) {
+                priv->current_status = priv->read_reg(priv,
+                                        &priv->regs->status);
+
+                /* handle Tx/Rx events */
+                if (priv->current_status & STATUS_TXOK)
+                        priv->write_reg(priv, &priv->regs->status,
+                                        priv->current_status & ~STATUS_TXOK);
+
+                if (priv->current_status & STATUS_RXOK)
+                        priv->write_reg(priv, &priv->regs->status,
+                                        priv->current_status & ~STATUS_RXOK);
+
+                /* handle state changes */
+                if ((priv->current_status & STATUS_EWARN) &&
+                                (!(priv->last_status & STATUS_EWARN))) {
+                        netdev_dbg(dev, "entered error warning state\n");
+                        work_done += c_can_handle_state_change(dev,
+                                                C_CAN_ERROR_WARNING);
+                }
+                if ((priv->current_status & STATUS_EPASS) &&
+                                (!(priv->last_status & STATUS_EPASS))) {
+                        netdev_dbg(dev, "entered error passive state\n");
+                        work_done += c_can_handle_state_change(dev,
+                                                C_CAN_ERROR_PASSIVE);
+                }
+                if ((priv->current_status & STATUS_BOFF) &&
+                                (!(priv->last_status & STATUS_BOFF))) {
+                        netdev_dbg(dev, "entered bus off state\n");
+                        work_done += c_can_handle_state_change(dev,
+                                                C_CAN_BUS_OFF);
+                }
+
+                /* handle bus recovery events */
+                if ((!(priv->current_status & STATUS_BOFF)) &&
+                                (priv->last_status & STATUS_BOFF)) {
+                        netdev_dbg(dev, "left bus off state\n");
+                        priv->can.state = CAN_STATE_ERROR_ACTIVE;
+                }
+                if ((!(priv->current_status & STATUS_EPASS)) &&
+                                (priv->last_status & STATUS_EPASS)) {
+                        netdev_dbg(dev, "left error passive state\n");
+                        priv->can.state = CAN_STATE_ERROR_ACTIVE;
+                }
+
+                priv->last_status = priv->current_status;
+
+                /* handle lec errors on the bus */
+                lec_type = c_can_has_and_handle_berr(priv);
+                if (lec_type)
+                        work_done += c_can_handle_bus_err(dev, lec_type);
+        } else if ((irqstatus >= C_CAN_MSG_OBJ_RX_FIRST) &&
+                        (irqstatus <= C_CAN_MSG_OBJ_RX_LAST)) {
+                /* handle events corresponding to receive message objects */
+                work_done += c_can_do_rx_poll(dev, (quota - work_done));
+        } else if ((irqstatus >= C_CAN_MSG_OBJ_TX_FIRST) &&
+                        (irqstatus <= C_CAN_MSG_OBJ_TX_LAST)) {
+                /* handle events corresponding to transmit message objects */
+                c_can_do_tx(dev);
+        }
+
+end:
+        if (work_done < quota) {
+                napi_complete(napi);
+                /* enable all IRQs */
+                c_can_enable_all_interrupts(priv, ENABLE_ALL_INTERRUPTS);
+        }
+
+        return work_done;
+}
+
+static irqreturn_t c_can_isr(int irq, void *dev_id)
+{
+        u16 irqstatus;
+        struct net_device *dev = (struct net_device *)dev_id;
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        irqstatus = priv->read_reg(priv, &priv->regs->interrupt);
+        if (!irqstatus)
+                return IRQ_NONE;
+
+        /* disable all interrupts and schedule the NAPI */
+        c_can_enable_all_interrupts(priv, DISABLE_ALL_INTERRUPTS);
+        napi_schedule(&priv->napi);
+
+        return IRQ_HANDLED;
+}
+
+static int c_can_open(struct net_device *dev)
+{
+        int err;
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        /* open the can device */
+        err = open_candev(dev);
+        if (err) {
+                netdev_err(dev, "failed to open can device\n");
+                return err;
+        }
+
+        /* register interrupt handler */
+        err = request_irq(dev->irq, &c_can_isr, IRQF_SHARED, dev->name,
+                                dev);
+        if (err < 0) {
+                netdev_err(dev, "failed to request interrupt\n");
+                goto exit_irq_fail;
+        }
+
+        /* start the c_can controller */
+        c_can_start(dev);
+
+        napi_enable(&priv->napi);
+        netif_start_queue(dev);
+
+        return 0;
+
+exit_irq_fail:
+        close_candev(dev);
+        return err;
+}
+
+static int c_can_close(struct net_device *dev)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        netif_stop_queue(dev);
+        napi_disable(&priv->napi);
+        c_can_stop(dev);
+        free_irq(dev->irq, dev);
+        close_candev(dev);
+
+        return 0;
+}
+
+struct net_device *alloc_c_can_dev(void)
+{
+        struct net_device *dev;
+        struct c_can_priv *priv;
+
+        dev = alloc_candev(sizeof(struct c_can_priv), C_CAN_MSG_OBJ_TX_NUM);
+        if (!dev)
+                return NULL;
+
+        priv = netdev_priv(dev);
+        netif_napi_add(dev, &priv->napi, c_can_poll, C_CAN_NAPI_WEIGHT);
+
+        priv->dev = dev;
+        priv->can.bittiming_const = &c_can_bittiming_const;
+        priv->can.do_set_mode = c_can_set_mode;
+        priv->can.do_get_berr_counter = c_can_get_berr_counter;
+        priv->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |
+                                        CAN_CTRLMODE_LISTENONLY |
+                                        CAN_CTRLMODE_BERR_REPORTING;
+
+        return dev;
+}
+EXPORT_SYMBOL_GPL(alloc_c_can_dev);
+
+void free_c_can_dev(struct net_device *dev)
+{
+        free_candev(dev);
+}
+EXPORT_SYMBOL_GPL(free_c_can_dev);
+
+static const struct net_device_ops c_can_netdev_ops = {
+        .ndo_open = c_can_open,
+        .ndo_stop = c_can_close,
+        .ndo_start_xmit = c_can_start_xmit,
+};
+
+int register_c_can_dev(struct net_device *dev)
+{
+        dev->flags |= IFF_ECHO; /* we support local echo */
+        dev->netdev_ops = &c_can_netdev_ops;
+
+        return register_candev(dev);
+}
+EXPORT_SYMBOL_GPL(register_c_can_dev);
+
+void unregister_c_can_dev(struct net_device *dev)
+{
+        struct c_can_priv *priv = netdev_priv(dev);
+
+        /* disable all interrupts */
+        c_can_enable_all_interrupts(priv, DISABLE_ALL_INTERRUPTS);
+
+        unregister_candev(dev);
+}
+EXPORT_SYMBOL_GPL(unregister_c_can_dev);
+
+MODULE_AUTHOR("Bhupesh Sharma <bhupesh.sharma@st.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("CAN bus driver for Bosch C_CAN controller");
diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h
new file mode 100644
index 00000000000..9b7fbef3d09
--- /dev/null
+++ b/drivers/net/can/c_can/c_can.h
@@ -0,0 +1,86 @@
+/*
+ * CAN bus driver for Bosch C_CAN controller
+ *
+ * Copyright (C) 2010 ST Microelectronics
+ * Bhupesh Sharma <bhupesh.sharma@st.com>
+ *
+ * Borrowed heavily from the C_CAN driver originally written by:
+ * Copyright (C) 2007
+ * - Sascha Hauer, Marc Kleine-Budde, Pengutronix <s.hauer@pengutronix.de>
+ * - Simon Kallweit, intefo AG <simon.kallweit@intefo.ch>
+ *
+ * Bosch C_CAN controller is compliant to CAN protocol version 2.0 part A and B.
+ * Bosch C_CAN user manual can be obtained from:
+ * http://www.semiconductors.bosch.de/media/en/pdf/ipmodules_1/c_can/
+ * users_manual_c_can.pdf
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#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];
+};
+
+/* 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];
+};
+
+/* c_can private data structure */
+struct c_can_priv {
+        struct can_priv can;    /* must be the first member */
+        struct napi_struct napi;
+        struct net_device *dev;
+        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;
+        unsigned long irq_flags; /* for request_irq() */
+        unsigned int tx_next;
+        unsigned int tx_echo;
+        void *priv;             /* for board-specific data */
+};
+
+struct net_device *alloc_c_can_dev(void);
+void free_c_can_dev(struct net_device *dev);
+int register_c_can_dev(struct net_device *dev);
+void unregister_c_can_dev(struct net_device *dev);
+
+#endif /* C_CAN_H */
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
new file mode 100644
index 00000000000..cc90824f2c9
--- /dev/null
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -0,0 +1,216 @@
+/*
+ * Platform CAN bus driver for Bosch C_CAN controller
+ *
+ * Copyright (C) 2010 ST Microelectronics
+ * Bhupesh Sharma <bhupesh.sharma@st.com>
+ *
+ * Borrowed heavily from the C_CAN driver originally written by:
+ * Copyright (C) 2007
+ * - Sascha Hauer, Marc Kleine-Budde, Pengutronix <s.hauer@pengutronix.de>
+ * - Simon Kallweit, intefo AG <simon.kallweit@intefo.ch>
+ *
+ * Bosch C_CAN controller is compliant to CAN protocol version 2.0 part A and B.
+ * Bosch C_CAN user manual can be obtained from:
+ * http://www.semiconductors.bosch.de/media/en/pdf/ipmodules_1/c_can/
+ * users_manual_c_can.pdf
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/netdevice.h>
+#include <linux/if_arp.h>
+#include <linux/if_ether.h>
+#include <linux/list.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+
+#include <linux/can/dev.h>
+
+#include "c_can.h"
+
+/*
+ * 16-bit c_can registers can be arranged differently in the memory
+ * architecture of different implementations. For example: 16-bit
+ * registers can be aligned to a 16-bit boundary or 32-bit boundary etc.
+ * 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)
+{
+        return readw(reg);
+}
+
+static void c_can_plat_write_reg_aligned_to_16bit(struct c_can_priv *priv,
+                                                void *reg, u16 val)
+{
+        writew(val, reg);
+}
+
+static u16 c_can_plat_read_reg_aligned_to_32bit(struct c_can_priv *priv,
+                                                void *reg)
+{
+        return readw(reg + (long)reg - (long)priv->regs);
+}
+
+static void c_can_plat_write_reg_aligned_to_32bit(struct c_can_priv *priv,
+                                                void *reg, u16 val)
+{
+        writew(val, reg + (long)reg - (long)priv->regs);
+}
+
+static int __devinit c_can_plat_probe(struct platform_device *pdev)
+{
+        int ret;
+        void __iomem *addr;
+        struct net_device *dev;
+        struct c_can_priv *priv;
+        struct resource *mem;
+        int irq;
+#ifdef CONFIG_HAVE_CLK
+        struct clk *clk;
+
+        /* get the appropriate clk */
+        clk = clk_get(&pdev->dev, NULL);
+        if (IS_ERR(clk)) {
+                dev_err(&pdev->dev, "no clock defined\n");
+                ret = -ENODEV;
+                goto exit;
+        }
+#endif
+
+        /* get the platform data */
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        irq = platform_get_irq(pdev, 0);
+        if (!mem || irq <= 0) {
+                ret = -ENODEV;
+                goto exit_free_clk;
+        }
+
+        if (!request_mem_region(mem->start, resource_size(mem),
+                                KBUILD_MODNAME)) {
+                dev_err(&pdev->dev, "resource unavailable\n");
+                ret = -ENODEV;
+                goto exit_free_clk;
+        }
+
+        addr = ioremap(mem->start, resource_size(mem));
+        if (!addr) {
+                dev_err(&pdev->dev, "failed to map can port\n");
+                ret = -ENOMEM;
+                goto exit_release_mem;
+        }
+
+        /* allocate the c_can device */
+        dev = alloc_c_can_dev();
+        if (!dev) {
+                ret = -ENOMEM;
+                goto exit_iounmap;
+        }
+
+        priv = netdev_priv(dev);
+
+        dev->irq = irq;
+        priv->regs = 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);
+
+        ret = register_c_can_dev(dev);
+        if (ret) {
+                dev_err(&pdev->dev, "registering %s failed (err=%d)\n",
+                        KBUILD_MODNAME, ret);
+                goto exit_free_device;
+        }
+
+        dev_info(&pdev->dev, "%s device registered (regs=%p, irq=%d)\n",
+                 KBUILD_MODNAME, priv->regs, dev->irq);
+        return 0;
+
+exit_free_device:
+        platform_set_drvdata(pdev, NULL);
+        free_c_can_dev(dev);
+exit_iounmap:
+        iounmap(addr);
+exit_release_mem:
+        release_mem_region(mem->start, resource_size(mem));
+exit_free_clk:
+#ifdef CONFIG_HAVE_CLK
+        clk_put(clk);
+exit:
+#endif
+        dev_err(&pdev->dev, "probe failed\n");
+
+        return ret;
+}
+
+static int __devexit c_can_plat_remove(struct platform_device *pdev)
+{
+        struct net_device *dev = platform_get_drvdata(pdev);
+        struct c_can_priv *priv = netdev_priv(dev);
+        struct resource *mem;
+
+        unregister_c_can_dev(dev);
+        platform_set_drvdata(pdev, NULL);
+
+        free_c_can_dev(dev);
+        iounmap(priv->regs);
+
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(mem->start, resource_size(mem));
+
+#ifdef CONFIG_HAVE_CLK
+        clk_put(priv->priv);
+#endif
+
+        return 0;
+}
+
+static struct platform_driver c_can_plat_driver = {
+        .driver = {
+                .name = KBUILD_MODNAME,
+                .owner = THIS_MODULE,
+        },
+        .probe = c_can_plat_probe,
+        .remove = __devexit_p(c_can_plat_remove),
+};
+
+static int __init c_can_plat_init(void)
+{
+        return platform_driver_register(&c_can_plat_driver);
+}
+module_init(c_can_plat_init);
+
+static void __exit c_can_plat_exit(void)
+{
+        platform_driver_unregister(&c_can_plat_driver);
+}
+module_exit(c_can_plat_exit);
+
+MODULE_AUTHOR("Bhupesh Sharma <bhupesh.sharma@st.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("Platform CAN bus driver for Bosch C_CAN controller");
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index b9a6d7a5a73..102b16c6cc9 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -15,6 +15,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
+#include <linux/mfd/core.h>
 
 #include <linux/netdevice.h>
 #include <linux/can.h>
@@ -1618,7 +1619,7 @@ static ssize_t ican3_sysfs_set_term(struct device *dev,
         return count;
 }
 
-static DEVICE_ATTR(termination, S_IWUGO | S_IRUGO, ican3_sysfs_show_term,
+static DEVICE_ATTR(termination, S_IWUSR | S_IRUGO, ican3_sysfs_show_term,
                                                    ican3_sysfs_set_term);
 
 static struct attribute *ican3_sysfs_attrs[] = {
@@ -1643,7 +1644,7 @@ static int __devinit ican3_probe(struct platform_device *pdev)
         struct device *dev;
         int ret;
 
-        pdata = pdev->dev.platform_data;
+        pdata = mfd_get_data(pdev);
         if (!pdata)
                 return -ENXIO;
 
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index 7ab534aee45..7513c4523ac 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -940,7 +940,7 @@ static int mcp251x_open(struct net_device *net)
                 goto open_unlock;
         }
 
-        priv->wq = create_freezeable_workqueue("mcp251x_wq");
+        priv->wq = create_freezable_workqueue("mcp251x_wq");
         INIT_WORK(&priv->tx_work, mcp251x_tx_work_handler);
         INIT_WORK(&priv->restart_work, mcp251x_restart_work_handler);
 
diff --git a/drivers/net/can/mscan/Kconfig b/drivers/net/can/mscan/Kconfig
index 27d1d398e25..d38706958af 100644
--- a/drivers/net/can/mscan/Kconfig
+++ b/drivers/net/can/mscan/Kconfig
@@ -1,5 +1,5 @@
 config CAN_MSCAN
-        depends on CAN_DEV && (PPC || M68K || M68KNOMMU)
+        depends on CAN_DEV && (PPC || M68K)
         tristate "Support for Freescale MSCAN based chips"
         ---help---
           The Motorola Scalable Controller Area Network (MSCAN) definition
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index 312b9c8f4f3..c0a1bc5b143 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -247,10 +247,9 @@ static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev,
 }
 #endif /* CONFIG_PPC_MPC512x */
 
-static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev,
-                                       const struct of_device_id *id)
+static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev)
 {
-        struct mpc5xxx_can_data *data = (struct mpc5xxx_can_data *)id->data;
+        struct mpc5xxx_can_data *data;
         struct device_node *np = ofdev->dev.of_node;
         struct net_device *dev;
         struct mscan_priv *priv;
@@ -259,6 +258,10 @@ static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev,
         int irq, mscan_clksrc = 0;
         int err = -ENOMEM;
 
+        if (!ofdev->dev.of_match)
+                return -EINVAL;
+        data = (struct mpc5xxx_can_data *)of_dev->dev.of_match->data;
+
         base = of_iomap(np, 0);
         if (!base) {
                 dev_err(&ofdev->dev, "couldn't ioremap\n");
@@ -391,7 +394,7 @@ static struct of_device_id __devinitdata mpc5xxx_can_table[] = {
         {},
 };
 
-static struct of_platform_driver mpc5xxx_can_driver = {
+static struct platform_driver mpc5xxx_can_driver = {
         .driver = {
                 .name = "mpc5xxx_can",
                 .owner = THIS_MODULE,
@@ -407,13 +410,13 @@ static struct of_platform_driver mpc5xxx_can_driver = {
 
 static int __init mpc5xxx_can_init(void)
 {
-        return of_register_platform_driver(&mpc5xxx_can_driver);
+        return platform_driver_register(&mpc5xxx_can_driver);
 }
 module_init(mpc5xxx_can_init);
 
 static void __exit mpc5xxx_can_exit(void)
 {
-        return of_unregister_platform_driver(&mpc5xxx_can_driver);
+        platform_driver_unregister(&mpc5xxx_can_driver);
 };
 module_exit(mpc5xxx_can_exit);
 
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index c42e9726824..e54712b22c2 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -185,7 +185,7 @@ struct pch_can_priv {
 
 static struct can_bittiming_const pch_can_bittiming_const = {
         .name = KBUILD_MODNAME,
-        .tseg1_min = 1,
+        .tseg1_min = 2,
         .tseg1_max = 16,
         .tseg2_min = 1,
         .tseg2_max = 8,
@@ -959,13 +959,13 @@ static void __devexit pch_can_remove(struct pci_dev *pdev)
         struct pch_can_priv *priv = netdev_priv(ndev);
 
         unregister_candev(priv->ndev);
-        pci_iounmap(pdev, priv->regs);
         if (priv->use_msi)
                 pci_disable_msi(priv->dev);
         pci_release_regions(pdev);
         pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
         pch_can_reset(priv);
+        pci_iounmap(pdev, priv->regs);
         free_candev(priv->ndev);
 }
 
@@ -1238,6 +1238,7 @@ static int __devinit pch_can_probe(struct pci_dev *pdev,
                 priv->use_msi = 0;
         } else {
                 netdev_err(ndev, "PCH CAN opened with MSI\n");
+                pci_set_master(pdev);
                 priv->use_msi = 1;
         }
 
diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c
index 09c3e9db931..9793df6e345 100644
--- a/drivers/net/can/sja1000/sja1000_of_platform.c
+++ b/drivers/net/can/sja1000/sja1000_of_platform.c
@@ -87,8 +87,7 @@ static int __devexit sja1000_ofp_remove(struct platform_device *ofdev)
         return 0;
 }
 
-static int __devinit sja1000_ofp_probe(struct platform_device *ofdev,
-                                       const struct of_device_id *id)
+static int __devinit sja1000_ofp_probe(struct platform_device *ofdev)
 {
         struct device_node *np = ofdev->dev.of_node;
         struct net_device *dev;
@@ -210,7 +209,7 @@ static struct of_device_id __devinitdata sja1000_ofp_table[] = {
 };
 MODULE_DEVICE_TABLE(of, sja1000_ofp_table);
 
-static struct of_platform_driver sja1000_ofp_driver = {
+static struct platform_driver sja1000_ofp_driver = {
         .driver = {
                 .owner = THIS_MODULE,
                 .name = DRV_NAME,
@@ -222,12 +221,12 @@ static struct of_platform_driver sja1000_ofp_driver = {
 
 static int __init sja1000_ofp_init(void)
 {
-        return of_register_platform_driver(&sja1000_ofp_driver);
+        return platform_driver_register(&sja1000_ofp_driver);
 }
 module_init(sja1000_ofp_init);
 
 static void __exit sja1000_ofp_exit(void)
 {
-        return of_unregister_platform_driver(&sja1000_ofp_driver);
+        return platform_driver_unregister(&sja1000_ofp_driver);
 };
 module_exit(sja1000_ofp_exit);
diff --git a/drivers/net/can/softing/Kconfig b/drivers/net/can/softing/Kconfig
new file mode 100644
index 00000000000..5de46a9a77b
--- /dev/null
+++ b/drivers/net/can/softing/Kconfig
@@ -0,0 +1,30 @@
+config CAN_SOFTING
+        tristate "Softing Gmbh CAN generic support"
+        depends on CAN_DEV && HAS_IOMEM
+        ---help---
+          Support for CAN cards from Softing Gmbh & some cards
+          from Vector Gmbh.
+          Softing Gmbh CAN cards come with 1 or 2 physical busses.
+          Those cards typically use Dual Port RAM to communicate
+          with the host CPU. The interface is then identical for PCI
+          and PCMCIA cards. This driver operates on a platform device,
+          which has been created by softing_cs or softing_pci driver.
+          Warning:
+          The API of the card does not allow fine control per bus, but
+          controls the 2 busses on the card together.
+          As such, some actions (start/stop/busoff recovery) on 1 bus
+          must bring down the other bus too temporarily.
+
+config CAN_SOFTING_CS
+        tristate "Softing Gmbh CAN pcmcia cards"
+        depends on PCMCIA
+        depends on CAN_SOFTING
+        ---help---
+          Support for PCMCIA cards from Softing Gmbh & some cards
+          from Vector Gmbh.
+          You need firmware for these, which you can get at
+          http://developer.berlios.de/projects/socketcan/
+          This version of the driver is written against
+          firmware version 4.6 (softing-fw-4.6-binaries.tar.gz)
+          In order to use the card as CAN device, you need the Softing generic
+          support too.
diff --git a/drivers/net/can/softing/Makefile b/drivers/net/can/softing/Makefile
new file mode 100644
index 00000000000..c5e5016c742
--- /dev/null
+++ b/drivers/net/can/softing/Makefile
@@ -0,0 +1,6 @@
+
+softing-y := softing_main.o softing_fw.o
+obj-$(CONFIG_CAN_SOFTING) += softing.o
+obj-$(CONFIG_CAN_SOFTING_CS) += softing_cs.o
+
+ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
diff --git a/drivers/net/can/softing/softing.h b/drivers/net/can/softing/softing.h
new file mode 100644
index 00000000000..7ec9f4db3d5
--- /dev/null
+++ b/drivers/net/can/softing/softing.h
@@ -0,0 +1,167 @@
+/*
+ * softing common interfaces
+ *
+ * by Kurt Van Dijck, 2008-2010
+ */
+
+#include <linux/atomic.h>
+#include <linux/netdevice.h>
+#include <linux/ktime.h>
+#include <linux/mutex.h>
+#include <linux/spinlock.h>
+#include <linux/can.h>
+#include <linux/can/dev.h>
+
+#include "softing_platform.h"
+
+struct softing;
+
+struct softing_priv {
+        struct can_priv can; /* must be the first member! */
+        struct net_device *netdev;
+        struct softing *card;
+        struct {
+                int pending;
+                /* variables wich hold the circular buffer */
+                int echo_put;
+                int echo_get;
+        } tx;
+        struct can_bittiming_const btr_const;
+        int index;
+        uint8_t output;
+        uint16_t chip;
+};
+#define netdev2softing(netdev)  ((struct softing_priv *)netdev_priv(netdev))
+
+struct softing {
+        const struct softing_platform_data *pdat;
+        struct platform_device *pdev;
+        struct net_device *net[2];
+        spinlock_t spin; /* protect this structure & DPRAM access */
+        ktime_t ts_ref;
+        ktime_t ts_overflow; /* timestamp overflow value, in ktime */
+
+        struct {
+                /* indication of firmware status */
+                int up;
+                /* protection of the 'up' variable */
+                struct mutex lock;
+        } fw;
+        struct {
+                int nr;
+                int requested;
+                int svc_count;
+                unsigned int dpram_position;
+        } irq;
+        struct {
+                int pending;
+                int last_bus;
+                /*
+                 * keep the bus that last tx'd a message,
+                 * in order to let every netdev queue resume
+                 */
+        } tx;
+        __iomem uint8_t *dpram;
+        unsigned long dpram_phys;
+        unsigned long dpram_size;
+        struct {
+                uint16_t fw_version, hw_version, license, serial;
+                uint16_t chip[2];
+                unsigned int freq; /* remote cpu's operating frequency */
+        } id;
+};
+
+extern int softing_default_output(struct net_device *netdev);
+
+extern ktime_t softing_raw2ktime(struct softing *card, u32 raw);
+
+extern int softing_chip_poweron(struct softing *card);
+
+extern int softing_bootloader_command(struct softing *card, int16_t cmd,
+                const char *msg);
+
+/* Load firmware after reset */
+extern int softing_load_fw(const char *file, struct softing *card,
+                        __iomem uint8_t *virt, unsigned int size, int offset);
+
+/* Load final application firmware after bootloader */
+extern int softing_load_app_fw(const char *file, struct softing *card);
+
+/*
+ * enable or disable irq
+ * only called with fw.lock locked
+ */
+extern int softing_enable_irq(struct softing *card, int enable);
+
+/* start/stop 1 bus on card */
+extern int softing_startstop(struct net_device *netdev, int up);
+
+/* netif_rx() */
+extern int softing_netdev_rx(struct net_device *netdev,
+                const struct can_frame *msg, ktime_t ktime);
+
+/* SOFTING DPRAM mappings */
+#define DPRAM_RX                0x0000
+        #define DPRAM_RX_SIZE   32
+        #define DPRAM_RX_CNT    16
+#define DPRAM_RX_RD             0x0201  /* uint8_t */
+#define DPRAM_RX_WR             0x0205  /* uint8_t */
+#define DPRAM_RX_LOST           0x0207  /* uint8_t */
+
+#define DPRAM_FCT_PARAM         0x0300  /* int16_t [20] */
+#define DPRAM_FCT_RESULT        0x0328  /* int16_t */
+#define DPRAM_FCT_HOST          0x032b  /* uint16_t */
+
+#define DPRAM_INFO_BUSSTATE     0x0331  /* uint16_t */
+#define DPRAM_INFO_BUSSTATE2    0x0335  /* uint16_t */
+#define DPRAM_INFO_ERRSTATE     0x0339  /* uint16_t */
+#define DPRAM_INFO_ERRSTATE2    0x033d  /* uint16_t */
+#define DPRAM_RESET             0x0341  /* uint16_t */
+#define DPRAM_CLR_RECV_FIFO     0x0345  /* uint16_t */
+#define DPRAM_RESET_TIME        0x034d  /* uint16_t */
+#define DPRAM_TIME              0x0350  /* uint64_t */
+#define DPRAM_WR_START          0x0358  /* uint8_t */
+#define DPRAM_WR_END            0x0359  /* uint8_t */
+#define DPRAM_RESET_RX_FIFO     0x0361  /* uint16_t */
+#define DPRAM_RESET_TX_FIFO     0x0364  /* uint8_t */
+#define DPRAM_READ_FIFO_LEVEL   0x0365  /* uint8_t */
+#define DPRAM_RX_FIFO_LEVEL     0x0366  /* uint16_t */
+#define DPRAM_TX_FIFO_LEVEL     0x0366  /* uint16_t */
+
+#define DPRAM_TX                0x0400  /* uint16_t */
+        #define DPRAM_TX_SIZE   16
+        #define DPRAM_TX_CNT    32
+#define DPRAM_TX_RD             0x0601  /* uint8_t */
+#define DPRAM_TX_WR             0x0605  /* uint8_t */
+
+#define DPRAM_COMMAND           0x07e0  /* uint16_t */
+#define DPRAM_RECEIPT           0x07f0  /* uint16_t */
+#define DPRAM_IRQ_TOHOST        0x07fe  /* uint8_t */
+#define DPRAM_IRQ_TOCARD        0x07ff  /* uint8_t */
+
+#define DPRAM_V2_RESET          0x0e00  /* uint8_t */
+#define DPRAM_V2_IRQ_TOHOST     0x0e02  /* uint8_t */
+
+#define TXMAX   (DPRAM_TX_CNT - 1)
+
+/* DPRAM return codes */
+#define RES_NONE        0
+#define RES_OK          1
+#define RES_NOK         2
+#define RES_UNKNOWN     3
+/* DPRAM flags */
+#define CMD_TX          0x01
+#define CMD_ACK         0x02
+#define CMD_XTD         0x04
+#define CMD_RTR         0x08
+#define CMD_ERR         0x10
+#define CMD_BUS2        0x80
+
+/* returned fifo entry bus state masks */
+#define SF_MASK_BUSOFF          0x80
+#define SF_MASK_EPASSIVE        0x60
+
+/* bus states */
+#define STATE_BUSOFF    2
+#define STATE_EPASSIVE  1
+#define STATE_EACTIVE   0
diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c
new file mode 100644
index 00000000000..c11bb4de863
--- /dev/null
+++ b/drivers/net/can/softing/softing_cs.c
@@ -0,0 +1,360 @@
+/*
+ * Copyright (C) 2008-2010
+ *
+ * - Kurt Van Dijck, EIA Electronics
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+
+#include <pcmcia/cistpl.h>
+#include <pcmcia/ds.h>
+
+#include "softing_platform.h"
+
+static int softingcs_index;
+static spinlock_t softingcs_index_lock;
+
+static int softingcs_reset(struct platform_device *pdev, int v);
+static int softingcs_enable_irq(struct platform_device *pdev, int v);
+
+/*
+ * platform_data descriptions
+ */
+#define MHZ (1000*1000)
+static const struct softing_platform_data softingcs_platform_data[] = {
+{
+        .name = "CANcard",
+        .manf = 0x0168, .prod = 0x001,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 16 * MHZ, .max_brp = 32, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "CANcard-NEC",
+        .manf = 0x0168, .prod = 0x002,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 16 * MHZ, .max_brp = 32, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "CANcard-SJA",
+        .manf = 0x0168, .prod = 0x004,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 20 * MHZ, .max_brp = 32, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cansja.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "CANcard-2",
+        .manf = 0x0168, .prod = 0x005,
+        .generation = 2,
+        .nbus = 2,
+        .freq = 24 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x1000,
+        .boot = {0x0000, 0x000000, fw_dir "bcard2.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard2.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancrd2.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = NULL,
+}, {
+        .name = "Vector-CANcard",
+        .manf = 0x0168, .prod = 0x081,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 16 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "Vector-CANcard-SJA",
+        .manf = 0x0168, .prod = 0x084,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 20 * MHZ, .max_brp = 32, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cansja.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "Vector-CANcard-2",
+        .manf = 0x0168, .prod = 0x085,
+        .generation = 2,
+        .nbus = 2,
+        .freq = 24 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x1000,
+        .boot = {0x0000, 0x000000, fw_dir "bcard2.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard2.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancrd2.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = NULL,
+}, {
+        .name = "EDICcard-NEC",
+        .manf = 0x0168, .prod = 0x102,
+        .generation = 1,
+        .nbus = 2,
+        .freq = 16 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x0800,
+        .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = softingcs_enable_irq,
+}, {
+        .name = "EDICcard-2",
+        .manf = 0x0168, .prod = 0x105,
+        .generation = 2,
+        .nbus = 2,
+        .freq = 24 * MHZ, .max_brp = 64, .max_sjw = 4,
+        .dpram_size = 0x1000,
+        .boot = {0x0000, 0x000000, fw_dir "bcard2.bin",},
+        .load = {0x0120, 0x00f600, fw_dir "ldcard2.bin",},
+        .app = {0x0010, 0x0d0000, fw_dir "cancrd2.bin",},
+        .reset = softingcs_reset,
+        .enable_irq = NULL,
+}, {
+        0, 0,
+},
+};
+
+MODULE_FIRMWARE(fw_dir "bcard.bin");
+MODULE_FIRMWARE(fw_dir "ldcard.bin");
+MODULE_FIRMWARE(fw_dir "cancard.bin");
+MODULE_FIRMWARE(fw_dir "cansja.bin");
+
+MODULE_FIRMWARE(fw_dir "bcard2.bin");
+MODULE_FIRMWARE(fw_dir "ldcard2.bin");
+MODULE_FIRMWARE(fw_dir "cancrd2.bin");
+
+static __devinit const struct softing_platform_data
+*softingcs_find_platform_data(unsigned int manf, unsigned int prod)
+{
+        const struct softing_platform_data *lp;
+
+        for (lp = softingcs_platform_data; lp->manf; ++lp) {
+                if ((lp->manf == manf) && (lp->prod == prod))
+                        return lp;
+        }
+        return NULL;
+}
+
+/*
+ * platformdata callbacks
+ */
+static int softingcs_reset(struct platform_device *pdev, int v)
+{
+        struct pcmcia_device *pcmcia = to_pcmcia_dev(pdev->dev.parent);
+
+        dev_dbg(&pdev->dev, "pcmcia config [2] %02x\n", v ? 0 : 0x20);
+        return pcmcia_write_config_byte(pcmcia, 2, v ? 0 : 0x20);
+}
+
+static int softingcs_enable_irq(struct platform_device *pdev, int v)
+{
+        struct pcmcia_device *pcmcia = to_pcmcia_dev(pdev->dev.parent);
+
+        dev_dbg(&pdev->dev, "pcmcia config [0] %02x\n", v ? 0x60 : 0);
+        return pcmcia_write_config_byte(pcmcia, 0, v ? 0x60 : 0);
+}
+
+/*
+ * pcmcia check
+ */
+static __devinit int softingcs_probe_config(struct pcmcia_device *pcmcia,
+                void *priv_data)
+{
+        struct softing_platform_data *pdat = priv_data;
+        struct resource *pres;
+        int memspeed = 0;
+
+        WARN_ON(!pdat);
+        pres = pcmcia->resource[PCMCIA_IOMEM_0];
+        if (resource_size(pres) < 0x1000)
+                return -ERANGE;
+
+        pres->flags |= WIN_MEMORY_TYPE_CM | WIN_ENABLE;
+        if (pdat->generation < 2) {
+                pres->flags |= WIN_USE_WAIT | WIN_DATA_WIDTH_8;
+                memspeed = 3;
+        } else {
+                pres->flags |= WIN_DATA_WIDTH_16;
+        }
+        return pcmcia_request_window(pcmcia, pres, memspeed);
+}
+
+static __devexit void softingcs_remove(struct pcmcia_device *pcmcia)
+{
+        struct platform_device *pdev = pcmcia->priv;
+
+        /* free bits */
+        platform_device_unregister(pdev);
+        /* release pcmcia stuff */
+        pcmcia_disable_device(pcmcia);
+}
+
+/*
+ * platform_device wrapper
+ * pdev->resource has 2 entries: io & irq
+ */
+static void softingcs_pdev_release(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        kfree(pdev);
+}
+
+static __devinit int softingcs_probe(struct pcmcia_device *pcmcia)
+{
+        int ret;
+        struct platform_device *pdev;
+        const struct softing_platform_data *pdat;
+        struct resource *pres;
+        struct dev {
+                struct platform_device pdev;
+                struct resource res[2];
+        } *dev;
+
+        /* find matching platform_data */
+        pdat = softingcs_find_platform_data(pcmcia->manf_id, pcmcia->card_id);
+        if (!pdat)
+                return -ENOTTY;
+
+        /* setup pcmcia device */
+        pcmcia->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IOMEM |
+                CONF_AUTO_SET_VPP | CONF_AUTO_CHECK_VCC;
+        ret = pcmcia_loop_config(pcmcia, softingcs_probe_config, (void *)pdat);
+        if (ret)
+                goto pcmcia_failed;
+
+        ret = pcmcia_enable_device(pcmcia);
+        if (ret < 0)
+                goto pcmcia_failed;
+
+        pres = pcmcia->resource[PCMCIA_IOMEM_0];
+        if (!pres) {
+                ret = -EBADF;
+                goto pcmcia_bad;
+        }
+
+        /* create softing platform device */
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev) {
+                ret = -ENOMEM;
+                goto mem_failed;
+        }
+        dev->pdev.resource = dev->res;
+        dev->pdev.num_resources = ARRAY_SIZE(dev->res);
+        dev->pdev.dev.release = softingcs_pdev_release;
+
+        pdev = &dev->pdev;
+        pdev->dev.platform_data = (void *)pdat;
+        pdev->dev.parent = &pcmcia->dev;
+        pcmcia->priv = pdev;
+
+        /* platform device resources */
+        pdev->resource[0].flags = IORESOURCE_MEM;
+        pdev->resource[0].start = pres->start;
+        pdev->resource[0].end = pres->end;
+
+        pdev->resource[1].flags = IORESOURCE_IRQ;
+        pdev->resource[1].start = pcmcia->irq;
+        pdev->resource[1].end = pdev->resource[1].start;
+
+        /* platform device setup */
+        spin_lock(&softingcs_index_lock);
+        pdev->id = softingcs_index++;
+        spin_unlock(&softingcs_index_lock);
+        pdev->name = "softing";
+        dev_set_name(&pdev->dev, "softingcs.%i", pdev->id);
+        ret = platform_device_register(pdev);
+        if (ret < 0)
+                goto platform_failed;
+
+        dev_info(&pcmcia->dev, "created %s\n", dev_name(&pdev->dev));
+        return 0;
+
+platform_failed:
+        kfree(dev);
+mem_failed:
+pcmcia_bad:
+pcmcia_failed:
+        pcmcia_disable_device(pcmcia);
+        pcmcia->priv = NULL;
+        return ret ?: -ENODEV;
+}
+
+static /*const*/ struct pcmcia_device_id softingcs_ids[] = {
+        /* softing */
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0001),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0002),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0004),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0005),
+        /* vector, manufacturer? */
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0081),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0084),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0085),
+        /* EDIC */
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0102),
+        PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0105),
+        PCMCIA_DEVICE_NULL,
+};
+
+MODULE_DEVICE_TABLE(pcmcia, softingcs_ids);
+
+static struct pcmcia_driver softingcs_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "softingcs",
+        .id_table       = softingcs_ids,
+        .probe          = softingcs_probe,
+        .remove         = __devexit_p(softingcs_remove),
+};
+
+static int __init softingcs_start(void)
+{
+        spin_lock_init(&softingcs_index_lock);
+        return pcmcia_register_driver(&softingcs_driver);
+}
+
+static void __exit softingcs_stop(void)
+{
+        pcmcia_unregister_driver(&softingcs_driver);
+}
+
+module_init(softingcs_start);
+module_exit(softingcs_stop);
+
+MODULE_DESCRIPTION("softing CANcard driver"
+                ", links PCMCIA card to softing driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/net/can/softing/softing_fw.c b/drivers/net/can/softing/softing_fw.c
new file mode 100644
index 00000000000..b520784fb19
--- /dev/null
+++ b/drivers/net/can/softing/softing_fw.c
@@ -0,0 +1,691 @@
+/*
+ * Copyright (C) 2008-2010
+ *
+ * - Kurt Van Dijck, EIA Electronics
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/firmware.h>
+#include <linux/sched.h>
+#include <asm/div64.h>
+
+#include "softing.h"
+
+/*
+ * low level DPRAM command.
+ * Make sure that card->dpram[DPRAM_FCT_HOST] is preset
+ */
+static int _softing_fct_cmd(struct softing *card, int16_t cmd, uint16_t vector,
+                const char *msg)
+{
+        int ret;
+        unsigned long stamp;
+
+        iowrite16(cmd, &card->dpram[DPRAM_FCT_PARAM]);
+        iowrite8(vector >> 8, &card->dpram[DPRAM_FCT_HOST + 1]);
+        iowrite8(vector, &card->dpram[DPRAM_FCT_HOST]);
+        /* be sure to flush this to the card */
+        wmb();
+        stamp = jiffies + 1 * HZ;
+        /* wait for card */
+        do {
+                /* DPRAM_FCT_HOST is _not_ aligned */
+                ret = ioread8(&card->dpram[DPRAM_FCT_HOST]) +
+                        (ioread8(&card->dpram[DPRAM_FCT_HOST + 1]) << 8);
+                /* don't have any cached variables */
+                rmb();
+                if (ret == RES_OK)
+                        /* read return-value now */
+                        return ioread16(&card->dpram[DPRAM_FCT_RESULT]);
+
+                if ((ret != vector) || time_after(jiffies, stamp))
+                        break;
+                /* process context => relax */
+                usleep_range(500, 10000);
+        } while (1);
+
+        ret = (ret == RES_NONE) ? -ETIMEDOUT : -ECANCELED;
+        dev_alert(&card->pdev->dev, "firmware %s failed (%i)\n", msg, ret);
+        return ret;
+}
+
+static int softing_fct_cmd(struct softing *card, int16_t cmd, const char *msg)
+{
+        int ret;
+
+        ret = _softing_fct_cmd(card, cmd, 0, msg);
+        if (ret > 0) {
+                dev_alert(&card->pdev->dev, "%s returned %u\n", msg, ret);
+                ret = -EIO;
+        }
+        return ret;
+}
+
+int softing_bootloader_command(struct softing *card, int16_t cmd,
+                const char *msg)
+{
+        int ret;
+        unsigned long stamp;
+
+        iowrite16(RES_NONE, &card->dpram[DPRAM_RECEIPT]);
+        iowrite16(cmd, &card->dpram[DPRAM_COMMAND]);
+        /* be sure to flush this to the card */
+        wmb();
+        stamp = jiffies + 3 * HZ;
+        /* wait for card */
+        do {
+                ret = ioread16(&card->dpram[DPRAM_RECEIPT]);
+                /* don't have any cached variables */
+                rmb();
+                if (ret == RES_OK)
+                        return 0;
+                if (time_after(jiffies, stamp))
+                        break;
+                /* process context => relax */
+                usleep_range(500, 10000);
+        } while (!signal_pending(current));
+
+        ret = (ret == RES_NONE) ? -ETIMEDOUT : -ECANCELED;
+        dev_alert(&card->pdev->dev, "bootloader %s failed (%i)\n", msg, ret);
+        return ret;
+}
+
+static int fw_parse(const uint8_t **pmem, uint16_t *ptype, uint32_t *paddr,
+                uint16_t *plen, const uint8_t **pdat)
+{
+        uint16_t checksum[2];
+        const uint8_t *mem;
+        const uint8_t *end;
+
+        /*
+         * firmware records are a binary, unaligned stream composed of:
+         * uint16_t type;
+         * uint32_t addr;
+         * uint16_t len;
+         * uint8_t dat[len];
+         * uint16_t checksum;
+         * all values in little endian.
+         * We could define a struct for this, with __attribute__((packed)),
+         * but would that solve the alignment in _all_ cases (cfr. the
+         * struct itself may be an odd address)?
+         *
+         * I chose to use leXX_to_cpup() since this solves both
+         * endianness & alignment.
+         */
+        mem = *pmem;
+        *ptype = le16_to_cpup((void *)&mem[0]);
+        *paddr = le32_to_cpup((void *)&mem[2]);
+        *plen = le16_to_cpup((void *)&mem[6]);
+        *pdat = &mem[8];
+        /* verify checksum */
+        end = &mem[8 + *plen];
+        checksum[0] = le16_to_cpup((void *)end);
+        for (checksum[1] = 0; mem < end; ++mem)
+                checksum[1] += *mem;
+        if (checksum[0] != checksum[1])
+                return -EINVAL;
+        /* increment */
+        *pmem += 10 + *plen;
+        return 0;
+}
+
+int softing_load_fw(const char *file, struct softing *card,
+                __iomem uint8_t *dpram, unsigned int size, int offset)
+{
+        const struct firmware *fw;
+        int ret;
+        const uint8_t *mem, *end, *dat;
+        uint16_t type, len;
+        uint32_t addr;
+        uint8_t *buf = NULL;
+        int buflen = 0;
+        int8_t type_end = 0;
+
+        ret = request_firmware(&fw, file, &card->pdev->dev);
+        if (ret < 0)
+                return ret;
+        dev_dbg(&card->pdev->dev, "%s, firmware(%s) got %u bytes"
+                ", offset %c0x%04x\n",
+                card->pdat->name, file, (unsigned int)fw->size,
+                (offset >= 0) ? '+' : '-', (unsigned int)abs(offset));
+        /* parse the firmware */
+        mem = fw->data;
+        end = &mem[fw->size];
+        /* look for header record */
+        ret = fw_parse(&mem, &type, &addr, &len, &dat);
+        if (ret < 0)
+                goto failed;
+        if (type != 0xffff)
+                goto failed;
+        if (strncmp("Structured Binary Format, Softing GmbH" , dat, len)) {
+                ret = -EINVAL;
+                goto failed;
+        }
+        /* ok, we had a header */
+        while (mem < end) {
+                ret = fw_parse(&mem, &type, &addr, &len, &dat);
+                if (ret < 0)
+                        goto failed;
+                if (type == 3) {
+                        /* start address, not used here */
+                        continue;
+                } else if (type == 1) {
+                        /* eof */
+                        type_end = 1;
+                        break;
+                } else if (type != 0) {
+                        ret = -EINVAL;
+                        goto failed;
+                }
+
+                if ((addr + len + offset) > size)
+                        goto failed;
+                memcpy_toio(&dpram[addr + offset], dat, len);
+                /* be sure to flush caches from IO space */
+                mb();
+                if (len > buflen) {
+                        /* align buflen */
+                        buflen = (len + (1024-1)) & ~(1024-1);
+                        buf = krealloc(buf, buflen, GFP_KERNEL);
+                        if (!buf) {
+                                ret = -ENOMEM;
+                                goto failed;
+                        }
+                }
+                /* verify record data */
+                memcpy_fromio(buf, &dpram[addr + offset], len);
+                if (memcmp(buf, dat, len)) {
+                        /* is not ok */
+                        dev_alert(&card->pdev->dev, "DPRAM readback failed\n");
+                        ret = -EIO;
+                        goto failed;
+                }
+        }
+        if (!type_end)
+                /* no end record seen */
+                goto failed;
+        ret = 0;
+failed:
+        kfree(buf);
+        release_firmware(fw);
+        if (ret < 0)
+                dev_info(&card->pdev->dev, "firmware %s failed\n", file);
+        return ret;
+}
+
+int softing_load_app_fw(const char *file, struct softing *card)
+{
+        const struct firmware *fw;
+        const uint8_t *mem, *end, *dat;
+        int ret, j;
+        uint16_t type, len;
+        uint32_t addr, start_addr = 0;
+        unsigned int sum, rx_sum;
+        int8_t type_end = 0, type_entrypoint = 0;
+
+        ret = request_firmware(&fw, file, &card->pdev->dev);
+        if (ret) {
+                dev_alert(&card->pdev->dev, "request_firmware(%s) got %i\n",
+                        file, ret);
+                return ret;
+        }
+        dev_dbg(&card->pdev->dev, "firmware(%s) got %lu bytes\n",
+                file, (unsigned long)fw->size);
+        /* parse the firmware */
+        mem = fw->data;
+        end = &mem[fw->size];
+        /* look for header record */
+        ret = fw_parse(&mem, &type, &addr, &len, &dat);
+        if (ret)
+                goto failed;
+        ret = -EINVAL;
+        if (type != 0xffff) {
+                dev_alert(&card->pdev->dev, "firmware starts with type 0x%x\n",
+                        type);
+                goto failed;
+        }
+        if (strncmp("Structured Binary Format, Softing GmbH", dat, len)) {
+                dev_alert(&card->pdev->dev, "firmware string '%.*s' fault\n",
+                                len, dat);
+                goto failed;
+        }
+        /* ok, we had a header */
+        while (mem < end) {
+                ret = fw_parse(&mem, &type, &addr, &len, &dat);
+                if (ret)
+                        goto failed;
+
+                if (type == 3) {
+                        /* start address */
+                        start_addr = addr;
+                        type_entrypoint = 1;
+                        continue;
+                } else if (type == 1) {
+                        /* eof */
+                        type_end = 1;
+                        break;
+                } else if (type != 0) {
+                        dev_alert(&card->pdev->dev,
+                                        "unknown record type 0x%04x\n", type);
+                        ret = -EINVAL;
+                        goto failed;
+                }
+
+                /* regualar data */
+                for (sum = 0, j = 0; j < len; ++j)
+                        sum += dat[j];
+                /* work in 16bit (target) */
+                sum &= 0xffff;
+
+                memcpy_toio(&card->dpram[card->pdat->app.offs], dat, len);
+                iowrite32(card->pdat->app.offs + card->pdat->app.addr,
+                                &card->dpram[DPRAM_COMMAND + 2]);
+                iowrite32(addr, &card->dpram[DPRAM_COMMAND + 6]);
+                iowrite16(len, &card->dpram[DPRAM_COMMAND + 10]);
+                iowrite8(1, &card->dpram[DPRAM_COMMAND + 12]);
+                ret = softing_bootloader_command(card, 1, "loading app.");
+                if (ret < 0)
+                        goto failed;
+                /* verify checksum */
+                rx_sum = ioread16(&card->dpram[DPRAM_RECEIPT + 2]);
+                if (rx_sum != sum) {
+                        dev_alert(&card->pdev->dev, "SRAM seems to be damaged"
+                                ", wanted 0x%04x, got 0x%04x\n", sum, rx_sum);
+                        ret = -EIO;
+                        goto failed;
+                }
+        }
+        if (!type_end || !type_entrypoint)
+                goto failed;
+        /* start application in card */
+        iowrite32(start_addr, &card->dpram[DPRAM_COMMAND + 2]);
+        iowrite8(1, &card->dpram[DPRAM_COMMAND + 6]);
+        ret = softing_bootloader_command(card, 3, "start app.");
+        if (ret < 0)
+                goto failed;
+        ret = 0;
+failed:
+        release_firmware(fw);
+        if (ret < 0)
+                dev_info(&card->pdev->dev, "firmware %s failed\n", file);
+        return ret;
+}
+
+static int softing_reset_chip(struct softing *card)
+{
+        int ret;
+
+        do {
+                /* reset chip */
+                iowrite8(0, &card->dpram[DPRAM_RESET_RX_FIFO]);
+                iowrite8(0, &card->dpram[DPRAM_RESET_RX_FIFO+1]);
+                iowrite8(1, &card->dpram[DPRAM_RESET]);
+                iowrite8(0, &card->dpram[DPRAM_RESET+1]);
+
+                ret = softing_fct_cmd(card, 0, "reset_can");
+                if (!ret)
+                        break;
+                if (signal_pending(current))
+                        /* don't wait any longer */
+                        break;
+        } while (1);
+        card->tx.pending = 0;
+        return ret;
+}
+
+int softing_chip_poweron(struct softing *card)
+{
+        int ret;
+        /* sync */
+        ret = _softing_fct_cmd(card, 99, 0x55, "sync-a");
+        if (ret < 0)
+                goto failed;
+
+        ret = _softing_fct_cmd(card, 99, 0xaa, "sync-b");
+        if (ret < 0)
+                goto failed;
+
+        ret = softing_reset_chip(card);
+        if (ret < 0)
+                goto failed;
+        /* get_serial */
+        ret = softing_fct_cmd(card, 43, "get_serial_number");
+        if (ret < 0)
+                goto failed;
+        card->id.serial = ioread32(&card->dpram[DPRAM_FCT_PARAM]);
+        /* get_version */
+        ret = softing_fct_cmd(card, 12, "get_version");
+        if (ret < 0)
+                goto failed;
+        card->id.fw_version = ioread16(&card->dpram[DPRAM_FCT_PARAM + 2]);
+        card->id.hw_version = ioread16(&card->dpram[DPRAM_FCT_PARAM + 4]);
+        card->id.license = ioread16(&card->dpram[DPRAM_FCT_PARAM + 6]);
+        card->id.chip[0] = ioread16(&card->dpram[DPRAM_FCT_PARAM + 8]);
+        card->id.chip[1] = ioread16(&card->dpram[DPRAM_FCT_PARAM + 10]);
+        return 0;
+failed:
+        return ret;
+}
+
+static void softing_initialize_timestamp(struct softing *card)
+{
+        uint64_t ovf;
+
+        card->ts_ref = ktime_get();
+
+        /* 16MHz is the reference */
+        ovf = 0x100000000ULL * 16;
+        do_div(ovf, card->pdat->freq ?: 16);
+
+        card->ts_overflow = ktime_add_us(ktime_set(0, 0), ovf);
+}
+
+ktime_t softing_raw2ktime(struct softing *card, u32 raw)
+{
+        uint64_t rawl;
+        ktime_t now, real_offset;
+        ktime_t target;
+        ktime_t tmp;
+
+        now = ktime_get();
+        real_offset = ktime_sub(ktime_get_real(), now);
+
+        /* find nsec from card */
+        rawl = raw * 16;
+        do_div(rawl, card->pdat->freq ?: 16);
+        target = ktime_add_us(card->ts_ref, rawl);
+        /* test for overflows */
+        tmp = ktime_add(target, card->ts_overflow);
+        while (unlikely(ktime_to_ns(tmp) > ktime_to_ns(now))) {
+                card->ts_ref = ktime_add(card->ts_ref, card->ts_overflow);
+                target = tmp;
+                tmp = ktime_add(target, card->ts_overflow);
+        }
+        return ktime_add(target, real_offset);
+}
+
+static inline int softing_error_reporting(struct net_device *netdev)
+{
+        struct softing_priv *priv = netdev_priv(netdev);
+
+        return (priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)
+                ? 1 : 0;
+}
+
+int softing_startstop(struct net_device *dev, int up)
+{
+        int ret;
+        struct softing *card;
+        struct softing_priv *priv;
+        struct net_device *netdev;
+        int bus_bitmask_start;
+        int j, error_reporting;
+        struct can_frame msg;
+        const struct can_bittiming *bt;
+
+        priv = netdev_priv(dev);
+        card = priv->card;
+
+        if (!card->fw.up)
+                return -EIO;
+
+        ret = mutex_lock_interruptible(&card->fw.lock);
+        if (ret)
+                return ret;
+
+        bus_bitmask_start = 0;
+        if (dev && up)
+                /* prepare to start this bus as well */
+                bus_bitmask_start |= (1 << priv->index);
+        /* bring netdevs down */
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                netdev = card->net[j];
+                if (!netdev)
+                        continue;
+                priv = netdev_priv(netdev);
+
+                if (dev != netdev)
+                        netif_stop_queue(netdev);
+
+                if (netif_running(netdev)) {
+                        if (dev != netdev)
+                                bus_bitmask_start |= (1 << j);
+                        priv->tx.pending = 0;
+                        priv->tx.echo_put = 0;
+                        priv->tx.echo_get = 0;
+                        /*
+                         * this bus' may just have called open_candev()
+                         * which is rather stupid to call close_candev()
+                         * already
+                         * but we may come here from busoff recovery too
+                         * in which case the echo_skb _needs_ flushing too.
+                         * just be sure to call open_candev() again
+                         */
+                        close_candev(netdev);
+                }
+                priv->can.state = CAN_STATE_STOPPED;
+        }
+        card->tx.pending = 0;
+
+        softing_enable_irq(card, 0);
+        ret = softing_reset_chip(card);
+        if (ret)
+                goto failed;
+        if (!bus_bitmask_start)
+                /* no busses to be brought up */
+                goto card_done;
+
+        if ((bus_bitmask_start & 1) && (bus_bitmask_start & 2)
+                        && (softing_error_reporting(card->net[0])
+                                != softing_error_reporting(card->net[1]))) {
+                dev_alert(&card->pdev->dev,
+                                "err_reporting flag differs for busses\n");
+                goto invalid;
+        }
+        error_reporting = 0;
+        if (bus_bitmask_start & 1) {
+                netdev = card->net[0];
+                priv = netdev_priv(netdev);
+                error_reporting += softing_error_reporting(netdev);
+                /* init chip 1 */
+                bt = &priv->can.bittiming;
+                iowrite16(bt->brp, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(bt->sjw, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                iowrite16(bt->phase_seg1 + bt->prop_seg,
+                                &card->dpram[DPRAM_FCT_PARAM + 6]);
+                iowrite16(bt->phase_seg2, &card->dpram[DPRAM_FCT_PARAM + 8]);
+                iowrite16((priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES) ? 1 : 0,
+                                &card->dpram[DPRAM_FCT_PARAM + 10]);
+                ret = softing_fct_cmd(card, 1, "initialize_chip[0]");
+                if (ret < 0)
+                        goto failed;
+                /* set mode */
+                iowrite16(0, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(0, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                ret = softing_fct_cmd(card, 3, "set_mode[0]");
+                if (ret < 0)
+                        goto failed;
+                /* set filter */
+                /* 11bit id & mask */
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(0x07ff, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                /* 29bit id.lo & mask.lo & id.hi & mask.hi */
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 6]);
+                iowrite16(0xffff, &card->dpram[DPRAM_FCT_PARAM + 8]);
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 10]);
+                iowrite16(0x1fff, &card->dpram[DPRAM_FCT_PARAM + 12]);
+                ret = softing_fct_cmd(card, 7, "set_filter[0]");
+                if (ret < 0)
+                        goto failed;
+                /* set output control */
+                iowrite16(priv->output, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                ret = softing_fct_cmd(card, 5, "set_output[0]");
+                if (ret < 0)
+                        goto failed;
+        }
+        if (bus_bitmask_start & 2) {
+                netdev = card->net[1];
+                priv = netdev_priv(netdev);
+                error_reporting += softing_error_reporting(netdev);
+                /* init chip2 */
+                bt = &priv->can.bittiming;
+                iowrite16(bt->brp, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(bt->sjw, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                iowrite16(bt->phase_seg1 + bt->prop_seg,
+                                &card->dpram[DPRAM_FCT_PARAM + 6]);
+                iowrite16(bt->phase_seg2, &card->dpram[DPRAM_FCT_PARAM + 8]);
+                iowrite16((priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES) ? 1 : 0,
+                                &card->dpram[DPRAM_FCT_PARAM + 10]);
+                ret = softing_fct_cmd(card, 2, "initialize_chip[1]");
+                if (ret < 0)
+                        goto failed;
+                /* set mode2 */
+                iowrite16(0, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(0, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                ret = softing_fct_cmd(card, 4, "set_mode[1]");
+                if (ret < 0)
+                        goto failed;
+                /* set filter2 */
+                /* 11bit id & mask */
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                iowrite16(0x07ff, &card->dpram[DPRAM_FCT_PARAM + 4]);
+                /* 29bit id.lo & mask.lo & id.hi & mask.hi */
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 6]);
+                iowrite16(0xffff, &card->dpram[DPRAM_FCT_PARAM + 8]);
+                iowrite16(0x0000, &card->dpram[DPRAM_FCT_PARAM + 10]);
+                iowrite16(0x1fff, &card->dpram[DPRAM_FCT_PARAM + 12]);
+                ret = softing_fct_cmd(card, 8, "set_filter[1]");
+                if (ret < 0)
+                        goto failed;
+                /* set output control2 */
+                iowrite16(priv->output, &card->dpram[DPRAM_FCT_PARAM + 2]);
+                ret = softing_fct_cmd(card, 6, "set_output[1]");
+                if (ret < 0)
+                        goto failed;
+        }
+        /* enable_error_frame */
+        /*
+         * Error reporting is switched off at the moment since
+         * the receiving of them is not yet 100% verified
+         * This should be enabled sooner or later
+         *
+        if (error_reporting) {
+                ret = softing_fct_cmd(card, 51, "enable_error_frame");
+                if (ret < 0)
+                        goto failed;
+        }
+        */
+        /* initialize interface */
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 2]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 4]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 6]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 8]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 10]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 12]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 14]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 16]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 18]);
+        iowrite16(1, &card->dpram[DPRAM_FCT_PARAM + 20]);
+        ret = softing_fct_cmd(card, 17, "initialize_interface");
+        if (ret < 0)
+                goto failed;
+        /* enable_fifo */
+        ret = softing_fct_cmd(card, 36, "enable_fifo");
+        if (ret < 0)
+                goto failed;
+        /* enable fifo tx ack */
+        ret = softing_fct_cmd(card, 13, "fifo_tx_ack[0]");
+        if (ret < 0)
+                goto failed;
+        /* enable fifo tx ack2 */
+        ret = softing_fct_cmd(card, 14, "fifo_tx_ack[1]");
+        if (ret < 0)
+                goto failed;
+        /* start_chip */
+        ret = softing_fct_cmd(card, 11, "start_chip");
+        if (ret < 0)
+                goto failed;
+        iowrite8(0, &card->dpram[DPRAM_INFO_BUSSTATE]);
+        iowrite8(0, &card->dpram[DPRAM_INFO_BUSSTATE2]);
+        if (card->pdat->generation < 2) {
+                iowrite8(0, &card->dpram[DPRAM_V2_IRQ_TOHOST]);
+                /* flush the DPRAM caches */
+                wmb();
+        }
+
+        softing_initialize_timestamp(card);
+
+        /*
+         * do socketcan notifications/status changes
+         * from here, no errors should occur, or the failed: part
+         * must be reviewed
+         */
+        memset(&msg, 0, sizeof(msg));
+        msg.can_id = CAN_ERR_FLAG | CAN_ERR_RESTARTED;
+        msg.can_dlc = CAN_ERR_DLC;
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                if (!(bus_bitmask_start & (1 << j)))
+                        continue;
+                netdev = card->net[j];
+                if (!netdev)
+                        continue;
+                priv = netdev_priv(netdev);
+                priv->can.state = CAN_STATE_ERROR_ACTIVE;
+                open_candev(netdev);
+                if (dev != netdev) {
+                        /* notify other busses on the restart */
+                        softing_netdev_rx(netdev, &msg, ktime_set(0, 0));
+                        ++priv->can.can_stats.restarts;
+                }
+                netif_wake_queue(netdev);
+        }
+
+        /* enable interrupts */
+        ret = softing_enable_irq(card, 1);
+        if (ret)
+                goto failed;
+card_done:
+        mutex_unlock(&card->fw.lock);
+        return 0;
+invalid:
+        ret = -EINVAL;
+failed:
+        softing_enable_irq(card, 0);
+        softing_reset_chip(card);
+        mutex_unlock(&card->fw.lock);
+        /* bring all other interfaces down */
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                netdev = card->net[j];
+                if (!netdev)
+                        continue;
+                dev_close(netdev);
+        }
+        return ret;
+}
+
+int softing_default_output(struct net_device *netdev)
+{
+        struct softing_priv *priv = netdev_priv(netdev);
+        struct softing *card = priv->card;
+
+        switch (priv->chip) {
+        case 1000:
+                return (card->pdat->generation < 2) ? 0xfb : 0xfa;
+        case 5:
+                return 0x60;
+        default:
+                return 0x40;
+        }
+}
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
new file mode 100644
index 00000000000..aeea9f9ff6e
--- /dev/null
+++ b/drivers/net/can/softing/softing_main.c
@@ -0,0 +1,894 @@
+/*
+ * Copyright (C) 2008-2010
+ *
+ * - Kurt Van Dijck, EIA Electronics
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+
+#include "softing.h"
+
+#define TX_ECHO_SKB_MAX (((TXMAX+1)/2)-1)
+
+/*
+ * test is a specific CAN netdev
+ * is online (ie. up 'n running, not sleeping, not busoff
+ */
+static inline int canif_is_active(struct net_device *netdev)
+{
+        struct can_priv *can = netdev_priv(netdev);
+
+        if (!netif_running(netdev))
+                return 0;
+        return (can->state <= CAN_STATE_ERROR_PASSIVE);
+}
+
+/* reset DPRAM */
+static inline void softing_set_reset_dpram(struct softing *card)
+{
+        if (card->pdat->generation >= 2) {
+                spin_lock_bh(&card->spin);
+                iowrite8(ioread8(&card->dpram[DPRAM_V2_RESET]) & ~1,
+                                &card->dpram[DPRAM_V2_RESET]);
+                spin_unlock_bh(&card->spin);
+        }
+}
+
+static inline void softing_clr_reset_dpram(struct softing *card)
+{
+        if (card->pdat->generation >= 2) {
+                spin_lock_bh(&card->spin);
+                iowrite8(ioread8(&card->dpram[DPRAM_V2_RESET]) | 1,
+                                &card->dpram[DPRAM_V2_RESET]);
+                spin_unlock_bh(&card->spin);
+        }
+}
+
+/* trigger the tx queue-ing */
+static netdev_tx_t softing_netdev_start_xmit(struct sk_buff *skb,
+                struct net_device *dev)
+{
+        struct softing_priv *priv = netdev_priv(dev);
+        struct softing *card = priv->card;
+        int ret;
+        uint8_t *ptr;
+        uint8_t fifo_wr, fifo_rd;
+        struct can_frame *cf = (struct can_frame *)skb->data;
+        uint8_t buf[DPRAM_TX_SIZE];
+
+        if (can_dropped_invalid_skb(dev, skb))
+                return NETDEV_TX_OK;
+
+        spin_lock(&card->spin);
+
+        ret = NETDEV_TX_BUSY;
+        if (!card->fw.up ||
+                        (card->tx.pending >= TXMAX) ||
+                        (priv->tx.pending >= TX_ECHO_SKB_MAX))
+                goto xmit_done;
+        fifo_wr = ioread8(&card->dpram[DPRAM_TX_WR]);
+        fifo_rd = ioread8(&card->dpram[DPRAM_TX_RD]);
+        if (fifo_wr == fifo_rd)
+                /* fifo full */
+                goto xmit_done;
+        memset(buf, 0, sizeof(buf));
+        ptr = buf;
+        *ptr = CMD_TX;
+        if (cf->can_id & CAN_RTR_FLAG)
+                *ptr |= CMD_RTR;
+        if (cf->can_id & CAN_EFF_FLAG)
+                *ptr |= CMD_XTD;
+        if (priv->index)
+                *ptr |= CMD_BUS2;
+        ++ptr;
+        *ptr++ = cf->can_dlc;
+        *ptr++ = (cf->can_id >> 0);
+        *ptr++ = (cf->can_id >> 8);
+        if (cf->can_id & CAN_EFF_FLAG) {
+                *ptr++ = (cf->can_id >> 16);
+                *ptr++ = (cf->can_id >> 24);
+        } else {
+                /* increment 1, not 2 as you might think */
+                ptr += 1;
+        }
+        if (!(cf->can_id & CAN_RTR_FLAG))
+                memcpy(ptr, &cf->data[0], cf->can_dlc);
+        memcpy_toio(&card->dpram[DPRAM_TX + DPRAM_TX_SIZE * fifo_wr],
+                        buf, DPRAM_TX_SIZE);
+        if (++fifo_wr >= DPRAM_TX_CNT)
+                fifo_wr = 0;
+        iowrite8(fifo_wr, &card->dpram[DPRAM_TX_WR]);
+        card->tx.last_bus = priv->index;
+        ++card->tx.pending;
+        ++priv->tx.pending;
+        can_put_echo_skb(skb, dev, priv->tx.echo_put);
+        ++priv->tx.echo_put;
+        if (priv->tx.echo_put >= TX_ECHO_SKB_MAX)
+                priv->tx.echo_put = 0;
+        /* can_put_echo_skb() saves the skb, safe to return TX_OK */
+        ret = NETDEV_TX_OK;
+xmit_done:
+        spin_unlock(&card->spin);
+        if (card->tx.pending >= TXMAX) {
+                int j;
+                for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                        if (card->net[j])
+                                netif_stop_queue(card->net[j]);
+                }
+        }
+        if (ret != NETDEV_TX_OK)
+                netif_stop_queue(dev);
+
+        return ret;
+}
+
+/*
+ * shortcut for skb delivery
+ */
+int softing_netdev_rx(struct net_device *netdev, const struct can_frame *msg,
+                ktime_t ktime)
+{
+        struct sk_buff *skb;
+        struct can_frame *cf;
+
+        skb = alloc_can_skb(netdev, &cf);
+        if (!skb)
+                return -ENOMEM;
+        memcpy(cf, msg, sizeof(*msg));
+        skb->tstamp = ktime;
+        return netif_rx(skb);
+}
+
+/*
+ * softing_handle_1
+ * pop 1 entry from the DPRAM queue, and process
+ */
+static int softing_handle_1(struct softing *card)
+{
+        struct net_device *netdev;
+        struct softing_priv *priv;
+        ktime_t ktime;
+        struct can_frame msg;
+        int cnt = 0, lost_msg;
+        uint8_t fifo_rd, fifo_wr, cmd;
+        uint8_t *ptr;
+        uint32_t tmp_u32;
+        uint8_t buf[DPRAM_RX_SIZE];
+
+        memset(&msg, 0, sizeof(msg));
+        /* test for lost msgs */
+        lost_msg = ioread8(&card->dpram[DPRAM_RX_LOST]);
+        if (lost_msg) {
+                int j;
+                /* reset condition */
+                iowrite8(0, &card->dpram[DPRAM_RX_LOST]);
+                /* prepare msg */
+                msg.can_id = CAN_ERR_FLAG | CAN_ERR_CRTL;
+                msg.can_dlc = CAN_ERR_DLC;
+                msg.data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
+                /*
+                 * service to all busses, we don't know which it was applicable
+                 * but only service busses that are online
+                 */
+                for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                        netdev = card->net[j];
+                        if (!netdev)
+                                continue;
+                        if (!canif_is_active(netdev))
+                                /* a dead bus has no overflows */
+                                continue;
+                        ++netdev->stats.rx_over_errors;
+                        softing_netdev_rx(netdev, &msg, ktime_set(0, 0));
+                }
+                /* prepare for other use */
+                memset(&msg, 0, sizeof(msg));
+                ++cnt;
+        }
+
+        fifo_rd = ioread8(&card->dpram[DPRAM_RX_RD]);
+        fifo_wr = ioread8(&card->dpram[DPRAM_RX_WR]);
+
+        if (++fifo_rd >= DPRAM_RX_CNT)
+                fifo_rd = 0;
+        if (fifo_wr == fifo_rd)
+                return cnt;
+
+        memcpy_fromio(buf, &card->dpram[DPRAM_RX + DPRAM_RX_SIZE*fifo_rd],
+                        DPRAM_RX_SIZE);
+        mb();
+        /* trigger dual port RAM */
+        iowrite8(fifo_rd, &card->dpram[DPRAM_RX_RD]);
+
+        ptr = buf;
+        cmd = *ptr++;
+        if (cmd == 0xff)
+                /* not quite usefull, probably the card has got out */
+                return 0;
+        netdev = card->net[0];
+        if (cmd & CMD_BUS2)
+                netdev = card->net[1];
+        priv = netdev_priv(netdev);
+
+        if (cmd & CMD_ERR) {
+                uint8_t can_state, state;
+
+                state = *ptr++;
+
+                msg.can_id = CAN_ERR_FLAG;
+                msg.can_dlc = CAN_ERR_DLC;
+
+                if (state & SF_MASK_BUSOFF) {
+                        can_state = CAN_STATE_BUS_OFF;
+                        msg.can_id |= CAN_ERR_BUSOFF;
+                        state = STATE_BUSOFF;
+                } else if (state & SF_MASK_EPASSIVE) {
+                        can_state = CAN_STATE_ERROR_PASSIVE;
+                        msg.can_id |= CAN_ERR_CRTL;
+                        msg.data[1] = CAN_ERR_CRTL_TX_PASSIVE;
+                        state = STATE_EPASSIVE;
+                } else {
+                        can_state = CAN_STATE_ERROR_ACTIVE;
+                        msg.can_id |= CAN_ERR_CRTL;
+                        state = STATE_EACTIVE;
+                }
+                /* update DPRAM */
+                iowrite8(state, &card->dpram[priv->index ?
+                                DPRAM_INFO_BUSSTATE2 : DPRAM_INFO_BUSSTATE]);
+                /* timestamp */
+                tmp_u32 = le32_to_cpup((void *)ptr);
+                ptr += 4;
+                ktime = softing_raw2ktime(card, tmp_u32);
+
+                ++netdev->stats.rx_errors;
+                /* update internal status */
+                if (can_state != priv->can.state) {
+                        priv->can.state = can_state;
+                        if (can_state == CAN_STATE_ERROR_PASSIVE)
+                                ++priv->can.can_stats.error_passive;
+                        else if (can_state == CAN_STATE_BUS_OFF) {
+                                /* this calls can_close_cleanup() */
+                                can_bus_off(netdev);
+                                netif_stop_queue(netdev);
+                        }
+                        /* trigger socketcan */
+                        softing_netdev_rx(netdev, &msg, ktime);
+                }
+
+        } else {
+                if (cmd & CMD_RTR)
+                        msg.can_id |= CAN_RTR_FLAG;
+                msg.can_dlc = get_can_dlc(*ptr++);
+                if (cmd & CMD_XTD) {
+                        msg.can_id |= CAN_EFF_FLAG;
+                        msg.can_id |= le32_to_cpup((void *)ptr);
+                        ptr += 4;
+                } else {
+                        msg.can_id |= le16_to_cpup((void *)ptr);
+                        ptr += 2;
+                }
+                /* timestamp */
+                tmp_u32 = le32_to_cpup((void *)ptr);
+                ptr += 4;
+                ktime = softing_raw2ktime(card, tmp_u32);
+                if (!(msg.can_id & CAN_RTR_FLAG))
+                        memcpy(&msg.data[0], ptr, 8);
+                ptr += 8;
+                /* update socket */
+                if (cmd & CMD_ACK) {
+                        /* acknowledge, was tx msg */
+                        struct sk_buff *skb;
+                        skb = priv->can.echo_skb[priv->tx.echo_get];
+                        if (skb)
+                                skb->tstamp = ktime;
+                        can_get_echo_skb(netdev, priv->tx.echo_get);
+                        ++priv->tx.echo_get;
+                        if (priv->tx.echo_get >= TX_ECHO_SKB_MAX)
+                                priv->tx.echo_get = 0;
+                        if (priv->tx.pending)
+                                --priv->tx.pending;
+                        if (card->tx.pending)
+                                --card->tx.pending;
+                        ++netdev->stats.tx_packets;
+                        if (!(msg.can_id & CAN_RTR_FLAG))
+                                netdev->stats.tx_bytes += msg.can_dlc;
+                } else {
+                        int ret;
+
+                        ret = softing_netdev_rx(netdev, &msg, ktime);
+                        if (ret == NET_RX_SUCCESS) {
+                                ++netdev->stats.rx_packets;
+                                if (!(msg.can_id & CAN_RTR_FLAG))
+                                        netdev->stats.rx_bytes += msg.can_dlc;
+                        } else {
+                                ++netdev->stats.rx_dropped;
+                        }
+                }
+        }
+        ++cnt;
+        return cnt;
+}
+
+/*
+ * real interrupt handler
+ */
+static irqreturn_t softing_irq_thread(int irq, void *dev_id)
+{
+        struct softing *card = (struct softing *)dev_id;
+        struct net_device *netdev;
+        struct softing_priv *priv;
+        int j, offset, work_done;
+
+        work_done = 0;
+        spin_lock_bh(&card->spin);
+        while (softing_handle_1(card) > 0) {
+                ++card->irq.svc_count;
+                ++work_done;
+        }
+        spin_unlock_bh(&card->spin);
+        /* resume tx queue's */
+        offset = card->tx.last_bus;
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                if (card->tx.pending >= TXMAX)
+                        break;
+                netdev = card->net[(j + offset + 1) % card->pdat->nbus];
+                if (!netdev)
+                        continue;
+                priv = netdev_priv(netdev);
+                if (!canif_is_active(netdev))
+                        /* it makes no sense to wake dead busses */
+                        continue;
+                if (priv->tx.pending >= TX_ECHO_SKB_MAX)
+                        continue;
+                ++work_done;
+                netif_wake_queue(netdev);
+        }
+        return work_done ? IRQ_HANDLED : IRQ_NONE;
+}
+
+/*
+ * interrupt routines:
+ * schedule the 'real interrupt handler'
+ */
+static irqreturn_t softing_irq_v2(int irq, void *dev_id)
+{
+        struct softing *card = (struct softing *)dev_id;
+        uint8_t ir;
+
+        ir = ioread8(&card->dpram[DPRAM_V2_IRQ_TOHOST]);
+        iowrite8(0, &card->dpram[DPRAM_V2_IRQ_TOHOST]);
+        return (1 == ir) ? IRQ_WAKE_THREAD : IRQ_NONE;
+}
+
+static irqreturn_t softing_irq_v1(int irq, void *dev_id)
+{
+        struct softing *card = (struct softing *)dev_id;
+        uint8_t ir;
+
+        ir = ioread8(&card->dpram[DPRAM_IRQ_TOHOST]);
+        iowrite8(0, &card->dpram[DPRAM_IRQ_TOHOST]);
+        return ir ? IRQ_WAKE_THREAD : IRQ_NONE;
+}
+
+/*
+ * netdev/candev inter-operability
+ */
+static int softing_netdev_open(struct net_device *ndev)
+{
+        int ret;
+
+        /* check or determine and set bittime */
+        ret = open_candev(ndev);
+        if (!ret)
+                ret = softing_startstop(ndev, 1);
+        return ret;
+}
+
+static int softing_netdev_stop(struct net_device *ndev)
+{
+        int ret;
+
+        netif_stop_queue(ndev);
+
+        /* softing cycle does close_candev() */
+        ret = softing_startstop(ndev, 0);
+        return ret;
+}
+
+static int softing_candev_set_mode(struct net_device *ndev, enum can_mode mode)
+{
+        int ret;
+
+        switch (mode) {
+        case CAN_MODE_START:
+                /* softing_startstop does close_candev() */
+                ret = softing_startstop(ndev, 1);
+                return ret;
+        case CAN_MODE_STOP:
+        case CAN_MODE_SLEEP:
+                return -EOPNOTSUPP;
+        }
+        return 0;
+}
+
+/*
+ * Softing device management helpers
+ */
+int softing_enable_irq(struct softing *card, int enable)
+{
+        int ret;
+
+        if (!card->irq.nr) {
+                return 0;
+        } else if (card->irq.requested && !enable) {
+                free_irq(card->irq.nr, card);
+                card->irq.requested = 0;
+        } else if (!card->irq.requested && enable) {
+                ret = request_threaded_irq(card->irq.nr,
+                                (card->pdat->generation >= 2) ?
+                                        softing_irq_v2 : softing_irq_v1,
+                                softing_irq_thread, IRQF_SHARED,
+                                dev_name(&card->pdev->dev), card);
+                if (ret) {
+                        dev_alert(&card->pdev->dev,
+                                        "request_threaded_irq(%u) failed\n",
+                                        card->irq.nr);
+                        return ret;
+                }
+                card->irq.requested = 1;
+        }
+        return 0;
+}
+
+static void softing_card_shutdown(struct softing *card)
+{
+        int fw_up = 0;
+
+        if (mutex_lock_interruptible(&card->fw.lock))
+                /* return -ERESTARTSYS */;
+        fw_up = card->fw.up;
+        card->fw.up = 0;
+
+        if (card->irq.requested && card->irq.nr) {
+                free_irq(card->irq.nr, card);
+                card->irq.requested = 0;
+        }
+        if (fw_up) {
+                if (card->pdat->enable_irq)
+                        card->pdat->enable_irq(card->pdev, 0);
+                softing_set_reset_dpram(card);
+                if (card->pdat->reset)
+                        card->pdat->reset(card->pdev, 1);
+        }
+        mutex_unlock(&card->fw.lock);
+}
+
+static __devinit int softing_card_boot(struct softing *card)
+{
+        int ret, j;
+        static const uint8_t stream[] = {
+                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, };
+        unsigned char back[sizeof(stream)];
+
+        if (mutex_lock_interruptible(&card->fw.lock))
+                return -ERESTARTSYS;
+        if (card->fw.up) {
+                mutex_unlock(&card->fw.lock);
+                return 0;
+        }
+        /* reset board */
+        if (card->pdat->enable_irq)
+                card->pdat->enable_irq(card->pdev, 1);
+        /* boot card */
+        softing_set_reset_dpram(card);
+        if (card->pdat->reset)
+                card->pdat->reset(card->pdev, 1);
+        for (j = 0; (j + sizeof(stream)) < card->dpram_size;
+                        j += sizeof(stream)) {
+
+                memcpy_toio(&card->dpram[j], stream, sizeof(stream));
+                /* flush IO cache */
+                mb();
+                memcpy_fromio(back, &card->dpram[j], sizeof(stream));
+
+                if (!memcmp(back, stream, sizeof(stream)))
+                        continue;
+                /* memory is not equal */
+                dev_alert(&card->pdev->dev, "dpram failed at 0x%04x\n", j);
+                ret = -EIO;
+                goto failed;
+        }
+        wmb();
+        /* load boot firmware */
+        ret = softing_load_fw(card->pdat->boot.fw, card, card->dpram,
+                                card->dpram_size,
+                                card->pdat->boot.offs - card->pdat->boot.addr);
+        if (ret < 0)
+                goto failed;
+        /* load loader firmware */
+        ret = softing_load_fw(card->pdat->load.fw, card, card->dpram,
+                                card->dpram_size,
+                                card->pdat->load.offs - card->pdat->load.addr);
+        if (ret < 0)
+                goto failed;
+
+        if (card->pdat->reset)
+                card->pdat->reset(card->pdev, 0);
+        softing_clr_reset_dpram(card);
+        ret = softing_bootloader_command(card, 0, "card boot");
+        if (ret < 0)
+                goto failed;
+        ret = softing_load_app_fw(card->pdat->app.fw, card);
+        if (ret < 0)
+                goto failed;
+
+        ret = softing_chip_poweron(card);
+        if (ret < 0)
+                goto failed;
+
+        card->fw.up = 1;
+        mutex_unlock(&card->fw.lock);
+        return 0;
+failed:
+        card->fw.up = 0;
+        if (card->pdat->enable_irq)
+                card->pdat->enable_irq(card->pdev, 0);
+        softing_set_reset_dpram(card);
+        if (card->pdat->reset)
+                card->pdat->reset(card->pdev, 1);
+        mutex_unlock(&card->fw.lock);
+        return ret;
+}
+
+/*
+ * netdev sysfs
+ */
+static ssize_t show_channel(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct softing_priv *priv = netdev2softing(ndev);
+
+        return sprintf(buf, "%i\n", priv->index);
+}
+
+static ssize_t show_chip(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct softing_priv *priv = netdev2softing(ndev);
+
+        return sprintf(buf, "%i\n", priv->chip);
+}
+
+static ssize_t show_output(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct softing_priv *priv = netdev2softing(ndev);
+
+        return sprintf(buf, "0x%02x\n", priv->output);
+}
+
+static ssize_t store_output(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct net_device *ndev = to_net_dev(dev);
+        struct softing_priv *priv = netdev2softing(ndev);
+        struct softing *card = priv->card;
+        unsigned long val;
+        int ret;
+
+        ret = strict_strtoul(buf, 0, &val);
+        if (ret < 0)
+                return ret;
+        val &= 0xFF;
+
+        ret = mutex_lock_interruptible(&card->fw.lock);
+        if (ret)
+                return -ERESTARTSYS;
+        if (netif_running(ndev)) {
+                mutex_unlock(&card->fw.lock);
+                return -EBUSY;
+        }
+        priv->output = val;
+        mutex_unlock(&card->fw.lock);
+        return count;
+}
+
+static const DEVICE_ATTR(channel, S_IRUGO, show_channel, NULL);
+static const DEVICE_ATTR(chip, S_IRUGO, show_chip, NULL);
+static const DEVICE_ATTR(output, S_IRUGO | S_IWUSR, show_output, store_output);
+
+static const struct attribute *const netdev_sysfs_attrs[] = {
+        &dev_attr_channel.attr,
+        &dev_attr_chip.attr,
+        &dev_attr_output.attr,
+        NULL,
+};
+static const struct attribute_group netdev_sysfs_group = {
+        .name = NULL,
+        .attrs = (struct attribute **)netdev_sysfs_attrs,
+};
+
+static const struct net_device_ops softing_netdev_ops = {
+        .ndo_open = softing_netdev_open,
+        .ndo_stop = softing_netdev_stop,
+        .ndo_start_xmit = softing_netdev_start_xmit,
+};
+
+static const struct can_bittiming_const softing_btr_const = {
+        .name = "softing",
+        .tseg1_min = 1,
+        .tseg1_max = 16,
+        .tseg2_min = 1,
+        .tseg2_max = 8,
+        .sjw_max = 4, /* overruled */
+        .brp_min = 1,
+        .brp_max = 32, /* overruled */
+        .brp_inc = 1,
+};
+
+
+static __devinit struct net_device *softing_netdev_create(struct softing *card,
+                uint16_t chip_id)
+{
+        struct net_device *netdev;
+        struct softing_priv *priv;
+
+        netdev = alloc_candev(sizeof(*priv), TX_ECHO_SKB_MAX);
+        if (!netdev) {
+                dev_alert(&card->pdev->dev, "alloc_candev failed\n");
+                return NULL;
+        }
+        priv = netdev_priv(netdev);
+        priv->netdev = netdev;
+        priv->card = card;
+        memcpy(&priv->btr_const, &softing_btr_const, sizeof(priv->btr_const));
+        priv->btr_const.brp_max = card->pdat->max_brp;
+        priv->btr_const.sjw_max = card->pdat->max_sjw;
+        priv->can.bittiming_const = &priv->btr_const;
+        priv->can.clock.freq = 8000000;
+        priv->chip = chip_id;
+        priv->output = softing_default_output(netdev);
+        SET_NETDEV_DEV(netdev, &card->pdev->dev);
+
+        netdev->flags |= IFF_ECHO;
+        netdev->netdev_ops = &softing_netdev_ops;
+        priv->can.do_set_mode = softing_candev_set_mode;
+        priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
+
+        return netdev;
+}
+
+static __devinit int softing_netdev_register(struct net_device *netdev)
+{
+        int ret;
+
+        netdev->sysfs_groups[0] = &netdev_sysfs_group;
+        ret = register_candev(netdev);
+        if (ret) {
+                dev_alert(&netdev->dev, "register failed\n");
+                return ret;
+        }
+        return 0;
+}
+
+static void softing_netdev_cleanup(struct net_device *netdev)
+{
+        unregister_candev(netdev);
+        free_candev(netdev);
+}
+
+/*
+ * sysfs for Platform device
+ */
+#define DEV_ATTR_RO(name, member) \
+static ssize_t show_##name(struct device *dev, \
+                struct device_attribute *attr, char *buf) \
+{ \
+        struct softing *card = platform_get_drvdata(to_platform_device(dev)); \
+        return sprintf(buf, "%u\n", card->member); \
+} \
+static DEVICE_ATTR(name, 0444, show_##name, NULL)
+
+#define DEV_ATTR_RO_STR(name, member) \
+static ssize_t show_##name(struct device *dev, \
+                struct device_attribute *attr, char *buf) \
+{ \
+        struct softing *card = platform_get_drvdata(to_platform_device(dev)); \
+        return sprintf(buf, "%s\n", card->member); \
+} \
+static DEVICE_ATTR(name, 0444, show_##name, NULL)
+
+DEV_ATTR_RO(serial, id.serial);
+DEV_ATTR_RO_STR(firmware, pdat->app.fw);
+DEV_ATTR_RO(firmware_version, id.fw_version);
+DEV_ATTR_RO_STR(hardware, pdat->name);
+DEV_ATTR_RO(hardware_version, id.hw_version);
+DEV_ATTR_RO(license, id.license);
+DEV_ATTR_RO(frequency, id.freq);
+DEV_ATTR_RO(txpending, tx.pending);
+
+static struct attribute *softing_pdev_attrs[] = {
+        &dev_attr_serial.attr,
+        &dev_attr_firmware.attr,
+        &dev_attr_firmware_version.attr,
+        &dev_attr_hardware.attr,
+        &dev_attr_hardware_version.attr,
+        &dev_attr_license.attr,
+        &dev_attr_frequency.attr,
+        &dev_attr_txpending.attr,
+        NULL,
+};
+
+static const struct attribute_group softing_pdev_group = {
+        .name = NULL,
+        .attrs = softing_pdev_attrs,
+};
+
+/*
+ * platform driver
+ */
+static __devexit int softing_pdev_remove(struct platform_device *pdev)
+{
+        struct softing *card = platform_get_drvdata(pdev);
+        int j;
+
+        /* first, disable card*/
+        softing_card_shutdown(card);
+
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                if (!card->net[j])
+                        continue;
+                softing_netdev_cleanup(card->net[j]);
+                card->net[j] = NULL;
+        }
+        sysfs_remove_group(&pdev->dev.kobj, &softing_pdev_group);
+
+        iounmap(card->dpram);
+        kfree(card);
+        return 0;
+}
+
+static __devinit int softing_pdev_probe(struct platform_device *pdev)
+{
+        const struct softing_platform_data *pdat = pdev->dev.platform_data;
+        struct softing *card;
+        struct net_device *netdev;
+        struct softing_priv *priv;
+        struct resource *pres;
+        int ret;
+        int j;
+
+        if (!pdat) {
+                dev_warn(&pdev->dev, "no platform data\n");
+                return -EINVAL;
+        }
+        if (pdat->nbus > ARRAY_SIZE(card->net)) {
+                dev_warn(&pdev->dev, "%u nets??\n", pdat->nbus);
+                return -EINVAL;
+        }
+
+        card = kzalloc(sizeof(*card), GFP_KERNEL);
+        if (!card)
+                return -ENOMEM;
+        card->pdat = pdat;
+        card->pdev = pdev;
+        platform_set_drvdata(pdev, card);
+        mutex_init(&card->fw.lock);
+        spin_lock_init(&card->spin);
+
+        ret = -EINVAL;
+        pres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!pres)
+                goto platform_resource_failed;;
+        card->dpram_phys = pres->start;
+        card->dpram_size = pres->end - pres->start + 1;
+        card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size);
+        if (!card->dpram) {
+                dev_alert(&card->pdev->dev, "dpram ioremap failed\n");
+                goto ioremap_failed;
+        }
+
+        pres = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (pres)
+                card->irq.nr = pres->start;
+
+        /* reset card */
+        ret = softing_card_boot(card);
+        if (ret < 0) {
+                dev_alert(&pdev->dev, "failed to boot\n");
+                goto boot_failed;
+        }
+
+        /* only now, the chip's are known */
+        card->id.freq = card->pdat->freq;
+
+        ret = sysfs_create_group(&pdev->dev.kobj, &softing_pdev_group);
+        if (ret < 0) {
+                dev_alert(&card->pdev->dev, "sysfs failed\n");
+                goto sysfs_failed;
+        }
+
+        ret = -ENOMEM;
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                card->net[j] = netdev =
+                        softing_netdev_create(card, card->id.chip[j]);
+                if (!netdev) {
+                        dev_alert(&pdev->dev, "failed to make can[%i]", j);
+                        goto netdev_failed;
+                }
+                priv = netdev_priv(card->net[j]);
+                priv->index = j;
+                ret = softing_netdev_register(netdev);
+                if (ret) {
+                        free_candev(netdev);
+                        card->net[j] = NULL;
+                        dev_alert(&card->pdev->dev,
+                                        "failed to register can[%i]\n", j);
+                        goto netdev_failed;
+                }
+        }
+        dev_info(&card->pdev->dev, "%s ready.\n", card->pdat->name);
+        return 0;
+
+netdev_failed:
+        for (j = 0; j < ARRAY_SIZE(card->net); ++j) {
+                if (!card->net[j])
+                        continue;
+                softing_netdev_cleanup(card->net[j]);
+        }
+        sysfs_remove_group(&pdev->dev.kobj, &softing_pdev_group);
+sysfs_failed:
+        softing_card_shutdown(card);
+boot_failed:
+        iounmap(card->dpram);
+ioremap_failed:
+platform_resource_failed:
+        kfree(card);
+        return ret;
+}
+
+static struct platform_driver softing_driver = {
+        .driver = {
+                .name = "softing",
+                .owner = THIS_MODULE,
+        },
+        .probe = softing_pdev_probe,
+        .remove = __devexit_p(softing_pdev_remove),
+};
+
+MODULE_ALIAS("platform:softing");
+
+static int __init softing_start(void)
+{
+        return platform_driver_register(&softing_driver);
+}
+
+static void __exit softing_stop(void)
+{
+        platform_driver_unregister(&softing_driver);
+}
+
+module_init(softing_start);
+module_exit(softing_stop);
+
+MODULE_DESCRIPTION("Softing DPRAM CAN driver");
+MODULE_AUTHOR("Kurt Van Dijck <kurt.van.dijck@eia.be>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/net/can/softing/softing_platform.h b/drivers/net/can/softing/softing_platform.h
new file mode 100644
index 00000000000..ebbf6981562
--- /dev/null
+++ b/drivers/net/can/softing/softing_platform.h
@@ -0,0 +1,40 @@
+
+#include <linux/platform_device.h>
+
+#ifndef _SOFTING_DEVICE_H_
+#define _SOFTING_DEVICE_H_
+
+/* softing firmware directory prefix */
+#define fw_dir "softing-4.6/"
+
+struct softing_platform_data {
+        unsigned int manf;
+        unsigned int prod;
+        /*
+         * generation
+         * 1st with NEC or SJA1000
+         * 8bit, exclusive interrupt, ...
+         * 2nd only SJA1000
+         * 16bit, shared interrupt
+         */
+        int generation;
+        int nbus; /* # busses on device */
+        unsigned int freq; /* operating frequency in Hz */
+        unsigned int max_brp;
+        unsigned int max_sjw;
+        unsigned long dpram_size;
+        const char *name;
+        struct {
+                unsigned long offs;
+                unsigned long addr;
+                const char *fw;
+        } boot, load, app;
+        /*
+         * reset() function
+         * bring pdev in or out of reset, depending on value
+         */
+        int (*reset)(struct platform_device *pdev, int value);
+        int (*enable_irq)(struct platform_device *pdev, int value);
+};
+
+#endif
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
index 05a52754f48..dc53c831ea9 100644
--- a/drivers/net/can/usb/esd_usb2.c
+++ b/drivers/net/can/usb/esd_usb2.c
@@ -659,7 +659,7 @@ failed:
 static void unlink_all_urbs(struct esd_usb2 *dev)
 {
         struct esd_usb2_net_priv *priv;
-        int i;
+        int i, j;
 
         usb_kill_anchored_urbs(&dev->rx_submitted);
         for (i = 0; i < dev->net_count; i++) {
@@ -668,8 +668,8 @@ static void unlink_all_urbs(struct esd_usb2 *dev)
                         usb_kill_anchored_urbs(&priv->tx_submitted);
                         atomic_set(&priv->active_tx_jobs, 0);
 
-                        for (i = 0; i < MAX_TX_URBS; i++)
-                                priv->tx_contexts[i].echo_index = MAX_TX_URBS;
+                        for (j = 0; j < MAX_TX_URBS; j++)
+                                priv->tx_contexts[j].echo_index = MAX_TX_URBS;
                 }
         }
 }
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 263a2944566..8cca60e4344 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -65,7 +65,14 @@ static LIST_HEAD(cnic_udev_list);
 static DEFINE_RWLOCK(cnic_dev_lock);
 static DEFINE_MUTEX(cnic_lock);
 
-static struct cnic_ulp_ops *cnic_ulp_tbl[MAX_CNIC_ULP_TYPE];
+static struct cnic_ulp_ops __rcu *cnic_ulp_tbl[MAX_CNIC_ULP_TYPE];
+
+/* helper function, assuming cnic_lock is held */
+static inline struct cnic_ulp_ops *cnic_ulp_tbl_prot(int type)
+{
+        return rcu_dereference_protected(cnic_ulp_tbl[type],
+                                         lockdep_is_held(&cnic_lock));
+}
 
 static int cnic_service_bnx2(void *, void *);
 static int cnic_service_bnx2x(void *, void *);
@@ -435,7 +442,7 @@ int cnic_register_driver(int ulp_type, struct cnic_ulp_ops *ulp_ops)
                 return -EINVAL;
         }
         mutex_lock(&cnic_lock);
-        if (cnic_ulp_tbl[ulp_type]) {
+        if (cnic_ulp_tbl_prot(ulp_type)) {
                 pr_err("%s: Type %d has already been registered\n",
                        __func__, ulp_type);
                 mutex_unlock(&cnic_lock);
@@ -478,7 +485,7 @@ int cnic_unregister_driver(int ulp_type)
                 return -EINVAL;
         }
         mutex_lock(&cnic_lock);
-        ulp_ops = cnic_ulp_tbl[ulp_type];
+        ulp_ops = cnic_ulp_tbl_prot(ulp_type);
         if (!ulp_ops) {
                 pr_err("%s: Type %d has not been registered\n",
                        __func__, ulp_type);
@@ -529,7 +536,7 @@ static int cnic_register_device(struct cnic_dev *dev, int ulp_type,
                 return -EINVAL;
         }
         mutex_lock(&cnic_lock);
-        if (cnic_ulp_tbl[ulp_type] == NULL) {
+        if (cnic_ulp_tbl_prot(ulp_type) == NULL) {
                 pr_err("%s: Driver with type %d has not been registered\n",
                        __func__, ulp_type);
                 mutex_unlock(&cnic_lock);
@@ -544,7 +551,7 @@ static int cnic_register_device(struct cnic_dev *dev, int ulp_type,
 
         clear_bit(ULP_F_START, &cp->ulp_flags[ulp_type]);
         cp->ulp_handle[ulp_type] = ulp_ctx;
-        ulp_ops = cnic_ulp_tbl[ulp_type];
+        ulp_ops = cnic_ulp_tbl_prot(ulp_type);
         rcu_assign_pointer(cp->ulp_ops[ulp_type], ulp_ops);
         cnic_hold(dev);
 
@@ -699,13 +706,13 @@ static void cnic_free_dma(struct cnic_dev *dev, struct cnic_dma *dma)
 static void cnic_setup_page_tbl(struct cnic_dev *dev, struct cnic_dma *dma)
 {
         int i;
-        u32 *page_table = dma->pgtbl;
+        __le32 *page_table = (__le32 *) dma->pgtbl;
 
         for (i = 0; i < dma->num_pages; i++) {
                 /* Each entry needs to be in big endian format. */
-                *page_table = (u32) ((u64) dma->pg_map_arr[i] >> 32);
+                *page_table = cpu_to_le32((u64) dma->pg_map_arr[i] >> 32);
                 page_table++;
-                *page_table = (u32) dma->pg_map_arr[i];
+                *page_table = cpu_to_le32(dma->pg_map_arr[i] & 0xffffffff);
                 page_table++;
         }
 }
@@ -713,13 +720,13 @@ static void cnic_setup_page_tbl(struct cnic_dev *dev, struct cnic_dma *dma)
 static void cnic_setup_page_tbl_le(struct cnic_dev *dev, struct cnic_dma *dma)
 {
         int i;
-        u32 *page_table = dma->pgtbl;
+        __le32 *page_table = (__le32 *) dma->pgtbl;
 
         for (i = 0; i < dma->num_pages; i++) {
                 /* Each entry needs to be in little endian format. */
-                *page_table = dma->pg_map_arr[i] & 0xffffffff;
+                *page_table = cpu_to_le32(dma->pg_map_arr[i] & 0xffffffff);
                 page_table++;
-                *page_table = (u32) ((u64) dma->pg_map_arr[i] >> 32);
+                *page_table = cpu_to_le32((u64) dma->pg_map_arr[i] >> 32);
                 page_table++;
         }
 }
@@ -2760,6 +2767,8 @@ static u32 cnic_service_bnx2_queues(struct cnic_dev *dev)
         u32 status_idx = (u16) *cp->kcq1.status_idx_ptr;
         int kcqe_cnt;
 
+        /* status block index must be read before reading other fields */
+        rmb();
         cp->kwq_con_idx = *cp->kwq_con_idx_ptr;
 
         while ((kcqe_cnt = cnic_get_kcqes(dev, &cp->kcq1))) {
@@ -2770,6 +2779,8 @@ static u32 cnic_service_bnx2_queues(struct cnic_dev *dev)
                 barrier();
                 if (status_idx != *cp->kcq1.status_idx_ptr) {
                         status_idx = (u16) *cp->kcq1.status_idx_ptr;
+                        /* status block index must be read first */
+                        rmb();
                         cp->kwq_con_idx = *cp->kwq_con_idx_ptr;
                 } else
                         break;
@@ -2888,6 +2899,8 @@ static u32 cnic_service_bnx2x_kcq(struct cnic_dev *dev, struct kcq_info *info)
         u32 last_status = *info->status_idx_ptr;
         int kcqe_cnt;
 
+        /* status block index must be read before reading the KCQ */
+        rmb();
         while ((kcqe_cnt = cnic_get_kcqes(dev, info))) {
 
                 service_kcqes(dev, kcqe_cnt);
@@ -2898,6 +2911,8 @@ static u32 cnic_service_bnx2x_kcq(struct cnic_dev *dev, struct kcq_info *info)
                         break;
 
                 last_status = *info->status_idx_ptr;
+                /* status block index must be read before reading the KCQ */
+                rmb();
         }
         return last_status;
 }
@@ -2906,26 +2921,35 @@ static void cnic_service_bnx2x_bh(unsigned long data)
 {
         struct cnic_dev *dev = (struct cnic_dev *) data;
         struct cnic_local *cp = dev->cnic_priv;
-        u32 status_idx;
+        u32 status_idx, new_status_idx;
 
         if (unlikely(!test_bit(CNIC_F_CNIC_UP, &dev->flags)))
                 return;
 
-        status_idx = cnic_service_bnx2x_kcq(dev, &cp->kcq1);
+        while (1) {
+                status_idx = cnic_service_bnx2x_kcq(dev, &cp->kcq1);
 
-        CNIC_WR16(dev, cp->kcq1.io_addr, cp->kcq1.sw_prod_idx + MAX_KCQ_IDX);
+                CNIC_WR16(dev, cp->kcq1.io_addr,
+                          cp->kcq1.sw_prod_idx + MAX_KCQ_IDX);
 
-        if (BNX2X_CHIP_IS_E2(cp->chip_id)) {
-                status_idx = cnic_service_bnx2x_kcq(dev, &cp->kcq2);
+                if (!BNX2X_CHIP_IS_E2(cp->chip_id)) {
+                        cnic_ack_bnx2x_int(dev, cp->bnx2x_igu_sb_id, USTORM_ID,
+                                           status_idx, IGU_INT_ENABLE, 1);
+                        break;
+                }
+
+                new_status_idx = cnic_service_bnx2x_kcq(dev, &cp->kcq2);
+
+                if (new_status_idx != status_idx)
+                        continue;
 
                 CNIC_WR16(dev, cp->kcq2.io_addr, cp->kcq2.sw_prod_idx +
                           MAX_KCQ_IDX);
 
                 cnic_ack_igu_sb(dev, cp->bnx2x_igu_sb_id, IGU_SEG_ACCESS_DEF,
                                 status_idx, IGU_INT_ENABLE, 1);
-        } else {
-                cnic_ack_bnx2x_int(dev, cp->bnx2x_igu_sb_id, USTORM_ID,
-                                   status_idx, IGU_INT_ENABLE, 1);
+
+                break;
         }
 }
 
@@ -2953,7 +2977,8 @@ static void cnic_ulp_stop(struct cnic_dev *dev)
                 struct cnic_ulp_ops *ulp_ops;
 
                 mutex_lock(&cnic_lock);
-                ulp_ops = cp->ulp_ops[if_type];
+                ulp_ops = rcu_dereference_protected(cp->ulp_ops[if_type],
+                                                    lockdep_is_held(&cnic_lock));
                 if (!ulp_ops) {
                         mutex_unlock(&cnic_lock);
                         continue;
@@ -2977,7 +3002,8 @@ static void cnic_ulp_start(struct cnic_dev *dev)
                 struct cnic_ulp_ops *ulp_ops;
 
                 mutex_lock(&cnic_lock);
-                ulp_ops = cp->ulp_ops[if_type];
+                ulp_ops = rcu_dereference_protected(cp->ulp_ops[if_type],
+                                                    lockdep_is_held(&cnic_lock));
                 if (!ulp_ops || !ulp_ops->cnic_start) {
                         mutex_unlock(&cnic_lock);
                         continue;
@@ -3041,7 +3067,7 @@ static void cnic_ulp_init(struct cnic_dev *dev)
                 struct cnic_ulp_ops *ulp_ops;
 
                 mutex_lock(&cnic_lock);
-                ulp_ops = cnic_ulp_tbl[i];
+                ulp_ops = cnic_ulp_tbl_prot(i);
                 if (!ulp_ops || !ulp_ops->cnic_init) {
                         mutex_unlock(&cnic_lock);
                         continue;
@@ -3065,7 +3091,7 @@ static void cnic_ulp_exit(struct cnic_dev *dev)
                 struct cnic_ulp_ops *ulp_ops;
 
                 mutex_lock(&cnic_lock);
-                ulp_ops = cnic_ulp_tbl[i];
+                ulp_ops = cnic_ulp_tbl_prot(i);
                 if (!ulp_ops || !ulp_ops->cnic_exit) {
                         mutex_unlock(&cnic_lock);
                         continue;
@@ -3381,17 +3407,14 @@ static int cnic_get_v4_route(struct sockaddr_in *dst_addr,
                              struct dst_entry **dst)
 {
 #if defined(CONFIG_INET)
-        struct flowi fl;
-        int err;
         struct rtable *rt;
 
-        memset(&fl, 0, sizeof(fl));
-        fl.nl_u.ip4_u.daddr = dst_addr->sin_addr.s_addr;
-
-        err = ip_route_output_key(&init_net, &rt, &fl);
-        if (!err)
+        rt = ip_route_output(&init_net, dst_addr->sin_addr.s_addr, 0, 0, 0);
+        if (!IS_ERR(rt)) {
                 *dst = &rt->dst;
-        return err;
+                return 0;
+        }
+        return PTR_ERR(rt);
 #else
         return -ENETUNREACH;
 #endif
@@ -3401,14 +3424,14 @@ static int cnic_get_v6_route(struct sockaddr_in6 *dst_addr,
                              struct dst_entry **dst)
 {
 #if defined(CONFIG_IPV6) || (defined(CONFIG_IPV6_MODULE) && defined(MODULE))
-        struct flowi fl;
+        struct flowi6 fl6;
 
-        memset(&fl, 0, sizeof(fl));
-        ipv6_addr_copy(&fl.fl6_dst, &dst_addr->sin6_addr);
-        if (ipv6_addr_type(&fl.fl6_dst) & IPV6_ADDR_LINKLOCAL)
-                fl.oif = dst_addr->sin6_scope_id;
+        memset(&fl6, 0, sizeof(fl6));
+        ipv6_addr_copy(&fl6.daddr, &dst_addr->sin6_addr);
+        if (ipv6_addr_type(&fl6.daddr) & IPV6_ADDR_LINKLOCAL)
+                fl6.flowi6_oif = dst_addr->sin6_scope_id;
 
-        *dst = ip6_route_output(&init_net, NULL, &fl);
+        *dst = ip6_route_output(&init_net, NULL, &fl6);
         if (*dst)
                 return 0;
 #endif
@@ -4170,6 +4193,14 @@ static void cnic_enable_bnx2_int(struct cnic_dev *dev)
                 BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | cp->last_status_idx);
 }
 
+static void cnic_get_bnx2_iscsi_info(struct cnic_dev *dev)
+{
+        u32 max_conn;
+
+        max_conn = cnic_reg_rd_ind(dev, BNX2_FW_MAX_ISCSI_CONN);
+        dev->max_iscsi_conn = max_conn;
+}
+
 static void cnic_disable_bnx2_int_sync(struct cnic_dev *dev)
 {
         struct cnic_local *cp = dev->cnic_priv;
@@ -4494,6 +4525,8 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev)
                 return err;
         }
 
+        cnic_get_bnx2_iscsi_info(dev);
+
         return 0;
 }
 
@@ -4705,129 +4738,6 @@ static void cnic_init_bnx2x_rx_ring(struct cnic_dev *dev,
         cp->rx_cons = *cp->rx_cons_ptr;
 }
 
-static int cnic_read_bnx2x_iscsi_mac(struct cnic_dev *dev, u32 upper_addr,
-                                     u32 lower_addr)
-{
-        u32 val;
-        u8 mac[6];
-
-        val = CNIC_RD(dev, upper_addr);
-
-        mac[0] = (u8) (val >> 8);
-        mac[1] = (u8) val;
-
-        val = CNIC_RD(dev, lower_addr);
-
-        mac[2] = (u8) (val >> 24);
-        mac[3] = (u8) (val >> 16);
-        mac[4] = (u8) (val >> 8);
-        mac[5] = (u8) val;
-
-        if (is_valid_ether_addr(mac)) {
-                memcpy(dev->mac_addr, mac, 6);
-                return 0;
-        } else {
-                return -EINVAL;
-        }
-}
-
-static void cnic_get_bnx2x_iscsi_info(struct cnic_dev *dev)
-{
-        struct cnic_local *cp = dev->cnic_priv;
-        u32 base, base2, addr, addr1, val;
-        int port = CNIC_PORT(cp);
-
-        dev->max_iscsi_conn = 0;
-        base = CNIC_RD(dev, MISC_REG_SHARED_MEM_ADDR);
-        if (base == 0)
-                return;
-
-        base2 = CNIC_RD(dev, (CNIC_PATH(cp) ? MISC_REG_GENERIC_CR_1 :
-                                              MISC_REG_GENERIC_CR_0));
-        addr = BNX2X_SHMEM_ADDR(base,
-                dev_info.port_hw_config[port].iscsi_mac_upper);
-
-        addr1 = BNX2X_SHMEM_ADDR(base,
-                dev_info.port_hw_config[port].iscsi_mac_lower);
-
-        cnic_read_bnx2x_iscsi_mac(dev, addr, addr1);
-
-        addr = BNX2X_SHMEM_ADDR(base, validity_map[port]);
-        val = CNIC_RD(dev, addr);
-
-        if (!(val & SHR_MEM_VALIDITY_LIC_NO_KEY_IN_EFFECT)) {
-                u16 val16;
-
-                addr = BNX2X_SHMEM_ADDR(base,
-                                drv_lic_key[port].max_iscsi_init_conn);
-                val16 = CNIC_RD16(dev, addr);
-
-                if (val16)
-                        val16 ^= 0x1e1e;
-                dev->max_iscsi_conn = val16;
-        }
-
-        if (BNX2X_CHIP_IS_E2(cp->chip_id))
-                dev->max_fcoe_conn = BNX2X_FCOE_NUM_CONNECTIONS;
-
-        if (BNX2X_CHIP_IS_E1H(cp->chip_id) || BNX2X_CHIP_IS_E2(cp->chip_id)) {
-                int func = CNIC_FUNC(cp);
-                u32 mf_cfg_addr;
-
-                if (BNX2X_SHMEM2_HAS(base2, mf_cfg_addr))
-                        mf_cfg_addr = CNIC_RD(dev, BNX2X_SHMEM2_ADDR(base2,
-                                              mf_cfg_addr));
-                else
-                        mf_cfg_addr = base + BNX2X_SHMEM_MF_BLK_OFFSET;
-
-                if (BNX2X_CHIP_IS_E2(cp->chip_id)) {
-                        /* Must determine if the MF is SD vs SI mode */
-                        addr = BNX2X_SHMEM_ADDR(base,
-                                        dev_info.shared_feature_config.config);
-                        val = CNIC_RD(dev, addr);
-                        if ((val & SHARED_FEAT_CFG_FORCE_SF_MODE_MASK) ==
-                            SHARED_FEAT_CFG_FORCE_SF_MODE_SWITCH_INDEPT) {
-                                int rc;
-
-                                /* MULTI_FUNCTION_SI mode */
-                                addr = BNX2X_MF_CFG_ADDR(mf_cfg_addr,
-                                        func_ext_config[func].func_cfg);
-                                val = CNIC_RD(dev, addr);
-                                if (!(val & MACP_FUNC_CFG_FLAGS_ISCSI_OFFLOAD))
-                                        dev->max_iscsi_conn = 0;
-
-                                if (!(val & MACP_FUNC_CFG_FLAGS_FCOE_OFFLOAD))
-                                        dev->max_fcoe_conn = 0;
-
-                                addr = BNX2X_MF_CFG_ADDR(mf_cfg_addr,
-                                        func_ext_config[func].
-                                        iscsi_mac_addr_upper);
-                                addr1 = BNX2X_MF_CFG_ADDR(mf_cfg_addr,
-                                        func_ext_config[func].
-                                        iscsi_mac_addr_lower);
-                                rc = cnic_read_bnx2x_iscsi_mac(dev, addr,
-                                                                addr1);
-                                if (rc && func > 1)
-                                        dev->max_iscsi_conn = 0;
-
-                                return;
-                        }
-                }
-
-                addr = BNX2X_MF_CFG_ADDR(mf_cfg_addr,
-                        func_mf_config[func].e1hov_tag);
-
-                val = CNIC_RD(dev, addr);
-                val &= FUNC_MF_CFG_E1HOV_TAG_MASK;
-                if (val != FUNC_MF_CFG_E1HOV_TAG_DEFAULT) {
-                        dev->max_fcoe_conn = 0;
-                        dev->max_iscsi_conn = 0;
-                }
-        }
-        if (!is_valid_ether_addr(dev->mac_addr))
-                dev->max_iscsi_conn = 0;
-}
-
 static void cnic_init_bnx2x_kcq(struct cnic_dev *dev)
 {
         struct cnic_local *cp = dev->cnic_priv;
@@ -4909,8 +4819,6 @@ static int cnic_start_bnx2x_hw(struct cnic_dev *dev)
 
         cnic_init_bnx2x_kcq(dev);
 
-        cnic_get_bnx2x_iscsi_info(dev);
-
         /* Only 1 EQ */
         CNIC_WR16(dev, cp->kcq1.io_addr, MAX_KCQ_IDX);
         CNIC_WR(dev, BAR_CSTRORM_INTMEM +
@@ -5264,15 +5172,11 @@ static struct cnic_dev *init_bnx2_cnic(struct net_device *dev)
 
         dev_hold(dev);
         pci_dev_get(pdev);
-        if (pdev->device == PCI_DEVICE_ID_NX2_5709 ||
-            pdev->device == PCI_DEVICE_ID_NX2_5709S) {
-                u8 rev;
-
-                pci_read_config_byte(pdev, PCI_REVISION_ID, &rev);
-                if (rev < 0x10) {
-                        pci_dev_put(pdev);
-                        goto cnic_err;
-                }
+        if ((pdev->device == PCI_DEVICE_ID_NX2_5709 ||
+             pdev->device == PCI_DEVICE_ID_NX2_5709S) &&
+            (pdev->revision < 0x10)) {
+                pci_dev_put(pdev);
+                goto cnic_err;
         }
         pci_dev_put(pdev);
 
@@ -5343,6 +5247,14 @@ static struct cnic_dev *init_bnx2x_cnic(struct net_device *dev)
         cdev->pcidev = pdev;
         cp->chip_id = ethdev->chip_id;
 
+        if (!(ethdev->drv_state & CNIC_DRV_STATE_NO_ISCSI))
+                cdev->max_iscsi_conn = ethdev->max_iscsi_conn;
+        if (BNX2X_CHIP_IS_E2(cp->chip_id) &&
+            !(ethdev->drv_state & CNIC_DRV_STATE_NO_FCOE))
+                cdev->max_fcoe_conn = ethdev->max_fcoe_conn;
+
+        memcpy(cdev->mac_addr, ethdev->iscsi_mac, 6);
+
         cp->cnic_ops = &cnic_bnx2x_ops;
         cp->start_hw = cnic_start_bnx2x_hw;
         cp->stop_hw = cnic_stop_bnx2x_hw;
diff --git a/drivers/net/cnic.h b/drivers/net/cnic.h
index b328f6c924c..4456260c653 100644
--- a/drivers/net/cnic.h
+++ b/drivers/net/cnic.h
@@ -220,7 +220,7 @@ struct cnic_local {
 #define ULP_F_INIT      0
 #define ULP_F_START     1
 #define ULP_F_CALL_PENDING      2
-        struct cnic_ulp_ops *ulp_ops[MAX_CNIC_ULP_TYPE];
+        struct cnic_ulp_ops __rcu *ulp_ops[MAX_CNIC_ULP_TYPE];
 
         unsigned long cnic_local_flags;
 #define CNIC_LCL_FL_KWQ_INIT            0x0
diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h
index 9f44e0ffe00..e01b49ee359 100644
--- a/drivers/net/cnic_if.h
+++ b/drivers/net/cnic_if.h
@@ -12,8 +12,8 @@
 #ifndef CNIC_IF_H
 #define CNIC_IF_H
 
-#define CNIC_MODULE_VERSION     "2.2.12"
-#define CNIC_MODULE_RELDATE     "Jan 03, 2011"
+#define CNIC_MODULE_VERSION     "2.2.13"
+#define CNIC_MODULE_RELDATE     "Jan 31, 2011"
 
 #define CNIC_ULP_RDMA           0
 #define CNIC_ULP_ISCSI          1
@@ -159,6 +159,9 @@ struct cnic_eth_dev {
         u32             drv_state;
 #define CNIC_DRV_STATE_REGD             0x00000001
 #define CNIC_DRV_STATE_USING_MSIX       0x00000002
+#define CNIC_DRV_STATE_NO_ISCSI_OOO     0x00000004
+#define CNIC_DRV_STATE_NO_ISCSI         0x00000008
+#define CNIC_DRV_STATE_NO_FCOE          0x00000010
         u32             chip_id;
         u32             max_kwqe_pending;
         struct pci_dev  *pdev;
@@ -176,6 +179,7 @@ struct cnic_eth_dev {
         u32             fcoe_init_cid;
         u16             iscsi_l2_client_id;
         u16             iscsi_l2_cid;
+        u8              iscsi_mac[ETH_ALEN];
 
         int             num_irq;
         struct cnic_irq irq_arr[MAX_CNIC_VEC];
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index d325e01a53e..537a4b2e202 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -95,6 +95,9 @@
   Dmitry Pervushin  : dpervushin@ru.mvista.com
                     : PNX010X platform support
 
+  Domenico Andreoli : cavokz@gmail.com
+                    : QQ2440 platform support
+
 */
 
 /* Always include 'config.h' first in case the user wants to turn on
@@ -176,6 +179,10 @@ static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0};
 #elif defined(CONFIG_ARCH_IXDP2X01)
 static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0};
 static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};
+#elif defined(CONFIG_MACH_QQ2440)
+#include <mach/qq2440.h>
+static unsigned int netcard_portlist[] __used __initdata = { QQ2440_CS8900_VIRT_BASE + 0x300, 0 };
+static unsigned int cs8900_irq_map[] = { QQ2440_CS8900_IRQ, 0, 0, 0 };
 #elif defined(CONFIG_MACH_MX31ADS)
 #include <mach/board-mx31ads.h>
 static unsigned int netcard_portlist[] __used __initdata = {
@@ -521,6 +528,10 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
 #endif
                 lp->force = g_cs89x0_media__force;
 #endif
+
+#if defined(CONFIG_MACH_QQ2440)
+                lp->force |= FORCE_RJ45 | FORCE_FULL;
+#endif
         }
 
         /* Grab the region so we can find another board if autoIRQ fails. */
@@ -943,10 +954,10 @@ skip_this_frame:
 static void __init reset_chip(struct net_device *dev)
 {
 #if !defined(CONFIG_MACH_MX31ADS)
-#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01)
+#if !defined(CS89x0_NONISA_IRQ)
         struct net_local *lp = netdev_priv(dev);
         int ioaddr = dev->base_addr;
-#endif
+#endif /* CS89x0_NONISA_IRQ */
         int reset_start_time;
 
         writereg(dev, PP_SelfCTL, readreg(dev, PP_SelfCTL) | POWER_ON_RESET);
@@ -954,7 +965,7 @@ static void __init reset_chip(struct net_device *dev)
         /* wait 30 ms */
         msleep(30);
 
-#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01)
+#if !defined(CS89x0_NONISA_IRQ)
         if (lp->chip_type != CS8900) {
                 /* Hardware problem requires PNP registers to be reconfigured after a reset */
                 writeword(ioaddr, ADD_PORT, PP_CS8920_ISAINT);
@@ -965,7 +976,7 @@ static void __init reset_chip(struct net_device *dev)
                 outb((dev->mem_start >> 16) & 0xff, ioaddr + DATA_PORT);
                 outb((dev->mem_start >> 8) & 0xff,   ioaddr + DATA_PORT + 1);
         }
-#endif  /* IXDP2x01 */
+#endif /* CS89x0_NONISA_IRQ */
 
         /* Wait until the chip is reset */
         reset_start_time = jiffies;
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 4d538a4e9d5..91089314329 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -1983,14 +1983,20 @@ static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
 {
         struct port_info *pi = netdev_priv(dev);
         struct adapter *adapter = pi->adapter;
-        struct qset_params *qsp = &adapter->params.sge.qset[0];
-        struct sge_qset *qs = &adapter->sge.qs[0];
+        struct qset_params *qsp;
+        struct sge_qset *qs;
+        int i;
 
         if (c->rx_coalesce_usecs * 10 > M_NEWTIMER)
                 return -EINVAL;
 
-        qsp->coalesce_usecs = c->rx_coalesce_usecs;
-        t3_update_qset_coalesce(qs, qsp);
+        for (i = 0; i < pi->nqsets; i++) {
+                qsp = &adapter->params.sge.qset[i];
+                qs = &adapter->sge.qs[i];
+                qsp->coalesce_usecs = c->rx_coalesce_usecs;
+                t3_update_qset_coalesce(qs, qsp);
+        }
+
         return 0;
 }
 
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index ef02aa68c92..862804f32b6 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -186,9 +186,10 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter,
                                 dev = NULL;
                                 if (grp)
                                         dev = vlan_group_get_device(grp, vlan);
-                        } else
+                        } else if (netif_is_bond_slave(dev)) {
                                 while (dev->master)
                                         dev = dev->master;
+                        }
                         return dev;
                 }
         }
@@ -967,8 +968,6 @@ static int nb_callback(struct notifier_block *self, unsigned long event,
                 cxgb_neigh_update((struct neighbour *)ctx);
                 break;
         }
-        case (NETEVENT_PMTU_UPDATE):
-                break;
         case (NETEVENT_REDIRECT):{
                 struct netevent_redirect *nr = ctx;
                 cxgb_redirect(nr->old, nr->new);
diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c
index 059c1eec8c3..5352c8a23f4 100644
--- a/drivers/net/cxgb4/cxgb4_main.c
+++ b/drivers/net/cxgb4/cxgb4_main.c
@@ -2471,7 +2471,6 @@ static int netevent_cb(struct notifier_block *nb, unsigned long event,
         case NETEVENT_NEIGH_UPDATE:
                 check_neigh_update(data);
                 break;
-        case NETEVENT_PMTU_UPDATE:
         case NETEVENT_REDIRECT:
         default:
                 break;
@@ -2710,6 +2709,8 @@ static int cxgb_open(struct net_device *dev)
         struct port_info *pi = netdev_priv(dev);
         struct adapter *adapter = pi->adapter;
 
+        netif_carrier_off(dev);
+
         if (!(adapter->flags & FULL_INIT_DONE)) {
                 err = cxgb_up(adapter);
                 if (err < 0)
@@ -3661,7 +3662,6 @@ static int __devinit init_one(struct pci_dev *pdev,
                 pi->xact_addr_filt = -1;
                 pi->rx_offload = RX_CSO;
                 pi->port_id = i;
-                netif_carrier_off(netdev);
                 netdev->irq = pdev->irq;
 
                 netdev->features |= NETIF_F_SG | TSO_FLAGS;
diff --git a/drivers/net/cxgb4/t4_msg.h b/drivers/net/cxgb4/t4_msg.h
index a550d0c706f..eb71b8250b9 100644
--- a/drivers/net/cxgb4/t4_msg.h
+++ b/drivers/net/cxgb4/t4_msg.h
@@ -123,6 +123,7 @@ enum {
         ULP_MODE_NONE          = 0,
         ULP_MODE_ISCSI         = 2,
         ULP_MODE_RDMA          = 4,
+        ULP_MODE_TCPDDP        = 5,
         ULP_MODE_FCOE          = 6,
 };
 
diff --git a/drivers/net/cxgb4vf/cxgb4vf_main.c b/drivers/net/cxgb4vf/cxgb4vf_main.c
index 56166ae2059..6aad64df4dc 100644
--- a/drivers/net/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/cxgb4vf/cxgb4vf_main.c
@@ -2040,7 +2040,7 @@ static int __devinit setup_debugfs(struct adapter *adapter)
 {
         int i;
 
-        BUG_ON(adapter->debugfs_root == NULL);
+        BUG_ON(IS_ERR_OR_NULL(adapter->debugfs_root));
 
         /*
          * Debugfs support is best effort.
@@ -2061,7 +2061,7 @@ static int __devinit setup_debugfs(struct adapter *adapter)
  */
 static void cleanup_debugfs(struct adapter *adapter)
 {
-        BUG_ON(adapter->debugfs_root == NULL);
+        BUG_ON(IS_ERR_OR_NULL(adapter->debugfs_root));
 
         /*
          * Unlike our sister routine cleanup_proc(), we don't need to remove
@@ -2489,17 +2489,6 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
         struct net_device *netdev;
 
         /*
-         * Vet our module parameters.
-         */
-        if (msi != MSI_MSIX && msi != MSI_MSI) {
-                dev_err(&pdev->dev, "bad module parameter msi=%d; must be %d"
-                        " (MSI-X or MSI) or %d (MSI)\n", msi, MSI_MSIX,
-                        MSI_MSI);
-                err = -EINVAL;
-                goto err_out;
-        }
-
-        /*
          * Print our driver banner the first time we're called to initialize a
          * device.
          */
@@ -2711,11 +2700,11 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
         /*
          * Set up our debugfs entries.
          */
-        if (cxgb4vf_debugfs_root) {
+        if (!IS_ERR_OR_NULL(cxgb4vf_debugfs_root)) {
                 adapter->debugfs_root =
                         debugfs_create_dir(pci_name(pdev),
                                            cxgb4vf_debugfs_root);
-                if (adapter->debugfs_root == NULL)
+                if (IS_ERR_OR_NULL(adapter->debugfs_root))
                         dev_warn(&pdev->dev, "could not create debugfs"
                                  " directory");
                 else
@@ -2770,7 +2759,7 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
          */
 
 err_free_debugfs:
-        if (adapter->debugfs_root) {
+        if (!IS_ERR_OR_NULL(adapter->debugfs_root)) {
                 cleanup_debugfs(adapter);
                 debugfs_remove_recursive(adapter->debugfs_root);
         }
@@ -2802,7 +2791,6 @@ err_release_regions:
 err_disable_device:
         pci_disable_device(pdev);
 
-err_out:
         return err;
 }
 
@@ -2840,7 +2828,7 @@ static void __devexit cxgb4vf_pci_remove(struct pci_dev *pdev)
                 /*
                  * Tear down our debugfs entries.
                  */
-                if (adapter->debugfs_root) {
+                if (!IS_ERR_OR_NULL(adapter->debugfs_root)) {
                         cleanup_debugfs(adapter);
                         debugfs_remove_recursive(adapter->debugfs_root);
                 }
@@ -2874,6 +2862,46 @@ static void __devexit cxgb4vf_pci_remove(struct pci_dev *pdev)
 }
 
 /*
+ * "Shutdown" quiesce the device, stopping Ingress Packet and Interrupt
+ * delivery.
+ */
+static void __devexit cxgb4vf_pci_shutdown(struct pci_dev *pdev)
+{
+        struct adapter *adapter;
+        int pidx;
+
+        adapter = pci_get_drvdata(pdev);
+        if (!adapter)
+                return;
+
+        /*
+         * Disable all Virtual Interfaces.  This will shut down the
+         * delivery of all ingress packets into the chip for these
+         * Virtual Interfaces.
+         */
+        for_each_port(adapter, pidx) {
+                struct net_device *netdev;
+                struct port_info *pi;
+
+                if (!test_bit(pidx, &adapter->registered_device_map))
+                        continue;
+
+                netdev = adapter->port[pidx];
+                if (!netdev)
+                        continue;
+
+                pi = netdev_priv(netdev);
+                t4vf_enable_vi(adapter, pi->viid, false, false);
+        }
+
+        /*
+         * Free up all Queues which will prevent further DMA and
+         * Interrupts allowing various internal pathways to drain.
+         */
+        t4vf_free_sge_resources(adapter);
+}
+
+/*
  * PCI Device registration data structures.
  */
 #define CH_DEVICE(devid, idx) \
@@ -2906,6 +2934,7 @@ static struct pci_driver cxgb4vf_driver = {
         .id_table       = cxgb4vf_pci_tbl,
         .probe          = cxgb4vf_pci_probe,
         .remove         = __devexit_p(cxgb4vf_pci_remove),
+        .shutdown       = __devexit_p(cxgb4vf_pci_shutdown),
 };
 
 /*
@@ -2915,14 +2944,25 @@ static int __init cxgb4vf_module_init(void)
 {
         int ret;
 
+        /*
+         * Vet our module parameters.
+         */
+        if (msi != MSI_MSIX && msi != MSI_MSI) {
+                printk(KERN_WARNING KBUILD_MODNAME
+                       ": bad module parameter msi=%d; must be %d"
+                       " (MSI-X or MSI) or %d (MSI)\n",
+                       msi, MSI_MSIX, MSI_MSI);
+                return -EINVAL;
+        }
+
         /* Debugfs support is optional, just warn if this fails */
         cxgb4vf_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL);
-        if (!cxgb4vf_debugfs_root)
+        if (IS_ERR_OR_NULL(cxgb4vf_debugfs_root))
                 printk(KERN_WARNING KBUILD_MODNAME ": could not create"
                        " debugfs entry, continuing\n");
 
         ret = pci_register_driver(&cxgb4vf_driver);
-        if (ret < 0)
+        if (ret < 0 && !IS_ERR_OR_NULL(cxgb4vf_debugfs_root))
                 debugfs_remove(cxgb4vf_debugfs_root);
         return ret;
 }
diff --git a/drivers/net/cxgb4vf/t4vf_hw.c b/drivers/net/cxgb4vf/t4vf_hw.c
index 0f51c80475c..192db226ec7 100644
--- a/drivers/net/cxgb4vf/t4vf_hw.c
+++ b/drivers/net/cxgb4vf/t4vf_hw.c
@@ -171,7 +171,7 @@ int t4vf_wr_mbox_core(struct adapter *adapter, const void *cmd, int size,
         delay_idx = 0;
         ms = delay[0];
 
-        for (i = 0; i < 500; i += ms) {
+        for (i = 0; i < FW_CMD_MAX_TIMEOUT; i += ms) {
                 if (sleep_ok) {
                         ms = delay[delay_idx];
                         if (delay_idx < ARRAY_SIZE(delay) - 1)
diff --git a/drivers/net/davinci_cpdma.c b/drivers/net/davinci_cpdma.c
index e92b2b6cd8c..ae47f23ba93 100644
--- a/drivers/net/davinci_cpdma.c
+++ b/drivers/net/davinci_cpdma.c
@@ -76,6 +76,7 @@ struct cpdma_desc {
 
 struct cpdma_desc_pool {
         u32                     phys;
+        u32                     hw_addr;
         void __iomem            *iomap;         /* ioremap map */
         void                    *cpumap;        /* dma_alloc map */
         int                     desc_size, mem_size;
@@ -137,7 +138,8 @@ struct cpdma_chan {
  * abstract out these details
  */
 static struct cpdma_desc_pool *
-cpdma_desc_pool_create(struct device *dev, u32 phys, int size, int align)
+cpdma_desc_pool_create(struct device *dev, u32 phys, u32 hw_addr,
+                                int size, int align)
 {
         int bitmap_size;
         struct cpdma_desc_pool *pool;
@@ -161,10 +163,12 @@ cpdma_desc_pool_create(struct device *dev, u32 phys, int size, int align)
         if (phys) {
                 pool->phys  = phys;
                 pool->iomap = ioremap(phys, size);
+                pool->hw_addr = hw_addr;
         } else {
                 pool->cpumap = dma_alloc_coherent(dev, size, &pool->phys,
                                                   GFP_KERNEL);
                 pool->iomap = (void __force __iomem *)pool->cpumap;
+                pool->hw_addr = pool->phys;
         }
 
         if (pool->iomap)
@@ -201,14 +205,14 @@ static inline dma_addr_t desc_phys(struct cpdma_desc_pool *pool,
 {
         if (!desc)
                 return 0;
-        return pool->phys + (__force dma_addr_t)desc -
+        return pool->hw_addr + (__force dma_addr_t)desc -
                             (__force dma_addr_t)pool->iomap;
 }
 
 static inline struct cpdma_desc __iomem *
 desc_from_phys(struct cpdma_desc_pool *pool, dma_addr_t dma)
 {
-        return dma ? pool->iomap + dma - pool->phys : NULL;
+        return dma ? pool->iomap + dma - pool->hw_addr : NULL;
 }
 
 static struct cpdma_desc __iomem *
@@ -260,6 +264,7 @@ struct cpdma_ctlr *cpdma_ctlr_create(struct cpdma_params *params)
 
         ctlr->pool = cpdma_desc_pool_create(ctlr->dev,
                                             ctlr->params.desc_mem_phys,
+                                            ctlr->params.desc_hw_addr,
                                             ctlr->params.desc_mem_size,
                                             ctlr->params.desc_align);
         if (!ctlr->pool) {
diff --git a/drivers/net/davinci_cpdma.h b/drivers/net/davinci_cpdma.h
index 868e50ebde4..afa19a0c0d8 100644
--- a/drivers/net/davinci_cpdma.h
+++ b/drivers/net/davinci_cpdma.h
@@ -33,6 +33,7 @@ struct cpdma_params {
         bool                    has_soft_reset;
         int                     min_packet_size;
         u32                     desc_mem_phys;
+        u32                     desc_hw_addr;
         int                     desc_mem_size;
         int                     desc_align;
 
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 2a628d17d17..baca6bfcb08 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -1008,7 +1008,7 @@ static void emac_rx_handler(void *token, int len, int status)
         int                     ret;
 
         /* free and bail if we are shutting down */
-        if (unlikely(!netif_running(ndev))) {
+        if (unlikely(!netif_running(ndev) || !netif_carrier_ok(ndev))) {
                 dev_kfree_skb_any(skb);
                 return;
         }
@@ -1730,7 +1730,7 @@ static struct net_device_stats *emac_dev_getnetstats(struct net_device *ndev)
                 emac_read(EMAC_TXCARRIERSENSE);
         emac_write(EMAC_TXCARRIERSENSE, stats_clear_mask);
 
-        ndev->stats.tx_fifo_errors = emac_read(EMAC_TXUNDERRUN);
+        ndev->stats.tx_fifo_errors += emac_read(EMAC_TXUNDERRUN);
         emac_write(EMAC_TXUNDERRUN, stats_clear_mask);
 
         return &ndev->stats;
@@ -1854,10 +1854,13 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
         dma_params.rxcp                 = priv->emac_base + 0x660;
         dma_params.num_chan             = EMAC_MAX_TXRX_CHANNELS;
         dma_params.min_packet_size      = EMAC_DEF_MIN_ETHPKTSIZE;
-        dma_params.desc_mem_phys        = hw_ram_addr;
+        dma_params.desc_hw_addr         = hw_ram_addr;
         dma_params.desc_mem_size        = pdata->ctrl_ram_size;
         dma_params.desc_align           = 16;
 
+        dma_params.desc_mem_phys = pdata->no_bd_ram ? 0 :
+                        (u32 __force)res->start + pdata->ctrl_ram_offset;
+
         priv->dma = cpdma_ctlr_create(&dma_params);
         if (!priv->dma) {
                 dev_err(emac_dev, "DaVinci EMAC: Error initializing DMA\n");
diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 1b48b68ad4f..8b0084d17c8 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -1094,7 +1094,7 @@ static int depca_rx(struct net_device *dev)
                                 }
                         }
                         /* Change buffer ownership for this last frame, back to the adapter */
-                        for (; lp->rx_old != entry; lp->rx_old = (++lp->rx_old) & lp->rxRingMask) {
+                        for (; lp->rx_old != entry; lp->rx_old = (lp->rx_old + 1) & lp->rxRingMask) {
                                 writel(readl(&lp->rx_ring[lp->rx_old].base) | R_OWN, &lp->rx_ring[lp->rx_old].base);
                         }
                         writel(readl(&lp->rx_ring[entry].base) | R_OWN, &lp->rx_ring[entry].base);
@@ -1103,7 +1103,7 @@ static int depca_rx(struct net_device *dev)
                 /*
                    ** Update entry information
                  */
-                lp->rx_new = (++lp->rx_new) & lp->rxRingMask;
+                lp->rx_new = (lp->rx_new + 1) & lp->rxRingMask;
         }
 
         return 0;
@@ -1148,7 +1148,7 @@ static int depca_tx(struct net_device *dev)
                 }
 
                 /* Update all the pointers */
-                lp->tx_old = (++lp->tx_old) & lp->txRingMask;
+                lp->tx_old = (lp->tx_old + 1) & lp->txRingMask;
         }
 
         return 0;
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index e1a8216ff69..c05db604605 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -1753,8 +1753,6 @@ rio_close (struct net_device *dev)
 
         /* Free all the skbuffs in the queue. */
         for (i = 0; i < RX_RING_SIZE; i++) {
-                np->rx_ring[i].status = 0;
-                np->rx_ring[i].fraginfo = 0;
                 skb = np->rx_skbuff[i];
                 if (skb) {
                         pci_unmap_single(np->pdev,
@@ -1763,6 +1761,8 @@ rio_close (struct net_device *dev)
                         dev_kfree_skb (skb);
                         np->rx_skbuff[i] = NULL;
                 }
+                np->rx_ring[i].status = 0;
+                np->rx_ring[i].fraginfo = 0;
         }
         for (i = 0; i < TX_RING_SIZE; i++) {
                 skb = np->tx_skbuff[i];
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 2d4c4fc1d90..b7af5bab993 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -621,9 +621,9 @@ static int dm9000_set_wol(struct net_device *dev, struct ethtool_wolinfo *w)
                 /* change in wol state, update IRQ state */
 
                 if (!dm->wake_state)
-                        set_irq_wake(dm->irq_wake, 1);
+                        irq_set_irq_wake(dm->irq_wake, 1);
                 else if (dm->wake_state & !opts)
-                        set_irq_wake(dm->irq_wake, 0);
+                        irq_set_irq_wake(dm->irq_wake, 0);
         }
 
         dm->wake_state = opts;
@@ -802,10 +802,7 @@ dm9000_init_dm9000(struct net_device *dev)
         /* Checksum mode */
         dm9000_set_rx_csum_unlocked(dev, db->rx_csum);
 
-        /* GPIO0 on pre-activate PHY */
-        iow(db, DM9000_GPR, 0); /* REG_1F bit0 activate phyxcer */
         iow(db, DM9000_GPCR, GPCR_GEP_CNTL);    /* Let GPIO0 output */
-        iow(db, DM9000_GPR, 0); /* Enable PHY */
 
         ncr = (db->flags & DM9000_PLATF_EXT_PHY) ? NCR_EXT_PHY : 0;
 
@@ -852,8 +849,8 @@ static void dm9000_timeout(struct net_device *dev)
         unsigned long flags;
 
         /* Save previous register address */
-        reg_save = readb(db->io_addr);
         spin_lock_irqsave(&db->lock, flags);
+        reg_save = readb(db->io_addr);
 
         netif_stop_queue(dev);
         dm9000_reset(db);
@@ -1194,6 +1191,10 @@ dm9000_open(struct net_device *dev)
         if (request_irq(dev->irq, dm9000_interrupt, irqflags, dev->name, dev))
                 return -EAGAIN;
 
+        /* GPIO0 on pre-activate PHY, Reg 1F is not set by reset */
+        iow(db, DM9000_GPR, 0); /* REG_1F bit0 activate phyxcer */
+        mdelay(1); /* delay needs by DM9000B */
+
         /* Initialize DM9000 board */
         dm9000_reset(db);
         dm9000_init_dm9000(dev);
@@ -1423,13 +1424,13 @@ dm9000_probe(struct platform_device *pdev)
                 } else {
 
                         /* test to see if irq is really wakeup capable */
-                        ret = set_irq_wake(db->irq_wake, 1);
+                        ret = irq_set_irq_wake(db->irq_wake, 1);
                         if (ret) {
                                 dev_err(db->dev, "irq %d cannot set wakeup (%d)\n",
                                         db->irq_wake, ret);
                                 ret = 0;
                         } else {
-                                set_irq_wake(db->irq_wake, 0);
+                                irq_set_irq_wake(db->irq_wake, 0);
                                 db->wake_supported = 1;
                         }
                 }
@@ -1592,10 +1593,15 @@ dm9000_probe(struct platform_device *pdev)
                         ndev->dev_addr[i] = ior(db, i+DM9000_PAR);
         }
 
-        if (!is_valid_ether_addr(ndev->dev_addr))
+        if (!is_valid_ether_addr(ndev->dev_addr)) {
                 dev_warn(db->dev, "%s: Invalid ethernet MAC address. Please "
                          "set using ifconfig\n", ndev->name);
 
+                random_ether_addr(ndev->dev_addr);
+                mac_src = "random";
+        }
+
+
         platform_set_drvdata(pdev, ndev);
         ret = register_netdev(ndev);
 
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 9d8a20b72fa..8318ea06cb6 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -337,8 +337,6 @@ static int dnet_mii_init(struct dnet *bp)
         for (i = 0; i < PHY_MAX_ADDR; i++)
                 bp->mii_bus->irq[i] = PHY_POLL;
 
-        platform_set_drvdata(bp->dev, bp->mii_bus);
-
         if (mdiobus_register(bp->mii_bus)) {
                 err = -ENXIO;
                 goto err_out_free_mdio_irq;
@@ -863,6 +861,7 @@ static int __devinit dnet_probe(struct platform_device *pdev)
         bp = netdev_priv(dev);
         bp->dev = dev;
 
+        platform_set_drvdata(pdev, dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
 
         spin_lock_init(&bp->lock);
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index aed223b1b89..7501d977d99 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -124,6 +124,7 @@ static s32 e1000_set_phy_type(struct e1000_hw *hw)
         case M88E1000_I_PHY_ID:
         case M88E1011_I_PHY_ID:
         case M88E1111_I_PHY_ID:
+        case M88E1118_E_PHY_ID:
                 hw->phy_type = e1000_phy_m88;
                 break;
         case IGP01E1000_I_PHY_ID:
@@ -3222,7 +3223,8 @@ static s32 e1000_detect_gig_phy(struct e1000_hw *hw)
                 break;
         case e1000_ce4100:
                 if ((hw->phy_id == RTL8211B_PHY_ID) ||
-                    (hw->phy_id == RTL8201N_PHY_ID))
+                    (hw->phy_id == RTL8201N_PHY_ID) ||
+                    (hw->phy_id == M88E1118_E_PHY_ID))
                         match = true;
                 break;
         case e1000_82541:
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index 196eeda2dd6..c70b23d5228 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -2917,6 +2917,7 @@ struct e1000_host_command_info {
 #define M88E1000_14_PHY_ID M88E1000_E_PHY_ID
 #define M88E1011_I_REV_4   0x04
 #define M88E1111_I_PHY_ID  0x01410CC0
+#define M88E1118_E_PHY_ID  0x01410E40
 #define L1LXT971A_PHY_ID   0x001378E0
 
 #define RTL8211B_PHY_ID    0x001CC910
diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h
index 55c1711f168..33e7c45a4fe 100644
--- a/drivers/net/e1000/e1000_osdep.h
+++ b/drivers/net/e1000/e1000_osdep.h
@@ -42,7 +42,8 @@
 #define GBE_CONFIG_RAM_BASE \
         ((unsigned int)(CONFIG_RAM_BASE + GBE_CONFIG_OFFSET))
 
-#define GBE_CONFIG_BASE_VIRT    phys_to_virt(GBE_CONFIG_RAM_BASE)
+#define GBE_CONFIG_BASE_VIRT \
+        ((void __iomem *)phys_to_virt(GBE_CONFIG_RAM_BASE))
 
 #define GBE_CONFIG_FLASH_WRITE(base, offset, count, data) \
         (iowrite16_rep(base + offset, data, count))
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h
index 13149983d07..c516a7440be 100644
--- a/drivers/net/e1000e/defines.h
+++ b/drivers/net/e1000e/defines.h
@@ -86,6 +86,7 @@
 #define E1000_CTRL_EXT_IAME           0x08000000 /* Interrupt acknowledge Auto-mask */
 #define E1000_CTRL_EXT_INT_TIMER_CLR  0x20000000 /* Clear Interrupt timers after IMS clear */
 #define E1000_CTRL_EXT_PBA_CLR        0x80000000 /* PBA Clear */
+#define E1000_CTRL_EXT_LSECCK         0x00001000
 #define E1000_CTRL_EXT_PHYPDEN        0x00100000
 
 /* Receive Descriptor bit definitions */
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index e610e136905..00bf595ebd6 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -364,6 +364,7 @@ struct e1000_adapter {
         /* structs defined in e1000_hw.h */
         struct e1000_hw hw;
 
+        spinlock_t stats64_lock;
         struct e1000_hw_stats stats;
         struct e1000_phy_info phy_info;
         struct e1000_phy_stats phy_stats;
@@ -494,7 +495,9 @@ extern int e1000e_setup_rx_resources(struct e1000_adapter *adapter);
 extern int e1000e_setup_tx_resources(struct e1000_adapter *adapter);
 extern void e1000e_free_rx_resources(struct e1000_adapter *adapter);
 extern void e1000e_free_tx_resources(struct e1000_adapter *adapter);
-extern void e1000e_update_stats(struct e1000_adapter *adapter);
+extern struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
+                                                    struct rtnl_link_stats64
+                                                    *stats);
 extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter);
 extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter);
 extern void e1000e_get_hw_control(struct e1000_adapter *adapter);
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index fa08b6336cf..07f09e96e45 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -46,15 +46,15 @@ struct e1000_stats {
 };
 
 #define E1000_STAT(str, m) { \
-                        .stat_string = str, \
-                        .type = E1000_STATS, \
-                        .sizeof_stat = sizeof(((struct e1000_adapter *)0)->m), \
-                        .stat_offset = offsetof(struct e1000_adapter, m) }
+                .stat_string = str, \
+                .type = E1000_STATS, \
+                .sizeof_stat = sizeof(((struct e1000_adapter *)0)->m), \
+                .stat_offset = offsetof(struct e1000_adapter, m) }
 #define E1000_NETDEV_STAT(str, m) { \
-                        .stat_string = str, \
-                        .type = NETDEV_STATS, \
-                        .sizeof_stat = sizeof(((struct net_device *)0)->m), \
-                        .stat_offset = offsetof(struct net_device, m) }
+                .stat_string = str, \
+                .type = NETDEV_STATS, \
+                .sizeof_stat = sizeof(((struct rtnl_link_stats64 *)0)->m), \
+                .stat_offset = offsetof(struct rtnl_link_stats64, m) }
 
 static const struct e1000_stats e1000_gstrings_stats[] = {
         E1000_STAT("rx_packets", stats.gprc),
@@ -65,21 +65,21 @@ static const struct e1000_stats e1000_gstrings_stats[] = {
         E1000_STAT("tx_broadcast", stats.bptc),
         E1000_STAT("rx_multicast", stats.mprc),
         E1000_STAT("tx_multicast", stats.mptc),
-        E1000_NETDEV_STAT("rx_errors", stats.rx_errors),
-        E1000_NETDEV_STAT("tx_errors", stats.tx_errors),
-        E1000_NETDEV_STAT("tx_dropped", stats.tx_dropped),
+        E1000_NETDEV_STAT("rx_errors", rx_errors),
+        E1000_NETDEV_STAT("tx_errors", tx_errors),
+        E1000_NETDEV_STAT("tx_dropped", tx_dropped),
         E1000_STAT("multicast", stats.mprc),
         E1000_STAT("collisions", stats.colc),
-        E1000_NETDEV_STAT("rx_length_errors", stats.rx_length_errors),
-        E1000_NETDEV_STAT("rx_over_errors", stats.rx_over_errors),
+        E1000_NETDEV_STAT("rx_length_errors", rx_length_errors),
+        E1000_NETDEV_STAT("rx_over_errors", rx_over_errors),
         E1000_STAT("rx_crc_errors", stats.crcerrs),
-        E1000_NETDEV_STAT("rx_frame_errors", stats.rx_frame_errors),
+        E1000_NETDEV_STAT("rx_frame_errors", rx_frame_errors),
         E1000_STAT("rx_no_buffer_count", stats.rnbc),
         E1000_STAT("rx_missed_errors", stats.mpc),
         E1000_STAT("tx_aborted_errors", stats.ecol),
         E1000_STAT("tx_carrier_errors", stats.tncrs),
-        E1000_NETDEV_STAT("tx_fifo_errors", stats.tx_fifo_errors),
-        E1000_NETDEV_STAT("tx_heartbeat_errors", stats.tx_heartbeat_errors),
+        E1000_NETDEV_STAT("tx_fifo_errors", tx_fifo_errors),
+        E1000_NETDEV_STAT("tx_heartbeat_errors", tx_heartbeat_errors),
         E1000_STAT("tx_window_errors", stats.latecol),
         E1000_STAT("tx_abort_late_coll", stats.latecol),
         E1000_STAT("tx_deferred_ok", stats.dc),
@@ -433,13 +433,11 @@ static void e1000_get_regs(struct net_device *netdev,
         struct e1000_hw *hw = &adapter->hw;
         u32 *regs_buff = p;
         u16 phy_data;
-        u8 revision_id;
 
         memset(p, 0, E1000_REGS_LEN * sizeof(u32));
 
-        pci_read_config_byte(adapter->pdev, PCI_REVISION_ID, &revision_id);
-
-        regs->version = (1 << 24) | (revision_id << 16) | adapter->pdev->device;
+        regs->version = (1 << 24) | (adapter->pdev->revision << 16) |
+                        adapter->pdev->device;
 
         regs_buff[0]  = er32(CTRL);
         regs_buff[1]  = er32(STATUS);
@@ -684,20 +682,13 @@ static int e1000_set_ringparam(struct net_device *netdev,
         rx_old = adapter->rx_ring;
 
         err = -ENOMEM;
-        tx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
+        tx_ring = kmemdup(tx_old, sizeof(struct e1000_ring), GFP_KERNEL);
         if (!tx_ring)
                 goto err_alloc_tx;
-        /*
-         * use a memcpy to save any previously configured
-         * items like napi structs from having to be
-         * reinitialized
-         */
-        memcpy(tx_ring, tx_old, sizeof(struct e1000_ring));
 
-        rx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL);
+        rx_ring = kmemdup(rx_old, sizeof(struct e1000_ring), GFP_KERNEL);
         if (!rx_ring)
                 goto err_alloc_rx;
-        memcpy(rx_ring, rx_old, sizeof(struct e1000_ring));
 
         adapter->tx_ring = tx_ring;
         adapter->rx_ring = rx_ring;
@@ -1255,7 +1246,6 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
         u32 ctrl_reg = 0;
-        u32 stat_reg = 0;
         u16 phy_reg = 0;
         s32 ret_val = 0;
 
@@ -1363,8 +1353,7 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
                  * Set the ILOS bit on the fiber Nic if half duplex link is
                  * detected.
                  */
-                stat_reg = er32(STATUS);
-                if ((stat_reg & E1000_STATUS_FD) == 0)
+                if ((er32(STATUS) & E1000_STATUS_FD) == 0)
                         ctrl_reg |= (E1000_CTRL_ILOS | E1000_CTRL_SLU);
         }
 
@@ -1677,10 +1666,13 @@ static int e1000_link_test(struct e1000_adapter *adapter, u64 *data)
         } else {
                 hw->mac.ops.check_for_link(hw);
                 if (hw->mac.autoneg)
-                        msleep(4000);
+                        /*
+                         * On some Phy/switch combinations, link establishment
+                         * can take a few seconds more than expected.
+                         */
+                        msleep(5000);
 
-                if (!(er32(STATUS) &
-                      E1000_STATUS_LU))
+                if (!(er32(STATUS) & E1000_STATUS_LU))
                         *data = 1;
         }
         return *data;
@@ -1807,8 +1799,7 @@ static void e1000_get_wol(struct net_device *netdev,
                 return;
 
         wol->supported = WAKE_UCAST | WAKE_MCAST |
-                         WAKE_BCAST | WAKE_MAGIC |
-                         WAKE_PHY | WAKE_ARP;
+            WAKE_BCAST | WAKE_MAGIC | WAKE_PHY;
 
         /* apply any specific unsupported masks here */
         if (adapter->flags & FLAG_NO_WAKE_UCAST) {
@@ -1829,19 +1820,16 @@ static void e1000_get_wol(struct net_device *netdev,
                 wol->wolopts |= WAKE_MAGIC;
         if (adapter->wol & E1000_WUFC_LNKC)
                 wol->wolopts |= WAKE_PHY;
-        if (adapter->wol & E1000_WUFC_ARP)
-                wol->wolopts |= WAKE_ARP;
 }
 
-static int e1000_set_wol(struct net_device *netdev,
-                         struct ethtool_wolinfo *wol)
+static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
 
         if (!(adapter->flags & FLAG_HAS_WOL) ||
             !device_can_wakeup(&adapter->pdev->dev) ||
             (wol->wolopts & ~(WAKE_UCAST | WAKE_MCAST | WAKE_BCAST |
-                              WAKE_MAGIC | WAKE_PHY | WAKE_ARP)))
+                              WAKE_MAGIC | WAKE_PHY)))
                 return -EOPNOTSUPP;
 
         /* these settings will always override what we currently have */
@@ -1857,8 +1845,6 @@ static int e1000_set_wol(struct net_device *netdev,
                 adapter->wol |= E1000_WUFC_MAG;
         if (wol->wolopts & WAKE_PHY)
                 adapter->wol |= E1000_WUFC_LNKC;
-        if (wol->wolopts & WAKE_ARP)
-                adapter->wol |= E1000_WUFC_ARP;
 
         device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
 
@@ -1972,8 +1958,15 @@ static int e1000_set_coalesce(struct net_device *netdev,
 static int e1000_nway_reset(struct net_device *netdev)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
-        if (netif_running(netdev))
-                e1000e_reinit_locked(adapter);
+
+        if (!netif_running(netdev))
+                return -EAGAIN;
+
+        if (!adapter->hw.mac.autoneg)
+                return -EINVAL;
+
+        e1000e_reinit_locked(adapter);
+
         return 0;
 }
 
@@ -1982,14 +1975,15 @@ static void e1000_get_ethtool_stats(struct net_device *netdev,
                                     u64 *data)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
+        struct rtnl_link_stats64 net_stats;
         int i;
         char *p = NULL;
 
-        e1000e_update_stats(adapter);
+        e1000e_get_stats64(netdev, &net_stats);
         for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
                 switch (e1000_gstrings_stats[i].type) {
                 case NETDEV_STATS:
-                        p = (char *) netdev +
+                        p = (char *) &net_stats +
                                         e1000_gstrings_stats[i].stat_offset;
                         break;
                 case E1000_STATS:
@@ -2014,7 +2008,7 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset,
 
         switch (stringset) {
         case ETH_SS_TEST:
-                memcpy(data, *e1000_gstrings_test, sizeof(e1000_gstrings_test));
+                memcpy(data, e1000_gstrings_test, sizeof(e1000_gstrings_test));
                 break;
         case ETH_SS_STATS:
                 for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index bc0860a598c..307e1ec2241 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -812,9 +812,8 @@ struct e1000_nvm_operations {
 
 struct e1000_mac_info {
         struct e1000_mac_operations ops;
-
-        u8 addr[6];
-        u8 perm_addr[6];
+        u8 addr[ETH_ALEN];
+        u8 perm_addr[ETH_ALEN];
 
         enum e1000_mac_type type;
 
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index fb46974cfec..ce1dbfdca11 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -140,6 +140,11 @@
 #define I82579_LPI_CTRL                 PHY_REG(772, 20)
 #define I82579_LPI_CTRL_ENABLE_MASK     0x6000
 
+/* EMI Registers */
+#define I82579_EMI_ADDR         0x10
+#define I82579_EMI_DATA         0x11
+#define I82579_LPI_UPDATE_TIMER 0x4805  /* in 40ns units + 40 ns base value */
+
 /* Strapping Option Register - RO */
 #define E1000_STRAP                     0x0000C
 #define E1000_STRAP_SMBUS_ADDRESS_MASK  0x00FE0000
@@ -302,9 +307,9 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
          * the interconnect to PCIe mode.
          */
         fwsm = er32(FWSM);
-        if (!(fwsm & E1000_ICH_FWSM_FW_VALID)) {
+        if (!(fwsm & E1000_ICH_FWSM_FW_VALID) && !e1000_check_reset_block(hw)) {
                 ctrl = er32(CTRL);
-                ctrl |=  E1000_CTRL_LANPHYPC_OVERRIDE;
+                ctrl |= E1000_CTRL_LANPHYPC_OVERRIDE;
                 ctrl &= ~E1000_CTRL_LANPHYPC_VALUE;
                 ew32(CTRL, ctrl);
                 udelay(10);
@@ -331,7 +336,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
                 goto out;
 
         /* Ungate automatic PHY configuration on non-managed 82579 */
-        if ((hw->mac.type == e1000_pch2lan)  &&
+        if ((hw->mac.type == e1000_pch2lan) &&
             !(fwsm & E1000_ICH_FWSM_FW_VALID)) {
                 msleep(10);
                 e1000_gate_hw_phy_config_ich8lan(hw, false);
@@ -366,7 +371,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
         case e1000_phy_82579:
                 phy->ops.check_polarity = e1000_check_polarity_82577;
                 phy->ops.force_speed_duplex =
-                        e1000_phy_force_speed_duplex_82577;
+                    e1000_phy_force_speed_duplex_82577;
                 phy->ops.get_cable_length = e1000_get_cable_length_82577;
                 phy->ops.get_info = e1000_get_phy_info_82577;
                 phy->ops.commit = e1000e_phy_sw_reset;
@@ -753,7 +758,13 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)
         if (rc)
                 return rc;
 
-        if (adapter->hw.phy.type == e1000_phy_ife) {
+        /*
+         * Disable Jumbo Frame support on parts with Intel 10/100 PHY or
+         * on parts with MACsec enabled in NVM (reflected in CTRL_EXT).
+         */
+        if ((adapter->hw.phy.type == e1000_phy_ife) ||
+            ((adapter->hw.mac.type >= e1000_pch2lan) &&
+             (!(er32(CTRL_EXT) & E1000_CTRL_EXT_LSECCK)))) {
                 adapter->flags &= ~FLAG_HAS_JUMBO_FRAMES;
                 adapter->max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN;
         }
@@ -1723,11 +1734,25 @@ static s32 e1000_post_phy_reset_ich8lan(struct e1000_hw *hw)
         /* Configure the LCD with the OEM bits in NVM */
         ret_val = e1000_oem_bits_config_ich8lan(hw, true);
 
-        /* Ungate automatic PHY configuration on non-managed 82579 */
-        if ((hw->mac.type == e1000_pch2lan) &&
-            !(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {
-                msleep(10);
-                e1000_gate_hw_phy_config_ich8lan(hw, false);
+        if (hw->mac.type == e1000_pch2lan) {
+                /* Ungate automatic PHY configuration on non-managed 82579 */
+                if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {
+                        msleep(10);
+                        e1000_gate_hw_phy_config_ich8lan(hw, false);
+                }
+
+                /* Set EEE LPI Update Timer to 200usec */
+                ret_val = hw->phy.ops.acquire(hw);
+                if (ret_val)
+                        goto out;
+                ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_ADDR,
+                                                       I82579_LPI_UPDATE_TIMER);
+                if (ret_val)
+                        goto release;
+                ret_val = hw->phy.ops.write_reg_locked(hw, I82579_EMI_DATA,
+                                                       0x1387);
+release:
+                hw->phy.ops.release(hw);
         }
 
 out:
@@ -2104,7 +2129,6 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
 {
         union ich8_hws_flash_status hsfsts;
         s32 ret_val = -E1000_ERR_NVM;
-        s32 i = 0;
 
         hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
 
@@ -2140,6 +2164,8 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
                 ew16flash(ICH_FLASH_HSFSTS, hsfsts.regval);
                 ret_val = 0;
         } else {
+                s32 i = 0;
+
                 /*
                  * Otherwise poll for sometime so the current
                  * cycle has a chance to end before giving up.
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index 68aa1749bf6..96921de5df2 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -1978,15 +1978,15 @@ static s32 e1000_ready_nvm_eeprom(struct e1000_hw *hw)
 {
         struct e1000_nvm_info *nvm = &hw->nvm;
         u32 eecd = er32(EECD);
-        u16 timeout = 0;
         u8 spi_stat_reg;
 
         if (nvm->type == e1000_nvm_eeprom_spi) {
+                u16 timeout = NVM_MAX_RETRY_SPI;
+
                 /* Clear SK and CS */
                 eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
                 ew32(EECD, eecd);
                 udelay(1);
-                timeout = NVM_MAX_RETRY_SPI;
 
                 /*
                  * Read "Status Register" repeatedly until the LSB is cleared.
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 1c18f26b081..a39d4a4d871 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -54,7 +54,7 @@
 
 #define DRV_EXTRAVERSION "-k2"
 
-#define DRV_VERSION "1.2.20" DRV_EXTRAVERSION
+#define DRV_VERSION "1.3.10" DRV_EXTRAVERSION
 char e1000e_driver_name[] = "e1000e";
 const char e1000e_driver_version[] = DRV_VERSION;
 
@@ -900,8 +900,6 @@ next_desc:
 
         adapter->total_rx_bytes += total_rx_bytes;
         adapter->total_rx_packets += total_rx_packets;
-        netdev->stats.rx_bytes += total_rx_bytes;
-        netdev->stats.rx_packets += total_rx_packets;
         return cleaned;
 }
 
@@ -937,6 +935,9 @@ static void e1000_print_hw_hang(struct work_struct *work)
         u16 phy_status, phy_1000t_status, phy_ext_status;
         u16 pci_status;
 
+        if (test_bit(__E1000_DOWN, &adapter->state))
+                return;
+
         e1e_rphy(hw, PHY_STATUS, &phy_status);
         e1e_rphy(hw, PHY_1000T_STATUS, &phy_1000t_status);
         e1e_rphy(hw, PHY_EXT_STATUS, &phy_ext_status);
@@ -1057,8 +1058,6 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
         }
         adapter->total_tx_bytes += total_tx_bytes;
         adapter->total_tx_packets += total_tx_packets;
-        netdev->stats.tx_bytes += total_tx_bytes;
-        netdev->stats.tx_packets += total_tx_packets;
         return count < tx_ring->count;
 }
 
@@ -1245,8 +1244,6 @@ next_desc:
 
         adapter->total_rx_bytes += total_rx_bytes;
         adapter->total_rx_packets += total_rx_packets;
-        netdev->stats.rx_bytes += total_rx_bytes;
-        netdev->stats.rx_packets += total_rx_packets;
         return cleaned;
 }
 
@@ -1325,7 +1322,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
                                 /* an error means any chain goes out the window
                                  * too */
                                 if (rx_ring->rx_skb_top)
-                                        dev_kfree_skb(rx_ring->rx_skb_top);
+                                        dev_kfree_skb_irq(rx_ring->rx_skb_top);
                                 rx_ring->rx_skb_top = NULL;
                                 goto next_desc;
                 }
@@ -1398,7 +1395,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
                 /* eth type trans needs skb->data to point to something */
                 if (!pskb_may_pull(skb, ETH_HLEN)) {
                         e_err("pskb_may_pull failed.\n");
-                        dev_kfree_skb(skb);
+                        dev_kfree_skb_irq(skb);
                         goto next_desc;
                 }
 
@@ -1426,8 +1423,6 @@ next_desc:
 
         adapter->total_rx_bytes += total_rx_bytes;
         adapter->total_rx_packets += total_rx_packets;
-        netdev->stats.rx_bytes += total_rx_bytes;
-        netdev->stats.rx_packets += total_rx_packets;
         return cleaned;
 }
 
@@ -1506,6 +1501,9 @@ static void e1000e_downshift_workaround(struct work_struct *work)
         struct e1000_adapter *adapter = container_of(work,
                                         struct e1000_adapter, downshift_task);
 
+        if (test_bit(__E1000_DOWN, &adapter->state))
+                return;
+
         e1000e_gig_downshift_workaround_ich8lan(&adapter->hw);
 }
 
@@ -1851,7 +1849,9 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
         int err = 0, vector = 0;
 
         if (strlen(netdev->name) < (IFNAMSIZ - 5))
-                sprintf(adapter->rx_ring->name, "%s-rx-0", netdev->name);
+                snprintf(adapter->rx_ring->name,
+                         sizeof(adapter->rx_ring->name) - 1,
+                         "%s-rx-0", netdev->name);
         else
                 memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);
         err = request_irq(adapter->msix_entries[vector].vector,
@@ -1864,7 +1864,9 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
         vector++;
 
         if (strlen(netdev->name) < (IFNAMSIZ - 5))
-                sprintf(adapter->tx_ring->name, "%s-tx-0", netdev->name);
+                snprintf(adapter->tx_ring->name,
+                         sizeof(adapter->tx_ring->name) - 1,
+                         "%s-tx-0", netdev->name);
         else
                 memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);
         err = request_irq(adapter->msix_entries[vector].vector,
@@ -2728,7 +2730,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
         u32 rctl, rfctl;
-        u32 psrctl = 0;
         u32 pages = 0;
 
         /* Workaround Si errata on 82579 - configure jumbo frame flow */
@@ -2827,6 +2828,8 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
                 adapter->rx_ps_pages = 0;
 
         if (adapter->rx_ps_pages) {
+                u32 psrctl = 0;
+
                 /* Configure extra packet-split registers */
                 rfctl = er32(RFCTL);
                 rfctl |= E1000_RFCTL_EXTEN;
@@ -3028,7 +3031,6 @@ static void e1000_set_multi(struct net_device *netdev)
         struct netdev_hw_addr *ha;
         u8  *mta_list;
         u32 rctl;
-        int i;
 
         /* Check for Promiscuous and All Multicast modes */
 
@@ -3051,12 +3053,13 @@ static void e1000_set_multi(struct net_device *netdev)
         ew32(RCTL, rctl);
 
         if (!netdev_mc_empty(netdev)) {
+                int i = 0;
+
                 mta_list = kmalloc(netdev_mc_count(netdev) * 6, GFP_ATOMIC);
                 if (!mta_list)
                         return;
 
                 /* prepare a packed array of only addresses. */
-                i = 0;
                 netdev_for_each_mc_addr(ha, netdev)
                         memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN);
 
@@ -3338,6 +3341,23 @@ int e1000e_up(struct e1000_adapter *adapter)
         return 0;
 }
 
+static void e1000e_flush_descriptors(struct e1000_adapter *adapter)
+{
+        struct e1000_hw *hw = &adapter->hw;
+
+        if (!(adapter->flags2 & FLAG2_DMA_BURST))
+                return;
+
+        /* flush pending descriptor writebacks to memory */
+        ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
+        ew32(RDTR, adapter->rx_int_delay | E1000_RDTR_FPD);
+
+        /* execute the writes immediately */
+        e1e_flush();
+}
+
+static void e1000e_update_stats(struct e1000_adapter *adapter);
+
 void e1000e_down(struct e1000_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
@@ -3372,11 +3392,19 @@ void e1000e_down(struct e1000_adapter *adapter)
         del_timer_sync(&adapter->phy_info_timer);
 
         netif_carrier_off(netdev);
+
+        spin_lock(&adapter->stats64_lock);
+        e1000e_update_stats(adapter);
+        spin_unlock(&adapter->stats64_lock);
+
         adapter->link_speed = 0;
         adapter->link_duplex = 0;
 
         if (!pci_channel_offline(adapter->pdev))
                 e1000e_reset(adapter);
+
+        e1000e_flush_descriptors(adapter);
+
         e1000_clean_tx_ring(adapter);
         e1000_clean_rx_ring(adapter);
 
@@ -3413,6 +3441,8 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
         adapter->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
         adapter->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
 
+        spin_lock_init(&adapter->stats64_lock);
+
         e1000e_set_interrupt_capability(adapter);
 
         if (e1000_alloc_queues(adapter))
@@ -3765,6 +3795,10 @@ static void e1000e_update_phy_task(struct work_struct *work)
 {
         struct e1000_adapter *adapter = container_of(work,
                                         struct e1000_adapter, update_phy_task);
+
+        if (test_bit(__E1000_DOWN, &adapter->state))
+                return;
+
         e1000_get_phy_info(&adapter->hw);
 }
 
@@ -3775,6 +3809,10 @@ static void e1000e_update_phy_task(struct work_struct *work)
 static void e1000_update_phy_info(unsigned long data)
 {
         struct e1000_adapter *adapter = (struct e1000_adapter *) data;
+
+        if (test_bit(__E1000_DOWN, &adapter->state))
+                return;
+
         schedule_work(&adapter->update_phy_task);
 }
 
@@ -3886,7 +3924,7 @@ release:
  * e1000e_update_stats - Update the board statistics counters
  * @adapter: board private structure
  **/
-void e1000e_update_stats(struct e1000_adapter *adapter)
+static void e1000e_update_stats(struct e1000_adapter *adapter)
 {
         struct net_device *netdev = adapter->netdev;
         struct e1000_hw *hw = &adapter->hw;
@@ -3998,10 +4036,11 @@ static void e1000_phy_read_status(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
         struct e1000_phy_regs *phy = &adapter->phy_regs;
-        int ret_val;
 
         if ((er32(STATUS) & E1000_STATUS_LU) &&
             (adapter->hw.phy.media_type == e1000_media_type_copper)) {
+                int ret_val;
+
                 ret_val  = e1e_rphy(hw, PHY_CONTROL, &phy->bmcr);
                 ret_val |= e1e_rphy(hw, PHY_STATUS, &phy->bmsr);
                 ret_val |= e1e_rphy(hw, PHY_AUTONEG_ADV, &phy->advertise);
@@ -4147,7 +4186,9 @@ static void e1000_watchdog_task(struct work_struct *work)
         struct e1000_ring *tx_ring = adapter->tx_ring;
         struct e1000_hw *hw = &adapter->hw;
         u32 link, tctl;
-        int tx_pending = 0;
+
+        if (test_bit(__E1000_DOWN, &adapter->state))
+                return;
 
         link = e1000e_has_link(adapter);
         if ((netif_carrier_ok(netdev)) && link) {
@@ -4285,7 +4326,9 @@ static void e1000_watchdog_task(struct work_struct *work)
         }
 
 link_up:
+        spin_lock(&adapter->stats64_lock);
         e1000e_update_stats(adapter);
+        spin_unlock(&adapter->stats64_lock);
 
         mac->tx_packet_delta = adapter->stats.tpt - adapter->tpt_old;
         adapter->tpt_old = adapter->stats.tpt;
@@ -4299,21 +4342,17 @@ link_up:
 
         e1000e_update_adaptive(&adapter->hw);
 
-        if (!netif_carrier_ok(netdev)) {
-                tx_pending = (e1000_desc_unused(tx_ring) + 1 <
-                               tx_ring->count);
-                if (tx_pending) {
-                        /*
-                         * We've lost link, so the controller stops DMA,
-                         * but we've got queued Tx work that's never going
-                         * to get done, so reset controller to flush Tx.
-                         * (Do the reset outside of interrupt context).
-                         */
-                        adapter->tx_timeout_count++;
-                        schedule_work(&adapter->reset_task);
-                        /* return immediately since reset is imminent */
-                        return;
-                }
+        if (!netif_carrier_ok(netdev) &&
+            (e1000_desc_unused(tx_ring) + 1 < tx_ring->count)) {
+                /*
+                 * We've lost link, so the controller stops DMA,
+                 * but we've got queued Tx work that's never going
+                 * to get done, so reset controller to flush Tx.
+                 * (Do the reset outside of interrupt context).
+                 */
+                schedule_work(&adapter->reset_task);
+                /* return immediately since reset is imminent */
+                return;
         }
 
         /* Simple mode for Interrupt Throttle Rate (ITR) */
@@ -4338,19 +4377,12 @@ link_up:
         else
                 ew32(ICS, E1000_ICS_RXDMT0);
 
+        /* flush pending descriptors to memory before detecting Tx hang */
+        e1000e_flush_descriptors(adapter);
+
         /* Force detection of hung controller every watchdog period */
         adapter->detect_tx_hung = 1;
 
-        /* flush partial descriptors to memory before detecting Tx hang */
-        if (adapter->flags2 & FLAG2_DMA_BURST) {
-                ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
-                ew32(RDTR, adapter->rx_int_delay | E1000_RDTR_FPD);
-                /*
-                 * no need to flush the writes because the timeout code does
-                 * an er32 first thing
-                 */
-        }
-
         /*
          * With 82571 controllers, LAA may be overwritten due to controller
          * reset from the other port. Set the appropriate LAA in RAR[0]
@@ -4384,13 +4416,13 @@ static int e1000_tso(struct e1000_adapter *adapter,
         u32 cmd_length = 0;
         u16 ipcse = 0, tucse, mss;
         u8 ipcss, ipcso, tucss, tucso, hdr_len;
-        int err;
 
         if (!skb_is_gso(skb))
                 return 0;
 
         if (skb_header_cloned(skb)) {
-                err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
+                int err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
+
                 if (err)
                         return err;
         }
@@ -4888,6 +4920,10 @@ static void e1000_reset_task(struct work_struct *work)
         struct e1000_adapter *adapter;
         adapter = container_of(work, struct e1000_adapter, reset_task);
 
+        /* don't run the task if already down */
+        if (test_bit(__E1000_DOWN, &adapter->state))
+                return;
+
         if (!((adapter->flags & FLAG_RX_NEEDS_RESTART) &&
               (adapter->flags & FLAG_RX_RESTART_NOW))) {
                 e1000e_dump(adapter);
@@ -4897,16 +4933,55 @@ static void e1000_reset_task(struct work_struct *work)
 }
 
 /**
- * e1000_get_stats - Get System Network Statistics
+ * e1000_get_stats64 - Get System Network Statistics
  * @netdev: network interface device structure
+ * @stats: rtnl_link_stats64 pointer
  *
  * Returns the address of the device statistics structure.
- * The statistics are actually updated from the timer callback.
  **/
-static struct net_device_stats *e1000_get_stats(struct net_device *netdev)
+struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
+                                             struct rtnl_link_stats64 *stats)
 {
-        /* only return the current stats */
-        return &netdev->stats;
+        struct e1000_adapter *adapter = netdev_priv(netdev);
+
+        memset(stats, 0, sizeof(struct rtnl_link_stats64));
+        spin_lock(&adapter->stats64_lock);
+        e1000e_update_stats(adapter);
+        /* Fill out the OS statistics structure */
+        stats->rx_bytes = adapter->stats.gorc;
+        stats->rx_packets = adapter->stats.gprc;
+        stats->tx_bytes = adapter->stats.gotc;
+        stats->tx_packets = adapter->stats.gptc;
+        stats->multicast = adapter->stats.mprc;
+        stats->collisions = adapter->stats.colc;
+
+        /* Rx Errors */
+
+        /*
+         * RLEC on some newer hardware can be incorrect so build
+         * our own version based on RUC and ROC
+         */
+        stats->rx_errors = adapter->stats.rxerrc +
+                adapter->stats.crcerrs + adapter->stats.algnerrc +
+                adapter->stats.ruc + adapter->stats.roc +
+                adapter->stats.cexterr;
+        stats->rx_length_errors = adapter->stats.ruc +
+                                              adapter->stats.roc;
+        stats->rx_crc_errors = adapter->stats.crcerrs;
+        stats->rx_frame_errors = adapter->stats.algnerrc;
+        stats->rx_missed_errors = adapter->stats.mpc;
+
+        /* Tx Errors */
+        stats->tx_errors = adapter->stats.ecol +
+                                       adapter->stats.latecol;
+        stats->tx_aborted_errors = adapter->stats.ecol;
+        stats->tx_window_errors = adapter->stats.latecol;
+        stats->tx_carrier_errors = adapter->stats.tncrs;
+
+        /* Tx Dropped needs to be maintained elsewhere */
+
+        spin_unlock(&adapter->stats64_lock);
+        return stats;
 }
 
 /**
@@ -5307,7 +5382,7 @@ void e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
         __e1000e_disable_aspm(pdev, state);
 }
 
-#ifdef CONFIG_PM_OPS
+#ifdef CONFIG_PM
 static bool e1000e_pm_ready(struct e1000_adapter *adapter)
 {
         return !!adapter->tx_ring->buffer_info;
@@ -5458,7 +5533,7 @@ static int e1000_runtime_resume(struct device *dev)
         return __e1000_resume(pdev);
 }
 #endif /* CONFIG_PM_RUNTIME */
-#endif /* CONFIG_PM_OPS */
+#endif /* CONFIG_PM */
 
 static void e1000_shutdown(struct pci_dev *pdev)
 {
@@ -5476,9 +5551,10 @@ static irqreturn_t e1000_intr_msix(int irq, void *data)
 {
         struct net_device *netdev = data;
         struct e1000_adapter *adapter = netdev_priv(netdev);
-        int vector, msix_irq;
 
         if (adapter->msix_entries) {
+                int vector, msix_irq;
+
                 vector = 0;
                 msix_irq = adapter->msix_entries[vector].vector;
                 disable_irq(msix_irq);
@@ -5675,7 +5751,7 @@ static const struct net_device_ops e1000e_netdev_ops = {
         .ndo_open               = e1000_open,
         .ndo_stop               = e1000_close,
         .ndo_start_xmit         = e1000_xmit_frame,
-        .ndo_get_stats          = e1000_get_stats,
+        .ndo_get_stats64        = e1000e_get_stats64,
         .ndo_set_multicast_list = e1000_set_multi,
         .ndo_set_mac_address    = e1000_set_mac,
         .ndo_change_mtu         = e1000_change_mtu,
@@ -5936,7 +6012,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                 /* APME bit in EEPROM is mapped to WUC.APME */
                 eeprom_data = er32(WUC);
                 eeprom_apme_mask = E1000_WUC_APME;
-                if (eeprom_data & E1000_WUC_PHY_WAKE)
+                if ((hw->mac.type > e1000_ich10lan) &&
+                    (eeprom_data & E1000_WUC_PHY_WAKE))
                         adapter->flags2 |= FLAG2_HAS_PHY_WAKEUP;
         } else if (adapter->flags & FLAG_APME_IN_CTRL3) {
                 if (adapter->flags & FLAG_APME_CHECK_PORT_B &&
@@ -6164,7 +6241,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
 };
 MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
 
-#ifdef CONFIG_PM_OPS
+#ifdef CONFIG_PM
 static const struct dev_pm_ops e1000_pm_ops = {
         SET_SYSTEM_SLEEP_PM_OPS(e1000_suspend, e1000_resume)
         SET_RUNTIME_PM_OPS(e1000_runtime_suspend,
@@ -6178,7 +6255,7 @@ static struct pci_driver e1000_driver = {
         .id_table = e1000_pci_tbl,
         .probe    = e1000_probe,
         .remove   = __devexit_p(e1000_remove),
-#ifdef CONFIG_PM_OPS
+#ifdef CONFIG_PM
         .driver.pm = &e1000_pm_ops,
 #endif
         .shutdown = e1000_shutdown,
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index 6bea051b134..6ae31fcfb62 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -2409,9 +2409,7 @@ static u32 e1000_get_phy_addr_for_bm_page(u32 page, u32 reg)
 s32 e1000e_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data)
 {
         s32 ret_val;
-        u32 page_select = 0;
         u32 page = offset >> IGP_PAGE_SHIFT;
-        u32 page_shift = 0;
 
         ret_val = hw->phy.ops.acquire(hw);
         if (ret_val)
@@ -2427,6 +2425,8 @@ s32 e1000e_write_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 data)
         hw->phy.addr = e1000_get_phy_addr_for_bm_page(page, offset);
 
         if (offset > MAX_PHY_MULTI_PAGE_REG) {
+                u32 page_shift, page_select;
+
                 /*
                  * Page select is register 31 for phy address 1 and 22 for
                  * phy address 2 and 3. Page select is shifted only for
@@ -2468,9 +2468,7 @@ out:
 s32 e1000e_read_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 *data)
 {
         s32 ret_val;
-        u32 page_select = 0;
         u32 page = offset >> IGP_PAGE_SHIFT;
-        u32 page_shift = 0;
 
         ret_val = hw->phy.ops.acquire(hw);
         if (ret_val)
@@ -2486,6 +2484,8 @@ s32 e1000e_read_phy_reg_bm(struct e1000_hw *hw, u32 offset, u16 *data)
         hw->phy.addr = e1000_get_phy_addr_for_bm_page(page, offset);
 
         if (offset > MAX_PHY_MULTI_PAGE_REG) {
+                u32 page_shift, page_select;
+
                 /*
                  * Page select is register 31 for phy address 1 and 22 for
                  * phy address 2 and 3. Page select is shifted only for
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index 112c5aa9af7..907b05a1c65 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -812,7 +812,7 @@ static void enc28j60_read_tsv(struct enc28j60_net *priv, u8 tsv[TSV_SIZE])
         if (netif_msg_hw(priv))
                 printk(KERN_DEBUG DRV_NAME ": reading TSV at addr:0x%04x\n",
                          endptr + 1);
-        enc28j60_mem_read(priv, endptr + 1, sizeof(tsv), tsv);
+        enc28j60_mem_read(priv, endptr + 1, TSV_SIZE, tsv);
 }
 
 static void enc28j60_dump_tsv(struct enc28j60_net *priv, const char *msg,
diff --git a/drivers/net/enic/Makefile b/drivers/net/enic/Makefile
index e7b6c31880b..2e573be16c1 100644
--- a/drivers/net/enic/Makefile
+++ b/drivers/net/enic/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_ENIC) := enic.o
 
 enic-y := enic_main.o vnic_cq.o vnic_intr.o vnic_wq.o \
-        enic_res.o vnic_dev.o vnic_rq.o vnic_vic.o
+        enic_res.o enic_dev.o vnic_dev.o vnic_rq.o vnic_vic.o
 
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index a937f49d9db..3a3c3c8a3a9 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -32,13 +32,13 @@
 
 #define DRV_NAME                "enic"
 #define DRV_DESCRIPTION         "Cisco VIC Ethernet NIC Driver"
-#define DRV_VERSION             "1.4.1.10"
-#define DRV_COPYRIGHT           "Copyright 2008-2010 Cisco Systems, Inc"
+#define DRV_VERSION             "2.1.1.12"
+#define DRV_COPYRIGHT           "Copyright 2008-2011 Cisco Systems, Inc"
 
 #define ENIC_BARS_MAX           6
 
-#define ENIC_WQ_MAX             8
-#define ENIC_RQ_MAX             8
+#define ENIC_WQ_MAX             1
+#define ENIC_RQ_MAX             1
 #define ENIC_CQ_MAX             (ENIC_WQ_MAX + ENIC_RQ_MAX)
 #define ENIC_INTR_MAX           (ENIC_CQ_MAX + 2)
 
@@ -49,7 +49,7 @@ struct enic_msix_entry {
         void *devid;
 };
 
-#define ENIC_SET_APPLIED                (1 << 0)
+#define ENIC_PORT_REQUEST_APPLIED       (1 << 0)
 #define ENIC_SET_REQUEST                (1 << 1)
 #define ENIC_SET_NAME                   (1 << 2)
 #define ENIC_SET_INSTANCE               (1 << 3)
@@ -101,7 +101,6 @@ struct enic {
         /* receive queue cache line section */
         ____cacheline_aligned struct vnic_rq rq[ENIC_RQ_MAX];
         unsigned int rq_count;
-        int (*rq_alloc_buf)(struct vnic_rq *rq);
         u64 rq_truncated_pkts;
         u64 rq_bad_fcs;
         struct napi_struct napi[ENIC_RQ_MAX];
diff --git a/drivers/net/enic/enic_dev.c b/drivers/net/enic/enic_dev.c
new file mode 100644
index 00000000000..37ad3a1c82e
--- /dev/null
+++ b/drivers/net/enic/enic_dev.c
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2011 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include <linux/pci.h>
+#include <linux/etherdevice.h>
+
+#include "vnic_dev.h"
+#include "vnic_vic.h"
+#include "enic_res.h"
+#include "enic.h"
+#include "enic_dev.h"
+
+int enic_dev_fw_info(struct enic *enic, struct vnic_devcmd_fw_info **fw_info)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_fw_info(enic->vdev, fw_info);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_stats_dump(enic->vdev, vstats);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_dev_add_station_addr(struct enic *enic)
+{
+        int err;
+
+        if (!is_valid_ether_addr(enic->netdev->dev_addr))
+                return -EADDRNOTAVAIL;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_add_addr(enic->vdev, enic->netdev->dev_addr);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_dev_del_station_addr(struct enic *enic)
+{
+        int err;
+
+        if (!is_valid_ether_addr(enic->netdev->dev_addr))
+                return -EADDRNOTAVAIL;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_del_addr(enic->vdev, enic->netdev->dev_addr);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_dev_packet_filter(struct enic *enic, int directed, int multicast,
+        int broadcast, int promisc, int allmulti)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_packet_filter(enic->vdev, directed,
+                multicast, broadcast, promisc, allmulti);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_dev_add_addr(struct enic *enic, u8 *addr)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_add_addr(enic->vdev, addr);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_dev_del_addr(struct enic *enic, u8 *addr)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_del_addr(enic->vdev, addr);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_dev_notify_unset(struct enic *enic)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_notify_unset(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_dev_hang_notify(struct enic *enic)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_hang_notify(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_set_ig_vlan_rewrite_mode(enic->vdev,
+                IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_dev_enable(struct enic *enic)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_enable_wait(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_dev_disable(struct enic *enic)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_disable(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_vnic_dev_deinit(struct enic *enic)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_deinit(enic->vdev);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_dev_init_prov(struct enic *enic, struct vic_provinfo *vp)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_init_prov(enic->vdev,
+                (u8 *)vp, vic_provinfo_size(vp));
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+int enic_dev_init_done(struct enic *enic, int *done, int *error)
+{
+        int err;
+
+        spin_lock(&enic->devcmd_lock);
+        err = vnic_dev_init_done(enic->vdev, done, error);
+        spin_unlock(&enic->devcmd_lock);
+
+        return err;
+}
+
+/* rtnl lock is held */
+void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+{
+        struct enic *enic = netdev_priv(netdev);
+
+        spin_lock(&enic->devcmd_lock);
+        enic_add_vlan(enic, vid);
+        spin_unlock(&enic->devcmd_lock);
+}
+
+/* rtnl lock is held */
+void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+{
+        struct enic *enic = netdev_priv(netdev);
+
+        spin_lock(&enic->devcmd_lock);
+        enic_del_vlan(enic, vid);
+        spin_unlock(&enic->devcmd_lock);
+}
diff --git a/drivers/net/enic/enic_dev.h b/drivers/net/enic/enic_dev.h
new file mode 100644
index 00000000000..495f57fcb88
--- /dev/null
+++ b/drivers/net/enic/enic_dev.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2011 Cisco Systems, Inc.  All rights reserved.
+ *
+ * This program is free software; you may redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef _ENIC_DEV_H_
+#define _ENIC_DEV_H_
+
+int enic_dev_fw_info(struct enic *enic, struct vnic_devcmd_fw_info **fw_info);
+int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats);
+int enic_dev_add_station_addr(struct enic *enic);
+int enic_dev_del_station_addr(struct enic *enic);
+int enic_dev_packet_filter(struct enic *enic, int directed, int multicast,
+        int broadcast, int promisc, int allmulti);
+int enic_dev_add_addr(struct enic *enic, u8 *addr);
+int enic_dev_del_addr(struct enic *enic, u8 *addr);
+void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
+void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
+int enic_dev_notify_unset(struct enic *enic);
+int enic_dev_hang_notify(struct enic *enic);
+int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic);
+int enic_dev_enable(struct enic *enic);
+int enic_dev_disable(struct enic *enic);
+int enic_vnic_dev_deinit(struct enic *enic);
+int enic_dev_init_prov(struct enic *enic, struct vic_provinfo *vp);
+int enic_dev_init_done(struct enic *enic, int *done, int *error);
+
+#endif /* _ENIC_DEV_H_ */
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index a0af48c51fb..8b9cad5e971 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -44,6 +44,7 @@
 #include "vnic_vic.h"
 #include "enic_res.h"
 #include "enic.h"
+#include "enic_dev.h"
 
 #define ENIC_NOTIFY_TIMER_PERIOD        (2 * HZ)
 #define WQ_ENET_MAX_DESC_LEN            (1 << WQ_ENET_LEN_BITS)
@@ -190,18 +191,6 @@ static int enic_get_settings(struct net_device *netdev,
         return 0;
 }
 
-static int enic_dev_fw_info(struct enic *enic,
-        struct vnic_devcmd_fw_info **fw_info)
-{
-        int err;
-
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_fw_info(enic->vdev, fw_info);
-        spin_unlock(&enic->devcmd_lock);
-
-        return err;
-}
-
 static void enic_get_drvinfo(struct net_device *netdev,
         struct ethtool_drvinfo *drvinfo)
 {
@@ -246,17 +235,6 @@ static int enic_get_sset_count(struct net_device *netdev, int sset)
         }
 }
 
-static int enic_dev_stats_dump(struct enic *enic, struct vnic_stats **vstats)
-{
-        int err;
-
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_stats_dump(enic->vdev, vstats);
-        spin_unlock(&enic->devcmd_lock);
-
-        return err;
-}
-
 static void enic_get_ethtool_stats(struct net_device *netdev,
         struct ethtool_stats *stats, u64 *data)
 {
@@ -896,9 +874,10 @@ static struct net_device_stats *enic_get_stats(struct net_device *netdev)
         return net_stats;
 }
 
-static void enic_reset_multicast_list(struct enic *enic)
+static void enic_reset_addr_lists(struct enic *enic)
 {
         enic->mc_count = 0;
+        enic->uc_count = 0;
         enic->flags = 0;
 }
 
@@ -919,32 +898,6 @@ static int enic_set_mac_addr(struct net_device *netdev, char *addr)
         return 0;
 }
 
-static int enic_dev_add_station_addr(struct enic *enic)
-{
-        int err = 0;
-
-        if (is_valid_ether_addr(enic->netdev->dev_addr)) {
-                spin_lock(&enic->devcmd_lock);
-                err = vnic_dev_add_addr(enic->vdev, enic->netdev->dev_addr);
-                spin_unlock(&enic->devcmd_lock);
-        }
-
-        return err;
-}
-
-static int enic_dev_del_station_addr(struct enic *enic)
-{
-        int err = 0;
-
-        if (is_valid_ether_addr(enic->netdev->dev_addr)) {
-                spin_lock(&enic->devcmd_lock);
-                err = vnic_dev_del_addr(enic->vdev, enic->netdev->dev_addr);
-                spin_unlock(&enic->devcmd_lock);
-        }
-
-        return err;
-}
-
 static int enic_set_mac_address_dynamic(struct net_device *netdev, void *p)
 {
         struct enic *enic = netdev_priv(netdev);
@@ -989,42 +942,7 @@ static int enic_set_mac_address(struct net_device *netdev, void *p)
         return enic_dev_add_station_addr(enic);
 }
 
-static int enic_dev_packet_filter(struct enic *enic, int directed,
-        int multicast, int broadcast, int promisc, int allmulti)
-{
-        int err;
-
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_packet_filter(enic->vdev, directed,
-                multicast, broadcast, promisc, allmulti);
-        spin_unlock(&enic->devcmd_lock);
-
-        return err;
-}
-
-static int enic_dev_add_addr(struct enic *enic, u8 *addr)
-{
-        int err;
-
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_add_addr(enic->vdev, addr);
-        spin_unlock(&enic->devcmd_lock);
-
-        return err;
-}
-
-static int enic_dev_del_addr(struct enic *enic, u8 *addr)
-{
-        int err;
-
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_del_addr(enic->vdev, addr);
-        spin_unlock(&enic->devcmd_lock);
-
-        return err;
-}
-
-static void enic_add_multicast_addr_list(struct enic *enic)
+static void enic_update_multicast_addr_list(struct enic *enic)
 {
         struct net_device *netdev = enic->netdev;
         struct netdev_hw_addr *ha;
@@ -1079,7 +997,7 @@ static void enic_add_multicast_addr_list(struct enic *enic)
         enic->mc_count = mc_count;
 }
 
-static void enic_add_unicast_addr_list(struct enic *enic)
+static void enic_update_unicast_addr_list(struct enic *enic)
 {
         struct net_device *netdev = enic->netdev;
         struct netdev_hw_addr *ha;
@@ -1156,9 +1074,9 @@ static void enic_set_rx_mode(struct net_device *netdev)
         }
 
         if (!promisc) {
-                enic_add_unicast_addr_list(enic);
+                enic_update_unicast_addr_list(enic);
                 if (!allmulti)
-                        enic_add_multicast_addr_list(enic);
+                        enic_update_multicast_addr_list(enic);
         }
 }
 
@@ -1170,26 +1088,6 @@ static void enic_vlan_rx_register(struct net_device *netdev,
         enic->vlan_group = vlan_group;
 }
 
-/* rtnl lock is held */
-static void enic_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
-{
-        struct enic *enic = netdev_priv(netdev);
-
-        spin_lock(&enic->devcmd_lock);
-        enic_add_vlan(enic, vid);
-        spin_unlock(&enic->devcmd_lock);
-}
-
-/* rtnl lock is held */
-static void enic_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
-{
-        struct enic *enic = netdev_priv(netdev);
-
-        spin_lock(&enic->devcmd_lock);
-        enic_del_vlan(enic, vid);
-        spin_unlock(&enic->devcmd_lock);
-}
-
 /* netif_tx_lock held, BHs disabled */
 static void enic_tx_timeout(struct net_device *netdev)
 {
@@ -1197,40 +1095,6 @@ static void enic_tx_timeout(struct net_device *netdev)
         schedule_work(&enic->reset);
 }
 
-static int enic_vnic_dev_deinit(struct enic *enic)
-{
-        int err;
-
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_deinit(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
-
-        return err;
-}
-
-static int enic_dev_init_prov(struct enic *enic, struct vic_provinfo *vp)
-{
-        int err;
-
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_init_prov(enic->vdev,
-                (u8 *)vp, vic_provinfo_size(vp));
-        spin_unlock(&enic->devcmd_lock);
-
-        return err;
-}
-
-static int enic_dev_init_done(struct enic *enic, int *done, int *error)
-{
-        int err;
-
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_init_done(enic->vdev, done, error);
-        spin_unlock(&enic->devcmd_lock);
-
-        return err;
-}
-
 static int enic_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
 {
         struct enic *enic = netdev_priv(netdev);
@@ -1262,6 +1126,8 @@ static int enic_set_port_profile(struct enic *enic, u8 *mac)
         if (err)
                 return err;
 
+        enic_reset_addr_lists(enic);
+
         switch (enic->pp.request) {
 
         case PORT_REQUEST_ASSOCIATE:
@@ -1318,18 +1184,20 @@ static int enic_set_port_profile(struct enic *enic, u8 *mac)
                 vic_provinfo_free(vp);
                 if (err)
                         return err;
-
-                enic->pp.set |= ENIC_SET_APPLIED;
                 break;
 
         case PORT_REQUEST_DISASSOCIATE:
-                enic->pp.set &= ~ENIC_SET_APPLIED;
                 break;
 
         default:
                 return -EINVAL;
         }
 
+        /* Set flag to indicate that the port assoc/disassoc
+         * request has been sent out to fw
+         */
+        enic->pp.set |= ENIC_PORT_REQUEST_APPLIED;
+
         return 0;
 }
 
@@ -1379,9 +1247,6 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,
 
                 if (is_zero_ether_addr(netdev->dev_addr))
                         random_ether_addr(netdev->dev_addr);
-        } else if (new_pp.request == PORT_REQUEST_DISASSOCIATE) {
-                if (!is_zero_ether_addr(enic->pp.mac_addr))
-                        enic_dev_del_addr(enic, enic->pp.mac_addr);
         }
 
         memcpy(&enic->pp, &new_pp, sizeof(struct enic_port_profile));
@@ -1390,9 +1255,6 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,
         if (err)
                 goto set_port_profile_cleanup;
 
-        if (!is_zero_ether_addr(enic->pp.mac_addr))
-                enic_dev_add_addr(enic, enic->pp.mac_addr);
-
 set_port_profile_cleanup:
         memset(enic->pp.vf_mac, 0, ETH_ALEN);
 
@@ -1411,7 +1273,7 @@ static int enic_get_vf_port(struct net_device *netdev, int vf,
         int err, error, done;
         u16 response = PORT_PROFILE_RESPONSE_SUCCESS;
 
-        if (!(enic->pp.set & ENIC_SET_APPLIED))
+        if (!(enic->pp.set & ENIC_PORT_REQUEST_APPLIED))
                 return -ENODATA;
 
         err = enic_dev_init_done(enic, &done, &error);
@@ -1489,62 +1351,6 @@ static int enic_rq_alloc_buf(struct vnic_rq *rq)
         return 0;
 }
 
-static int enic_rq_alloc_buf_a1(struct vnic_rq *rq)
-{
-        struct rq_enet_desc *desc = vnic_rq_next_desc(rq);
-
-        if (vnic_rq_posting_soon(rq)) {
-
-                /* SW workaround for A0 HW erratum: if we're just about
-                 * to write posted_index, insert a dummy desc
-                 * of type resvd
-                 */
-
-                rq_enet_desc_enc(desc, 0, RQ_ENET_TYPE_RESV2, 0);
-                vnic_rq_post(rq, 0, 0, 0, 0);
-        } else {
-                return enic_rq_alloc_buf(rq);
-        }
-
-        return 0;
-}
-
-static int enic_dev_hw_version(struct enic *enic,
-        enum vnic_dev_hw_version *hw_ver)
-{
-        int err;
-
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_hw_version(enic->vdev, hw_ver);
-        spin_unlock(&enic->devcmd_lock);
-
-        return err;
-}
-
-static int enic_set_rq_alloc_buf(struct enic *enic)
-{
-        enum vnic_dev_hw_version hw_ver;
-        int err;
-
-        err = enic_dev_hw_version(enic, &hw_ver);
-        if (err)
-                return err;
-
-        switch (hw_ver) {
-        case VNIC_DEV_HW_VER_A1:
-                enic->rq_alloc_buf = enic_rq_alloc_buf_a1;
-                break;
-        case VNIC_DEV_HW_VER_A2:
-        case VNIC_DEV_HW_VER_UNKNOWN:
-                enic->rq_alloc_buf = enic_rq_alloc_buf;
-                break;
-        default:
-                return -ENODEV;
-        }
-
-        return 0;
-}
-
 static void enic_rq_indicate_buf(struct vnic_rq *rq,
         struct cq_desc *cq_desc, struct vnic_rq_buf *buf,
         int skipped, void *opaque)
@@ -1681,7 +1487,7 @@ static int enic_poll(struct napi_struct *napi, int budget)
                         0 /* don't unmask intr */,
                         0 /* don't reset intr timer */);
 
-        err = vnic_rq_fill(&enic->rq[0], enic->rq_alloc_buf);
+        err = vnic_rq_fill(&enic->rq[0], enic_rq_alloc_buf);
 
         /* Buffer allocation failed. Stay in polling
          * mode so we can try to fill the ring again.
@@ -1731,7 +1537,7 @@ static int enic_poll_msix(struct napi_struct *napi, int budget)
                         0 /* don't unmask intr */,
                         0 /* don't reset intr timer */);
 
-        err = vnic_rq_fill(&enic->rq[rq], enic->rq_alloc_buf);
+        err = vnic_rq_fill(&enic->rq[rq], enic_rq_alloc_buf);
 
         /* Buffer allocation failed. Stay in polling mode
          * so we can try to fill the ring again.
@@ -1901,39 +1707,6 @@ static int enic_dev_notify_set(struct enic *enic)
         return err;
 }
 
-static int enic_dev_notify_unset(struct enic *enic)
-{
-        int err;
-
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_notify_unset(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
-
-        return err;
-}
-
-static int enic_dev_enable(struct enic *enic)
-{
-        int err;
-
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_enable_wait(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
-
-        return err;
-}
-
-static int enic_dev_disable(struct enic *enic)
-{
-        int err;
-
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_disable(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
-
-        return err;
-}
-
 static void enic_notify_timer_start(struct enic *enic)
 {
         switch (vnic_dev_get_intr_mode(enic->vdev)) {
@@ -1967,7 +1740,7 @@ static int enic_open(struct net_device *netdev)
         }
 
         for (i = 0; i < enic->rq_count; i++) {
-                vnic_rq_fill(&enic->rq[i], enic->rq_alloc_buf);
+                vnic_rq_fill(&enic->rq[i], enic_rq_alloc_buf);
                 /* Need at least one buffer on ring to get going */
                 if (vnic_rq_desc_used(&enic->rq[i]) == 0) {
                         netdev_err(netdev, "Unable to alloc receive buffers\n");
@@ -2285,29 +2058,6 @@ static int enic_set_rss_nic_cfg(struct enic *enic)
                 rss_hash_bits, rss_base_cpu, rss_enable);
 }
 
-static int enic_dev_hang_notify(struct enic *enic)
-{
-        int err;
-
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_hang_notify(enic->vdev);
-        spin_unlock(&enic->devcmd_lock);
-
-        return err;
-}
-
-static int enic_dev_set_ig_vlan_rewrite_mode(struct enic *enic)
-{
-        int err;
-
-        spin_lock(&enic->devcmd_lock);
-        err = vnic_dev_set_ig_vlan_rewrite_mode(enic->vdev,
-                IG_VLAN_REWRITE_MODE_PRIORITY_TAG_DEFAULT_VLAN);
-        spin_unlock(&enic->devcmd_lock);
-
-        return err;
-}
-
 static void enic_reset(struct work_struct *work)
 {
         struct enic *enic = container_of(work, struct enic, reset);
@@ -2320,7 +2070,7 @@ static void enic_reset(struct work_struct *work)
         enic_dev_hang_notify(enic);
         enic_stop(enic->netdev);
         enic_dev_hang_reset(enic);
-        enic_reset_multicast_list(enic);
+        enic_reset_addr_lists(enic);
         enic_init_vnic_resources(enic);
         enic_set_rss_nic_cfg(enic);
         enic_dev_set_ig_vlan_rewrite_mode(enic);
@@ -2332,7 +2082,7 @@ static void enic_reset(struct work_struct *work)
 static int enic_set_intr_mode(struct enic *enic)
 {
         unsigned int n = min_t(unsigned int, enic->rq_count, ENIC_RQ_MAX);
-        unsigned int m = 1;
+        unsigned int m = min_t(unsigned int, enic->wq_count, ENIC_WQ_MAX);
         unsigned int i;
 
         /* Set interrupt mode (INTx, MSI, MSI-X) depending
@@ -2475,9 +2225,7 @@ static const struct net_device_ops enic_netdev_dynamic_ops = {
         .ndo_tx_timeout         = enic_tx_timeout,
         .ndo_set_vf_port        = enic_set_vf_port,
         .ndo_get_vf_port        = enic_get_vf_port,
-#ifdef IFLA_VF_MAX
         .ndo_set_vf_mac         = enic_set_vf_mac,
-#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = enic_poll_controller,
 #endif
@@ -2556,25 +2304,12 @@ static int enic_dev_init(struct enic *enic)
 
         enic_init_vnic_resources(enic);
 
-        err = enic_set_rq_alloc_buf(enic);
-        if (err) {
-                dev_err(dev, "Failed to set RQ buffer allocator, aborting\n");
-                goto err_out_free_vnic_resources;
-        }
-
         err = enic_set_rss_nic_cfg(enic);
         if (err) {
                 dev_err(dev, "Failed to config nic, aborting\n");
                 goto err_out_free_vnic_resources;
         }
 
-        err = enic_dev_set_ig_vlan_rewrite_mode(enic);
-        if (err) {
-                dev_err(dev,
-                        "Failed to set ingress vlan rewrite mode, aborting.\n");
-                goto err_out_free_vnic_resources;
-        }
-
         switch (vnic_dev_get_intr_mode(enic->vdev)) {
         default:
                 netif_napi_add(netdev, &enic->napi[0], enic_poll, 64);
@@ -2713,6 +2448,22 @@ static int __devinit enic_probe(struct pci_dev *pdev,
                 goto err_out_vnic_unregister;
         }
 
+        /* Setup devcmd lock
+         */
+
+        spin_lock_init(&enic->devcmd_lock);
+
+        /*
+         * Set ingress vlan rewrite mode before vnic initialization
+         */
+
+        err = enic_dev_set_ig_vlan_rewrite_mode(enic);
+        if (err) {
+                dev_err(dev,
+                        "Failed to set ingress vlan rewrite mode, aborting.\n");
+                goto err_out_dev_close;
+        }
+
         /* Issue device init to initialize the vnic-to-switch link.
          * We'll start with carrier off and wait for link UP
          * notification later to turn on carrier.  We don't need
@@ -2736,11 +2487,6 @@ static int __devinit enic_probe(struct pci_dev *pdev,
                 }
         }
 
-        /* Setup devcmd lock
-         */
-
-        spin_lock_init(&enic->devcmd_lock);
-
         err = enic_dev_init(enic);
         if (err) {
                 dev_err(dev, "Device initialization failed, aborting\n");
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c
index fb35d8b1766..c089b362a36 100644
--- a/drivers/net/enic/vnic_dev.c
+++ b/drivers/net/enic/vnic_dev.c
@@ -408,10 +408,17 @@ int vnic_dev_fw_info(struct vnic_dev *vdev,
                 if (!vdev->fw_info)
                         return -ENOMEM;
 
+                memset(vdev->fw_info, 0, sizeof(struct vnic_devcmd_fw_info));
+
                 a0 = vdev->fw_info_pa;
+                a1 = sizeof(struct vnic_devcmd_fw_info);
 
                 /* only get fw_info once and cache it */
                 err = vnic_dev_cmd(vdev, CMD_MCPU_FW_INFO, &a0, &a1, wait);
+                if (err == ERR_ECMDUNKNOWN) {
+                        err = vnic_dev_cmd(vdev, CMD_MCPU_FW_INFO_OLD,
+                                &a0, &a1, wait);
+                }
         }
 
         *fw_info = vdev->fw_info;
@@ -419,25 +426,6 @@ int vnic_dev_fw_info(struct vnic_dev *vdev,
         return err;
 }
 
-int vnic_dev_hw_version(struct vnic_dev *vdev, enum vnic_dev_hw_version *hw_ver)
-{
-        struct vnic_devcmd_fw_info *fw_info;
-        int err;
-
-        err = vnic_dev_fw_info(vdev, &fw_info);
-        if (err)
-                return err;
-
-        if (strncmp(fw_info->hw_version, "A1", sizeof("A1")) == 0)
-                *hw_ver = VNIC_DEV_HW_VER_A1;
-        else if (strncmp(fw_info->hw_version, "A2", sizeof("A2")) == 0)
-                *hw_ver = VNIC_DEV_HW_VER_A2;
-        else
-                *hw_ver = VNIC_DEV_HW_VER_UNKNOWN;
-
-        return 0;
-}
-
 int vnic_dev_spec(struct vnic_dev *vdev, unsigned int offset, unsigned int size,
         void *value)
 {
diff --git a/drivers/net/enic/vnic_dev.h b/drivers/net/enic/vnic_dev.h
index 05f9a24cd45..e837546213a 100644
--- a/drivers/net/enic/vnic_dev.h
+++ b/drivers/net/enic/vnic_dev.h
@@ -44,12 +44,6 @@ static inline void writeq(u64 val, void __iomem *reg)
 #undef pr_fmt
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-enum vnic_dev_hw_version {
-        VNIC_DEV_HW_VER_UNKNOWN,
-        VNIC_DEV_HW_VER_A1,
-        VNIC_DEV_HW_VER_A2,
-};
-
 enum vnic_dev_intr_mode {
         VNIC_DEV_INTR_MODE_UNKNOWN,
         VNIC_DEV_INTR_MODE_INTX,
@@ -93,8 +87,6 @@ int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
         u64 *a0, u64 *a1, int wait);
 int vnic_dev_fw_info(struct vnic_dev *vdev,
         struct vnic_devcmd_fw_info **fw_info);
-int vnic_dev_hw_version(struct vnic_dev *vdev,
-        enum vnic_dev_hw_version *hw_ver);
 int vnic_dev_spec(struct vnic_dev *vdev, unsigned int offset, unsigned int size,
         void *value);
 int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats);
diff --git a/drivers/net/enic/vnic_devcmd.h b/drivers/net/enic/vnic_devcmd.h
index 9abb3d51dea..d833a071bac 100644
--- a/drivers/net/enic/vnic_devcmd.h
+++ b/drivers/net/enic/vnic_devcmd.h
@@ -80,8 +80,34 @@
 enum vnic_devcmd_cmd {
         CMD_NONE                = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_NONE, 0),
 
-        /* mcpu fw info in mem: (u64)a0=paddr to struct vnic_devcmd_fw_info */
-        CMD_MCPU_FW_INFO        = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 1),
+        /*
+         * mcpu fw info in mem:
+         * in:
+         *   (u64)a0=paddr to struct vnic_devcmd_fw_info
+         * action:
+         *   Fills in struct vnic_devcmd_fw_info (128 bytes)
+         * note:
+         *   An old definition of CMD_MCPU_FW_INFO
+         */
+        CMD_MCPU_FW_INFO_OLD    = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 1),
+
+        /*
+         * mcpu fw info in mem:
+         * in:
+         *   (u64)a0=paddr to struct vnic_devcmd_fw_info
+         *   (u16)a1=size of the structure
+         * out:
+         *       (u16)a1=0                          for in:a1 = 0,
+         *               data size actually written for other values.
+         * action:
+         *   Fills in first 128 bytes of vnic_devcmd_fw_info for in:a1 = 0,
+         *            first in:a1 bytes               for 0 < in:a1 <= 132,
+         *            132 bytes                       for other values of in:a1.
+         * note:
+         *   CMD_MCPU_FW_INFO and CMD_MCPU_FW_INFO_OLD have the same enum 1
+         *   for source compatibility.
+         */
+        CMD_MCPU_FW_INFO        = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 1),
 
         /* dev-specific block member:
          *    in: (u16)a0=offset,(u8)a1=size
@@ -291,11 +317,19 @@ enum vnic_devcmd_error {
         ERR_EMAXRES = 10,
 };
 
+/*
+ * note: hw_version and asic_rev refer to the same thing,
+ *       but have different formats. hw_version is
+ *       a 32-byte string (e.g. "A2") and asic_rev is
+ *       a 16-bit integer (e.g. 0xA2).
+ */
 struct vnic_devcmd_fw_info {
         char fw_version[32];
         char fw_build[32];
         char hw_version[32];
         char hw_serial_number[32];
+        u16 asic_type;
+        u16 asic_rev;
 };
 
 struct vnic_devcmd_notify {
diff --git a/drivers/net/enic/vnic_rq.h b/drivers/net/enic/vnic_rq.h
index 37f08de2454..2056586f4d4 100644
--- a/drivers/net/enic/vnic_rq.h
+++ b/drivers/net/enic/vnic_rq.h
@@ -141,11 +141,6 @@ static inline void vnic_rq_post(struct vnic_rq *rq,
         }
 }
 
-static inline int vnic_rq_posting_soon(struct vnic_rq *rq)
-{
-        return (rq->to_use->index & VNIC_RQ_RETURN_RATE) == 0;
-}
-
 static inline void vnic_rq_return_descs(struct vnic_rq *rq, unsigned int count)
 {
         rq->ring.desc_avail += count;
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index 0cb1cf9cf4b..a59cf961a43 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -111,6 +111,8 @@
  * Sorry, I had to rewrite most of this for 2.5.x -DaveM
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/capability.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -162,7 +164,7 @@ static void eql_timer(unsigned long param)
 }
 
 static const char version[] __initconst =
-        "Equalizer2002: Simon Janes (simon@ncm.com) and David S. Miller (davem@redhat.com)\n";
+        "Equalizer2002: Simon Janes (simon@ncm.com) and David S. Miller (davem@redhat.com)";
 
 static const struct net_device_ops eql_netdev_ops = {
         .ndo_open       = eql_open,
@@ -204,8 +206,8 @@ static int eql_open(struct net_device *dev)
         equalizer_t *eql = netdev_priv(dev);
 
         /* XXX We should force this off automatically for the user. */
-        printk(KERN_INFO "%s: remember to turn off Van-Jacobson compression on "
-               "your slave devices.\n", dev->name);
+        netdev_info(dev,
+                    "remember to turn off Van-Jacobson compression on your slave devices\n");
 
         BUG_ON(!list_empty(&eql->queue.all_slaves));
 
@@ -591,7 +593,7 @@ static int __init eql_init_module(void)
 {
         int err;
 
-        printk(version);
+        pr_info("%s\n", version);
 
         dev_eql = alloc_netdev(sizeof(equalizer_t), "eql", eql_setup);
         if (!dev_eql)
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index b79d7e1555d..db0290f05bd 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -1163,15 +1163,11 @@ static int ethoc_resume(struct platform_device *pdev)
 # define ethoc_resume  NULL
 #endif
 
-#ifdef CONFIG_OF
 static struct of_device_id ethoc_match[] = {
-        {
-                .compatible = "opencores,ethoc",
-        },
+        { .compatible = "opencores,ethoc", },
         {},
 };
 MODULE_DEVICE_TABLE(of, ethoc_match);
-#endif
 
 static struct platform_driver ethoc_driver = {
         .probe   = ethoc_probe,
@@ -1181,9 +1177,7 @@ static struct platform_driver ethoc_driver = {
         .driver  = {
                 .name = "ethoc",
                 .owner = THIS_MODULE,
-#ifdef CONFIG_OF
                 .of_match_table = ethoc_match,
-#endif
         },
 };
 
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 2a71373719a..885d8baff7d 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -54,7 +54,7 @@
 
 #include "fec.h"
 
-#if defined(CONFIG_ARCH_MXC) || defined(CONFIG_SOC_IMX28)
+#if defined(CONFIG_ARM)
 #define FEC_ALIGNMENT   0xf
 #else
 #define FEC_ALIGNMENT   0x3
@@ -74,7 +74,8 @@ static struct platform_device_id fec_devtype[] = {
         }, {
                 .name = "imx28-fec",
                 .driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_SWAP_FRAME,
-        }
+        },
+        { }
 };
 
 static unsigned char macaddr[ETH_ALEN];
@@ -147,8 +148,7 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");
  * account when setting it.
  */
 #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
-    defined(CONFIG_M520x) || defined(CONFIG_M532x) || \
-    defined(CONFIG_ARCH_MXC) || defined(CONFIG_SOC_IMX28)
+    defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM)
 #define OPT_FRAME_SIZE  (PKT_MAXBUF_SIZE << 16)
 #else
 #define OPT_FRAME_SIZE  0
@@ -183,7 +183,7 @@ struct fec_enet_private {
         struct bufdesc  *rx_bd_base;
         struct bufdesc  *tx_bd_base;
         /* The next free ring entry */
-        struct bufdesc  *cur_rx, *cur_tx; 
+        struct bufdesc  *cur_rx, *cur_tx;
         /* The ring entries to be free()ed */
         struct bufdesc  *dirty_tx;
 
@@ -191,28 +191,21 @@ struct fec_enet_private {
         /* hold while accessing the HW like ringbuffer for tx/rx but not MAC */
         spinlock_t hw_lock;
 
-        struct  platform_device *pdev;
+        struct  platform_device *pdev;
 
         int     opened;
 
         /* Phylib and MDIO interface */
-        struct  mii_bus *mii_bus;
-        struct  phy_device *phy_dev;
-        int     mii_timeout;
-        uint    phy_speed;
+        struct  mii_bus *mii_bus;
+        struct  phy_device *phy_dev;
+        int     mii_timeout;
+        uint    phy_speed;
         phy_interface_t phy_interface;
         int     link;
         int     full_duplex;
         struct  completion mdio_done;
 };
 
-static irqreturn_t fec_enet_interrupt(int irq, void * dev_id);
-static void fec_enet_tx(struct net_device *dev);
-static void fec_enet_rx(struct net_device *dev);
-static int fec_enet_close(struct net_device *dev);
-static void fec_restart(struct net_device *dev, int duplex);
-static void fec_stop(struct net_device *dev);
-
 /* FEC MII MMFR bits definition */
 #define FEC_MMFR_ST             (1 << 30)
 #define FEC_MMFR_OP_READ        (2 << 28)
@@ -239,9 +232,9 @@ static void *swap_buffer(void *bufaddr, int len)
 }
 
 static netdev_tx_t
-fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
+fec_enet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         const struct platform_device_id *id_entry =
                                 platform_get_device_id(fep->pdev);
         struct bufdesc *bdp;
@@ -262,9 +255,9 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (status & BD_ENET_TX_READY) {
                 /* Ooops.  All transmit buffers are full.  Bail out.
-                 * This should not happen, since dev->tbusy should be set.
+                 * This should not happen, since ndev->tbusy should be set.
                  */
-                printk("%s: tx queue full!.\n", dev->name);
+                printk("%s: tx queue full!.\n", ndev->name);
                 spin_unlock_irqrestore(&fep->hw_lock, flags);
                 return NETDEV_TX_BUSY;
         }
@@ -284,7 +277,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (((unsigned long) bufaddr) & FEC_ALIGNMENT) {
                 unsigned int index;
                 index = bdp - fep->tx_bd_base;
-                memcpy(fep->tx_bounce[index], (void *)skb->data, skb->len);
+                memcpy(fep->tx_bounce[index], skb->data, skb->len);
                 bufaddr = fep->tx_bounce[index];
         }
 
@@ -299,13 +292,13 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* Save skb pointer */
         fep->tx_skbuff[fep->skb_cur] = skb;
 
-        dev->stats.tx_bytes += skb->len;
+        ndev->stats.tx_bytes += skb->len;
         fep->skb_cur = (fep->skb_cur+1) & TX_RING_MOD_MASK;
 
         /* Push the data cache so the CPM does not get stale memory
          * data.
          */
-        bdp->cbd_bufaddr = dma_map_single(&dev->dev, bufaddr,
+        bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, bufaddr,
                         FEC_ENET_TX_FRSIZE, DMA_TO_DEVICE);
 
         /* Send it on its way.  Tell FEC it's ready, interrupt when done,
@@ -326,7 +319,7 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (bdp == fep->dirty_tx) {
                 fep->tx_full = 1;
-                netif_stop_queue(dev);
+                netif_stop_queue(ndev);
         }
 
         fep->cur_tx = bdp;
@@ -336,62 +329,170 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
         return NETDEV_TX_OK;
 }
 
+/* This function is called to start or restart the FEC during a link
+ * change.  This only happens when switching between half and full
+ * duplex.
+ */
 static void
-fec_timeout(struct net_device *dev)
+fec_restart(struct net_device *ndev, int duplex)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
+        const struct platform_device_id *id_entry =
+                                platform_get_device_id(fep->pdev);
+        int i;
+        u32 temp_mac[2];
+        u32 rcntl = OPT_FRAME_SIZE | 0x04;
 
-        dev->stats.tx_errors++;
+        /* Whack a reset.  We should wait for this. */
+        writel(1, fep->hwp + FEC_ECNTRL);
+        udelay(10);
 
-        fec_restart(dev, fep->full_duplex);
-        netif_wake_queue(dev);
-}
+        /*
+         * enet-mac reset will reset mac address registers too,
+         * so need to reconfigure it.
+         */
+        if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) {
+                memcpy(&temp_mac, ndev->dev_addr, ETH_ALEN);
+                writel(cpu_to_be32(temp_mac[0]), fep->hwp + FEC_ADDR_LOW);
+                writel(cpu_to_be32(temp_mac[1]), fep->hwp + FEC_ADDR_HIGH);
+        }
 
-static irqreturn_t
-fec_enet_interrupt(int irq, void * dev_id)
-{
-        struct  net_device *dev = dev_id;
-        struct fec_enet_private *fep = netdev_priv(dev);
-        uint    int_events;
-        irqreturn_t ret = IRQ_NONE;
+        /* Clear any outstanding interrupt. */
+        writel(0xffc00000, fep->hwp + FEC_IEVENT);
 
-        do {
-                int_events = readl(fep->hwp + FEC_IEVENT);
-                writel(int_events, fep->hwp + FEC_IEVENT);
+        /* Reset all multicast. */
+        writel(0, fep->hwp + FEC_GRP_HASH_TABLE_HIGH);
+        writel(0, fep->hwp + FEC_GRP_HASH_TABLE_LOW);
+#ifndef CONFIG_M5272
+        writel(0, fep->hwp + FEC_HASH_TABLE_HIGH);
+        writel(0, fep->hwp + FEC_HASH_TABLE_LOW);
+#endif
 
-                if (int_events & FEC_ENET_RXF) {
-                        ret = IRQ_HANDLED;
-                        fec_enet_rx(dev);
-                }
+        /* Set maximum receive buffer size. */
+        writel(PKT_MAXBLR_SIZE, fep->hwp + FEC_R_BUFF_SIZE);
 
-                /* Transmit OK, or non-fatal error. Update the buffer
-                 * descriptors. FEC handles all errors, we just discover
-                 * them as part of the transmit process.
-                 */
-                if (int_events & FEC_ENET_TXF) {
-                        ret = IRQ_HANDLED;
-                        fec_enet_tx(dev);
+        /* Set receive and transmit descriptor base. */
+        writel(fep->bd_dma, fep->hwp + FEC_R_DES_START);
+        writel((unsigned long)fep->bd_dma + sizeof(struct bufdesc) * RX_RING_SIZE,
+                        fep->hwp + FEC_X_DES_START);
+
+        fep->dirty_tx = fep->cur_tx = fep->tx_bd_base;
+        fep->cur_rx = fep->rx_bd_base;
+
+        /* Reset SKB transmit buffers. */
+        fep->skb_cur = fep->skb_dirty = 0;
+        for (i = 0; i <= TX_RING_MOD_MASK; i++) {
+                if (fep->tx_skbuff[i]) {
+                        dev_kfree_skb_any(fep->tx_skbuff[i]);
+                        fep->tx_skbuff[i] = NULL;
                 }
+        }
 
-                if (int_events & FEC_ENET_MII) {
-                        ret = IRQ_HANDLED;
-                        complete(&fep->mdio_done);
+        /* Enable MII mode */
+        if (duplex) {
+                /* FD enable */
+                writel(0x04, fep->hwp + FEC_X_CNTRL);
+        } else {
+                /* No Rcv on Xmit */
+                rcntl |= 0x02;
+                writel(0x0, fep->hwp + FEC_X_CNTRL);
+        }
+
+        fep->full_duplex = duplex;
+
+        /* Set MII speed */
+        writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
+
+        /*
+         * The phy interface and speed need to get configured
+         * differently on enet-mac.
+         */
+        if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) {
+                /* Enable flow control and length check */
+                rcntl |= 0x40000000 | 0x00000020;
+
+                /* MII or RMII */
+                if (fep->phy_interface == PHY_INTERFACE_MODE_RMII)
+                        rcntl |= (1 << 8);
+                else
+                        rcntl &= ~(1 << 8);
+
+                /* 10M or 100M */
+                if (fep->phy_dev && fep->phy_dev->speed == SPEED_100)
+                        rcntl &= ~(1 << 9);
+                else
+                        rcntl |= (1 << 9);
+
+        } else {
+#ifdef FEC_MIIGSK_ENR
+                if (fep->phy_interface == PHY_INTERFACE_MODE_RMII) {
+                        /* disable the gasket and wait */
+                        writel(0, fep->hwp + FEC_MIIGSK_ENR);
+                        while (readl(fep->hwp + FEC_MIIGSK_ENR) & 4)
+                                udelay(1);
+
+                        /*
+                         * configure the gasket:
+                         *   RMII, 50 MHz, no loopback, no echo
+                         */
+                        writel(1, fep->hwp + FEC_MIIGSK_CFGR);
+
+                        /* re-enable the gasket */
+                        writel(2, fep->hwp + FEC_MIIGSK_ENR);
                 }
-        } while (int_events);
+#endif
+        }
+        writel(rcntl, fep->hwp + FEC_R_CNTRL);
 
-        return ret;
+        /* And last, enable the transmit and receive processing */
+        writel(2, fep->hwp + FEC_ECNTRL);
+        writel(0, fep->hwp + FEC_R_DES_ACTIVE);
+
+        /* Enable interrupts we wish to service */
+        writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
 }
 
+static void
+fec_stop(struct net_device *ndev)
+{
+        struct fec_enet_private *fep = netdev_priv(ndev);
+
+        /* We cannot expect a graceful transmit stop without link !!! */
+        if (fep->link) {
+                writel(1, fep->hwp + FEC_X_CNTRL); /* Graceful transmit stop */
+                udelay(10);
+                if (!(readl(fep->hwp + FEC_IEVENT) & FEC_ENET_GRA))
+                        printk("fec_stop : Graceful transmit stop did not complete !\n");
+        }
+
+        /* Whack a reset.  We should wait for this. */
+        writel(1, fep->hwp + FEC_ECNTRL);
+        udelay(10);
+        writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
+        writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
+}
+
+
+static void
+fec_timeout(struct net_device *ndev)
+{
+        struct fec_enet_private *fep = netdev_priv(ndev);
+
+        ndev->stats.tx_errors++;
+
+        fec_restart(ndev, fep->full_duplex);
+        netif_wake_queue(ndev);
+}
 
 static void
-fec_enet_tx(struct net_device *dev)
+fec_enet_tx(struct net_device *ndev)
 {
         struct  fec_enet_private *fep;
         struct bufdesc *bdp;
         unsigned short status;
         struct  sk_buff *skb;
 
-        fep = netdev_priv(dev);
+        fep = netdev_priv(ndev);
         spin_lock(&fep->hw_lock);
         bdp = fep->dirty_tx;
 
@@ -399,7 +500,8 @@ fec_enet_tx(struct net_device *dev)
                 if (bdp == fep->cur_tx && fep->tx_full == 0)
                         break;
 
-                dma_unmap_single(&dev->dev, bdp->cbd_bufaddr, FEC_ENET_TX_FRSIZE, DMA_TO_DEVICE);
+                dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr,
+                                FEC_ENET_TX_FRSIZE, DMA_TO_DEVICE);
                 bdp->cbd_bufaddr = 0;
 
                 skb = fep->tx_skbuff[fep->skb_dirty];
@@ -407,19 +509,19 @@ fec_enet_tx(struct net_device *dev)
                 if (status & (BD_ENET_TX_HB | BD_ENET_TX_LC |
                                    BD_ENET_TX_RL | BD_ENET_TX_UN |
                                    BD_ENET_TX_CSL)) {
-                        dev->stats.tx_errors++;
+                        ndev->stats.tx_errors++;
                         if (status & BD_ENET_TX_HB)  /* No heartbeat */
-                                dev->stats.tx_heartbeat_errors++;
+                                ndev->stats.tx_heartbeat_errors++;
                         if (status & BD_ENET_TX_LC)  /* Late collision */
-                                dev->stats.tx_window_errors++;
+                                ndev->stats.tx_window_errors++;
                         if (status & BD_ENET_TX_RL)  /* Retrans limit */
-                                dev->stats.tx_aborted_errors++;
+                                ndev->stats.tx_aborted_errors++;
                         if (status & BD_ENET_TX_UN)  /* Underrun */
-                                dev->stats.tx_fifo_errors++;
+                                ndev->stats.tx_fifo_errors++;
                         if (status & BD_ENET_TX_CSL) /* Carrier lost */
-                                dev->stats.tx_carrier_errors++;
+                                ndev->stats.tx_carrier_errors++;
                 } else {
-                        dev->stats.tx_packets++;
+                        ndev->stats.tx_packets++;
                 }
 
                 if (status & BD_ENET_TX_READY)
@@ -429,7 +531,7 @@ fec_enet_tx(struct net_device *dev)
                  * but we eventually sent the packet OK.
                  */
                 if (status & BD_ENET_TX_DEF)
-                        dev->stats.collisions++;
+                        ndev->stats.collisions++;
 
                 /* Free the sk buffer associated with this last transmit */
                 dev_kfree_skb_any(skb);
@@ -446,8 +548,8 @@ fec_enet_tx(struct net_device *dev)
                  */
                 if (fep->tx_full) {
                         fep->tx_full = 0;
-                        if (netif_queue_stopped(dev))
-                                netif_wake_queue(dev);
+                        if (netif_queue_stopped(ndev))
+                                netif_wake_queue(ndev);
                 }
         }
         fep->dirty_tx = bdp;
@@ -461,9 +563,9 @@ fec_enet_tx(struct net_device *dev)
  * effectively tossing the packet.
  */
 static void
-fec_enet_rx(struct net_device *dev)
+fec_enet_rx(struct net_device *ndev)
 {
-        struct  fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         const struct platform_device_id *id_entry =
                                 platform_get_device_id(fep->pdev);
         struct bufdesc *bdp;
@@ -497,17 +599,17 @@ fec_enet_rx(struct net_device *dev)
                 /* Check for errors. */
                 if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH | BD_ENET_RX_NO |
                            BD_ENET_RX_CR | BD_ENET_RX_OV)) {
-                        dev->stats.rx_errors++;
+                        ndev->stats.rx_errors++;
                         if (status & (BD_ENET_RX_LG | BD_ENET_RX_SH)) {
                                 /* Frame too long or too short. */
-                                dev->stats.rx_length_errors++;
+                                ndev->stats.rx_length_errors++;
                         }
                         if (status & BD_ENET_RX_NO)     /* Frame alignment */
-                                dev->stats.rx_frame_errors++;
+                                ndev->stats.rx_frame_errors++;
                         if (status & BD_ENET_RX_CR)     /* CRC Error */
-                                dev->stats.rx_crc_errors++;
+                                ndev->stats.rx_crc_errors++;
                         if (status & BD_ENET_RX_OV)     /* FIFO overrun */
-                                dev->stats.rx_fifo_errors++;
+                                ndev->stats.rx_fifo_errors++;
                 }
 
                 /* Report late collisions as a frame error.
@@ -515,19 +617,19 @@ fec_enet_rx(struct net_device *dev)
                  * have in the buffer.  So, just drop this frame on the floor.
                  */
                 if (status & BD_ENET_RX_CL) {
-                        dev->stats.rx_errors++;
-                        dev->stats.rx_frame_errors++;
+                        ndev->stats.rx_errors++;
+                        ndev->stats.rx_frame_errors++;
                         goto rx_processing_done;
                 }
 
                 /* Process the incoming frame. */
-                dev->stats.rx_packets++;
+                ndev->stats.rx_packets++;
                 pkt_len = bdp->cbd_datlen;
-                dev->stats.rx_bytes += pkt_len;
+                ndev->stats.rx_bytes += pkt_len;
                 data = (__u8*)__va(bdp->cbd_bufaddr);
 
-                dma_unmap_single(NULL, bdp->cbd_bufaddr, bdp->cbd_datlen,
-                                DMA_FROM_DEVICE);
+                dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr,
+                                FEC_ENET_TX_FRSIZE, DMA_FROM_DEVICE);
 
                 if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME)
                         swap_buffer(data, pkt_len);
@@ -541,18 +643,18 @@ fec_enet_rx(struct net_device *dev)
 
                 if (unlikely(!skb)) {
                         printk("%s: Memory squeeze, dropping packet.\n",
-                                        dev->name);
-                        dev->stats.rx_dropped++;
+                                        ndev->name);
+                        ndev->stats.rx_dropped++;
                 } else {
                         skb_reserve(skb, NET_IP_ALIGN);
                         skb_put(skb, pkt_len - 4);      /* Make room */
                         skb_copy_to_linear_data(skb, data, pkt_len - 4);
-                        skb->protocol = eth_type_trans(skb, dev);
+                        skb->protocol = eth_type_trans(skb, ndev);
                         netif_rx(skb);
                 }
 
-                bdp->cbd_bufaddr = dma_map_single(NULL, data, bdp->cbd_datlen,
-                        DMA_FROM_DEVICE);
+                bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, data,
+                                FEC_ENET_TX_FRSIZE, DMA_FROM_DEVICE);
 rx_processing_done:
                 /* Clear the status flags for this buffer */
                 status &= ~BD_ENET_RX_STATS;
@@ -577,10 +679,47 @@ rx_processing_done:
         spin_unlock(&fep->hw_lock);
 }
 
+static irqreturn_t
+fec_enet_interrupt(int irq, void *dev_id)
+{
+        struct net_device *ndev = dev_id;
+        struct fec_enet_private *fep = netdev_priv(ndev);
+        uint int_events;
+        irqreturn_t ret = IRQ_NONE;
+
+        do {
+                int_events = readl(fep->hwp + FEC_IEVENT);
+                writel(int_events, fep->hwp + FEC_IEVENT);
+
+                if (int_events & FEC_ENET_RXF) {
+                        ret = IRQ_HANDLED;
+                        fec_enet_rx(ndev);
+                }
+
+                /* Transmit OK, or non-fatal error. Update the buffer
+                 * descriptors. FEC handles all errors, we just discover
+                 * them as part of the transmit process.
+                 */
+                if (int_events & FEC_ENET_TXF) {
+                        ret = IRQ_HANDLED;
+                        fec_enet_tx(ndev);
+                }
+
+                if (int_events & FEC_ENET_MII) {
+                        ret = IRQ_HANDLED;
+                        complete(&fep->mdio_done);
+                }
+        } while (int_events);
+
+        return ret;
+}
+
+
+
 /* ------------------------------------------------------------------------- */
-static void __inline__ fec_get_mac(struct net_device *dev)
+static void __inline__ fec_get_mac(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct fec_platform_data *pdata = fep->pdev->dev.platform_data;
         unsigned char *iap, tmpaddr[ETH_ALEN];
 
@@ -616,11 +755,11 @@ static void __inline__ fec_get_mac(struct net_device *dev)
                 iap = &tmpaddr[0];
         }
 
-        memcpy(dev->dev_addr, iap, ETH_ALEN);
+        memcpy(ndev->dev_addr, iap, ETH_ALEN);
 
         /* Adjust MAC if using macaddr */
         if (iap == macaddr)
-                 dev->dev_addr[ETH_ALEN-1] = macaddr[ETH_ALEN-1] + fep->pdev->id;
+                 ndev->dev_addr[ETH_ALEN-1] = macaddr[ETH_ALEN-1] + fep->pdev->id;
 }
 
 /* ------------------------------------------------------------------------- */
@@ -628,9 +767,9 @@ static void __inline__ fec_get_mac(struct net_device *dev)
 /*
  * Phy section
  */
-static void fec_enet_adjust_link(struct net_device *dev)
+static void fec_enet_adjust_link(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct phy_device *phy_dev = fep->phy_dev;
         unsigned long flags;
 
@@ -647,7 +786,7 @@ static void fec_enet_adjust_link(struct net_device *dev)
         /* Duplex link change */
         if (phy_dev->link) {
                 if (fep->full_duplex != phy_dev->duplex) {
-                        fec_restart(dev, phy_dev->duplex);
+                        fec_restart(ndev, phy_dev->duplex);
                         status_change = 1;
                 }
         }
@@ -656,9 +795,9 @@ static void fec_enet_adjust_link(struct net_device *dev)
         if (phy_dev->link != fep->link) {
                 fep->link = phy_dev->link;
                 if (phy_dev->link)
-                        fec_restart(dev, phy_dev->duplex);
+                        fec_restart(ndev, phy_dev->duplex);
                 else
-                        fec_stop(dev);
+                        fec_stop(ndev);
                 status_change = 1;
         }
 
@@ -727,9 +866,9 @@ static int fec_enet_mdio_reset(struct mii_bus *bus)
         return 0;
 }
 
-static int fec_enet_mii_probe(struct net_device *dev)
+static int fec_enet_mii_probe(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct phy_device *phy_dev = NULL;
         char mdio_bus_id[MII_BUS_ID_SIZE];
         char phy_name[MII_BUS_ID_SIZE + 3];
@@ -754,16 +893,16 @@ static int fec_enet_mii_probe(struct net_device *dev)
 
         if (phy_id >= PHY_MAX_ADDR) {
                 printk(KERN_INFO "%s: no PHY, assuming direct connection "
-                        "to switch\n", dev->name);
+                        "to switch\n", ndev->name);
                 strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE);
                 phy_id = 0;
         }
 
         snprintf(phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
-        phy_dev = phy_connect(dev, phy_name, &fec_enet_adjust_link, 0,
+        phy_dev = phy_connect(ndev, phy_name, &fec_enet_adjust_link, 0,
                 PHY_INTERFACE_MODE_MII);
         if (IS_ERR(phy_dev)) {
-                printk(KERN_ERR "%s: could not attach to PHY\n", dev->name);
+                printk(KERN_ERR "%s: could not attach to PHY\n", ndev->name);
                 return PTR_ERR(phy_dev);
         }
 
@@ -776,7 +915,7 @@ static int fec_enet_mii_probe(struct net_device *dev)
         fep->full_duplex = 0;
 
         printk(KERN_INFO "%s: Freescale FEC PHY driver [%s] "
-                "(mii_bus:phy_addr=%s, irq=%d)\n", dev->name,
+                "(mii_bus:phy_addr=%s, irq=%d)\n", ndev->name,
                 fep->phy_dev->drv->name, dev_name(&fep->phy_dev->dev),
                 fep->phy_dev->irq);
 
@@ -786,8 +925,8 @@ static int fec_enet_mii_probe(struct net_device *dev)
 static int fec_enet_mii_init(struct platform_device *pdev)
 {
         static struct mii_bus *fec0_mii_bus;
-        struct net_device *dev = platform_get_drvdata(pdev);
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct net_device *ndev = platform_get_drvdata(pdev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         const struct platform_device_id *id_entry =
                                 platform_get_device_id(fep->pdev);
         int err = -ENXIO, i;
@@ -845,8 +984,6 @@ static int fec_enet_mii_init(struct platform_device *pdev)
         for (i = 0; i < PHY_MAX_ADDR; i++)
                 fep->mii_bus->irq[i] = PHY_POLL;
 
-        platform_set_drvdata(dev, fep->mii_bus);
-
         if (mdiobus_register(fep->mii_bus))
                 goto err_out_free_mdio_irq;
 
@@ -873,10 +1010,10 @@ static void fec_enet_mii_remove(struct fec_enet_private *fep)
         mdiobus_free(fep->mii_bus);
 }
 
-static int fec_enet_get_settings(struct net_device *dev,
+static int fec_enet_get_settings(struct net_device *ndev,
                                   struct ethtool_cmd *cmd)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct phy_device *phydev = fep->phy_dev;
 
         if (!phydev)
@@ -885,10 +1022,10 @@ static int fec_enet_get_settings(struct net_device *dev,
         return phy_ethtool_gset(phydev, cmd);
 }
 
-static int fec_enet_set_settings(struct net_device *dev,
+static int fec_enet_set_settings(struct net_device *ndev,
                                  struct ethtool_cmd *cmd)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct phy_device *phydev = fep->phy_dev;
 
         if (!phydev)
@@ -897,14 +1034,14 @@ static int fec_enet_set_settings(struct net_device *dev,
         return phy_ethtool_sset(phydev, cmd);
 }
 
-static void fec_enet_get_drvinfo(struct net_device *dev,
+static void fec_enet_get_drvinfo(struct net_device *ndev,
                                  struct ethtool_drvinfo *info)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
 
         strcpy(info->driver, fep->pdev->dev.driver->name);
         strcpy(info->version, "Revision: 1.0");
-        strcpy(info->bus_info, dev_name(&dev->dev));
+        strcpy(info->bus_info, dev_name(&ndev->dev));
 }
 
 static struct ethtool_ops fec_enet_ethtool_ops = {
@@ -914,12 +1051,12 @@ static struct ethtool_ops fec_enet_ethtool_ops = {
         .get_link               = ethtool_op_get_link,
 };
 
-static int fec_enet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+static int fec_enet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct phy_device *phydev = fep->phy_dev;
 
-        if (!netif_running(dev))
+        if (!netif_running(ndev))
                 return -EINVAL;
 
         if (!phydev)
@@ -928,9 +1065,9 @@ static int fec_enet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
         return phy_mii_ioctl(phydev, rq, cmd);
 }
 
-static void fec_enet_free_buffers(struct net_device *dev)
+static void fec_enet_free_buffers(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         int i;
         struct sk_buff *skb;
         struct bufdesc  *bdp;
@@ -940,7 +1077,7 @@ static void fec_enet_free_buffers(struct net_device *dev)
                 skb = fep->rx_skbuff[i];
 
                 if (bdp->cbd_bufaddr)
-                        dma_unmap_single(&dev->dev, bdp->cbd_bufaddr,
+                        dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr,
                                         FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE);
                 if (skb)
                         dev_kfree_skb(skb);
@@ -952,9 +1089,9 @@ static void fec_enet_free_buffers(struct net_device *dev)
                 kfree(fep->tx_bounce[i]);
 }
 
-static int fec_enet_alloc_buffers(struct net_device *dev)
+static int fec_enet_alloc_buffers(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         int i;
         struct sk_buff *skb;
         struct bufdesc  *bdp;
@@ -963,12 +1100,12 @@ static int fec_enet_alloc_buffers(struct net_device *dev)
         for (i = 0; i < RX_RING_SIZE; i++) {
                 skb = dev_alloc_skb(FEC_ENET_RX_FRSIZE);
                 if (!skb) {
-                        fec_enet_free_buffers(dev);
+                        fec_enet_free_buffers(ndev);
                         return -ENOMEM;
                 }
                 fep->rx_skbuff[i] = skb;
 
-                bdp->cbd_bufaddr = dma_map_single(&dev->dev, skb->data,
+                bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, skb->data,
                                 FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE);
                 bdp->cbd_sc = BD_ENET_RX_EMPTY;
                 bdp++;
@@ -995,45 +1132,47 @@ static int fec_enet_alloc_buffers(struct net_device *dev)
 }
 
 static int
-fec_enet_open(struct net_device *dev)
+fec_enet_open(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         int ret;
 
         /* I should reset the ring buffers here, but I don't yet know
          * a simple way to do that.
          */
 
-        ret = fec_enet_alloc_buffers(dev);
+        ret = fec_enet_alloc_buffers(ndev);
         if (ret)
                 return ret;
 
         /* Probe and connect to PHY when open the interface */
-        ret = fec_enet_mii_probe(dev);
+        ret = fec_enet_mii_probe(ndev);
         if (ret) {
-                fec_enet_free_buffers(dev);
+                fec_enet_free_buffers(ndev);
                 return ret;
         }
         phy_start(fep->phy_dev);
-        netif_start_queue(dev);
+        netif_start_queue(ndev);
         fep->opened = 1;
         return 0;
 }
 
 static int
-fec_enet_close(struct net_device *dev)
+fec_enet_close(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
 
         /* Don't know what to do yet. */
         fep->opened = 0;
-        netif_stop_queue(dev);
-        fec_stop(dev);
+        netif_stop_queue(ndev);
+        fec_stop(ndev);
 
-        if (fep->phy_dev)
+        if (fep->phy_dev) {
+                phy_stop(fep->phy_dev);
                 phy_disconnect(fep->phy_dev);
+        }
 
-        fec_enet_free_buffers(dev);
+        fec_enet_free_buffers(ndev);
 
         return 0;
 }
@@ -1051,14 +1190,14 @@ fec_enet_close(struct net_device *dev)
 #define HASH_BITS       6               /* #bits in hash */
 #define CRC32_POLY      0xEDB88320
 
-static void set_multicast_list(struct net_device *dev)
+static void set_multicast_list(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct netdev_hw_addr *ha;
         unsigned int i, bit, data, crc, tmp;
         unsigned char hash;
 
-        if (dev->flags & IFF_PROMISC) {
+        if (ndev->flags & IFF_PROMISC) {
                 tmp = readl(fep->hwp + FEC_R_CNTRL);
                 tmp |= 0x8;
                 writel(tmp, fep->hwp + FEC_R_CNTRL);
@@ -1069,7 +1208,7 @@ static void set_multicast_list(struct net_device *dev)
         tmp &= ~0x8;
         writel(tmp, fep->hwp + FEC_R_CNTRL);
 
-        if (dev->flags & IFF_ALLMULTI) {
+        if (ndev->flags & IFF_ALLMULTI) {
                 /* Catch all multicast addresses, so set the
                  * filter to all 1's
                  */
@@ -1084,7 +1223,7 @@ static void set_multicast_list(struct net_device *dev)
         writel(0, fep->hwp + FEC_GRP_HASH_TABLE_HIGH);
         writel(0, fep->hwp + FEC_GRP_HASH_TABLE_LOW);
 
-        netdev_for_each_mc_addr(ha, dev) {
+        netdev_for_each_mc_addr(ha, ndev) {
                 /* Only support group multicast for now */
                 if (!(ha->addr[0] & 1))
                         continue;
@@ -1092,7 +1231,7 @@ static void set_multicast_list(struct net_device *dev)
                 /* calculate crc32 value of mac address */
                 crc = 0xffffffff;
 
-                for (i = 0; i < dev->addr_len; i++) {
+                for (i = 0; i < ndev->addr_len; i++) {
                         data = ha->addr[i];
                         for (bit = 0; bit < 8; bit++, data >>= 1) {
                                 crc = (crc >> 1) ^
@@ -1119,20 +1258,20 @@ static void set_multicast_list(struct net_device *dev)
 
 /* Set a MAC change in hardware. */
 static int
-fec_set_mac_address(struct net_device *dev, void *p)
+fec_set_mac_address(struct net_device *ndev, void *p)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct sockaddr *addr = p;
 
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
 
-        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+        memcpy(ndev->dev_addr, addr->sa_data, ndev->addr_len);
 
-        writel(dev->dev_addr[3] | (dev->dev_addr[2] << 8) |
-                (dev->dev_addr[1] << 16) | (dev->dev_addr[0] << 24),
+        writel(ndev->dev_addr[3] | (ndev->dev_addr[2] << 8) |
+                (ndev->dev_addr[1] << 16) | (ndev->dev_addr[0] << 24),
                 fep->hwp + FEC_ADDR_LOW);
-        writel((dev->dev_addr[5] << 16) | (dev->dev_addr[4] << 24),
+        writel((ndev->dev_addr[5] << 16) | (ndev->dev_addr[4] << 24),
                 fep->hwp + FEC_ADDR_HIGH);
         return 0;
 }
@@ -1146,16 +1285,16 @@ static const struct net_device_ops fec_netdev_ops = {
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_tx_timeout         = fec_timeout,
         .ndo_set_mac_address    = fec_set_mac_address,
-        .ndo_do_ioctl           = fec_enet_ioctl,
+        .ndo_do_ioctl           = fec_enet_ioctl,
 };
 
  /*
   * XXX:  We need to clean up on failure exits here.
   *
   */
-static int fec_enet_init(struct net_device *dev)
+static int fec_enet_init(struct net_device *ndev)
 {
-        struct fec_enet_private *fep = netdev_priv(dev);
+        struct fec_enet_private *fep = netdev_priv(ndev);
         struct bufdesc *cbd_base;
         struct bufdesc *bdp;
         int i;
@@ -1170,20 +1309,19 @@ static int fec_enet_init(struct net_device *dev)
 
         spin_lock_init(&fep->hw_lock);
 
-        fep->hwp = (void __iomem *)dev->base_addr;
-        fep->netdev = dev;
+        fep->netdev = ndev;
 
         /* Get the Ethernet address */
-        fec_get_mac(dev);
+        fec_get_mac(ndev);
 
         /* Set receive and transmit descriptor base. */
         fep->rx_bd_base = cbd_base;
         fep->tx_bd_base = cbd_base + RX_RING_SIZE;
 
         /* The FEC Ethernet specific entries in the device structure */
-        dev->watchdog_timeo = TX_TIMEOUT;
-        dev->netdev_ops = &fec_netdev_ops;
-        dev->ethtool_ops = &fec_enet_ethtool_ops;
+        ndev->watchdog_timeo = TX_TIMEOUT;
+        ndev->netdev_ops = &fec_netdev_ops;
+        ndev->ethtool_ops = &fec_enet_ethtool_ops;
 
         /* Initialize the receive buffer descriptors. */
         bdp = fep->rx_bd_base;
@@ -1212,152 +1350,11 @@ static int fec_enet_init(struct net_device *dev)
         bdp--;
         bdp->cbd_sc |= BD_SC_WRAP;
 
-        fec_restart(dev, 0);
+        fec_restart(ndev, 0);
 
         return 0;
 }
 
-/* This function is called to start or restart the FEC during a link
- * change.  This only happens when switching between half and full
- * duplex.
- */
-static void
-fec_restart(struct net_device *dev, int duplex)
-{
-        struct fec_enet_private *fep = netdev_priv(dev);
-        const struct platform_device_id *id_entry =
-                                platform_get_device_id(fep->pdev);
-        int i;
-        u32 val, temp_mac[2];
-
-        /* Whack a reset.  We should wait for this. */
-        writel(1, fep->hwp + FEC_ECNTRL);
-        udelay(10);
-
-        /*
-         * enet-mac reset will reset mac address registers too,
-         * so need to reconfigure it.
-         */
-        if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) {
-                memcpy(&temp_mac, dev->dev_addr, ETH_ALEN);
-                writel(cpu_to_be32(temp_mac[0]), fep->hwp + FEC_ADDR_LOW);
-                writel(cpu_to_be32(temp_mac[1]), fep->hwp + FEC_ADDR_HIGH);
-        }
-
-        /* Clear any outstanding interrupt. */
-        writel(0xffc00000, fep->hwp + FEC_IEVENT);
-
-        /* Reset all multicast. */
-        writel(0, fep->hwp + FEC_GRP_HASH_TABLE_HIGH);
-        writel(0, fep->hwp + FEC_GRP_HASH_TABLE_LOW);
-#ifndef CONFIG_M5272
-        writel(0, fep->hwp + FEC_HASH_TABLE_HIGH);
-        writel(0, fep->hwp + FEC_HASH_TABLE_LOW);
-#endif
-
-        /* Set maximum receive buffer size. */
-        writel(PKT_MAXBLR_SIZE, fep->hwp + FEC_R_BUFF_SIZE);
-
-        /* Set receive and transmit descriptor base. */
-        writel(fep->bd_dma, fep->hwp + FEC_R_DES_START);
-        writel((unsigned long)fep->bd_dma + sizeof(struct bufdesc) * RX_RING_SIZE,
-                        fep->hwp + FEC_X_DES_START);
-
-        fep->dirty_tx = fep->cur_tx = fep->tx_bd_base;
-        fep->cur_rx = fep->rx_bd_base;
-
-        /* Reset SKB transmit buffers. */
-        fep->skb_cur = fep->skb_dirty = 0;
-        for (i = 0; i <= TX_RING_MOD_MASK; i++) {
-                if (fep->tx_skbuff[i]) {
-                        dev_kfree_skb_any(fep->tx_skbuff[i]);
-                        fep->tx_skbuff[i] = NULL;
-                }
-        }
-
-        /* Enable MII mode */
-        if (duplex) {
-                /* MII enable / FD enable */
-                writel(OPT_FRAME_SIZE | 0x04, fep->hwp + FEC_R_CNTRL);
-                writel(0x04, fep->hwp + FEC_X_CNTRL);
-        } else {
-                /* MII enable / No Rcv on Xmit */
-                writel(OPT_FRAME_SIZE | 0x06, fep->hwp + FEC_R_CNTRL);
-                writel(0x0, fep->hwp + FEC_X_CNTRL);
-        }
-        fep->full_duplex = duplex;
-
-        /* Set MII speed */
-        writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
-
-        /*
-         * The phy interface and speed need to get configured
-         * differently on enet-mac.
-         */
-        if (id_entry->driver_data & FEC_QUIRK_ENET_MAC) {
-                val = readl(fep->hwp + FEC_R_CNTRL);
-
-                /* MII or RMII */
-                if (fep->phy_interface == PHY_INTERFACE_MODE_RMII)
-                        val |= (1 << 8);
-                else
-                        val &= ~(1 << 8);
-
-                /* 10M or 100M */
-                if (fep->phy_dev && fep->phy_dev->speed == SPEED_100)
-                        val &= ~(1 << 9);
-                else
-                        val |= (1 << 9);
-
-                writel(val, fep->hwp + FEC_R_CNTRL);
-        } else {
-#ifdef FEC_MIIGSK_ENR
-                if (fep->phy_interface == PHY_INTERFACE_MODE_RMII) {
-                        /* disable the gasket and wait */
-                        writel(0, fep->hwp + FEC_MIIGSK_ENR);
-                        while (readl(fep->hwp + FEC_MIIGSK_ENR) & 4)
-                                udelay(1);
-
-                        /*
-                         * configure the gasket:
-                         *   RMII, 50 MHz, no loopback, no echo
-                         */
-                        writel(1, fep->hwp + FEC_MIIGSK_CFGR);
-
-                        /* re-enable the gasket */
-                        writel(2, fep->hwp + FEC_MIIGSK_ENR);
-                }
-#endif
-        }
-
-        /* And last, enable the transmit and receive processing */
-        writel(2, fep->hwp + FEC_ECNTRL);
-        writel(0, fep->hwp + FEC_R_DES_ACTIVE);
-
-        /* Enable interrupts we wish to service */
-        writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
-}
-
-static void
-fec_stop(struct net_device *dev)
-{
-        struct fec_enet_private *fep = netdev_priv(dev);
-
-        /* We cannot expect a graceful transmit stop without link !!! */
-        if (fep->link) {
-                writel(1, fep->hwp + FEC_X_CNTRL); /* Graceful transmit stop */
-                udelay(10);
-                if (!(readl(fep->hwp + FEC_IEVENT) & FEC_ENET_GRA))
-                        printk("fec_stop : Graceful transmit stop did not complete !\n");
-        }
-
-        /* Whack a reset.  We should wait for this. */
-        writel(1, fep->hwp + FEC_ECNTRL);
-        udelay(10);
-        writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);
-        writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
-}
-
 static int __devinit
 fec_probe(struct platform_device *pdev)
 {
@@ -1377,19 +1374,20 @@ fec_probe(struct platform_device *pdev)
 
         /* Init network device */
         ndev = alloc_etherdev(sizeof(struct fec_enet_private));
-        if (!ndev)
-                return -ENOMEM;
+        if (!ndev) {
+                ret = -ENOMEM;
+                goto failed_alloc_etherdev;
+        }
 
         SET_NETDEV_DEV(ndev, &pdev->dev);
 
         /* setup board info structure */
         fep = netdev_priv(ndev);
-        memset(fep, 0, sizeof(*fep));
 
-        ndev->base_addr = (unsigned long)ioremap(r->start, resource_size(r));
+        fep->hwp = ioremap(r->start, resource_size(r));
         fep->pdev = pdev;
 
-        if (!ndev->base_addr) {
+        if (!fep->hwp) {
                 ret = -ENOMEM;
                 goto failed_ioremap;
         }
@@ -1407,10 +1405,9 @@ fec_probe(struct platform_device *pdev)
                         break;
                 ret = request_irq(irq, fec_enet_interrupt, IRQF_DISABLED, pdev->name, ndev);
                 if (ret) {
-                        while (i >= 0) {
+                        while (--i >= 0) {
                                 irq = platform_get_irq(pdev, i);
                                 free_irq(irq, ndev);
-                                i--;
                         }
                         goto failed_irq;
                 }
@@ -1453,9 +1450,11 @@ failed_clk:
                         free_irq(irq, ndev);
         }
 failed_irq:
-        iounmap((void __iomem *)ndev->base_addr);
+        iounmap(fep->hwp);
 failed_ioremap:
         free_netdev(ndev);
+failed_alloc_etherdev:
+        release_mem_region(r->start, resource_size(r));
 
         return ret;
 }
@@ -1465,16 +1464,22 @@ fec_drv_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
         struct fec_enet_private *fep = netdev_priv(ndev);
-
-        platform_set_drvdata(pdev, NULL);
+        struct resource *r;
 
         fec_stop(ndev);
         fec_enet_mii_remove(fep);
         clk_disable(fep->clk);
         clk_put(fep->clk);
-        iounmap((void __iomem *)ndev->base_addr);
+        iounmap(fep->hwp);
         unregister_netdev(ndev);
         free_netdev(ndev);
+
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        BUG_ON(!r);
+        release_mem_region(r->start, resource_size(r));
+
+        platform_set_drvdata(pdev, NULL);
+
         return 0;
 }
 
@@ -1483,16 +1488,14 @@ static int
 fec_suspend(struct device *dev)
 {
         struct net_device *ndev = dev_get_drvdata(dev);
-        struct fec_enet_private *fep;
+        struct fec_enet_private *fep = netdev_priv(ndev);
 
-        if (ndev) {
-                fep = netdev_priv(ndev);
-                if (netif_running(ndev)) {
-                        fec_stop(ndev);
-                        netif_device_detach(ndev);
-                }
-                clk_disable(fep->clk);
+        if (netif_running(ndev)) {
+                fec_stop(ndev);
+                netif_device_detach(ndev);
         }
+        clk_disable(fep->clk);
+
         return 0;
 }
 
@@ -1500,16 +1503,14 @@ static int
 fec_resume(struct device *dev)
 {
         struct net_device *ndev = dev_get_drvdata(dev);
-        struct fec_enet_private *fep;
+        struct fec_enet_private *fep = netdev_priv(ndev);
 
-        if (ndev) {
-                fep = netdev_priv(ndev);
-                clk_enable(fep->clk);
-                if (netif_running(ndev)) {
-                        fec_restart(ndev, fep->full_duplex);
-                        netif_device_attach(ndev);
-                }
+        clk_enable(fep->clk);
+        if (netif_running(ndev)) {
+                fec_restart(ndev, fep->full_duplex);
+                netif_device_attach(ndev);
         }
+
         return 0;
 }
 
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index 50c1213f61f..9f81b1ac130 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -840,8 +840,7 @@ static const struct net_device_ops mpc52xx_fec_netdev_ops = {
 /* OF Driver                                                                */
 /* ======================================================================== */
 
-static int __devinit
-mpc52xx_fec_probe(struct platform_device *op, const struct of_device_id *match)
+static int __devinit mpc52xx_fec_probe(struct platform_device *op)
 {
         int rv;
         struct net_device *ndev;
@@ -1049,7 +1048,7 @@ static struct of_device_id mpc52xx_fec_match[] = {
 
 MODULE_DEVICE_TABLE(of, mpc52xx_fec_match);
 
-static struct of_platform_driver mpc52xx_fec_driver = {
+static struct platform_driver mpc52xx_fec_driver = {
         .driver = {
                 .name = DRIVER_NAME,
                 .owner = THIS_MODULE,
@@ -1073,21 +1072,21 @@ mpc52xx_fec_init(void)
 {
 #ifdef CONFIG_FEC_MPC52xx_MDIO
         int ret;
-        ret = of_register_platform_driver(&mpc52xx_fec_mdio_driver);
+        ret = platform_driver_register(&mpc52xx_fec_mdio_driver);
         if (ret) {
                 printk(KERN_ERR DRIVER_NAME ": failed to register mdio driver\n");
                 return ret;
         }
 #endif
-        return of_register_platform_driver(&mpc52xx_fec_driver);
+        return platform_driver_register(&mpc52xx_fec_driver);
 }
 
 static void __exit
 mpc52xx_fec_exit(void)
 {
-        of_unregister_platform_driver(&mpc52xx_fec_driver);
+        platform_driver_unregister(&mpc52xx_fec_driver);
 #ifdef CONFIG_FEC_MPC52xx_MDIO
-        of_unregister_platform_driver(&mpc52xx_fec_mdio_driver);
+        platform_driver_unregister(&mpc52xx_fec_mdio_driver);
 #endif
 }
 
diff --git a/drivers/net/fec_mpc52xx.h b/drivers/net/fec_mpc52xx.h
index a227a525bdb..41d2dffde55 100644
--- a/drivers/net/fec_mpc52xx.h
+++ b/drivers/net/fec_mpc52xx.h
@@ -289,6 +289,6 @@ struct mpc52xx_fec {
 #define FEC_XMIT_FSM_ENABLE_CRC         0x01000000
 
 
-extern struct of_platform_driver mpc52xx_fec_mdio_driver;
+extern struct platform_driver mpc52xx_fec_mdio_driver;
 
 #endif  /* __DRIVERS_NET_MPC52XX_FEC_H__ */
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index 0b4cb6f1598..360a578c2bb 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -61,8 +61,7 @@ static int mpc52xx_fec_mdio_write(struct mii_bus *bus, int phy_id, int reg,
                 data | FEC_MII_WRITE_FRAME);
 }
 
-static int mpc52xx_fec_mdio_probe(struct platform_device *of,
-                const struct of_device_id *match)
+static int mpc52xx_fec_mdio_probe(struct platform_device *of)
 {
         struct device *dev = &of->dev;
         struct device_node *np = of->dev.of_node;
@@ -145,7 +144,7 @@ static struct of_device_id mpc52xx_fec_mdio_match[] = {
 };
 MODULE_DEVICE_TABLE(of, mpc52xx_fec_mdio_match);
 
-struct of_platform_driver mpc52xx_fec_mdio_driver = {
+struct platform_driver mpc52xx_fec_mdio_driver = {
         .driver = {
                 .name = "mpc5200b-fec-phy",
                 .owner = THIS_MODULE,
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index af09296ef0d..7b92897ca66 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5645,6 +5645,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                 goto out_error;
         }
 
+        netif_carrier_off(dev);
+
         dev_info(&pci_dev->dev, "ifname %s, PHY OUI 0x%x @ %d, addr %pM\n",
                  dev->name, np->phy_oui, np->phyaddr, dev->dev_addr);
 
@@ -5742,7 +5744,7 @@ static void __devexit nv_remove(struct pci_dev *pci_dev)
         pci_set_drvdata(pci_dev, NULL);
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int nv_suspend(struct device *device)
 {
         struct pci_dev *pdev = to_pci_dev(device);
@@ -5793,6 +5795,11 @@ static int nv_resume(struct device *device)
 static SIMPLE_DEV_PM_OPS(nv_pm_ops, nv_suspend, nv_resume);
 #define NV_PM_OPS (&nv_pm_ops)
 
+#else
+#define NV_PM_OPS NULL
+#endif /* CONFIG_PM_SLEEP */
+
+#ifdef CONFIG_PM
 static void nv_shutdown(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
@@ -5820,7 +5827,6 @@ static void nv_shutdown(struct pci_dev *pdev)
         }
 }
 #else
-#define NV_PM_OPS NULL
 #define nv_shutdown NULL
 #endif /* CONFIG_PM */
 
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 7a1f3d0ffa7..24cb953900d 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -998,8 +998,7 @@ static const struct net_device_ops fs_enet_netdev_ops = {
 #endif
 };
 
-static int __devinit fs_enet_probe(struct platform_device *ofdev,
-                                   const struct of_device_id *match)
+static int __devinit fs_enet_probe(struct platform_device *ofdev)
 {
         struct net_device *ndev;
         struct fs_enet_private *fep;
@@ -1008,11 +1007,14 @@ static int __devinit fs_enet_probe(struct platform_device *ofdev,
         const u8 *mac_addr;
         int privsize, len, ret = -ENODEV;
 
+        if (!ofdev->dev.of_match)
+                return -EINVAL;
+
         fpi = kzalloc(sizeof(*fpi), GFP_KERNEL);
         if (!fpi)
                 return -ENOMEM;
 
-        if (!IS_FEC(match)) {
+        if (!IS_FEC(ofdev->dev.of_match)) {
                 data = of_get_property(ofdev->dev.of_node, "fsl,cpm-command", &len);
                 if (!data || len != 4)
                         goto out_free_fpi;
@@ -1047,7 +1049,7 @@ static int __devinit fs_enet_probe(struct platform_device *ofdev,
         fep->dev = &ofdev->dev;
         fep->ndev = ndev;
         fep->fpi = fpi;
-        fep->ops = match->data;
+        fep->ops = ofdev->dev.of_match->data;
 
         ret = fep->ops->setup_data(ndev);
         if (ret)
@@ -1156,7 +1158,7 @@ static struct of_device_id fs_enet_match[] = {
 };
 MODULE_DEVICE_TABLE(of, fs_enet_match);
 
-static struct of_platform_driver fs_enet_driver = {
+static struct platform_driver fs_enet_driver = {
         .driver = {
                 .owner = THIS_MODULE,
                 .name = "fs_enet",
@@ -1168,12 +1170,12 @@ static struct of_platform_driver fs_enet_driver = {
 
 static int __init fs_init(void)
 {
-        return of_register_platform_driver(&fs_enet_driver);
+        return platform_driver_register(&fs_enet_driver);
 }
 
 static void __exit fs_cleanup(void)
 {
-        of_unregister_platform_driver(&fs_enet_driver);
+        platform_driver_unregister(&fs_enet_driver);
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c
index 3cda2b51547..ad297544071 100644
--- a/drivers/net/fs_enet/mii-bitbang.c
+++ b/drivers/net/fs_enet/mii-bitbang.c
@@ -150,8 +150,7 @@ static int __devinit fs_mii_bitbang_init(struct mii_bus *bus,
         return 0;
 }
 
-static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev,
-                                        const struct of_device_id *match)
+static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev)
 {
         struct mii_bus *new_bus;
         struct bb_info *bitbang;
@@ -223,7 +222,7 @@ static struct of_device_id fs_enet_mdio_bb_match[] = {
 };
 MODULE_DEVICE_TABLE(of, fs_enet_mdio_bb_match);
 
-static struct of_platform_driver fs_enet_bb_mdio_driver = {
+static struct platform_driver fs_enet_bb_mdio_driver = {
         .driver = {
                 .name = "fsl-bb-mdio",
                 .owner = THIS_MODULE,
@@ -235,12 +234,12 @@ static struct of_platform_driver fs_enet_bb_mdio_driver = {
 
 static int fs_enet_mdio_bb_init(void)
 {
-        return of_register_platform_driver(&fs_enet_bb_mdio_driver);
+        return platform_driver_register(&fs_enet_bb_mdio_driver);
 }
 
 static void fs_enet_mdio_bb_exit(void)
 {
-        of_unregister_platform_driver(&fs_enet_bb_mdio_driver);
+        platform_driver_unregister(&fs_enet_bb_mdio_driver);
 }
 
 module_init(fs_enet_mdio_bb_init);
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index dbb9c48623d..7e840d373ab 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -101,15 +101,18 @@ static int fs_enet_fec_mii_reset(struct mii_bus *bus)
         return 0;
 }
 
-static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev,
-                                        const struct of_device_id *match)
+static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev)
 {
         struct resource res;
         struct mii_bus *new_bus;
         struct fec_info *fec;
-        int (*get_bus_freq)(struct device_node *) = match->data;
+        int (*get_bus_freq)(struct device_node *);
         int ret = -ENOMEM, clock, speed;
 
+        if (!ofdev->dev.of_match)
+                return -EINVAL;
+        get_bus_freq = ofdev->dev.of_match->data;
+
         new_bus = mdiobus_alloc();
         if (!new_bus)
                 goto out;
@@ -221,7 +224,7 @@ static struct of_device_id fs_enet_mdio_fec_match[] = {
 };
 MODULE_DEVICE_TABLE(of, fs_enet_mdio_fec_match);
 
-static struct of_platform_driver fs_enet_fec_mdio_driver = {
+static struct platform_driver fs_enet_fec_mdio_driver = {
         .driver = {
                 .name = "fsl-fec-mdio",
                 .owner = THIS_MODULE,
@@ -233,12 +236,12 @@ static struct of_platform_driver fs_enet_fec_mdio_driver = {
 
 static int fs_enet_mdio_fec_init(void)
 {
-        return of_register_platform_driver(&fs_enet_fec_mdio_driver);
+        return platform_driver_register(&fs_enet_fec_mdio_driver);
 }
 
 static void fs_enet_mdio_fec_exit(void)
 {
-        of_unregister_platform_driver(&fs_enet_fec_mdio_driver);
+        platform_driver_unregister(&fs_enet_fec_mdio_driver);
 }
 
 module_init(fs_enet_mdio_fec_init);
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c
index 8d3a2ccbc95..52f4e8ad48e 100644
--- a/drivers/net/fsl_pq_mdio.c
+++ b/drivers/net/fsl_pq_mdio.c
@@ -265,8 +265,7 @@ static int get_ucc_id_for_range(u64 start, u64 end, u32 *ucc_id)
 #endif
 
 
-static int fsl_pq_mdio_probe(struct platform_device *ofdev,
-                const struct of_device_id *match)
+static int fsl_pq_mdio_probe(struct platform_device *ofdev)
 {
         struct device_node *np = ofdev->dev.of_node;
         struct device_node *tbi;
@@ -471,7 +470,7 @@ static struct of_device_id fsl_pq_mdio_match[] = {
 };
 MODULE_DEVICE_TABLE(of, fsl_pq_mdio_match);
 
-static struct of_platform_driver fsl_pq_mdio_driver = {
+static struct platform_driver fsl_pq_mdio_driver = {
         .driver = {
                 .name = "fsl-pq_mdio",
                 .owner = THIS_MODULE,
@@ -483,13 +482,13 @@ static struct of_platform_driver fsl_pq_mdio_driver = {
 
 int __init fsl_pq_mdio_init(void)
 {
-        return of_register_platform_driver(&fsl_pq_mdio_driver);
+        return platform_driver_register(&fsl_pq_mdio_driver);
 }
 module_init(fsl_pq_mdio_init);
 
 void fsl_pq_mdio_exit(void)
 {
-        of_unregister_platform_driver(&fsl_pq_mdio_driver);
+        platform_driver_unregister(&fsl_pq_mdio_driver);
 }
 module_exit(fsl_pq_mdio_exit);
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
new file mode 100644
index 00000000000..a31661948c4
--- /dev/null
+++ b/drivers/net/ftmac100.c
@@ -0,0 +1,1198 @@
+/*
+ * Faraday FTMAC100 10/100 Ethernet
+ *
+ * (C) Copyright 2009-2011 Faraday Technology
+ * Po-Yu Chuang <ratbert@faraday-tech.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#define pr_fmt(fmt)     KBUILD_MODNAME ": " fmt
+
+#include <linux/dma-mapping.h>
+#include <linux/etherdevice.h>
+#include <linux/ethtool.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/mii.h>
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/platform_device.h>
+
+#include "ftmac100.h"
+
+#define DRV_NAME        "ftmac100"
+#define DRV_VERSION     "0.2"
+
+#define RX_QUEUE_ENTRIES        128     /* must be power of 2 */
+#define TX_QUEUE_ENTRIES        16      /* must be power of 2 */
+
+#define MAX_PKT_SIZE            1518
+#define RX_BUF_SIZE             2044    /* must be smaller than 0x7ff */
+
+#if MAX_PKT_SIZE > 0x7ff
+#error invalid MAX_PKT_SIZE
+#endif
+
+#if RX_BUF_SIZE > 0x7ff || RX_BUF_SIZE > PAGE_SIZE
+#error invalid RX_BUF_SIZE
+#endif
+
+/******************************************************************************
+ * private data
+ *****************************************************************************/
+struct ftmac100_descs {
+        struct ftmac100_rxdes rxdes[RX_QUEUE_ENTRIES];
+        struct ftmac100_txdes txdes[TX_QUEUE_ENTRIES];
+};
+
+struct ftmac100 {
+        struct resource *res;
+        void __iomem *base;
+        int irq;
+
+        struct ftmac100_descs *descs;
+        dma_addr_t descs_dma_addr;
+
+        unsigned int rx_pointer;
+        unsigned int tx_clean_pointer;
+        unsigned int tx_pointer;
+        unsigned int tx_pending;
+
+        spinlock_t tx_lock;
+
+        struct net_device *netdev;
+        struct device *dev;
+        struct napi_struct napi;
+
+        struct mii_if_info mii;
+};
+
+static int ftmac100_alloc_rx_page(struct ftmac100 *priv,
+                                  struct ftmac100_rxdes *rxdes, gfp_t gfp);
+
+/******************************************************************************
+ * internal functions (hardware register access)
+ *****************************************************************************/
+#define INT_MASK_ALL_ENABLED    (FTMAC100_INT_RPKT_FINISH       | \
+                                 FTMAC100_INT_NORXBUF           | \
+                                 FTMAC100_INT_XPKT_OK           | \
+                                 FTMAC100_INT_XPKT_LOST         | \
+                                 FTMAC100_INT_RPKT_LOST         | \
+                                 FTMAC100_INT_AHB_ERR           | \
+                                 FTMAC100_INT_PHYSTS_CHG)
+
+#define INT_MASK_ALL_DISABLED   0
+
+static void ftmac100_enable_all_int(struct ftmac100 *priv)
+{
+        iowrite32(INT_MASK_ALL_ENABLED, priv->base + FTMAC100_OFFSET_IMR);
+}
+
+static void ftmac100_disable_all_int(struct ftmac100 *priv)
+{
+        iowrite32(INT_MASK_ALL_DISABLED, priv->base + FTMAC100_OFFSET_IMR);
+}
+
+static void ftmac100_set_rx_ring_base(struct ftmac100 *priv, dma_addr_t addr)
+{
+        iowrite32(addr, priv->base + FTMAC100_OFFSET_RXR_BADR);
+}
+
+static void ftmac100_set_tx_ring_base(struct ftmac100 *priv, dma_addr_t addr)
+{
+        iowrite32(addr, priv->base + FTMAC100_OFFSET_TXR_BADR);
+}
+
+static void ftmac100_txdma_start_polling(struct ftmac100 *priv)
+{
+        iowrite32(1, priv->base + FTMAC100_OFFSET_TXPD);
+}
+
+static int ftmac100_reset(struct ftmac100 *priv)
+{
+        struct net_device *netdev = priv->netdev;
+        int i;
+
+        /* NOTE: reset clears all registers */
+        iowrite32(FTMAC100_MACCR_SW_RST, priv->base + FTMAC100_OFFSET_MACCR);
+
+        for (i = 0; i < 5; i++) {
+                unsigned int maccr;
+
+                maccr = ioread32(priv->base + FTMAC100_OFFSET_MACCR);
+                if (!(maccr & FTMAC100_MACCR_SW_RST)) {
+                        /*
+                         * FTMAC100_MACCR_SW_RST cleared does not indicate
+                         * that hardware reset completed (what the f*ck).
+                         * We still need to wait for a while.
+                         */
+                        usleep_range(500, 1000);
+                        return 0;
+                }
+
+                usleep_range(1000, 10000);
+        }
+
+        netdev_err(netdev, "software reset failed\n");
+        return -EIO;
+}
+
+static void ftmac100_set_mac(struct ftmac100 *priv, const unsigned char *mac)
+{
+        unsigned int maddr = mac[0] << 8 | mac[1];
+        unsigned int laddr = mac[2] << 24 | mac[3] << 16 | mac[4] << 8 | mac[5];
+
+        iowrite32(maddr, priv->base + FTMAC100_OFFSET_MAC_MADR);
+        iowrite32(laddr, priv->base + FTMAC100_OFFSET_MAC_LADR);
+}
+
+#define MACCR_ENABLE_ALL        (FTMAC100_MACCR_XMT_EN  | \
+                                 FTMAC100_MACCR_RCV_EN  | \
+                                 FTMAC100_MACCR_XDMA_EN | \
+                                 FTMAC100_MACCR_RDMA_EN | \
+                                 FTMAC100_MACCR_CRC_APD | \
+                                 FTMAC100_MACCR_FULLDUP | \
+                                 FTMAC100_MACCR_RX_RUNT | \
+                                 FTMAC100_MACCR_RX_BROADPKT)
+
+static int ftmac100_start_hw(struct ftmac100 *priv)
+{
+        struct net_device *netdev = priv->netdev;
+
+        if (ftmac100_reset(priv))
+                return -EIO;
+
+        /* setup ring buffer base registers */
+        ftmac100_set_rx_ring_base(priv,
+                                  priv->descs_dma_addr +
+                                  offsetof(struct ftmac100_descs, rxdes));
+        ftmac100_set_tx_ring_base(priv,
+                                  priv->descs_dma_addr +
+                                  offsetof(struct ftmac100_descs, txdes));
+
+        iowrite32(FTMAC100_APTC_RXPOLL_CNT(1), priv->base + FTMAC100_OFFSET_APTC);
+
+        ftmac100_set_mac(priv, netdev->dev_addr);
+
+        iowrite32(MACCR_ENABLE_ALL, priv->base + FTMAC100_OFFSET_MACCR);
+        return 0;
+}
+
+static void ftmac100_stop_hw(struct ftmac100 *priv)
+{
+        iowrite32(0, priv->base + FTMAC100_OFFSET_MACCR);
+}
+
+/******************************************************************************
+ * internal functions (receive descriptor)
+ *****************************************************************************/
+static bool ftmac100_rxdes_first_segment(struct ftmac100_rxdes *rxdes)
+{
+        return rxdes->rxdes0 & cpu_to_le32(FTMAC100_RXDES0_FRS);
+}
+
+static bool ftmac100_rxdes_last_segment(struct ftmac100_rxdes *rxdes)
+{
+        return rxdes->rxdes0 & cpu_to_le32(FTMAC100_RXDES0_LRS);
+}
+
+static bool ftmac100_rxdes_owned_by_dma(struct ftmac100_rxdes *rxdes)
+{
+        return rxdes->rxdes0 & cpu_to_le32(FTMAC100_RXDES0_RXDMA_OWN);
+}
+
+static void ftmac100_rxdes_set_dma_own(struct ftmac100_rxdes *rxdes)
+{
+        /* clear status bits */
+        rxdes->rxdes0 = cpu_to_le32(FTMAC100_RXDES0_RXDMA_OWN);
+}
+
+static bool ftmac100_rxdes_rx_error(struct ftmac100_rxdes *rxdes)
+{
+        return rxdes->rxdes0 & cpu_to_le32(FTMAC100_RXDES0_RX_ERR);
+}
+
+static bool ftmac100_rxdes_crc_error(struct ftmac100_rxdes *rxdes)
+{
+        return rxdes->rxdes0 & cpu_to_le32(FTMAC100_RXDES0_CRC_ERR);
+}
+
+static bool ftmac100_rxdes_frame_too_long(struct ftmac100_rxdes *rxdes)
+{
+        return rxdes->rxdes0 & cpu_to_le32(FTMAC100_RXDES0_FTL);
+}
+
+static bool ftmac100_rxdes_runt(struct ftmac100_rxdes *rxdes)
+{
+        return rxdes->rxdes0 & cpu_to_le32(FTMAC100_RXDES0_RUNT);
+}
+
+static bool ftmac100_rxdes_odd_nibble(struct ftmac100_rxdes *rxdes)
+{
+        return rxdes->rxdes0 & cpu_to_le32(FTMAC100_RXDES0_RX_ODD_NB);
+}
+
+static unsigned int ftmac100_rxdes_frame_length(struct ftmac100_rxdes *rxdes)
+{
+        return le32_to_cpu(rxdes->rxdes0) & FTMAC100_RXDES0_RFL;
+}
+
+static bool ftmac100_rxdes_multicast(struct ftmac100_rxdes *rxdes)
+{
+        return rxdes->rxdes0 & cpu_to_le32(FTMAC100_RXDES0_MULTICAST);
+}
+
+static void ftmac100_rxdes_set_buffer_size(struct ftmac100_rxdes *rxdes,
+                                           unsigned int size)
+{
+        rxdes->rxdes1 &= cpu_to_le32(FTMAC100_RXDES1_EDORR);
+        rxdes->rxdes1 |= cpu_to_le32(FTMAC100_RXDES1_RXBUF_SIZE(size));
+}
+
+static void ftmac100_rxdes_set_end_of_ring(struct ftmac100_rxdes *rxdes)
+{
+        rxdes->rxdes1 |= cpu_to_le32(FTMAC100_RXDES1_EDORR);
+}
+
+static void ftmac100_rxdes_set_dma_addr(struct ftmac100_rxdes *rxdes,
+                                        dma_addr_t addr)
+{
+        rxdes->rxdes2 = cpu_to_le32(addr);
+}
+
+static dma_addr_t ftmac100_rxdes_get_dma_addr(struct ftmac100_rxdes *rxdes)
+{
+        return le32_to_cpu(rxdes->rxdes2);
+}
+
+/*
+ * rxdes3 is not used by hardware. We use it to keep track of page.
+ * Since hardware does not touch it, we can skip cpu_to_le32()/le32_to_cpu().
+ */
+static void ftmac100_rxdes_set_page(struct ftmac100_rxdes *rxdes, struct page *page)
+{
+        rxdes->rxdes3 = (unsigned int)page;
+}
+
+static struct page *ftmac100_rxdes_get_page(struct ftmac100_rxdes *rxdes)
+{
+        return (struct page *)rxdes->rxdes3;
+}
+
+/******************************************************************************
+ * internal functions (receive)
+ *****************************************************************************/
+static int ftmac100_next_rx_pointer(int pointer)
+{
+        return (pointer + 1) & (RX_QUEUE_ENTRIES - 1);
+}
+
+static void ftmac100_rx_pointer_advance(struct ftmac100 *priv)
+{
+        priv->rx_pointer = ftmac100_next_rx_pointer(priv->rx_pointer);
+}
+
+static struct ftmac100_rxdes *ftmac100_current_rxdes(struct ftmac100 *priv)
+{
+        return &priv->descs->rxdes[priv->rx_pointer];
+}
+
+static struct ftmac100_rxdes *
+ftmac100_rx_locate_first_segment(struct ftmac100 *priv)
+{
+        struct ftmac100_rxdes *rxdes = ftmac100_current_rxdes(priv);
+
+        while (!ftmac100_rxdes_owned_by_dma(rxdes)) {
+                if (ftmac100_rxdes_first_segment(rxdes))
+                        return rxdes;
+
+                ftmac100_rxdes_set_dma_own(rxdes);
+                ftmac100_rx_pointer_advance(priv);
+                rxdes = ftmac100_current_rxdes(priv);
+        }
+
+        return NULL;
+}
+
+static bool ftmac100_rx_packet_error(struct ftmac100 *priv,
+                                     struct ftmac100_rxdes *rxdes)
+{
+        struct net_device *netdev = priv->netdev;
+        bool error = false;
+
+        if (unlikely(ftmac100_rxdes_rx_error(rxdes))) {
+                if (net_ratelimit())
+                        netdev_info(netdev, "rx err\n");
+
+                netdev->stats.rx_errors++;
+                error = true;
+        }
+
+        if (unlikely(ftmac100_rxdes_crc_error(rxdes))) {
+                if (net_ratelimit())
+                        netdev_info(netdev, "rx crc err\n");
+
+                netdev->stats.rx_crc_errors++;
+                error = true;
+        }
+
+        if (unlikely(ftmac100_rxdes_frame_too_long(rxdes))) {
+                if (net_ratelimit())
+                        netdev_info(netdev, "rx frame too long\n");
+
+                netdev->stats.rx_length_errors++;
+                error = true;
+        } else if (unlikely(ftmac100_rxdes_runt(rxdes))) {
+                if (net_ratelimit())
+                        netdev_info(netdev, "rx runt\n");
+
+                netdev->stats.rx_length_errors++;
+                error = true;
+        } else if (unlikely(ftmac100_rxdes_odd_nibble(rxdes))) {
+                if (net_ratelimit())
+                        netdev_info(netdev, "rx odd nibble\n");
+
+                netdev->stats.rx_length_errors++;
+                error = true;
+        }
+
+        return error;
+}
+
+static void ftmac100_rx_drop_packet(struct ftmac100 *priv)
+{
+        struct net_device *netdev = priv->netdev;
+        struct ftmac100_rxdes *rxdes = ftmac100_current_rxdes(priv);
+        bool done = false;
+
+        if (net_ratelimit())
+                netdev_dbg(netdev, "drop packet %p\n", rxdes);
+
+        do {
+                if (ftmac100_rxdes_last_segment(rxdes))
+                        done = true;
+
+                ftmac100_rxdes_set_dma_own(rxdes);
+                ftmac100_rx_pointer_advance(priv);
+                rxdes = ftmac100_current_rxdes(priv);
+        } while (!done && !ftmac100_rxdes_owned_by_dma(rxdes));
+
+        netdev->stats.rx_dropped++;
+}
+
+static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed)
+{
+        struct net_device *netdev = priv->netdev;
+        struct ftmac100_rxdes *rxdes;
+        struct sk_buff *skb;
+        struct page *page;
+        dma_addr_t map;
+        int length;
+
+        rxdes = ftmac100_rx_locate_first_segment(priv);
+        if (!rxdes)
+                return false;
+
+        if (unlikely(ftmac100_rx_packet_error(priv, rxdes))) {
+                ftmac100_rx_drop_packet(priv);
+                return true;
+        }
+
+        /*
+         * It is impossible to get multi-segment packets
+         * because we always provide big enough receive buffers.
+         */
+        if (unlikely(!ftmac100_rxdes_last_segment(rxdes)))
+                BUG();
+
+        /* start processing */
+        skb = netdev_alloc_skb_ip_align(netdev, 128);
+        if (unlikely(!skb)) {
+                if (net_ratelimit())
+                        netdev_err(netdev, "rx skb alloc failed\n");
+
+                ftmac100_rx_drop_packet(priv);
+                return true;
+        }
+
+        if (unlikely(ftmac100_rxdes_multicast(rxdes)))
+                netdev->stats.multicast++;
+
+        map = ftmac100_rxdes_get_dma_addr(rxdes);
+        dma_unmap_page(priv->dev, map, RX_BUF_SIZE, DMA_FROM_DEVICE);
+
+        length = ftmac100_rxdes_frame_length(rxdes);
+        page = ftmac100_rxdes_get_page(rxdes);
+        skb_fill_page_desc(skb, 0, page, 0, length);
+        skb->len += length;
+        skb->data_len += length;
+        skb->truesize += length;
+        __pskb_pull_tail(skb, min(length, 64));
+
+        ftmac100_alloc_rx_page(priv, rxdes, GFP_ATOMIC);
+
+        ftmac100_rx_pointer_advance(priv);
+
+        skb->protocol = eth_type_trans(skb, netdev);
+
+        netdev->stats.rx_packets++;
+        netdev->stats.rx_bytes += skb->len;
+
+        /* push packet to protocol stack */
+        netif_receive_skb(skb);
+
+        (*processed)++;
+        return true;
+}
+
+/******************************************************************************
+ * internal functions (transmit descriptor)
+ *****************************************************************************/
+static void ftmac100_txdes_reset(struct ftmac100_txdes *txdes)
+{
+        /* clear all except end of ring bit */
+        txdes->txdes0 = 0;
+        txdes->txdes1 &= cpu_to_le32(FTMAC100_TXDES1_EDOTR);
+        txdes->txdes2 = 0;
+        txdes->txdes3 = 0;
+}
+
+static bool ftmac100_txdes_owned_by_dma(struct ftmac100_txdes *txdes)
+{
+        return txdes->txdes0 & cpu_to_le32(FTMAC100_TXDES0_TXDMA_OWN);
+}
+
+static void ftmac100_txdes_set_dma_own(struct ftmac100_txdes *txdes)
+{
+        /*
+         * Make sure dma own bit will not be set before any other
+         * descriptor fields.
+         */
+        wmb();
+        txdes->txdes0 |= cpu_to_le32(FTMAC100_TXDES0_TXDMA_OWN);
+}
+
+static bool ftmac100_txdes_excessive_collision(struct ftmac100_txdes *txdes)
+{
+        return txdes->txdes0 & cpu_to_le32(FTMAC100_TXDES0_TXPKT_EXSCOL);
+}
+
+static bool ftmac100_txdes_late_collision(struct ftmac100_txdes *txdes)
+{
+        return txdes->txdes0 & cpu_to_le32(FTMAC100_TXDES0_TXPKT_LATECOL);
+}
+
+static void ftmac100_txdes_set_end_of_ring(struct ftmac100_txdes *txdes)
+{
+        txdes->txdes1 |= cpu_to_le32(FTMAC100_TXDES1_EDOTR);
+}
+
+static void ftmac100_txdes_set_first_segment(struct ftmac100_txdes *txdes)
+{
+        txdes->txdes1 |= cpu_to_le32(FTMAC100_TXDES1_FTS);
+}
+
+static void ftmac100_txdes_set_last_segment(struct ftmac100_txdes *txdes)
+{
+        txdes->txdes1 |= cpu_to_le32(FTMAC100_TXDES1_LTS);
+}
+
+static void ftmac100_txdes_set_txint(struct ftmac100_txdes *txdes)
+{
+        txdes->txdes1 |= cpu_to_le32(FTMAC100_TXDES1_TXIC);
+}
+
+static void ftmac100_txdes_set_buffer_size(struct ftmac100_txdes *txdes,
+                                           unsigned int len)
+{
+        txdes->txdes1 |= cpu_to_le32(FTMAC100_TXDES1_TXBUF_SIZE(len));
+}
+
+static void ftmac100_txdes_set_dma_addr(struct ftmac100_txdes *txdes,
+                                        dma_addr_t addr)
+{
+        txdes->txdes2 = cpu_to_le32(addr);
+}
+
+static dma_addr_t ftmac100_txdes_get_dma_addr(struct ftmac100_txdes *txdes)
+{
+        return le32_to_cpu(txdes->txdes2);
+}
+
+/*
+ * txdes3 is not used by hardware. We use it to keep track of socket buffer.
+ * Since hardware does not touch it, we can skip cpu_to_le32()/le32_to_cpu().
+ */
+static void ftmac100_txdes_set_skb(struct ftmac100_txdes *txdes, struct sk_buff *skb)
+{
+        txdes->txdes3 = (unsigned int)skb;
+}
+
+static struct sk_buff *ftmac100_txdes_get_skb(struct ftmac100_txdes *txdes)
+{
+        return (struct sk_buff *)txdes->txdes3;
+}
+
+/******************************************************************************
+ * internal functions (transmit)
+ *****************************************************************************/
+static int ftmac100_next_tx_pointer(int pointer)
+{
+        return (pointer + 1) & (TX_QUEUE_ENTRIES - 1);
+}
+
+static void ftmac100_tx_pointer_advance(struct ftmac100 *priv)
+{
+        priv->tx_pointer = ftmac100_next_tx_pointer(priv->tx_pointer);
+}
+
+static void ftmac100_tx_clean_pointer_advance(struct ftmac100 *priv)
+{
+        priv->tx_clean_pointer = ftmac100_next_tx_pointer(priv->tx_clean_pointer);
+}
+
+static struct ftmac100_txdes *ftmac100_current_txdes(struct ftmac100 *priv)
+{
+        return &priv->descs->txdes[priv->tx_pointer];
+}
+
+static struct ftmac100_txdes *ftmac100_current_clean_txdes(struct ftmac100 *priv)
+{
+        return &priv->descs->txdes[priv->tx_clean_pointer];
+}
+
+static bool ftmac100_tx_complete_packet(struct ftmac100 *priv)
+{
+        struct net_device *netdev = priv->netdev;
+        struct ftmac100_txdes *txdes;
+        struct sk_buff *skb;
+        dma_addr_t map;
+
+        if (priv->tx_pending == 0)
+                return false;
+
+        txdes = ftmac100_current_clean_txdes(priv);
+
+        if (ftmac100_txdes_owned_by_dma(txdes))
+                return false;
+
+        skb = ftmac100_txdes_get_skb(txdes);
+        map = ftmac100_txdes_get_dma_addr(txdes);
+
+        if (unlikely(ftmac100_txdes_excessive_collision(txdes) ||
+                     ftmac100_txdes_late_collision(txdes))) {
+                /*
+                 * packet transmitted to ethernet lost due to late collision
+                 * or excessive collision
+                 */
+                netdev->stats.tx_aborted_errors++;
+        } else {
+                netdev->stats.tx_packets++;
+                netdev->stats.tx_bytes += skb->len;
+        }
+
+        dma_unmap_single(priv->dev, map, skb_headlen(skb), DMA_TO_DEVICE);
+        dev_kfree_skb(skb);
+
+        ftmac100_txdes_reset(txdes);
+
+        ftmac100_tx_clean_pointer_advance(priv);
+
+        spin_lock(&priv->tx_lock);
+        priv->tx_pending--;
+        spin_unlock(&priv->tx_lock);
+        netif_wake_queue(netdev);
+
+        return true;
+}
+
+static void ftmac100_tx_complete(struct ftmac100 *priv)
+{
+        while (ftmac100_tx_complete_packet(priv))
+                ;
+}
+
+static int ftmac100_xmit(struct ftmac100 *priv, struct sk_buff *skb,
+                         dma_addr_t map)
+{
+        struct net_device *netdev = priv->netdev;
+        struct ftmac100_txdes *txdes;
+        unsigned int len = (skb->len < ETH_ZLEN) ? ETH_ZLEN : skb->len;
+
+        txdes = ftmac100_current_txdes(priv);
+        ftmac100_tx_pointer_advance(priv);
+
+        /* setup TX descriptor */
+        ftmac100_txdes_set_skb(txdes, skb);
+        ftmac100_txdes_set_dma_addr(txdes, map);
+
+        ftmac100_txdes_set_first_segment(txdes);
+        ftmac100_txdes_set_last_segment(txdes);
+        ftmac100_txdes_set_txint(txdes);
+        ftmac100_txdes_set_buffer_size(txdes, len);
+
+        spin_lock(&priv->tx_lock);
+        priv->tx_pending++;
+        if (priv->tx_pending == TX_QUEUE_ENTRIES)
+                netif_stop_queue(netdev);
+
+        /* start transmit */
+        ftmac100_txdes_set_dma_own(txdes);
+        spin_unlock(&priv->tx_lock);
+
+        ftmac100_txdma_start_polling(priv);
+        return NETDEV_TX_OK;
+}
+
+/******************************************************************************
+ * internal functions (buffer)
+ *****************************************************************************/
+static int ftmac100_alloc_rx_page(struct ftmac100 *priv,
+                                  struct ftmac100_rxdes *rxdes, gfp_t gfp)
+{
+        struct net_device *netdev = priv->netdev;
+        struct page *page;
+        dma_addr_t map;
+
+        page = alloc_page(gfp);
+        if (!page) {
+                if (net_ratelimit())
+                        netdev_err(netdev, "failed to allocate rx page\n");
+                return -ENOMEM;
+        }
+
+        map = dma_map_page(priv->dev, page, 0, RX_BUF_SIZE, DMA_FROM_DEVICE);
+        if (unlikely(dma_mapping_error(priv->dev, map))) {
+                if (net_ratelimit())
+                        netdev_err(netdev, "failed to map rx page\n");
+                __free_page(page);
+                return -ENOMEM;
+        }
+
+        ftmac100_rxdes_set_page(rxdes, page);
+        ftmac100_rxdes_set_dma_addr(rxdes, map);
+        ftmac100_rxdes_set_buffer_size(rxdes, RX_BUF_SIZE);
+        ftmac100_rxdes_set_dma_own(rxdes);
+        return 0;
+}
+
+static void ftmac100_free_buffers(struct ftmac100 *priv)
+{
+        int i;
+
+        for (i = 0; i < RX_QUEUE_ENTRIES; i++) {
+                struct ftmac100_rxdes *rxdes = &priv->descs->rxdes[i];
+                struct page *page = ftmac100_rxdes_get_page(rxdes);
+                dma_addr_t map = ftmac100_rxdes_get_dma_addr(rxdes);
+
+                if (!page)
+                        continue;
+
+                dma_unmap_page(priv->dev, map, RX_BUF_SIZE, DMA_FROM_DEVICE);
+                __free_page(page);
+        }
+
+        for (i = 0; i < TX_QUEUE_ENTRIES; i++) {
+                struct ftmac100_txdes *txdes = &priv->descs->txdes[i];
+                struct sk_buff *skb = ftmac100_txdes_get_skb(txdes);
+                dma_addr_t map = ftmac100_txdes_get_dma_addr(txdes);
+
+                if (!skb)
+                        continue;
+
+                dma_unmap_single(priv->dev, map, skb_headlen(skb), DMA_TO_DEVICE);
+                dev_kfree_skb(skb);
+        }
+
+        dma_free_coherent(priv->dev, sizeof(struct ftmac100_descs),
+                          priv->descs, priv->descs_dma_addr);
+}
+
+static int ftmac100_alloc_buffers(struct ftmac100 *priv)
+{
+        int i;
+
+        priv->descs = dma_alloc_coherent(priv->dev, sizeof(struct ftmac100_descs),
+                                         &priv->descs_dma_addr, GFP_KERNEL);
+        if (!priv->descs)
+                return -ENOMEM;
+
+        memset(priv->descs, 0, sizeof(struct ftmac100_descs));
+
+        /* initialize RX ring */
+        ftmac100_rxdes_set_end_of_ring(&priv->descs->rxdes[RX_QUEUE_ENTRIES - 1]);
+
+        for (i = 0; i < RX_QUEUE_ENTRIES; i++) {
+                struct ftmac100_rxdes *rxdes = &priv->descs->rxdes[i];
+
+                if (ftmac100_alloc_rx_page(priv, rxdes, GFP_KERNEL))
+                        goto err;
+        }
+
+        /* initialize TX ring */
+        ftmac100_txdes_set_end_of_ring(&priv->descs->txdes[TX_QUEUE_ENTRIES - 1]);
+        return 0;
+
+err:
+        ftmac100_free_buffers(priv);
+        return -ENOMEM;
+}
+
+/******************************************************************************
+ * struct mii_if_info functions
+ *****************************************************************************/
+static int ftmac100_mdio_read(struct net_device *netdev, int phy_id, int reg)
+{
+        struct ftmac100 *priv = netdev_priv(netdev);
+        unsigned int phycr;
+        int i;
+
+        phycr = FTMAC100_PHYCR_PHYAD(phy_id) |
+                FTMAC100_PHYCR_REGAD(reg) |
+                FTMAC100_PHYCR_MIIRD;
+
+        iowrite32(phycr, priv->base + FTMAC100_OFFSET_PHYCR);
+
+        for (i = 0; i < 10; i++) {
+                phycr = ioread32(priv->base + FTMAC100_OFFSET_PHYCR);
+
+                if ((phycr & FTMAC100_PHYCR_MIIRD) == 0)
+                        return phycr & FTMAC100_PHYCR_MIIRDATA;
+
+                usleep_range(100, 1000);
+        }
+
+        netdev_err(netdev, "mdio read timed out\n");
+        return 0;
+}
+
+static void ftmac100_mdio_write(struct net_device *netdev, int phy_id, int reg,
+                                int data)
+{
+        struct ftmac100 *priv = netdev_priv(netdev);
+        unsigned int phycr;
+        int i;
+
+        phycr = FTMAC100_PHYCR_PHYAD(phy_id) |
+                FTMAC100_PHYCR_REGAD(reg) |
+                FTMAC100_PHYCR_MIIWR;
+
+        data = FTMAC100_PHYWDATA_MIIWDATA(data);
+
+        iowrite32(data, priv->base + FTMAC100_OFFSET_PHYWDATA);
+        iowrite32(phycr, priv->base + FTMAC100_OFFSET_PHYCR);
+
+        for (i = 0; i < 10; i++) {
+                phycr = ioread32(priv->base + FTMAC100_OFFSET_PHYCR);
+
+                if ((phycr & FTMAC100_PHYCR_MIIWR) == 0)
+                        return;
+
+                usleep_range(100, 1000);
+        }
+
+        netdev_err(netdev, "mdio write timed out\n");
+}
+
+/******************************************************************************
+ * struct ethtool_ops functions
+ *****************************************************************************/
+static void ftmac100_get_drvinfo(struct net_device *netdev,
+                                 struct ethtool_drvinfo *info)
+{
+        strcpy(info->driver, DRV_NAME);
+        strcpy(info->version, DRV_VERSION);
+        strcpy(info->bus_info, dev_name(&netdev->dev));
+}
+
+static int ftmac100_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
+{
+        struct ftmac100 *priv = netdev_priv(netdev);
+        return mii_ethtool_gset(&priv->mii, cmd);
+}
+
+static int ftmac100_set_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
+{
+        struct ftmac100 *priv = netdev_priv(netdev);
+        return mii_ethtool_sset(&priv->mii, cmd);
+}
+
+static int ftmac100_nway_reset(struct net_device *netdev)
+{
+        struct ftmac100 *priv = netdev_priv(netdev);
+        return mii_nway_restart(&priv->mii);
+}
+
+static u32 ftmac100_get_link(struct net_device *netdev)
+{
+        struct ftmac100 *priv = netdev_priv(netdev);
+        return mii_link_ok(&priv->mii);
+}
+
+static const struct ethtool_ops ftmac100_ethtool_ops = {
+        .set_settings           = ftmac100_set_settings,
+        .get_settings           = ftmac100_get_settings,
+        .get_drvinfo            = ftmac100_get_drvinfo,
+        .nway_reset             = ftmac100_nway_reset,
+        .get_link               = ftmac100_get_link,
+};
+
+/******************************************************************************
+ * interrupt handler
+ *****************************************************************************/
+static irqreturn_t ftmac100_interrupt(int irq, void *dev_id)
+{
+        struct net_device *netdev = dev_id;
+        struct ftmac100 *priv = netdev_priv(netdev);
+
+        if (likely(netif_running(netdev))) {
+                /* Disable interrupts for polling */
+                ftmac100_disable_all_int(priv);
+                napi_schedule(&priv->napi);
+        }
+
+        return IRQ_HANDLED;
+}
+
+/******************************************************************************
+ * struct napi_struct functions
+ *****************************************************************************/
+static int ftmac100_poll(struct napi_struct *napi, int budget)
+{
+        struct ftmac100 *priv = container_of(napi, struct ftmac100, napi);
+        struct net_device *netdev = priv->netdev;
+        unsigned int status;
+        bool completed = true;
+        int rx = 0;
+
+        status = ioread32(priv->base + FTMAC100_OFFSET_ISR);
+
+        if (status & (FTMAC100_INT_RPKT_FINISH | FTMAC100_INT_NORXBUF)) {
+                /*
+                 * FTMAC100_INT_RPKT_FINISH:
+                 *      RX DMA has received packets into RX buffer successfully
+                 *
+                 * FTMAC100_INT_NORXBUF:
+                 *      RX buffer unavailable
+                 */
+                bool retry;
+
+                do {
+                        retry = ftmac100_rx_packet(priv, &rx);
+                } while (retry && rx < budget);
+
+                if (retry && rx == budget)
+                        completed = false;
+        }
+
+        if (status & (FTMAC100_INT_XPKT_OK | FTMAC100_INT_XPKT_LOST)) {
+                /*
+                 * FTMAC100_INT_XPKT_OK:
+                 *      packet transmitted to ethernet successfully
+                 *
+                 * FTMAC100_INT_XPKT_LOST:
+                 *      packet transmitted to ethernet lost due to late
+                 *      collision or excessive collision
+                 */
+                ftmac100_tx_complete(priv);
+        }
+
+        if (status & (FTMAC100_INT_NORXBUF | FTMAC100_INT_RPKT_LOST |
+                      FTMAC100_INT_AHB_ERR | FTMAC100_INT_PHYSTS_CHG)) {
+                if (net_ratelimit())
+                        netdev_info(netdev, "[ISR] = 0x%x: %s%s%s%s\n", status,
+                                    status & FTMAC100_INT_NORXBUF ? "NORXBUF " : "",
+                                    status & FTMAC100_INT_RPKT_LOST ? "RPKT_LOST " : "",
+                                    status & FTMAC100_INT_AHB_ERR ? "AHB_ERR " : "",
+                                    status & FTMAC100_INT_PHYSTS_CHG ? "PHYSTS_CHG" : "");
+
+                if (status & FTMAC100_INT_NORXBUF) {
+                        /* RX buffer unavailable */
+                        netdev->stats.rx_over_errors++;
+                }
+
+                if (status & FTMAC100_INT_RPKT_LOST) {
+                        /* received packet lost due to RX FIFO full */
+                        netdev->stats.rx_fifo_errors++;
+                }
+
+                if (status & FTMAC100_INT_PHYSTS_CHG) {
+                        /* PHY link status change */
+                        mii_check_link(&priv->mii);
+                }
+        }
+
+        if (completed) {
+                /* stop polling */
+                napi_complete(napi);
+                ftmac100_enable_all_int(priv);
+        }
+
+        return rx;
+}
+
+/******************************************************************************
+ * struct net_device_ops functions
+ *****************************************************************************/
+static int ftmac100_open(struct net_device *netdev)
+{
+        struct ftmac100 *priv = netdev_priv(netdev);
+        int err;
+
+        err = ftmac100_alloc_buffers(priv);
+        if (err) {
+                netdev_err(netdev, "failed to allocate buffers\n");
+                goto err_alloc;
+        }
+
+        err = request_irq(priv->irq, ftmac100_interrupt, 0, netdev->name, netdev);
+        if (err) {
+                netdev_err(netdev, "failed to request irq %d\n", priv->irq);
+                goto err_irq;
+        }
+
+        priv->rx_pointer = 0;
+        priv->tx_clean_pointer = 0;
+        priv->tx_pointer = 0;
+        priv->tx_pending = 0;
+
+        err = ftmac100_start_hw(priv);
+        if (err)
+                goto err_hw;
+
+        napi_enable(&priv->napi);
+        netif_start_queue(netdev);
+
+        ftmac100_enable_all_int(priv);
+
+        return 0;
+
+err_hw:
+        free_irq(priv->irq, netdev);
+err_irq:
+        ftmac100_free_buffers(priv);
+err_alloc:
+        return err;
+}
+
+static int ftmac100_stop(struct net_device *netdev)
+{
+        struct ftmac100 *priv = netdev_priv(netdev);
+
+        ftmac100_disable_all_int(priv);
+        netif_stop_queue(netdev);
+        napi_disable(&priv->napi);
+        ftmac100_stop_hw(priv);
+        free_irq(priv->irq, netdev);
+        ftmac100_free_buffers(priv);
+
+        return 0;
+}
+
+static int ftmac100_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev)
+{
+        struct ftmac100 *priv = netdev_priv(netdev);
+        dma_addr_t map;
+
+        if (unlikely(skb->len > MAX_PKT_SIZE)) {
+                if (net_ratelimit())
+                        netdev_dbg(netdev, "tx packet too big\n");
+
+                netdev->stats.tx_dropped++;
+                dev_kfree_skb(skb);
+                return NETDEV_TX_OK;
+        }
+
+        map = dma_map_single(priv->dev, skb->data, skb_headlen(skb), DMA_TO_DEVICE);
+        if (unlikely(dma_mapping_error(priv->dev, map))) {
+                /* drop packet */
+                if (net_ratelimit())
+                        netdev_err(netdev, "map socket buffer failed\n");
+
+                netdev->stats.tx_dropped++;
+                dev_kfree_skb(skb);
+                return NETDEV_TX_OK;
+        }
+
+        return ftmac100_xmit(priv, skb, map);
+}
+
+/* optional */
+static int ftmac100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
+{
+        struct ftmac100 *priv = netdev_priv(netdev);
+        struct mii_ioctl_data *data = if_mii(ifr);
+
+        return generic_mii_ioctl(&priv->mii, data, cmd, NULL);
+}
+
+static const struct net_device_ops ftmac100_netdev_ops = {
+        .ndo_open               = ftmac100_open,
+        .ndo_stop               = ftmac100_stop,
+        .ndo_start_xmit         = ftmac100_hard_start_xmit,
+        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_do_ioctl           = ftmac100_do_ioctl,
+};
+
+/******************************************************************************
+ * struct platform_driver functions
+ *****************************************************************************/
+static int ftmac100_probe(struct platform_device *pdev)
+{
+        struct resource *res;
+        int irq;
+        struct net_device *netdev;
+        struct ftmac100 *priv;
+        int err;
+
+        if (!pdev)
+                return -ENODEV;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -ENXIO;
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0)
+                return irq;
+
+        /* setup net_device */
+        netdev = alloc_etherdev(sizeof(*priv));
+        if (!netdev) {
+                err = -ENOMEM;
+                goto err_alloc_etherdev;
+        }
+
+        SET_NETDEV_DEV(netdev, &pdev->dev);
+        SET_ETHTOOL_OPS(netdev, &ftmac100_ethtool_ops);
+        netdev->netdev_ops = &ftmac100_netdev_ops;
+
+        platform_set_drvdata(pdev, netdev);
+
+        /* setup private data */
+        priv = netdev_priv(netdev);
+        priv->netdev = netdev;
+        priv->dev = &pdev->dev;
+
+        spin_lock_init(&priv->tx_lock);
+
+        /* initialize NAPI */
+        netif_napi_add(netdev, &priv->napi, ftmac100_poll, 64);
+
+        /* map io memory */
+        priv->res = request_mem_region(res->start, resource_size(res),
+                                       dev_name(&pdev->dev));
+        if (!priv->res) {
+                dev_err(&pdev->dev, "Could not reserve memory region\n");
+                err = -ENOMEM;
+                goto err_req_mem;
+        }
+
+        priv->base = ioremap(res->start, resource_size(res));
+        if (!priv->base) {
+                dev_err(&pdev->dev, "Failed to ioremap ethernet registers\n");
+                err = -EIO;
+                goto err_ioremap;
+        }
+
+        priv->irq = irq;
+
+        /* initialize struct mii_if_info */
+        priv->mii.phy_id        = 0;
+        priv->mii.phy_id_mask   = 0x1f;
+        priv->mii.reg_num_mask  = 0x1f;
+        priv->mii.dev           = netdev;
+        priv->mii.mdio_read     = ftmac100_mdio_read;
+        priv->mii.mdio_write    = ftmac100_mdio_write;
+
+        /* register network device */
+        err = register_netdev(netdev);
+        if (err) {
+                dev_err(&pdev->dev, "Failed to register netdev\n");
+                goto err_register_netdev;
+        }
+
+        netdev_info(netdev, "irq %d, mapped at %p\n", priv->irq, priv->base);
+
+        if (!is_valid_ether_addr(netdev->dev_addr)) {
+                random_ether_addr(netdev->dev_addr);
+                netdev_info(netdev, "generated random MAC address %pM\n",
+                            netdev->dev_addr);
+        }
+
+        return 0;
+
+err_register_netdev:
+        iounmap(priv->base);
+err_ioremap:
+        release_resource(priv->res);
+err_req_mem:
+        netif_napi_del(&priv->napi);
+        platform_set_drvdata(pdev, NULL);
+        free_netdev(netdev);
+err_alloc_etherdev:
+        return err;
+}
+
+static int __exit ftmac100_remove(struct platform_device *pdev)
+{
+        struct net_device *netdev;
+        struct ftmac100 *priv;
+
+        netdev = platform_get_drvdata(pdev);
+        priv = netdev_priv(netdev);
+
+        unregister_netdev(netdev);
+
+        iounmap(priv->base);
+        release_resource(priv->res);
+
+        netif_napi_del(&priv->napi);
+        platform_set_drvdata(pdev, NULL);
+        free_netdev(netdev);
+        return 0;
+}
+
+static struct platform_driver ftmac100_driver = {
+        .probe          = ftmac100_probe,
+        .remove         = __exit_p(ftmac100_remove),
+        .driver         = {
+                .name   = DRV_NAME,
+                .owner  = THIS_MODULE,
+        },
+};
+
+/******************************************************************************
+ * initialization / finalization
+ *****************************************************************************/
+static int __init ftmac100_init(void)
+{
+        pr_info("Loading version " DRV_VERSION " ...\n");
+        return platform_driver_register(&ftmac100_driver);
+}
+
+static void __exit ftmac100_exit(void)
+{
+        platform_driver_unregister(&ftmac100_driver);
+}
+
+module_init(ftmac100_init);
+module_exit(ftmac100_exit);
+
+MODULE_AUTHOR("Po-Yu Chuang <ratbert@faraday-tech.com>");
+MODULE_DESCRIPTION("FTMAC100 driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/ftmac100.h b/drivers/net/ftmac100.h
new file mode 100644
index 00000000000..46a0c47b1ee
--- /dev/null
+++ b/drivers/net/ftmac100.h
@@ -0,0 +1,180 @@
+/*
+ * Faraday FTMAC100 10/100 Ethernet
+ *
+ * (C) Copyright 2009-2011 Faraday Technology
+ * Po-Yu Chuang <ratbert@faraday-tech.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef __FTMAC100_H
+#define __FTMAC100_H
+
+#define FTMAC100_OFFSET_ISR             0x00
+#define FTMAC100_OFFSET_IMR             0x04
+#define FTMAC100_OFFSET_MAC_MADR        0x08
+#define FTMAC100_OFFSET_MAC_LADR        0x0c
+#define FTMAC100_OFFSET_MAHT0           0x10
+#define FTMAC100_OFFSET_MAHT1           0x14
+#define FTMAC100_OFFSET_TXPD            0x18
+#define FTMAC100_OFFSET_RXPD            0x1c
+#define FTMAC100_OFFSET_TXR_BADR        0x20
+#define FTMAC100_OFFSET_RXR_BADR        0x24
+#define FTMAC100_OFFSET_ITC             0x28
+#define FTMAC100_OFFSET_APTC            0x2c
+#define FTMAC100_OFFSET_DBLAC           0x30
+#define FTMAC100_OFFSET_MACCR           0x88
+#define FTMAC100_OFFSET_MACSR           0x8c
+#define FTMAC100_OFFSET_PHYCR           0x90
+#define FTMAC100_OFFSET_PHYWDATA        0x94
+#define FTMAC100_OFFSET_FCR             0x98
+#define FTMAC100_OFFSET_BPR             0x9c
+#define FTMAC100_OFFSET_TS              0xc4
+#define FTMAC100_OFFSET_DMAFIFOS        0xc8
+#define FTMAC100_OFFSET_TM              0xcc
+#define FTMAC100_OFFSET_TX_MCOL_SCOL    0xd4
+#define FTMAC100_OFFSET_RPF_AEP         0xd8
+#define FTMAC100_OFFSET_XM_PG           0xdc
+#define FTMAC100_OFFSET_RUNT_TLCC       0xe0
+#define FTMAC100_OFFSET_CRCER_FTL       0xe4
+#define FTMAC100_OFFSET_RLC_RCC         0xe8
+#define FTMAC100_OFFSET_BROC            0xec
+#define FTMAC100_OFFSET_MULCA           0xf0
+#define FTMAC100_OFFSET_RP              0xf4
+#define FTMAC100_OFFSET_XP              0xf8
+
+/*
+ * Interrupt status register & interrupt mask register
+ */
+#define FTMAC100_INT_RPKT_FINISH        (1 << 0)
+#define FTMAC100_INT_NORXBUF            (1 << 1)
+#define FTMAC100_INT_XPKT_FINISH        (1 << 2)
+#define FTMAC100_INT_NOTXBUF            (1 << 3)
+#define FTMAC100_INT_XPKT_OK            (1 << 4)
+#define FTMAC100_INT_XPKT_LOST          (1 << 5)
+#define FTMAC100_INT_RPKT_SAV           (1 << 6)
+#define FTMAC100_INT_RPKT_LOST          (1 << 7)
+#define FTMAC100_INT_AHB_ERR            (1 << 8)
+#define FTMAC100_INT_PHYSTS_CHG         (1 << 9)
+
+/*
+ * Interrupt timer control register
+ */
+#define FTMAC100_ITC_RXINT_CNT(x)       (((x) & 0xf) << 0)
+#define FTMAC100_ITC_RXINT_THR(x)       (((x) & 0x7) << 4)
+#define FTMAC100_ITC_RXINT_TIME_SEL     (1 << 7)
+#define FTMAC100_ITC_TXINT_CNT(x)       (((x) & 0xf) << 8)
+#define FTMAC100_ITC_TXINT_THR(x)       (((x) & 0x7) << 12)
+#define FTMAC100_ITC_TXINT_TIME_SEL     (1 << 15)
+
+/*
+ * Automatic polling timer control register
+ */
+#define FTMAC100_APTC_RXPOLL_CNT(x)     (((x) & 0xf) << 0)
+#define FTMAC100_APTC_RXPOLL_TIME_SEL   (1 << 4)
+#define FTMAC100_APTC_TXPOLL_CNT(x)     (((x) & 0xf) << 8)
+#define FTMAC100_APTC_TXPOLL_TIME_SEL   (1 << 12)
+
+/*
+ * DMA burst length and arbitration control register
+ */
+#define FTMAC100_DBLAC_INCR4_EN         (1 << 0)
+#define FTMAC100_DBLAC_INCR8_EN         (1 << 1)
+#define FTMAC100_DBLAC_INCR16_EN        (1 << 2)
+#define FTMAC100_DBLAC_RXFIFO_LTHR(x)   (((x) & 0x7) << 3)
+#define FTMAC100_DBLAC_RXFIFO_HTHR(x)   (((x) & 0x7) << 6)
+#define FTMAC100_DBLAC_RX_THR_EN        (1 << 9)
+
+/*
+ * MAC control register
+ */
+#define FTMAC100_MACCR_XDMA_EN          (1 << 0)
+#define FTMAC100_MACCR_RDMA_EN          (1 << 1)
+#define FTMAC100_MACCR_SW_RST           (1 << 2)
+#define FTMAC100_MACCR_LOOP_EN          (1 << 3)
+#define FTMAC100_MACCR_CRC_DIS          (1 << 4)
+#define FTMAC100_MACCR_XMT_EN           (1 << 5)
+#define FTMAC100_MACCR_ENRX_IN_HALFTX   (1 << 6)
+#define FTMAC100_MACCR_RCV_EN           (1 << 8)
+#define FTMAC100_MACCR_HT_MULTI_EN      (1 << 9)
+#define FTMAC100_MACCR_RX_RUNT          (1 << 10)
+#define FTMAC100_MACCR_RX_FTL           (1 << 11)
+#define FTMAC100_MACCR_RCV_ALL          (1 << 12)
+#define FTMAC100_MACCR_CRC_APD          (1 << 14)
+#define FTMAC100_MACCR_FULLDUP          (1 << 15)
+#define FTMAC100_MACCR_RX_MULTIPKT      (1 << 16)
+#define FTMAC100_MACCR_RX_BROADPKT      (1 << 17)
+
+/*
+ * PHY control register
+ */
+#define FTMAC100_PHYCR_MIIRDATA         0xffff
+#define FTMAC100_PHYCR_PHYAD(x)         (((x) & 0x1f) << 16)
+#define FTMAC100_PHYCR_REGAD(x)         (((x) & 0x1f) << 21)
+#define FTMAC100_PHYCR_MIIRD            (1 << 26)
+#define FTMAC100_PHYCR_MIIWR            (1 << 27)
+
+/*
+ * PHY write data register
+ */
+#define FTMAC100_PHYWDATA_MIIWDATA(x)   ((x) & 0xffff)
+
+/*
+ * Transmit descriptor, aligned to 16 bytes
+ */
+struct ftmac100_txdes {
+        unsigned int    txdes0;
+        unsigned int    txdes1;
+        unsigned int    txdes2; /* TXBUF_BADR */
+        unsigned int    txdes3; /* not used by HW */
+} __attribute__ ((aligned(16)));
+
+#define FTMAC100_TXDES0_TXPKT_LATECOL   (1 << 0)
+#define FTMAC100_TXDES0_TXPKT_EXSCOL    (1 << 1)
+#define FTMAC100_TXDES0_TXDMA_OWN       (1 << 31)
+
+#define FTMAC100_TXDES1_TXBUF_SIZE(x)   ((x) & 0x7ff)
+#define FTMAC100_TXDES1_LTS             (1 << 27)
+#define FTMAC100_TXDES1_FTS             (1 << 28)
+#define FTMAC100_TXDES1_TX2FIC          (1 << 29)
+#define FTMAC100_TXDES1_TXIC            (1 << 30)
+#define FTMAC100_TXDES1_EDOTR           (1 << 31)
+
+/*
+ * Receive descriptor, aligned to 16 bytes
+ */
+struct ftmac100_rxdes {
+        unsigned int    rxdes0;
+        unsigned int    rxdes1;
+        unsigned int    rxdes2; /* RXBUF_BADR */
+        unsigned int    rxdes3; /* not used by HW */
+} __attribute__ ((aligned(16)));
+
+#define FTMAC100_RXDES0_RFL             0x7ff
+#define FTMAC100_RXDES0_MULTICAST       (1 << 16)
+#define FTMAC100_RXDES0_BROADCAST       (1 << 17)
+#define FTMAC100_RXDES0_RX_ERR          (1 << 18)
+#define FTMAC100_RXDES0_CRC_ERR         (1 << 19)
+#define FTMAC100_RXDES0_FTL             (1 << 20)
+#define FTMAC100_RXDES0_RUNT            (1 << 21)
+#define FTMAC100_RXDES0_RX_ODD_NB       (1 << 22)
+#define FTMAC100_RXDES0_LRS             (1 << 28)
+#define FTMAC100_RXDES0_FRS             (1 << 29)
+#define FTMAC100_RXDES0_RXDMA_OWN       (1 << 31)
+
+#define FTMAC100_RXDES1_RXBUF_SIZE(x)   ((x) & 0x7ff)
+#define FTMAC100_RXDES1_EDORR           (1 << 31)
+
+#endif /* __FTMAC100_H */
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 119aa2000c2..2a0ad9a501b 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -123,8 +123,7 @@ static irqreturn_t gfar_interrupt(int irq, void *dev_id);
 static void adjust_link(struct net_device *dev);
 static void init_registers(struct net_device *dev);
 static int init_phy(struct net_device *dev);
-static int gfar_probe(struct platform_device *ofdev,
-                const struct of_device_id *match);
+static int gfar_probe(struct platform_device *ofdev);
 static int gfar_remove(struct platform_device *ofdev);
 static void free_skb_resources(struct gfar_private *priv);
 static void gfar_set_multi(struct net_device *dev);
@@ -950,6 +949,11 @@ static void gfar_detect_errata(struct gfar_private *priv)
                         (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))
+                priv->errata |= GFAR_ERRATA_12;
+
         if (priv->errata)
                 dev_info(dev, "enabled errata workarounds, flags: 0x%x\n",
                          priv->errata);
@@ -957,8 +961,7 @@ 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 */
-static int gfar_probe(struct platform_device *ofdev,
-                const struct of_device_id *match)
+static int gfar_probe(struct platform_device *ofdev)
 {
         u32 tempval;
         struct net_device *dev = NULL;
@@ -1920,7 +1923,7 @@ int startup_gfar(struct net_device *ndev)
                 if (err) {
                         for (j = 0; j < i; j++)
                                 free_grp_irqs(&priv->gfargrp[j]);
-                                goto irq_fail;
+                        goto irq_fail;
                 }
         }
 
@@ -2156,8 +2159,15 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
         /* Set up checksumming */
         if (CHECKSUM_PARTIAL == skb->ip_summed) {
                 fcb = gfar_add_fcb(skb);
-                lstatus |= BD_LFLAG(TXBD_TOE);
-                gfar_tx_checksum(skb, fcb);
+                /* as specified by errata */
+                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 {
+                        lstatus |= BD_LFLAG(TXBD_TOE);
+                        gfar_tx_checksum(skb, fcb);
+                }
         }
 
         if (vlan_tx_tag_present(skb)) {
@@ -3256,7 +3266,7 @@ static struct of_device_id gfar_match[] =
 MODULE_DEVICE_TABLE(of, gfar_match);
 
 /* Structure for a device driver */
-static struct of_platform_driver gfar_driver = {
+static struct platform_driver gfar_driver = {
         .driver = {
                 .name = "fsl-gianfar",
                 .owner = THIS_MODULE,
@@ -3269,12 +3279,12 @@ static struct of_platform_driver gfar_driver = {
 
 static int __init gfar_init(void)
 {
-        return of_register_platform_driver(&gfar_driver);
+        return platform_driver_register(&gfar_driver);
 }
 
 static void __exit gfar_exit(void)
 {
-        of_unregister_platform_driver(&gfar_driver);
+        platform_driver_unregister(&gfar_driver);
 }
 
 module_init(gfar_init);
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index 54de4135e93..ec5d595ce2e 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -1039,6 +1039,7 @@ enum gfar_errata {
         GFAR_ERRATA_74          = 0x01,
         GFAR_ERRATA_76          = 0x02,
         GFAR_ERRATA_A002        = 0x04,
+        GFAR_ERRATA_12          = 0x08, /* a.k.a errata eTSEC49 */
 };
 
 /* Struct stolen almost completely (and shamelessly) from the FCC enet source
diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index fdb0333f5cb..396ff7d785d 100644
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -1411,7 +1411,7 @@ error:
 }
 
 /* Initialize the GRETH MAC */
-static int __devinit greth_of_probe(struct platform_device *ofdev, const struct of_device_id *match)
+static int __devinit greth_of_probe(struct platform_device *ofdev)
 {
         struct net_device *dev;
         struct greth_private *greth;
@@ -1646,7 +1646,7 @@ static struct of_device_id greth_of_match[] = {
 
 MODULE_DEVICE_TABLE(of, greth_of_match);
 
-static struct of_platform_driver greth_of_driver = {
+static struct platform_driver greth_of_driver = {
         .driver = {
                 .name = "grlib-greth",
                 .owner = THIS_MODULE,
@@ -1658,12 +1658,12 @@ static struct of_platform_driver greth_of_driver = {
 
 static int __init greth_init(void)
 {
-        return of_register_platform_driver(&greth_of_driver);
+        return platform_driver_register(&greth_of_driver);
 }
 
 static void __exit greth_cleanup(void)
 {
-        of_unregister_platform_driver(&greth_of_driver);
+        platform_driver_unregister(&greth_of_driver);
 }
 
 module_init(greth_init);
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index ac1d323c5eb..8931168d3e7 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -400,13 +400,14 @@ static void *bpq_seq_start(struct seq_file *seq, loff_t *pos)
 static void *bpq_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
         struct list_head *p;
+        struct bpqdev *bpqdev = v;
 
         ++*pos;
 
         if (v == SEQ_START_TOKEN)
-                p = rcu_dereference(bpq_devices.next);
+                p = rcu_dereference(list_next_rcu(&bpq_devices));
         else
-                p = rcu_dereference(((struct bpqdev *)v)->bpq_list.next);
+                p = rcu_dereference(list_next_rcu(&bpqdev->bpq_list));
 
         return (p == &bpq_devices) ? NULL 
                 : list_entry(p, struct bpqdev, bpq_list);
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 6d9275c52e0..3bb990b6651 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -2719,8 +2719,7 @@ static const struct net_device_ops emac_gige_netdev_ops = {
         .ndo_change_mtu         = emac_change_mtu,
 };
 
-static int __devinit emac_probe(struct platform_device *ofdev,
-                                const struct of_device_id *match)
+static int __devinit emac_probe(struct platform_device *ofdev)
 {
         struct net_device *ndev;
         struct emac_instance *dev;
@@ -2994,7 +2993,7 @@ static struct of_device_id emac_match[] =
 };
 MODULE_DEVICE_TABLE(of, emac_match);
 
-static struct of_platform_driver emac_driver = {
+static struct platform_driver emac_driver = {
         .driver = {
                 .name = "emac",
                 .owner = THIS_MODULE,
@@ -3069,7 +3068,7 @@ static int __init emac_init(void)
         rc = tah_init();
         if (rc)
                 goto err_rgmii;
-        rc = of_register_platform_driver(&emac_driver);
+        rc = platform_driver_register(&emac_driver);
         if (rc)
                 goto err_tah;
 
@@ -3091,7 +3090,7 @@ static void __exit emac_exit(void)
 {
         int i;
 
-        of_unregister_platform_driver(&emac_driver);
+        platform_driver_unregister(&emac_driver);
 
         tah_exit();
         rgmii_exit();
diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ibm_newemac/mal.c
index d5717e2123e..d268f404b7b 100644
--- a/drivers/net/ibm_newemac/mal.c
+++ b/drivers/net/ibm_newemac/mal.c
@@ -517,8 +517,7 @@ void *mal_dump_regs(struct mal_instance *mal, void *buf)
         return regs + 1;
 }
 
-static int __devinit mal_probe(struct platform_device *ofdev,
-                               const struct of_device_id *match)
+static int __devinit mal_probe(struct platform_device *ofdev)
 {
         struct mal_instance *mal;
         int err = 0, i, bd_size;
@@ -789,7 +788,7 @@ static struct of_device_id mal_platform_match[] =
         {},
 };
 
-static struct of_platform_driver mal_of_driver = {
+static struct platform_driver mal_of_driver = {
         .driver = {
                 .name = "mcmal",
                 .owner = THIS_MODULE,
@@ -801,10 +800,10 @@ static struct of_platform_driver mal_of_driver = {
 
 int __init mal_init(void)
 {
-        return of_register_platform_driver(&mal_of_driver);
+        return platform_driver_register(&mal_of_driver);
 }
 
 void mal_exit(void)
 {
-        of_unregister_platform_driver(&mal_of_driver);
+        platform_driver_unregister(&mal_of_driver);
 }
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c
index dd61798897a..4fa53f3def6 100644
--- a/drivers/net/ibm_newemac/rgmii.c
+++ b/drivers/net/ibm_newemac/rgmii.c
@@ -228,8 +228,7 @@ void *rgmii_dump_regs(struct platform_device *ofdev, void *buf)
 }
 
 
-static int __devinit rgmii_probe(struct platform_device *ofdev,
-                                 const struct of_device_id *match)
+static int __devinit rgmii_probe(struct platform_device *ofdev)
 {
         struct device_node *np = ofdev->dev.of_node;
         struct rgmii_instance *dev;
@@ -318,7 +317,7 @@ static struct of_device_id rgmii_match[] =
         {},
 };
 
-static struct of_platform_driver rgmii_driver = {
+static struct platform_driver rgmii_driver = {
         .driver = {
                 .name = "emac-rgmii",
                 .owner = THIS_MODULE,
@@ -330,10 +329,10 @@ static struct of_platform_driver rgmii_driver = {
 
 int __init rgmii_init(void)
 {
-        return of_register_platform_driver(&rgmii_driver);
+        return platform_driver_register(&rgmii_driver);
 }
 
 void rgmii_exit(void)
 {
-        of_unregister_platform_driver(&rgmii_driver);
+        platform_driver_unregister(&rgmii_driver);
 }
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ibm_newemac/tah.c
index 299aa49490c..8ead6a96aba 100644
--- a/drivers/net/ibm_newemac/tah.c
+++ b/drivers/net/ibm_newemac/tah.c
@@ -87,8 +87,7 @@ void *tah_dump_regs(struct platform_device *ofdev, void *buf)
         return regs + 1;
 }
 
-static int __devinit tah_probe(struct platform_device *ofdev,
-                               const struct of_device_id *match)
+static int __devinit tah_probe(struct platform_device *ofdev)
 {
         struct device_node *np = ofdev->dev.of_node;
         struct tah_instance *dev;
@@ -165,7 +164,7 @@ static struct of_device_id tah_match[] =
         {},
 };
 
-static struct of_platform_driver tah_driver = {
+static struct platform_driver tah_driver = {
         .driver = {
                 .name = "emac-tah",
                 .owner = THIS_MODULE,
@@ -177,10 +176,10 @@ static struct of_platform_driver tah_driver = {
 
 int __init tah_init(void)
 {
-        return of_register_platform_driver(&tah_driver);
+        return platform_driver_register(&tah_driver);
 }
 
 void tah_exit(void)
 {
-        of_unregister_platform_driver(&tah_driver);
+        platform_driver_unregister(&tah_driver);
 }
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ibm_newemac/zmii.c
index 34ed6ee8ca8..97449e786d6 100644
--- a/drivers/net/ibm_newemac/zmii.c
+++ b/drivers/net/ibm_newemac/zmii.c
@@ -231,8 +231,7 @@ void *zmii_dump_regs(struct platform_device *ofdev, void *buf)
         return regs + 1;
 }
 
-static int __devinit zmii_probe(struct platform_device *ofdev,
-                                const struct of_device_id *match)
+static int __devinit zmii_probe(struct platform_device *ofdev)
 {
         struct device_node *np = ofdev->dev.of_node;
         struct zmii_instance *dev;
@@ -312,7 +311,7 @@ static struct of_device_id zmii_match[] =
         {},
 };
 
-static struct of_platform_driver zmii_driver = {
+static struct platform_driver zmii_driver = {
         .driver = {
                 .name = "emac-zmii",
                 .owner = THIS_MODULE,
@@ -324,10 +323,10 @@ static struct of_platform_driver zmii_driver = {
 
 int __init zmii_init(void)
 {
-        return of_register_platform_driver(&zmii_driver);
+        return platform_driver_register(&zmii_driver);
 }
 
 void zmii_exit(void)
 {
-        of_unregister_platform_driver(&zmii_driver);
+        platform_driver_unregister(&zmii_driver);
 }
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
index 0a2368fa6bc..6b256c275e1 100644
--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/igb/e1000_82575.c
@@ -64,7 +64,14 @@ static s32  igb_reset_init_script_82575(struct e1000_hw *);
 static s32  igb_read_mac_addr_82575(struct e1000_hw *);
 static s32  igb_set_pcie_completion_timeout(struct e1000_hw *hw);
 static s32  igb_reset_mdicnfg_82580(struct e1000_hw *hw);
-
+static s32  igb_validate_nvm_checksum_82580(struct e1000_hw *hw);
+static s32  igb_update_nvm_checksum_82580(struct e1000_hw *hw);
+static s32  igb_update_nvm_checksum_with_offset(struct e1000_hw *hw,
+                                                u16 offset);
+static s32 igb_validate_nvm_checksum_with_offset(struct e1000_hw *hw,
+                                                u16 offset);
+static s32 igb_validate_nvm_checksum_i350(struct e1000_hw *hw);
+static s32 igb_update_nvm_checksum_i350(struct e1000_hw *hw);
 static const u16 e1000_82580_rxpbs_table[] =
         { 36, 72, 144, 1, 2, 4, 8, 16,
           35, 70, 140 };
@@ -129,6 +136,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
                 break;
         case E1000_DEV_ID_82580_COPPER:
         case E1000_DEV_ID_82580_FIBER:
+        case E1000_DEV_ID_82580_QUAD_FIBER:
         case E1000_DEV_ID_82580_SERDES:
         case E1000_DEV_ID_82580_SGMII:
         case E1000_DEV_ID_82580_COPPER_DUAL:
@@ -194,7 +202,11 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
         mac->arc_subsystem_valid =
                 (rd32(E1000_FWSM) & E1000_FWSM_MODE_MASK)
                         ? true : false;
-
+        /* enable EEE on i350 parts */
+        if (mac->type == e1000_i350)
+                dev_spec->eee_disable = false;
+        else
+                dev_spec->eee_disable = true;
         /* physical interface link setup */
         mac->ops.setup_physical_interface =
                 (hw->phy.media_type == e1000_media_type_copper)
@@ -232,14 +244,42 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
          */
         size += NVM_WORD_SIZE_BASE_SHIFT;
 
-        /* EEPROM access above 16k is unsupported */
-        if (size > 14)
-                size = 14;
         nvm->word_size = 1 << size;
+        if (nvm->word_size == (1 << 15))
+                nvm->page_size = 128;
 
-        /* if 82576 then initialize mailbox parameters */
-        if (mac->type == e1000_82576)
+        /* NVM Function Pointers */
+        nvm->ops.acquire = igb_acquire_nvm_82575;
+        if (nvm->word_size < (1 << 15))
+                nvm->ops.read = igb_read_nvm_eerd;
+        else
+                nvm->ops.read = igb_read_nvm_spi;
+
+        nvm->ops.release = igb_release_nvm_82575;
+        switch (hw->mac.type) {
+        case e1000_82580:
+                nvm->ops.validate = igb_validate_nvm_checksum_82580;
+                nvm->ops.update = igb_update_nvm_checksum_82580;
+                break;
+        case e1000_i350:
+                nvm->ops.validate = igb_validate_nvm_checksum_i350;
+                nvm->ops.update = igb_update_nvm_checksum_i350;
+                break;
+        default:
+                nvm->ops.validate = igb_validate_nvm_checksum;
+                nvm->ops.update = igb_update_nvm_checksum;
+        }
+        nvm->ops.write = igb_write_nvm_spi;
+
+        /* if part supports SR-IOV then initialize mailbox parameters */
+        switch (mac->type) {
+        case e1000_82576:
+        case e1000_i350:
                 igb_init_mbx_params_pf(hw);
+                break;
+        default:
+                break;
+        }
 
         /* setup PHY parameters */
         if (phy->media_type != e1000_media_type_copper) {
@@ -1747,6 +1787,248 @@ u16 igb_rxpbs_adjust_82580(u32 data)
         return ret_val;
 }
 
+/**
+ *  igb_validate_nvm_checksum_with_offset - Validate EEPROM
+ *  checksum
+ *  @hw: pointer to the HW structure
+ *  @offset: offset in words of the checksum protected region
+ *
+ *  Calculates the EEPROM checksum by reading/adding each word of the EEPROM
+ *  and then verifies that the sum of the EEPROM is equal to 0xBABA.
+ **/
+s32 igb_validate_nvm_checksum_with_offset(struct e1000_hw *hw, u16 offset)
+{
+        s32 ret_val = 0;
+        u16 checksum = 0;
+        u16 i, nvm_data;
+
+        for (i = offset; i < ((NVM_CHECKSUM_REG + offset) + 1); i++) {
+                ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data);
+                if (ret_val) {
+                        hw_dbg("NVM Read Error\n");
+                        goto out;
+                }
+                checksum += nvm_data;
+        }
+
+        if (checksum != (u16) NVM_SUM) {
+                hw_dbg("NVM Checksum Invalid\n");
+                ret_val = -E1000_ERR_NVM;
+                goto out;
+        }
+
+out:
+        return ret_val;
+}
+
+/**
+ *  igb_update_nvm_checksum_with_offset - Update EEPROM
+ *  checksum
+ *  @hw: pointer to the HW structure
+ *  @offset: offset in words of the checksum protected region
+ *
+ *  Updates the EEPROM checksum by reading/adding each word of the EEPROM
+ *  up to the checksum.  Then calculates the EEPROM checksum and writes the
+ *  value to the EEPROM.
+ **/
+s32 igb_update_nvm_checksum_with_offset(struct e1000_hw *hw, u16 offset)
+{
+        s32 ret_val;
+        u16 checksum = 0;
+        u16 i, nvm_data;
+
+        for (i = offset; i < (NVM_CHECKSUM_REG + offset); i++) {
+                ret_val = hw->nvm.ops.read(hw, i, 1, &nvm_data);
+                if (ret_val) {
+                        hw_dbg("NVM Read Error while updating checksum.\n");
+                        goto out;
+                }
+                checksum += nvm_data;
+        }
+        checksum = (u16) NVM_SUM - checksum;
+        ret_val = hw->nvm.ops.write(hw, (NVM_CHECKSUM_REG + offset), 1,
+                                &checksum);
+        if (ret_val)
+                hw_dbg("NVM Write Error while updating checksum.\n");
+
+out:
+        return ret_val;
+}
+
+/**
+ *  igb_validate_nvm_checksum_82580 - Validate EEPROM checksum
+ *  @hw: pointer to the HW structure
+ *
+ *  Calculates the EEPROM section checksum by reading/adding each word of
+ *  the EEPROM and then verifies that the sum of the EEPROM is
+ *  equal to 0xBABA.
+ **/
+static s32 igb_validate_nvm_checksum_82580(struct e1000_hw *hw)
+{
+        s32 ret_val = 0;
+        u16 eeprom_regions_count = 1;
+        u16 j, nvm_data;
+        u16 nvm_offset;
+
+        ret_val = hw->nvm.ops.read(hw, NVM_COMPATIBILITY_REG_3, 1, &nvm_data);
+        if (ret_val) {
+                hw_dbg("NVM Read Error\n");
+                goto out;
+        }
+
+        if (nvm_data & NVM_COMPATIBILITY_BIT_MASK) {
+                /* if chekcsums compatibility bit is set validate checksums
+                 * for all 4 ports. */
+                eeprom_regions_count = 4;
+        }
+
+        for (j = 0; j < eeprom_regions_count; j++) {
+                nvm_offset = NVM_82580_LAN_FUNC_OFFSET(j);
+                ret_val = igb_validate_nvm_checksum_with_offset(hw,
+                                                                nvm_offset);
+                if (ret_val != 0)
+                        goto out;
+        }
+
+out:
+        return ret_val;
+}
+
+/**
+ *  igb_update_nvm_checksum_82580 - Update EEPROM checksum
+ *  @hw: pointer to the HW structure
+ *
+ *  Updates the EEPROM section checksums for all 4 ports by reading/adding
+ *  each word of the EEPROM up to the checksum.  Then calculates the EEPROM
+ *  checksum and writes the value to the EEPROM.
+ **/
+static s32 igb_update_nvm_checksum_82580(struct e1000_hw *hw)
+{
+        s32 ret_val;
+        u16 j, nvm_data;
+        u16 nvm_offset;
+
+        ret_val = hw->nvm.ops.read(hw, NVM_COMPATIBILITY_REG_3, 1, &nvm_data);
+        if (ret_val) {
+                hw_dbg("NVM Read Error while updating checksum"
+                        " compatibility bit.\n");
+                goto out;
+        }
+
+        if ((nvm_data & NVM_COMPATIBILITY_BIT_MASK) == 0) {
+                /* set compatibility bit to validate checksums appropriately */
+                nvm_data = nvm_data | NVM_COMPATIBILITY_BIT_MASK;
+                ret_val = hw->nvm.ops.write(hw, NVM_COMPATIBILITY_REG_3, 1,
+                                        &nvm_data);
+                if (ret_val) {
+                        hw_dbg("NVM Write Error while updating checksum"
+                                " compatibility bit.\n");
+                        goto out;
+                }
+        }
+
+        for (j = 0; j < 4; j++) {
+                nvm_offset = NVM_82580_LAN_FUNC_OFFSET(j);
+                ret_val = igb_update_nvm_checksum_with_offset(hw, nvm_offset);
+                if (ret_val)
+                        goto out;
+        }
+
+out:
+        return ret_val;
+}
+
+/**
+ *  igb_validate_nvm_checksum_i350 - Validate EEPROM checksum
+ *  @hw: pointer to the HW structure
+ *
+ *  Calculates the EEPROM section checksum by reading/adding each word of
+ *  the EEPROM and then verifies that the sum of the EEPROM is
+ *  equal to 0xBABA.
+ **/
+static s32 igb_validate_nvm_checksum_i350(struct e1000_hw *hw)
+{
+        s32 ret_val = 0;
+        u16 j;
+        u16 nvm_offset;
+
+        for (j = 0; j < 4; j++) {
+                nvm_offset = NVM_82580_LAN_FUNC_OFFSET(j);
+                ret_val = igb_validate_nvm_checksum_with_offset(hw,
+                                                                nvm_offset);
+                if (ret_val != 0)
+                        goto out;
+        }
+
+out:
+        return ret_val;
+}
+
+/**
+ *  igb_update_nvm_checksum_i350 - Update EEPROM checksum
+ *  @hw: pointer to the HW structure
+ *
+ *  Updates the EEPROM section checksums for all 4 ports by reading/adding
+ *  each word of the EEPROM up to the checksum.  Then calculates the EEPROM
+ *  checksum and writes the value to the EEPROM.
+ **/
+static s32 igb_update_nvm_checksum_i350(struct e1000_hw *hw)
+{
+        s32 ret_val = 0;
+        u16 j;
+        u16 nvm_offset;
+
+        for (j = 0; j < 4; j++) {
+                nvm_offset = NVM_82580_LAN_FUNC_OFFSET(j);
+                ret_val = igb_update_nvm_checksum_with_offset(hw, nvm_offset);
+                if (ret_val != 0)
+                        goto out;
+        }
+
+out:
+        return ret_val;
+}
+/**
+ *  igb_set_eee_i350 - Enable/disable EEE support
+ *  @hw: pointer to the HW structure
+ *
+ *  Enable/disable EEE based on setting in dev_spec structure.
+ *
+ **/
+s32 igb_set_eee_i350(struct e1000_hw *hw)
+{
+        s32 ret_val = 0;
+        u32 ipcnfg, eeer, ctrl_ext;
+
+        ctrl_ext = rd32(E1000_CTRL_EXT);
+        if ((hw->mac.type != e1000_i350) ||
+            (ctrl_ext & E1000_CTRL_EXT_LINK_MODE_MASK))
+                goto out;
+        ipcnfg = rd32(E1000_IPCNFG);
+        eeer = rd32(E1000_EEER);
+
+        /* enable or disable per user setting */
+        if (!(hw->dev_spec._82575.eee_disable)) {
+                ipcnfg |= (E1000_IPCNFG_EEE_1G_AN |
+                        E1000_IPCNFG_EEE_100M_AN);
+                eeer |= (E1000_EEER_TX_LPI_EN |
+                        E1000_EEER_RX_LPI_EN |
+                        E1000_EEER_LPI_FC);
+
+        } else {
+                ipcnfg &= ~(E1000_IPCNFG_EEE_1G_AN |
+                        E1000_IPCNFG_EEE_100M_AN);
+                eeer &= ~(E1000_EEER_TX_LPI_EN |
+                        E1000_EEER_RX_LPI_EN |
+                        E1000_EEER_LPI_FC);
+        }
+        wr32(E1000_IPCNFG, ipcnfg);
+        wr32(E1000_EEER, eeer);
+out:
+
+        return ret_val;
+}
+
 static struct e1000_mac_operations e1000_mac_ops_82575 = {
         .init_hw              = igb_init_hw_82575,
         .check_for_link       = igb_check_for_link_82575,
diff --git a/drivers/net/igb/e1000_82575.h b/drivers/net/igb/e1000_82575.h
index 1d01af2472e..dd6df349899 100644
--- a/drivers/net/igb/e1000_82575.h
+++ b/drivers/net/igb/e1000_82575.h
@@ -251,5 +251,6 @@ void igb_vmdq_set_anti_spoofing_pf(struct e1000_hw *, bool, int);
 void igb_vmdq_set_loopback_pf(struct e1000_hw *, bool);
 void igb_vmdq_set_replication_pf(struct e1000_hw *, bool);
 u16 igb_rxpbs_adjust_82580(u32 data);
+s32 igb_set_eee_i350(struct e1000_hw *);
 
 #endif
diff --git a/drivers/net/igb/e1000_defines.h b/drivers/net/igb/e1000_defines.h
index 6319ed902bc..6b80d40110c 100644
--- a/drivers/net/igb/e1000_defines.h
+++ b/drivers/net/igb/e1000_defines.h
@@ -51,6 +51,7 @@
 #define E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES  0x00C00000
 #define E1000_CTRL_EXT_LINK_MODE_1000BASE_KX  0x00400000
 #define E1000_CTRL_EXT_LINK_MODE_SGMII   0x00800000
+#define E1000_CTRL_EXT_LINK_MODE_GMII   0x00000000
 #define E1000_CTRL_EXT_EIAME          0x01000000
 #define E1000_CTRL_EXT_IRCA           0x00000001
 /* Interrupt delay cancellation */
@@ -110,6 +111,7 @@
 /* Management Control */
 #define E1000_MANC_SMBUS_EN      0x00000001 /* SMBus Enabled - RO */
 #define E1000_MANC_ASF_EN        0x00000002 /* ASF Enabled - RO */
+#define E1000_MANC_EN_BMC2OS     0x10000000 /* OSBMC is Enabled or not */
 /* Enable Neighbor Discovery Filtering */
 #define E1000_MANC_RCV_TCO_EN    0x00020000 /* Receive TCO Packets Enabled */
 #define E1000_MANC_BLK_PHY_RST_ON_IDE   0x00040000 /* Block phy resets */
@@ -286,7 +288,34 @@
 #define E1000_TCTL_COLD   0x003ff000    /* collision distance */
 #define E1000_TCTL_RTLC   0x01000000    /* Re-transmit on late collision */
 
-/* Transmit Arbitration Count */
+/* DMA Coalescing register fields */
+#define E1000_DMACR_DMACWT_MASK         0x00003FFF /* DMA Coalescing
+                                                        * Watchdog Timer */
+#define E1000_DMACR_DMACTHR_MASK        0x00FF0000 /* DMA Coalescing Receive
+                                                        * Threshold */
+#define E1000_DMACR_DMACTHR_SHIFT       16
+#define E1000_DMACR_DMAC_LX_MASK        0x30000000 /* Lx when no PCIe
+                                                        * transactions */
+#define E1000_DMACR_DMAC_LX_SHIFT       28
+#define E1000_DMACR_DMAC_EN             0x80000000 /* Enable DMA Coalescing */
+
+#define E1000_DMCTXTH_DMCTTHR_MASK      0x00000FFF /* DMA Coalescing Transmit
+                                                        * Threshold */
+
+#define E1000_DMCTLX_TTLX_MASK          0x00000FFF /* Time to LX request */
+
+#define E1000_DMCRTRH_UTRESH_MASK       0x0007FFFF /* Receive Traffic Rate
+                                                        * Threshold */
+#define E1000_DMCRTRH_LRPRCW            0x80000000 /* Rcv packet rate in
+                                                        * current window */
+
+#define E1000_DMCCNT_CCOUNT_MASK        0x01FFFFFF /* DMA Coal Rcv Traffic
+                                                        * Current Cnt */
+
+#define E1000_FCRTC_RTH_COAL_MASK       0x0003FFF0 /* Flow ctrl Rcv Threshold
+                                                        * High val */
+#define E1000_FCRTC_RTH_COAL_SHIFT      4
+#define E1000_PCIEMISC_LX_DECISION      0x00000080 /* Lx power decision */
 
 /* SerDes Control */
 #define E1000_SCTL_DISABLE_SERDES_LOOPBACK 0x0400
@@ -565,6 +594,8 @@
 #define NVM_INIT_CONTROL3_PORT_A   0x0024
 #define NVM_ALT_MAC_ADDR_PTR       0x0037
 #define NVM_CHECKSUM_REG           0x003F
+#define NVM_COMPATIBILITY_REG_3    0x0003
+#define NVM_COMPATIBILITY_BIT_MASK 0x8000
 
 #define E1000_NVM_CFG_DONE_PORT_0  0x040000 /* MNG config cycle done */
 #define E1000_NVM_CFG_DONE_PORT_1  0x080000 /* ...for second port */
@@ -599,6 +630,7 @@
 /* NVM Commands - SPI */
 #define NVM_MAX_RETRY_SPI          5000 /* Max wait of 5ms, for RDY signal */
 #define NVM_WRITE_OPCODE_SPI       0x02 /* NVM write opcode */
+#define NVM_READ_OPCODE_SPI        0x03 /* NVM read opcode */
 #define NVM_A8_OPCODE_SPI          0x08 /* opcode bit-3 = address bit-8 */
 #define NVM_WREN_OPCODE_SPI        0x06 /* NVM set Write Enable latch */
 #define NVM_RDSR_OPCODE_SPI        0x05 /* NVM read Status register */
@@ -757,6 +789,17 @@
 #define E1000_MDIC_ERROR     0x40000000
 #define E1000_MDIC_DEST      0x80000000
 
+/* Thermal Sensor */
+#define E1000_THSTAT_PWR_DOWN       0x00000001 /* Power Down Event */
+#define E1000_THSTAT_LINK_THROTTLE  0x00000002 /* Link Speed Throttle Event */
+
+/* Energy Efficient Ethernet */
+#define E1000_IPCNFG_EEE_1G_AN       0x00000008  /* EEE Enable 1G AN */
+#define E1000_IPCNFG_EEE_100M_AN     0x00000004  /* EEE Enable 100M AN */
+#define E1000_EEER_TX_LPI_EN         0x00010000  /* EEE Tx LPI Enable */
+#define E1000_EEER_RX_LPI_EN         0x00020000  /* EEE Rx LPI Enable */
+#define E1000_EEER_LPI_FC            0x00040000  /* EEE Enable on FC */
+
 /* SerDes Control */
 #define E1000_GEN_CTL_READY             0x80000000
 #define E1000_GEN_CTL_ADDRESS_SHIFT     8
@@ -770,4 +813,11 @@
 #define E1000_PCIEMISC_LX_DECISION      0x00000080 /* Lx power decision based
                                                       on DMA coal */
 
+/* Tx Rate-Scheduler Config fields */
+#define E1000_RTTBCNRC_RS_ENA           0x80000000
+#define E1000_RTTBCNRC_RF_DEC_MASK      0x00003FFF
+#define E1000_RTTBCNRC_RF_INT_SHIFT     14
+#define E1000_RTTBCNRC_RF_INT_MASK      \
+        (E1000_RTTBCNRC_RF_DEC_MASK << E1000_RTTBCNRC_RF_INT_SHIFT)
+
 #endif
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
index e2638afb8cd..27153e8d7b1 100644
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/igb/e1000_hw.h
@@ -54,6 +54,7 @@ struct e1000_hw;
 #define E1000_DEV_ID_82580_SERDES             0x1510
 #define E1000_DEV_ID_82580_SGMII              0x1511
 #define E1000_DEV_ID_82580_COPPER_DUAL        0x1516
+#define E1000_DEV_ID_82580_QUAD_FIBER         0x1527
 #define E1000_DEV_ID_DH89XXCC_SGMII           0x0438
 #define E1000_DEV_ID_DH89XXCC_SERDES          0x043A
 #define E1000_DEV_ID_DH89XXCC_BACKPLANE       0x043C
@@ -247,6 +248,10 @@ struct e1000_hw_stats {
         u64 scvpc;
         u64 hrmpc;
         u64 doosync;
+        u64 o2bgptc;
+        u64 o2bspc;
+        u64 b2ospc;
+        u64 b2ogprc;
 };
 
 struct e1000_phy_stats {
@@ -331,6 +336,8 @@ struct e1000_nvm_operations {
         s32  (*read)(struct e1000_hw *, u16, u16, u16 *);
         void (*release)(struct e1000_hw *);
         s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
+        s32  (*update)(struct e1000_hw *);
+        s32  (*validate)(struct e1000_hw *);
 };
 
 struct e1000_info {
@@ -417,7 +424,6 @@ struct e1000_phy_info {
 
 struct e1000_nvm_info {
         struct e1000_nvm_operations ops;
-
         enum e1000_nvm_type type;
         enum e1000_nvm_override override;
 
@@ -483,6 +489,7 @@ struct e1000_mbx_info {
 struct e1000_dev_spec_82575 {
         bool sgmii_active;
         bool global_device_reset;
+        bool eee_disable;
 };
 
 struct e1000_hw {
diff --git a/drivers/net/igb/e1000_mbx.c b/drivers/net/igb/e1000_mbx.c
index c474cdb7004..78d48c7fa85 100644
--- a/drivers/net/igb/e1000_mbx.c
+++ b/drivers/net/igb/e1000_mbx.c
@@ -422,26 +422,24 @@ s32 igb_init_mbx_params_pf(struct e1000_hw *hw)
 {
         struct e1000_mbx_info *mbx = &hw->mbx;
 
-        if (hw->mac.type == e1000_82576) {
-                mbx->timeout = 0;
-                mbx->usec_delay = 0;
-
-                mbx->size = E1000_VFMAILBOX_SIZE;
-
-                mbx->ops.read = igb_read_mbx_pf;
-                mbx->ops.write = igb_write_mbx_pf;
-                mbx->ops.read_posted = igb_read_posted_mbx;
-                mbx->ops.write_posted = igb_write_posted_mbx;
-                mbx->ops.check_for_msg = igb_check_for_msg_pf;
-                mbx->ops.check_for_ack = igb_check_for_ack_pf;
-                mbx->ops.check_for_rst = igb_check_for_rst_pf;
-
-                mbx->stats.msgs_tx = 0;
-                mbx->stats.msgs_rx = 0;
-                mbx->stats.reqs = 0;
-                mbx->stats.acks = 0;
-                mbx->stats.rsts = 0;
-        }
+        mbx->timeout = 0;
+        mbx->usec_delay = 0;
+
+        mbx->size = E1000_VFMAILBOX_SIZE;
+
+        mbx->ops.read = igb_read_mbx_pf;
+        mbx->ops.write = igb_write_mbx_pf;
+        mbx->ops.read_posted = igb_read_posted_mbx;
+        mbx->ops.write_posted = igb_write_posted_mbx;
+        mbx->ops.check_for_msg = igb_check_for_msg_pf;
+        mbx->ops.check_for_ack = igb_check_for_ack_pf;
+        mbx->ops.check_for_rst = igb_check_for_rst_pf;
+
+        mbx->stats.msgs_tx = 0;
+        mbx->stats.msgs_rx = 0;
+        mbx->stats.reqs = 0;
+        mbx->stats.acks = 0;
+        mbx->stats.rsts = 0;
 
         return 0;
 }
diff --git a/drivers/net/igb/e1000_nvm.c b/drivers/net/igb/e1000_nvm.c
index 6b5cc2cc453..75bf36a4bae 100644
--- a/drivers/net/igb/e1000_nvm.c
+++ b/drivers/net/igb/e1000_nvm.c
@@ -318,6 +318,68 @@ out:
 }
 
 /**
+ *  igb_read_nvm_spi - Read EEPROM's using SPI
+ *  @hw: pointer to the HW structure
+ *  @offset: offset of word in the EEPROM to read
+ *  @words: number of words to read
+ *  @data: word read from the EEPROM
+ *
+ *  Reads a 16 bit word from the EEPROM.
+ **/
+s32 igb_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
+{
+        struct e1000_nvm_info *nvm = &hw->nvm;
+        u32 i = 0;
+        s32 ret_val;
+        u16 word_in;
+        u8 read_opcode = NVM_READ_OPCODE_SPI;
+
+        /*
+         * A check for invalid values:  offset too large, too many words,
+         * and not enough words.
+         */
+        if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
+            (words == 0)) {
+                hw_dbg("nvm parameter(s) out of bounds\n");
+                ret_val = -E1000_ERR_NVM;
+                goto out;
+        }
+
+        ret_val = nvm->ops.acquire(hw);
+        if (ret_val)
+                goto out;
+
+        ret_val = igb_ready_nvm_eeprom(hw);
+        if (ret_val)
+                goto release;
+
+        igb_standby_nvm(hw);
+
+        if ((nvm->address_bits == 8) && (offset >= 128))
+                read_opcode |= NVM_A8_OPCODE_SPI;
+
+        /* Send the READ command (opcode + addr) */
+        igb_shift_out_eec_bits(hw, read_opcode, nvm->opcode_bits);
+        igb_shift_out_eec_bits(hw, (u16)(offset*2), nvm->address_bits);
+
+        /*
+         * Read the data.  SPI NVMs increment the address with each byte
+         * read and will roll over if reading beyond the end.  This allows
+         * us to read the whole NVM from any offset
+         */
+        for (i = 0; i < words; i++) {
+                word_in = igb_shift_in_eec_bits(hw, 16);
+                data[i] = (word_in >> 8) | (word_in << 8);
+        }
+
+release:
+        nvm->ops.release(hw);
+
+out:
+        return ret_val;
+}
+
+/**
  *  igb_read_nvm_eerd - Reads EEPROM using EERD register
  *  @hw: pointer to the HW structure
  *  @offset: offset of word in the EEPROM to read
@@ -353,7 +415,7 @@ s32 igb_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
                         break;
 
                 data[i] = (rd32(E1000_EERD) >>
-                           E1000_NVM_RW_REG_DATA);
+                        E1000_NVM_RW_REG_DATA);
         }
 
 out:
diff --git a/drivers/net/igb/e1000_nvm.h b/drivers/net/igb/e1000_nvm.h
index 29c956a84bd..7f43564c4bc 100644
--- a/drivers/net/igb/e1000_nvm.h
+++ b/drivers/net/igb/e1000_nvm.h
@@ -35,6 +35,7 @@ s32  igb_read_part_num(struct e1000_hw *hw, u32 *part_num);
 s32  igb_read_part_string(struct e1000_hw *hw, u8 *part_num,
                           u32 part_num_size);
 s32  igb_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
+s32  igb_read_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 s32  igb_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data);
 s32  igb_validate_nvm_checksum(struct e1000_hw *hw);
 s32  igb_update_nvm_checksum(struct e1000_hw *hw);
diff --git a/drivers/net/igb/e1000_regs.h b/drivers/net/igb/e1000_regs.h
index 8ac83c5190d..958ca3bda48 100644
--- a/drivers/net/igb/e1000_regs.h
+++ b/drivers/net/igb/e1000_regs.h
@@ -106,6 +106,19 @@
 
 #define E1000_RQDPC(_n) (0x0C030 + ((_n) * 0x40))
 
+/* DMA Coalescing registers */
+#define E1000_DMACR             0x02508 /* Control Register */
+#define E1000_DMCTXTH           0x03550 /* Transmit Threshold */
+#define E1000_DMCTLX            0x02514 /* Time to Lx Request */
+#define E1000_DMCRTRH           0x05DD0 /* Receive Packet Rate Threshold */
+#define E1000_DMCCNT            0x05DD4 /* Current Rx Count */
+#define E1000_FCRTC             0x02170 /* Flow Control Rx high watermark */
+#define E1000_PCIEMISC          0x05BB8 /* PCIE misc config register */
+
+/* TX Rate Limit Registers */
+#define E1000_RTTDQSEL  0x3604  /* Tx Desc Plane Queue Select - WO */
+#define E1000_RTTBCNRC  0x36B0  /* Tx BCN Rate-Scheduler Config - WO */
+
 /* Split and Replication RX Control - RW */
 #define E1000_RXPBS    0x02404  /* Rx Packet Buffer Size - RW */
 /*
@@ -324,4 +337,18 @@
 
 /* DMA Coalescing registers */
 #define E1000_PCIEMISC          0x05BB8 /* PCIE misc config register */
+
+/* Energy Efficient Ethernet "EEE" register */
+#define E1000_IPCNFG  0x0E38  /* Internal PHY Configuration */
+#define E1000_EEER    0x0E30  /* Energy Efficient Ethernet */
+
+/* Thermal Sensor Register */
+#define E1000_THSTAT    0x08110 /* Thermal Sensor Status */
+
+/* OS2BMC Registers */
+#define E1000_B2OSPC    0x08FE0 /* BMC2OS packets sent by BMC */
+#define E1000_B2OGPRC   0x04158 /* BMC2OS packets received by host */
+#define E1000_O2BGPTC   0x08FE4 /* OS2BMC packets received by BMC */
+#define E1000_O2BSPC    0x0415C /* OS2BMC packets transmitted by host */
+
 #endif
diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h
index 92a4ef09e55..1c687e298d5 100644
--- a/drivers/net/igb/igb.h
+++ b/drivers/net/igb/igb.h
@@ -77,6 +77,7 @@ struct vf_data_storage {
         unsigned long last_nack;
         u16 pf_vlan; /* When set, guest VLAN config not allowed. */
         u16 pf_qos;
+        u16 tx_rate;
 };
 
 #define IGB_VF_FLAG_CTS            0x00000001 /* VF is clear to send data */
@@ -323,6 +324,7 @@ struct igb_adapter {
         u16 rx_ring_count;
         unsigned int vfs_allocated_count;
         struct vf_data_storage *vf_data;
+        int vf_rate_link_speed;
         u32 rss_queues;
         u32 wvbr;
 };
@@ -331,6 +333,12 @@ struct igb_adapter {
 #define IGB_FLAG_DCA_ENABLED       (1 << 1)
 #define IGB_FLAG_QUAD_PORT_A       (1 << 2)
 #define IGB_FLAG_QUEUE_PAIRS       (1 << 3)
+#define IGB_FLAG_DMAC              (1 << 4)
+
+/* DMA Coalescing defines */
+#define IGB_MIN_TXPBSIZE           20408
+#define IGB_TX_BUF_4096            4096
+#define IGB_DMCTLX_DCFLUSH_DIS     0x80000000  /* Disable DMA Coal Flush */
 
 #define IGB_82576_TSYNC_SHIFT 19
 #define IGB_82580_TSYNC_SHIFT 24
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c
index a70e16bcfa7..d976733bbcc 100644
--- a/drivers/net/igb/igb_ethtool.c
+++ b/drivers/net/igb/igb_ethtool.c
@@ -86,6 +86,10 @@ static const struct igb_stats igb_gstrings_stats[] = {
         IGB_STAT("tx_smbus", stats.mgptc),
         IGB_STAT("rx_smbus", stats.mgprc),
         IGB_STAT("dropped_smbus", stats.mgpdc),
+        IGB_STAT("os2bmc_rx_by_bmc", stats.o2bgptc),
+        IGB_STAT("os2bmc_tx_by_bmc", stats.b2ospc),
+        IGB_STAT("os2bmc_tx_by_host", stats.o2bspc),
+        IGB_STAT("os2bmc_rx_by_host", stats.b2ogprc),
 };
 
 #define IGB_NETDEV_STAT(_net_stat) { \
@@ -603,7 +607,10 @@ static void igb_get_regs(struct net_device *netdev,
         regs_buff[548] = rd32(E1000_TDFT);
         regs_buff[549] = rd32(E1000_TDFHS);
         regs_buff[550] = rd32(E1000_TDFPC);
-
+        regs_buff[551] = adapter->stats.o2bgptc;
+        regs_buff[552] = adapter->stats.b2ospc;
+        regs_buff[553] = adapter->stats.o2bspc;
+        regs_buff[554] = adapter->stats.b2ogprc;
 }
 
 static int igb_get_eeprom_len(struct net_device *netdev)
@@ -714,7 +721,7 @@ static int igb_set_eeprom(struct net_device *netdev,
         /* Update the checksum over the first part of the EEPROM if needed
          * and flush shadow RAM for 82573 controllers */
         if ((ret_val == 0) && ((first_word <= NVM_CHECKSUM_REG)))
-                igb_update_nvm_checksum(hw);
+                hw->nvm.ops.update(hw);
 
         kfree(eeprom_buff);
         return ret_val;
@@ -727,8 +734,9 @@ static void igb_get_drvinfo(struct net_device *netdev,
         char firmware_version[32];
         u16 eeprom_data;
 
-        strncpy(drvinfo->driver,  igb_driver_name, 32);
-        strncpy(drvinfo->version, igb_driver_version, 32);
+        strncpy(drvinfo->driver,  igb_driver_name, sizeof(drvinfo->driver) - 1);
+        strncpy(drvinfo->version, igb_driver_version,
+                sizeof(drvinfo->version) - 1);
 
         /* EEPROM image version # is reported as firmware version # for
          * 82575 controllers */
@@ -738,8 +746,10 @@ static void igb_get_drvinfo(struct net_device *netdev,
                 (eeprom_data & 0x0FF0) >> 4,
                 eeprom_data & 0x000F);
 
-        strncpy(drvinfo->fw_version, firmware_version, 32);
-        strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
+        strncpy(drvinfo->fw_version, firmware_version,
+                sizeof(drvinfo->fw_version) - 1);
+        strncpy(drvinfo->bus_info, pci_name(adapter->pdev),
+                sizeof(drvinfo->bus_info) - 1);
         drvinfo->n_stats = IGB_STATS_LEN;
         drvinfo->testinfo_len = IGB_TEST_LEN;
         drvinfo->regdump_len = igb_get_regs_len(netdev);
@@ -1070,7 +1080,7 @@ static bool reg_pattern_test(struct igb_adapter *adapter, u64 *data,
                 {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
         for (pat = 0; pat < ARRAY_SIZE(_test); pat++) {
                 wr32(reg, (_test[pat] & write));
-                val = rd32(reg);
+                val = rd32(reg) & mask;
                 if (val != (_test[pat] & write & mask)) {
                         dev_err(&adapter->pdev->dev, "pattern test reg %04X "
                                 "failed: got 0x%08X expected 0x%08X\n",
@@ -1999,6 +2009,12 @@ static int igb_set_coalesce(struct net_device *netdev,
         if ((adapter->flags & IGB_FLAG_QUEUE_PAIRS) && ec->tx_coalesce_usecs)
                 return -EINVAL;
 
+        /* If ITR is disabled, disable DMAC */
+        if (ec->rx_coalesce_usecs == 0) {
+                if (adapter->flags & IGB_FLAG_DMAC)
+                        adapter->flags &= ~IGB_FLAG_DMAC;
+        }
+
         /* convert to rate of irq's per second */
         if (ec->rx_coalesce_usecs && ec->rx_coalesce_usecs <= 3)
                 adapter->rx_itr_setting = ec->rx_coalesce_usecs;
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 58c665b7513..3d850af0cdd 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -50,12 +50,17 @@
 #endif
 #include "igb.h"
 
-#define DRV_VERSION "2.1.0-k2"
+#define MAJ 3
+#define MIN 0
+#define BUILD 6
+#define KFIX 2
+#define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \
+__stringify(BUILD) "-k" __stringify(KFIX)
 char igb_driver_name[] = "igb";
 char igb_driver_version[] = DRV_VERSION;
 static const char igb_driver_string[] =
                                 "Intel(R) Gigabit Ethernet Network Driver";
-static const char igb_copyright[] = "Copyright (c) 2007-2009 Intel Corporation.";
+static const char igb_copyright[] = "Copyright (c) 2007-2011 Intel Corporation.";
 
 static const struct e1000_info *igb_info_tbl[] = {
         [board_82575] = &e1000_82575_info,
@@ -68,6 +73,7 @@ static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = {
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_SGMII), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_FIBER), board_82575 },
+        { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_QUAD_FIBER), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_SERDES), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_SGMII), board_82575 },
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER_DUAL), board_82575 },
@@ -100,6 +106,7 @@ static void igb_free_all_rx_resources(struct igb_adapter *);
 static void igb_setup_mrqc(struct igb_adapter *);
 static int igb_probe(struct pci_dev *, const struct pci_device_id *);
 static void __devexit igb_remove(struct pci_dev *pdev);
+static void igb_init_hw_timer(struct igb_adapter *adapter);
 static int igb_sw_init(struct igb_adapter *);
 static int igb_open(struct net_device *);
 static int igb_close(struct net_device *);
@@ -149,6 +156,7 @@ static int igb_ndo_set_vf_vlan(struct net_device *netdev,
 static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate);
 static int igb_ndo_get_vf_config(struct net_device *netdev, int vf,
                                  struct ifla_vf_info *ivi);
+static void igb_check_vf_rate_limit(struct igb_adapter *);
 
 #ifdef CONFIG_PM
 static int igb_suspend(struct pci_dev *, pm_message_t);
@@ -1672,7 +1680,58 @@ void igb_reset(struct igb_adapter *adapter)
 
         if (hw->mac.ops.init_hw(hw))
                 dev_err(&pdev->dev, "Hardware Error\n");
+        if (hw->mac.type > e1000_82580) {
+                if (adapter->flags & IGB_FLAG_DMAC) {
+                        u32 reg;
 
+                        /*
+                         * DMA Coalescing high water mark needs to be higher
+                         * than * the * Rx threshold.  The Rx threshold is
+                         * currently * pba - 6, so we * should use a high water
+                         * mark of pba * - 4. */
+                        hwm = (pba - 4) << 10;
+
+                        reg = (((pba-6) << E1000_DMACR_DMACTHR_SHIFT)
+                               & E1000_DMACR_DMACTHR_MASK);
+
+                        /* transition to L0x or L1 if available..*/
+                        reg |= (E1000_DMACR_DMAC_EN | E1000_DMACR_DMAC_LX_MASK);
+
+                        /* watchdog timer= +-1000 usec in 32usec intervals */
+                        reg |= (1000 >> 5);
+                        wr32(E1000_DMACR, reg);
+
+                        /* no lower threshold to disable coalescing(smart fifb)
+                         * -UTRESH=0*/
+                        wr32(E1000_DMCRTRH, 0);
+
+                        /* set hwm to PBA -  2 * max frame size */
+                        wr32(E1000_FCRTC, hwm);
+
+                        /*
+                         * This sets the time to wait before requesting tran-
+                         * sition to * low power state to number of usecs needed
+                         * to receive 1 512 * byte frame at gigabit line rate
+                         */
+                        reg = rd32(E1000_DMCTLX);
+                        reg |= IGB_DMCTLX_DCFLUSH_DIS;
+
+                        /* Delay 255 usec before entering Lx state. */
+                        reg |= 0xFF;
+                        wr32(E1000_DMCTLX, reg);
+
+                        /* free space in Tx packet buffer to wake from DMAC */
+                        wr32(E1000_DMCTXTH,
+                             (IGB_MIN_TXPBSIZE -
+                             (IGB_TX_BUF_4096 + adapter->max_frame_size))
+                             >> 6);
+
+                        /* make low power state decision controlled by DMAC */
+                        reg = rd32(E1000_PCIEMISC);
+                        reg |= E1000_PCIEMISC_LX_DECISION;
+                        wr32(E1000_PCIEMISC, reg);
+                } /* end if IGB_FLAG_DMAC set */
+        }
         if (hw->mac.type == e1000_82580) {
                 u32 reg = rd32(E1000_PCIEMISC);
                 wr32(E1000_PCIEMISC,
@@ -1882,7 +1941,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
         hw->mac.ops.reset_hw(hw);
 
         /* make sure the NVM is good */
-        if (igb_validate_nvm_checksum(hw) < 0) {
+        if (hw->nvm.ops.validate(hw) < 0) {
                 dev_err(&pdev->dev, "The NVM Checksum Is Not Valid\n");
                 err = -EIO;
                 goto err_eeprom;
@@ -1990,6 +2049,9 @@ static int __devinit igb_probe(struct pci_dev *pdev,
         }
 
 #endif
+        /* do hw tstamp init after resetting */
+        igb_init_hw_timer(adapter);
+
         dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n");
         /* print bus type/speed/width info */
         dev_info(&pdev->dev, "%s: (PCIe:%s:%s) %pM\n",
@@ -2012,7 +2074,13 @@ static int __devinit igb_probe(struct pci_dev *pdev,
                 adapter->msix_entries ? "MSI-X" :
                 (adapter->flags & IGB_FLAG_HAS_MSI) ? "MSI" : "legacy",
                 adapter->num_rx_queues, adapter->num_tx_queues);
-
+        switch (hw->mac.type) {
+        case e1000_i350:
+                igb_set_eee_i350(hw);
+                break;
+        default:
+                break;
+        }
         return 0;
 
 err_register:
@@ -2149,6 +2217,9 @@ static void __devinit igb_probe_vfs(struct igb_adapter * adapter)
                         random_ether_addr(mac_addr);
                         igb_set_vf_mac(adapter, i, mac_addr);
                 }
+                /* DMA Coalescing is not supported in IOV mode. */
+                if (adapter->flags & IGB_FLAG_DMAC)
+                        adapter->flags &= ~IGB_FLAG_DMAC;
         }
 #endif /* CONFIG_PCI_IOV */
 }
@@ -2286,9 +2357,19 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter)
 
         spin_lock_init(&adapter->stats64_lock);
 #ifdef CONFIG_PCI_IOV
-        if (hw->mac.type == e1000_82576)
-                adapter->vfs_allocated_count = (max_vfs > 7) ? 7 : max_vfs;
-
+        switch (hw->mac.type) {
+        case e1000_82576:
+        case e1000_i350:
+                if (max_vfs > 7) {
+                        dev_warn(&pdev->dev,
+                                 "Maximum of 7 VFs per PF, using max\n");
+                        adapter->vfs_allocated_count = 7;
+                } else
+                        adapter->vfs_allocated_count = max_vfs;
+                break;
+        default:
+                break;
+        }
 #endif /* CONFIG_PCI_IOV */
         adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus());
 
@@ -2307,12 +2388,14 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter)
                 return -ENOMEM;
         }
 
-        igb_init_hw_timer(adapter);
         igb_probe_vfs(adapter);
 
         /* Explicitly disable IRQ since the NIC can be in any state. */
         igb_irq_disable(adapter);
 
+        if (hw->mac.type == e1000_i350)
+                adapter->flags &= ~IGB_FLAG_DMAC;
+
         set_bit(__IGB_DOWN, &adapter->state);
         return 0;
 }
@@ -3467,7 +3550,7 @@ static void igb_watchdog_task(struct work_struct *work)
                                                    watchdog_task);
         struct e1000_hw *hw = &adapter->hw;
         struct net_device *netdev = adapter->netdev;
-        u32 link;
+        u32 link, ctrl_ext, thstat;
         int i;
 
         link = igb_has_link(adapter);
@@ -3491,6 +3574,25 @@ static void igb_watchdog_task(struct work_struct *work)
                                ((ctrl & E1000_CTRL_RFCE) ?  "RX" :
                                ((ctrl & E1000_CTRL_TFCE) ?  "TX" : "None")));
 
+                        /* check for thermal sensor event on i350,
+                         * copper only */
+                        if (hw->mac.type == e1000_i350) {
+                                thstat = rd32(E1000_THSTAT);
+                                ctrl_ext = rd32(E1000_CTRL_EXT);
+                                if ((hw->phy.media_type ==
+                                     e1000_media_type_copper) && !(ctrl_ext &
+                                     E1000_CTRL_EXT_LINK_MODE_SGMII)) {
+                                        if (thstat &
+                                            E1000_THSTAT_LINK_THROTTLE) {
+                                                printk(KERN_INFO "igb: %s The "
+                                                       "network adapter link "
+                                                       "speed was downshifted "
+                                                       "because it "
+                                                       "overheated.\n",
+                                                       netdev->name);
+                                        }
+                                }
+                        }
                         /* adjust timeout factor according to speed/duplex */
                         adapter->tx_timeout_factor = 1;
                         switch (adapter->link_speed) {
@@ -3505,6 +3607,7 @@ static void igb_watchdog_task(struct work_struct *work)
                         netif_carrier_on(netdev);
 
                         igb_ping_all_vfs(adapter);
+                        igb_check_vf_rate_limit(adapter);
 
                         /* link state has changed, schedule phy info update */
                         if (!test_bit(__IGB_DOWN, &adapter->state))
@@ -3515,6 +3618,22 @@ static void igb_watchdog_task(struct work_struct *work)
                 if (netif_carrier_ok(netdev)) {
                         adapter->link_speed = 0;
                         adapter->link_duplex = 0;
+                        /* check for thermal sensor event on i350
+                         * copper only*/
+                        if (hw->mac.type == e1000_i350) {
+                                thstat = rd32(E1000_THSTAT);
+                                ctrl_ext = rd32(E1000_CTRL_EXT);
+                                if ((hw->phy.media_type ==
+                                     e1000_media_type_copper) && !(ctrl_ext &
+                                     E1000_CTRL_EXT_LINK_MODE_SGMII)) {
+                                        if (thstat & E1000_THSTAT_PWR_DOWN) {
+                                                printk(KERN_ERR "igb: %s The "
+                                                "network adapter was stopped "
+                                                "because it overheated.\n",
+                                                netdev->name);
+                                        }
+                                }
+                        }
                         /* Links status message must follow this format */
                         printk(KERN_INFO "igb: %s NIC Link is Down\n",
                                netdev->name);
@@ -4547,6 +4666,15 @@ void igb_update_stats(struct igb_adapter *adapter,
         adapter->stats.mgptc += rd32(E1000_MGTPTC);
         adapter->stats.mgprc += rd32(E1000_MGTPRC);
         adapter->stats.mgpdc += rd32(E1000_MGTPDC);
+
+        /* OS2BMC Stats */
+        reg = rd32(E1000_MANC);
+        if (reg & E1000_MANC_EN_BMC2OS) {
+                adapter->stats.o2bgptc += rd32(E1000_O2BGPTC);
+                adapter->stats.o2bspc += rd32(E1000_O2BSPC);
+                adapter->stats.b2ospc += rd32(E1000_B2OSPC);
+                adapter->stats.b2ogprc += rd32(E1000_B2OGPRC);
+        }
 }
 
 static irqreturn_t igb_msix_other(int irq, void *data)
@@ -6593,9 +6721,91 @@ static int igb_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)
         return igb_set_vf_mac(adapter, vf, mac);
 }
 
+static int igb_link_mbps(int internal_link_speed)
+{
+        switch (internal_link_speed) {
+        case SPEED_100:
+                return 100;
+        case SPEED_1000:
+                return 1000;
+        default:
+                return 0;
+        }
+}
+
+static void igb_set_vf_rate_limit(struct e1000_hw *hw, int vf, int tx_rate,
+                                  int link_speed)
+{
+        int rf_dec, rf_int;
+        u32 bcnrc_val;
+
+        if (tx_rate != 0) {
+                /* Calculate the rate factor values to set */
+                rf_int = link_speed / tx_rate;
+                rf_dec = (link_speed - (rf_int * tx_rate));
+                rf_dec = (rf_dec * (1<<E1000_RTTBCNRC_RF_INT_SHIFT)) / tx_rate;
+
+                bcnrc_val = E1000_RTTBCNRC_RS_ENA;
+                bcnrc_val |= ((rf_int<<E1000_RTTBCNRC_RF_INT_SHIFT) &
+                               E1000_RTTBCNRC_RF_INT_MASK);
+                bcnrc_val |= (rf_dec & E1000_RTTBCNRC_RF_DEC_MASK);
+        } else {
+                bcnrc_val = 0;
+        }
+
+        wr32(E1000_RTTDQSEL, vf); /* vf X uses queue X */
+        wr32(E1000_RTTBCNRC, bcnrc_val);
+}
+
+static void igb_check_vf_rate_limit(struct igb_adapter *adapter)
+{
+        int actual_link_speed, i;
+        bool reset_rate = false;
+
+        /* VF TX rate limit was not set or not supported */
+        if ((adapter->vf_rate_link_speed == 0) ||
+            (adapter->hw.mac.type != e1000_82576))
+                return;
+
+        actual_link_speed = igb_link_mbps(adapter->link_speed);
+        if (actual_link_speed != adapter->vf_rate_link_speed) {
+                reset_rate = true;
+                adapter->vf_rate_link_speed = 0;
+                dev_info(&adapter->pdev->dev,
+                         "Link speed has been changed. VF Transmit "
+                         "rate is disabled\n");
+        }
+
+        for (i = 0; i < adapter->vfs_allocated_count; i++) {
+                if (reset_rate)
+                        adapter->vf_data[i].tx_rate = 0;
+
+                igb_set_vf_rate_limit(&adapter->hw, i,
+                                      adapter->vf_data[i].tx_rate,
+                                      actual_link_speed);
+        }
+}
+
 static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate)
 {
-        return -EOPNOTSUPP;
+        struct igb_adapter *adapter = netdev_priv(netdev);
+        struct e1000_hw *hw = &adapter->hw;
+        int actual_link_speed;
+
+        if (hw->mac.type != e1000_82576)
+                return -EOPNOTSUPP;
+
+        actual_link_speed = igb_link_mbps(adapter->link_speed);
+        if ((vf >= adapter->vfs_allocated_count) ||
+            (!(rd32(E1000_STATUS) & E1000_STATUS_LU)) ||
+            (tx_rate < 0) || (tx_rate > actual_link_speed))
+                return -EINVAL;
+
+        adapter->vf_rate_link_speed = actual_link_speed;
+        adapter->vf_data[vf].tx_rate = (u16)tx_rate;
+        igb_set_vf_rate_limit(hw, vf, tx_rate, actual_link_speed);
+
+        return 0;
 }
 
 static int igb_ndo_get_vf_config(struct net_device *netdev,
@@ -6606,7 +6816,7 @@ static int igb_ndo_get_vf_config(struct net_device *netdev,
                 return -EINVAL;
         ivi->vf = vf;
         memcpy(&ivi->mac, adapter->vf_data[vf].vf_mac_addresses, ETH_ALEN);
-        ivi->tx_rate = 0;
+        ivi->tx_rate = adapter->vf_data[vf].tx_rate;
         ivi->vlan = adapter->vf_data[vf].pf_vlan;
         ivi->qos = adapter->vf_data[vf].pf_qos;
         return 0;
diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/igbvf/ethtool.c
index ed6e3d91024..1d943aa7c7a 100644
--- a/drivers/net/igbvf/ethtool.c
+++ b/drivers/net/igbvf/ethtool.c
@@ -201,13 +201,11 @@ static void igbvf_get_regs(struct net_device *netdev,
         struct igbvf_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
         u32 *regs_buff = p;
-        u8 revision_id;
 
         memset(p, 0, IGBVF_REGS_LEN * sizeof(u32));
 
-        pci_read_config_byte(adapter->pdev, PCI_REVISION_ID, &revision_id);
-
-        regs->version = (1 << 24) | (revision_id << 16) | adapter->pdev->device;
+        regs->version = (1 << 24) | (adapter->pdev->revision << 16) |
+                        adapter->pdev->device;
 
         regs_buff[0] = er32(CTRL);
         regs_buff[1] = er32(STATUS);
diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h
index 990c329e6c3..d5dad5d607d 100644
--- a/drivers/net/igbvf/igbvf.h
+++ b/drivers/net/igbvf/igbvf.h
@@ -201,9 +201,6 @@ struct igbvf_adapter {
         unsigned int restart_queue;
         u32 txd_cmd;
 
-        bool detect_tx_hung;
-        u8 tx_timeout_factor;
-
         u32 tx_int_delay;
         u32 tx_abs_int_delay;
 
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index 6352c8158e6..6ccc32fd733 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -396,35 +396,6 @@ static void igbvf_put_txbuf(struct igbvf_adapter *adapter,
         buffer_info->time_stamp = 0;
 }
 
-static void igbvf_print_tx_hang(struct igbvf_adapter *adapter)
-{
-        struct igbvf_ring *tx_ring = adapter->tx_ring;
-        unsigned int i = tx_ring->next_to_clean;
-        unsigned int eop = tx_ring->buffer_info[i].next_to_watch;
-        union e1000_adv_tx_desc *eop_desc = IGBVF_TX_DESC_ADV(*tx_ring, eop);
-
-        /* detected Tx unit hang */
-        dev_err(&adapter->pdev->dev,
-                "Detected Tx Unit Hang:\n"
-                "  TDH                  <%x>\n"
-                "  TDT                  <%x>\n"
-                "  next_to_use          <%x>\n"
-                "  next_to_clean        <%x>\n"
-                "buffer_info[next_to_clean]:\n"
-                "  time_stamp           <%lx>\n"
-                "  next_to_watch        <%x>\n"
-                "  jiffies              <%lx>\n"
-                "  next_to_watch.status <%x>\n",
-                readl(adapter->hw.hw_addr + tx_ring->head),
-                readl(adapter->hw.hw_addr + tx_ring->tail),
-                tx_ring->next_to_use,
-                tx_ring->next_to_clean,
-                tx_ring->buffer_info[eop].time_stamp,
-                eop,
-                jiffies,
-                eop_desc->wb.status);
-}
-
 /**
  * igbvf_setup_tx_resources - allocate Tx resources (Descriptors)
  * @adapter: board private structure
@@ -771,7 +742,6 @@ static void igbvf_set_itr(struct igbvf_adapter *adapter)
 static bool igbvf_clean_tx_irq(struct igbvf_ring *tx_ring)
 {
         struct igbvf_adapter *adapter = tx_ring->adapter;
-        struct e1000_hw *hw = &adapter->hw;
         struct net_device *netdev = adapter->netdev;
         struct igbvf_buffer *buffer_info;
         struct sk_buff *skb;
@@ -832,22 +802,6 @@ static bool igbvf_clean_tx_irq(struct igbvf_ring *tx_ring)
                 }
         }
 
-        if (adapter->detect_tx_hung) {
-                /* Detect a transmit hang in hardware, this serializes the
-                 * check with the clearing of time_stamp and movement of i */
-                adapter->detect_tx_hung = false;
-                if (tx_ring->buffer_info[i].time_stamp &&
-                    time_after(jiffies, tx_ring->buffer_info[i].time_stamp +
-                               (adapter->tx_timeout_factor * HZ)) &&
-                    !(er32(STATUS) & E1000_STATUS_TXOFF)) {
-
-                        tx_desc = IGBVF_TX_DESC_ADV(*tx_ring, i);
-                        /* detected Tx unit hang */
-                        igbvf_print_tx_hang(adapter);
-
-                        netif_stop_queue(netdev);
-                }
-        }
         adapter->net_stats.tx_bytes += total_bytes;
         adapter->net_stats.tx_packets += total_packets;
         return count < tx_ring->count;
@@ -1863,17 +1817,6 @@ static void igbvf_watchdog_task(struct work_struct *work)
                                                   &adapter->link_duplex);
                         igbvf_print_link_info(adapter);
 
-                        /* adjust timeout factor according to speed/duplex */
-                        adapter->tx_timeout_factor = 1;
-                        switch (adapter->link_speed) {
-                        case SPEED_10:
-                                adapter->tx_timeout_factor = 16;
-                                break;
-                        case SPEED_100:
-                                /* maybe add some timeout factor ? */
-                                break;
-                        }
-
                         netif_carrier_on(netdev);
                         netif_wake_queue(netdev);
                 }
@@ -1907,9 +1850,6 @@ static void igbvf_watchdog_task(struct work_struct *work)
         /* Cause software interrupt to ensure Rx ring is cleaned */
         ew32(EICS, adapter->rx_ring->eims_value);
 
-        /* Force detection of hung controller every watchdog period */
-        adapter->detect_tx_hung = 1;
-
         /* Reset the timer */
         if (!test_bit(__IGBVF_DOWN, &adapter->state))
                 mod_timer(&adapter->watchdog_timer,
@@ -2699,8 +2639,7 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
         hw->device_id = pdev->device;
         hw->subsystem_vendor_id = pdev->subsystem_vendor;
         hw->subsystem_device_id = pdev->subsystem_device;
-
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
+        hw->revision_id = pdev->revision;
 
         err = -EIO;
         adapter->hw.hw_addr = ioremap(pci_resource_start(pdev, 0),
diff --git a/drivers/net/igbvf/vf.c b/drivers/net/igbvf/vf.c
index 74486a8b009..af3822f9ea9 100644
--- a/drivers/net/igbvf/vf.c
+++ b/drivers/net/igbvf/vf.c
@@ -220,7 +220,7 @@ static u32 e1000_hash_mc_addr_vf(struct e1000_hw *hw, u8 *mc_addr)
  *  The parameter rar_count will usually be hw->mac.rar_entry_count
  *  unless there are workarounds that change this.
  **/
-void e1000_update_mc_addr_list_vf(struct e1000_hw *hw,
+static void e1000_update_mc_addr_list_vf(struct e1000_hw *hw,
                                   u8 *mc_addr_list, u32 mc_addr_count,
                                   u32 rar_used_count, u32 rar_count)
 {
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index aa93655c3aa..a5b0f0e194b 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -2025,7 +2025,6 @@ static void ipg_init_mii(struct net_device *dev)
 
         if (phyaddr != 0x1f) {
                 u16 mii_phyctrl, mii_1000cr;
-                u8 revisionid = 0;
 
                 mii_1000cr  = mdio_read(dev, phyaddr, MII_CTRL1000);
                 mii_1000cr |= ADVERTISE_1000FULL | ADVERTISE_1000HALF |
@@ -2035,8 +2034,7 @@ static void ipg_init_mii(struct net_device *dev)
                 mii_phyctrl = mdio_read(dev, phyaddr, MII_BMCR);
 
                 /* Set default phyparam */
-                pci_read_config_byte(sp->pdev, PCI_REVISION_ID, &revisionid);
-                ipg_set_phy_default_param(revisionid, dev, phyaddr);
+                ipg_set_phy_default_param(sp->pdev->revision, dev, phyaddr);
 
                 /* Reset PHY */
                 mii_phyctrl |= BMCR_RESET | BMCR_ANRESTART;
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index ee1dde52e8f..3352b2443e5 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -167,7 +167,7 @@ static int irtty_set_dtr_rts(struct sir_dev *dev, int dtr, int rts)
          * let's be careful... Jean II
          */
         IRDA_ASSERT(priv->tty->ops->tiocmset != NULL, return -1;);
-        priv->tty->ops->tiocmset(priv->tty, NULL, set, clear);
+        priv->tty->ops->tiocmset(priv->tty, set, clear);
 
         return 0;
 }
diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c
index 9e3f4f54281..4488bd581ec 100644
--- a/drivers/net/irda/sh_irda.c
+++ b/drivers/net/irda/sh_irda.c
@@ -635,7 +635,7 @@ static int sh_irda_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
 
         ret = sh_irda_set_baudrate(self, speed);
         if (ret < 0)
-                return ret;
+                goto sh_irda_hard_xmit_end;
 
         self->tx_buff.len = 0;
         if (skb->len) {
@@ -652,11 +652,21 @@ static int sh_irda_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
 
                 sh_irda_write(self, IRTFLR, self->tx_buff.len);
                 sh_irda_write(self, IRTCTR, ARMOD | TE);
-        }
+        } else
+                goto sh_irda_hard_xmit_end;
 
         dev_kfree_skb(skb);
 
         return 0;
+
+sh_irda_hard_xmit_end:
+        sh_irda_set_baudrate(self, 9600);
+        netif_wake_queue(self->ndev);
+        sh_irda_rcv_ctrl(self, 1);
+        dev_kfree_skb(skb);
+
+        return ret;
+
 }
 
 static int sh_irda_ioctl(struct net_device *ndev, struct ifreq *ifreq, int cmd)
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
index 521c0c73299..8f3df044e81 100644
--- a/drivers/net/ixgb/ixgb.h
+++ b/drivers/net/ixgb/ixgb.h
@@ -149,7 +149,7 @@ struct ixgb_desc_ring {
 
 struct ixgb_adapter {
         struct timer_list watchdog_timer;
-        struct vlan_group *vlgrp;
+        unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
         u32 bd_number;
         u32 rx_buffer_len;
         u32 part_num;
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c
index 43994c19999..cc53aa1541b 100644
--- a/drivers/net/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ixgb/ixgb_ethtool.c
@@ -706,6 +706,43 @@ ixgb_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
         }
 }
 
+static int ixgb_set_flags(struct net_device *netdev, u32 data)
+{
+        struct ixgb_adapter *adapter = netdev_priv(netdev);
+        bool need_reset;
+        int rc;
+
+        /*
+         * Tx VLAN insertion does not work per HW design when Rx stripping is
+         * disabled.  Disable txvlan when rxvlan is turned off, and enable
+         * rxvlan when txvlan is turned on.
+         */
+        if (!(data & ETH_FLAG_RXVLAN) &&
+            (netdev->features & NETIF_F_HW_VLAN_TX))
+                data &= ~ETH_FLAG_TXVLAN;
+        else if (data & ETH_FLAG_TXVLAN)
+                data |= ETH_FLAG_RXVLAN;
+
+        need_reset = (data & ETH_FLAG_RXVLAN) !=
+                     (netdev->features & NETIF_F_HW_VLAN_RX);
+
+        rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_RXVLAN |
+                                                ETH_FLAG_TXVLAN);
+        if (rc)
+                return rc;
+
+        if (need_reset) {
+                if (netif_running(netdev)) {
+                        ixgb_down(adapter, true);
+                        ixgb_up(adapter);
+                        ixgb_set_speed_duplex(netdev);
+                } else
+                        ixgb_reset(adapter);
+        }
+
+        return 0;
+}
+
 static const struct ethtool_ops ixgb_ethtool_ops = {
         .get_settings = ixgb_get_settings,
         .set_settings = ixgb_set_settings,
@@ -732,6 +769,8 @@ static const struct ethtool_ops ixgb_ethtool_ops = {
         .phys_id = ixgb_phys_id,
         .get_sset_count = ixgb_get_sset_count,
         .get_ethtool_stats = ixgb_get_ethtool_stats,
+        .get_flags = ethtool_op_get_flags,
+        .set_flags = ixgb_set_flags,
 };
 
 void ixgb_set_ethtool_ops(struct net_device *netdev)
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 5639cccb493..0f681ac2da8 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -100,8 +100,6 @@ static void ixgb_tx_timeout_task(struct work_struct *work);
 
 static void ixgb_vlan_strip_enable(struct ixgb_adapter *adapter);
 static void ixgb_vlan_strip_disable(struct ixgb_adapter *adapter);
-static void ixgb_vlan_rx_register(struct net_device *netdev,
-                                  struct vlan_group *grp);
 static void ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
 static void ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
 static void ixgb_restore_vlan(struct ixgb_adapter *adapter);
@@ -336,7 +334,6 @@ static const struct net_device_ops ixgb_netdev_ops = {
         .ndo_set_mac_address    = ixgb_set_mac,
         .ndo_change_mtu         = ixgb_change_mtu,
         .ndo_tx_timeout         = ixgb_tx_timeout,
-        .ndo_vlan_rx_register   = ixgb_vlan_rx_register,
         .ndo_vlan_rx_add_vid    = ixgb_vlan_rx_add_vid,
         .ndo_vlan_rx_kill_vid   = ixgb_vlan_rx_kill_vid,
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -1508,7 +1505,7 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                      DESC_NEEDED)))
                 return NETDEV_TX_BUSY;
 
-        if (adapter->vlgrp && vlan_tx_tag_present(skb)) {
+        if (vlan_tx_tag_present(skb)) {
                 tx_flags |= IXGB_TX_FLAGS_VLAN;
                 vlan_id = vlan_tx_tag_get(skb);
         }
@@ -2049,12 +2046,11 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter, int *work_done, int work_to_do)
                 ixgb_rx_checksum(adapter, rx_desc, skb);
 
                 skb->protocol = eth_type_trans(skb, netdev);
-                if (adapter->vlgrp && (status & IXGB_RX_DESC_STATUS_VP)) {
-                        vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
-                                                le16_to_cpu(rx_desc->special));
-                } else {
-                        netif_receive_skb(skb);
-                }
+                if (status & IXGB_RX_DESC_STATUS_VP)
+                        __vlan_hwaccel_put_tag(skb,
+                                               le16_to_cpu(rx_desc->special));
+
+                netif_receive_skb(skb);
 
 rxdesc_done:
                 /* clean up descriptor, might be written over by hw */
@@ -2152,20 +2148,6 @@ map_skb:
         }
 }
 
-/**
- * ixgb_vlan_rx_register - enables or disables vlan tagging/stripping.
- *
- * @param netdev network interface device structure
- * @param grp indicates to enable or disable tagging/stripping
- **/
-static void
-ixgb_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
-{
-        struct ixgb_adapter *adapter = netdev_priv(netdev);
-
-        adapter->vlgrp = grp;
-}
-
 static void
 ixgb_vlan_strip_enable(struct ixgb_adapter *adapter)
 {
@@ -2200,6 +2182,7 @@ ixgb_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
         vfta = IXGB_READ_REG_ARRAY(&adapter->hw, VFTA, index);
         vfta |= (1 << (vid & 0x1F));
         ixgb_write_vfta(&adapter->hw, index, vfta);
+        set_bit(vid, adapter->active_vlans);
 }
 
 static void
@@ -2208,35 +2191,22 @@ ixgb_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
         struct ixgb_adapter *adapter = netdev_priv(netdev);
         u32 vfta, index;
 
-        ixgb_irq_disable(adapter);
-
-        vlan_group_set_device(adapter->vlgrp, vid, NULL);
-
-        /* don't enable interrupts unless we are UP */
-        if (adapter->netdev->flags & IFF_UP)
-                ixgb_irq_enable(adapter);
-
         /* remove VID from filter table */
 
         index = (vid >> 5) & 0x7F;
         vfta = IXGB_READ_REG_ARRAY(&adapter->hw, VFTA, index);
         vfta &= ~(1 << (vid & 0x1F));
         ixgb_write_vfta(&adapter->hw, index, vfta);
+        clear_bit(vid, adapter->active_vlans);
 }
 
 static void
 ixgb_restore_vlan(struct ixgb_adapter *adapter)
 {
-        ixgb_vlan_rx_register(adapter->netdev, adapter->vlgrp);
-
-        if (adapter->vlgrp) {
-                u16 vid;
-                for (vid = 0; vid < VLAN_N_VID; vid++) {
-                        if (!vlan_group_get_device(adapter->vlgrp, vid))
-                                continue;
-                        ixgb_vlan_rx_add_vid(adapter->netdev, vid);
-                }
-        }
+        u16 vid;
+
+        for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
+                ixgb_vlan_rx_add_vid(adapter->netdev, vid);
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
index 3b8c9246361..8d468028bb5 100644
--- a/drivers/net/ixgbe/ixgbe.h
+++ b/drivers/net/ixgbe/ixgbe.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -118,6 +118,7 @@ struct vf_data_storage {
         bool pf_set_mac;
         u16 pf_vlan; /* When set, guest VLAN config not allowed. */
         u16 pf_qos;
+        u16 tx_rate;
 };
 
 /* wrapper around a pointer to a socket buffer,
@@ -209,6 +210,7 @@ struct ixgbe_ring {
                                          * associated with this ring, which is
                                          * different for DCB and RSS modes
                                          */
+        u8 dcb_tc;
 
         u16 work_limit;                 /* max work per interrupt */
 
@@ -243,7 +245,7 @@ enum ixgbe_ring_f_enum {
         RING_F_ARRAY_SIZE      /* must be last in enum set */
 };
 
-#define IXGBE_MAX_DCB_INDICES   8
+#define IXGBE_MAX_DCB_INDICES  64
 #define IXGBE_MAX_RSS_INDICES  16
 #define IXGBE_MAX_VMDQ_INDICES 64
 #define IXGBE_MAX_FDIR_INDICES 64
@@ -334,9 +336,14 @@ struct ixgbe_adapter {
         u16 bd_number;
         struct work_struct reset_task;
         struct ixgbe_q_vector *q_vector[MAX_MSIX_Q_VECTORS];
+
+        /* DCB parameters */
+        struct ieee_pfc *ixgbe_ieee_pfc;
+        struct ieee_ets *ixgbe_ieee_ets;
         struct ixgbe_dcb_config dcb_cfg;
         struct ixgbe_dcb_config temp_dcb_cfg;
         u8 dcb_set_bitmap;
+        u8 dcbx_cap;
         enum ixgbe_fc_mode last_lfc_mode;
 
         /* Interrupt Throttle Rate */
@@ -462,6 +469,7 @@ struct ixgbe_adapter {
         DECLARE_BITMAP(active_vfs, IXGBE_MAX_VF_FUNCTIONS);
         unsigned int num_vfs;
         struct vf_data_storage *vfinfo;
+        int vf_rate_link_speed;
 };
 
 enum ixbge_state_t {
@@ -521,7 +529,6 @@ extern void ixgbe_unmap_and_free_tx_resource(struct ixgbe_ring *,
 extern void ixgbe_alloc_rx_buffers(struct ixgbe_ring *, u16);
 extern void ixgbe_write_eitr(struct ixgbe_q_vector *);
 extern int ethtool_ioctl(struct ifreq *ifr);
-extern u8 ixgbe_dcb_txq_to_tc(struct ixgbe_adapter *adapter, u8 index);
 extern s32 ixgbe_reinit_fdir_tables_82599(struct ixgbe_hw *hw);
 extern s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 pballoc);
 extern s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 pballoc);
@@ -538,6 +545,7 @@ extern void ixgbe_configure_rscctl(struct ixgbe_adapter *adapter,
 extern void ixgbe_clear_rscctl(struct ixgbe_adapter *adapter,
                                struct ixgbe_ring *ring);
 extern void ixgbe_set_rx_mode(struct net_device *netdev);
+extern int ixgbe_setup_tc(struct net_device *dev, u8 tc);
 #ifdef IXGBE_FCOE
 extern void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter);
 extern int ixgbe_fso(struct ixgbe_adapter *adapter,
@@ -549,6 +557,8 @@ extern int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
                           struct sk_buff *skb);
 extern int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
                               struct scatterlist *sgl, unsigned int sgc);
+extern int ixgbe_fcoe_ddp_target(struct net_device *netdev, u16 xid,
+                                 struct scatterlist *sgl, unsigned int sgc);
 extern int ixgbe_fcoe_ddp_put(struct net_device *netdev, u16 xid);
 extern int ixgbe_fcoe_enable(struct net_device *netdev);
 extern int ixgbe_fcoe_disable(struct net_device *netdev);
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c
index d0f1d9d2c41..845c679c8b8 100644
--- a/drivers/net/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ixgbe/ixgbe_82598.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -158,6 +158,7 @@ static s32 ixgbe_init_phy_ops_82598(struct ixgbe_hw *hw)
 
         switch (hw->phy.type) {
         case ixgbe_phy_tn:
+                phy->ops.setup_link = &ixgbe_setup_phy_link_tnx;
                 phy->ops.check_link = &ixgbe_check_phy_link_tnx;
                 phy->ops.get_firmware_version =
                              &ixgbe_get_phy_firmware_version_tnx;
@@ -280,10 +281,22 @@ static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw)
 {
         enum ixgbe_media_type media_type;
 
+        /* Detect if there is a copper PHY attached. */
+        switch (hw->phy.type) {
+        case ixgbe_phy_cu_unknown:
+        case ixgbe_phy_tn:
+        case ixgbe_phy_aq:
+                media_type = ixgbe_media_type_copper;
+                goto out;
+        default:
+                break;
+        }
+
         /* Media type for I82598 is based on device ID */
         switch (hw->device_id) {
         case IXGBE_DEV_ID_82598:
         case IXGBE_DEV_ID_82598_BX:
+                /* Default device ID is mezzanine card KX/KX4 */
                 media_type = ixgbe_media_type_backplane;
                 break;
         case IXGBE_DEV_ID_82598AF_DUAL_PORT:
@@ -306,7 +319,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw)
                 media_type = ixgbe_media_type_unknown;
                 break;
         }
-
+out:
         return media_type;
 }
 
@@ -354,7 +367,7 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
 
         /* Negotiate the fc mode to use */
         ret_val = ixgbe_fc_autoneg(hw);
-        if (ret_val)
+        if (ret_val == IXGBE_ERR_FLOW_CONTROL)
                 goto out;
 
         /* Disable any previous flow control settings */
@@ -372,10 +385,10 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
          * 2: Tx flow control is enabled (we can send pause frames but
          *     we do not support receiving pause frames).
          * 3: Both Rx and Tx flow control (symmetric) are enabled.
-         * other: Invalid.
 #ifdef CONFIG_DCB
          * 4: Priority Flow Control is enabled.
 #endif
+         * other: Invalid.
          */
         switch (hw->fc.current_mode) {
         case ixgbe_fc_none:
@@ -432,9 +445,10 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw, s32 packetbuf_num)
                 reg = (rx_pba_size - hw->fc.low_water) << 6;
                 if (hw->fc.send_xon)
                         reg |= IXGBE_FCRTL_XONE;
+
                 IXGBE_WRITE_REG(hw, IXGBE_FCRTL(packetbuf_num), reg);
 
-                reg = (rx_pba_size - hw->fc.high_water) << 10;
+                reg = (rx_pba_size - hw->fc.high_water) << 6;
                 reg |= IXGBE_FCRTH_FCEN;
 
                 IXGBE_WRITE_REG(hw, IXGBE_FCRTH(packetbuf_num), reg);
@@ -627,13 +641,12 @@ out:
         return 0;
 }
 
-
 /**
  *  ixgbe_setup_mac_link_82598 - Set MAC link speed
  *  @hw: pointer to hardware structure
  *  @speed: new link speed
  *  @autoneg: true if auto-negotiation enabled
- *  @autoneg_wait_to_complete: true if waiting is needed to complete
+ *  @autoneg_wait_to_complete: true when waiting for completion is needed
  *
  *  Set the link speed in the AUTOC register and restarts link.
  **/
@@ -672,7 +685,8 @@ static s32 ixgbe_setup_mac_link_82598(struct ixgbe_hw *hw,
                  * ixgbe_hw This will write the AUTOC register based on the new
                  * stored values
                  */
-                status = ixgbe_start_mac_link_82598(hw, autoneg_wait_to_complete);
+                status = ixgbe_start_mac_link_82598(hw,
+                                                    autoneg_wait_to_complete);
         }
 
         return status;
@@ -698,7 +712,6 @@ static s32 ixgbe_setup_copper_link_82598(struct ixgbe_hw *hw,
         /* Setup the PHY according to input speed */
         status = hw->phy.ops.setup_link_speed(hw, speed, autoneg,
                                               autoneg_wait_to_complete);
-
         /* Set up MAC */
         ixgbe_start_mac_link_82598(hw, autoneg_wait_to_complete);
 
@@ -770,7 +783,6 @@ static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw)
                 else if (phy_status == IXGBE_ERR_SFP_NOT_PRESENT)
                         goto no_phy_reset;
 
-
                 hw->phy.ops.reset(hw);
         }
 
@@ -779,12 +791,9 @@ no_phy_reset:
          * Prevent the PCI-E bus from from hanging by disabling PCI-E master
          * access and verify no pending requests before reset
          */
-        status = ixgbe_disable_pcie_master(hw);
-        if (status != 0) {
-                status = IXGBE_ERR_MASTER_REQUESTS_PENDING;
-                hw_dbg(hw, "PCI-E Master disable polling has failed.\n");
-        }
+        ixgbe_disable_pcie_master(hw);
 
+mac_reset_top:
         /*
          * Issue global reset to the MAC.  This needs to be a SW reset.
          * If link reset is used, it might reset the MAC when mng is using it
@@ -805,6 +814,19 @@ no_phy_reset:
                 hw_dbg(hw, "Reset polling failed to complete.\n");
         }
 
+        /*
+         * Double resets are required for recovery from certain error
+         * conditions.  Between resets, it is necessary to stall to allow time
+         * for any pending HW events to complete.  We use 1usec since that is
+         * what is needed for ixgbe_disable_pcie_master().  The second reset
+         * then clears out any effects of those events.
+         */
+        if (hw->mac.flags & IXGBE_FLAGS_DOUBLE_RESET_REQUIRED) {
+                hw->mac.flags &= ~IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
+                udelay(1);
+                goto mac_reset_top;
+        }
+
         msleep(50);
 
         gheccr = IXGBE_READ_REG(hw, IXGBE_GHECCR);
@@ -824,15 +846,15 @@ no_phy_reset:
                 IXGBE_WRITE_REG(hw, IXGBE_AUTOC, hw->mac.orig_autoc);
         }
 
+        /* Store the permanent mac address */
+        hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
+
         /*
          * Store MAC address from RAR0, clear receive address registers, and
          * clear the multicast table
          */
         hw->mac.ops.init_rx_addrs(hw);
 
-        /* Store the permanent mac address */
-        hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
-
 reset_hw_out:
         if (phy_status)
                 status = phy_status;
@@ -849,6 +871,13 @@ reset_hw_out:
 static s32 ixgbe_set_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
 {
         u32 rar_high;
+        u32 rar_entries = hw->mac.num_rar_entries;
+
+        /* Make sure we are using a valid rar index range */
+        if (rar >= rar_entries) {
+                hw_dbg(hw, "RAR index %d is out of range.\n", rar);
+                return IXGBE_ERR_INVALID_ARGUMENT;
+        }
 
         rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(rar));
         rar_high &= ~IXGBE_RAH_VIND_MASK;
@@ -868,14 +897,17 @@ static s32 ixgbe_clear_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
         u32 rar_high;
         u32 rar_entries = hw->mac.num_rar_entries;
 
-        if (rar < rar_entries) {
-                rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(rar));
-                if (rar_high & IXGBE_RAH_VIND_MASK) {
-                        rar_high &= ~IXGBE_RAH_VIND_MASK;
-                        IXGBE_WRITE_REG(hw, IXGBE_RAH(rar), rar_high);
-                }
-        } else {
+
+        /* Make sure we are using a valid rar index range */
+        if (rar >= rar_entries) {
                 hw_dbg(hw, "RAR index %d is out of range.\n", rar);
+                return IXGBE_ERR_INVALID_ARGUMENT;
+        }
+
+        rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(rar));
+        if (rar_high & IXGBE_RAH_VIND_MASK) {
+                rar_high &= ~IXGBE_RAH_VIND_MASK;
+                IXGBE_WRITE_REG(hw, IXGBE_RAH(rar), rar_high);
         }
 
         return 0;
@@ -994,13 +1026,12 @@ static s32 ixgbe_write_analog_reg8_82598(struct ixgbe_hw *hw, u32 reg, u8 val)
 }
 
 /**
- *  ixgbe_read_i2c_eeprom_82598 - Read 8 bit EEPROM word of an SFP+ module
- *  over I2C interface through an intermediate phy.
+ *  ixgbe_read_i2c_eeprom_82598 - Reads 8 bit word over I2C interface.
  *  @hw: pointer to hardware structure
  *  @byte_offset: EEPROM byte offset to read
  *  @eeprom_data: value read
  *
- *  Performs byte read operation to SFP module's EEPROM over I2C interface.
+ *  Performs 8 byte read operation to SFP module's EEPROM over I2C interface.
  **/
 static s32 ixgbe_read_i2c_eeprom_82598(struct ixgbe_hw *hw, u8 byte_offset,
                                        u8 *eeprom_data)
@@ -1074,10 +1105,12 @@ static u32 ixgbe_get_supported_physical_layer_82598(struct ixgbe_hw *hw)
 
         /* Copper PHY must be checked before AUTOC LMS to determine correct
          * physical layer because 10GBase-T PHYs use LMS = KX4/KX */
-        if (hw->phy.type == ixgbe_phy_tn ||
-            hw->phy.type == ixgbe_phy_cu_unknown) {
-                hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE, MDIO_MMD_PMAPMD,
-                                     &ext_ability);
+        switch (hw->phy.type) {
+        case ixgbe_phy_tn:
+        case ixgbe_phy_aq:
+        case ixgbe_phy_cu_unknown:
+                hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE,
+                MDIO_MMD_PMAPMD, &ext_ability);
                 if (ext_ability & MDIO_PMA_EXTABLE_10GBT)
                         physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_T;
                 if (ext_ability & MDIO_PMA_EXTABLE_1000BT)
@@ -1085,6 +1118,8 @@ static u32 ixgbe_get_supported_physical_layer_82598(struct ixgbe_hw *hw)
                 if (ext_ability & MDIO_PMA_EXTABLE_100BTX)
                         physical_layer |= IXGBE_PHYSICAL_LAYER_100BASE_TX;
                 goto out;
+        default:
+                break;
         }
 
         switch (autoc & IXGBE_AUTOC_LMS_MASK) {
@@ -1179,13 +1214,14 @@ static struct ixgbe_mac_operations mac_ops_82598 = {
         .set_vmdq               = &ixgbe_set_vmdq_82598,
         .clear_vmdq             = &ixgbe_clear_vmdq_82598,
         .init_rx_addrs          = &ixgbe_init_rx_addrs_generic,
-        .update_uc_addr_list    = &ixgbe_update_uc_addr_list_generic,
         .update_mc_addr_list    = &ixgbe_update_mc_addr_list_generic,
         .enable_mc              = &ixgbe_enable_mc_generic,
         .disable_mc             = &ixgbe_disable_mc_generic,
         .clear_vfta             = &ixgbe_clear_vfta_82598,
         .set_vfta               = &ixgbe_set_vfta_82598,
         .fc_enable              = &ixgbe_fc_enable_82598,
+        .acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,
+        .release_swfw_sync      = &ixgbe_release_swfw_sync,
 };
 
 static struct ixgbe_eeprom_operations eeprom_ops_82598 = {
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index a21f5817685..00aeba385a2 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -112,7 +112,8 @@ static s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw)
                         goto setup_sfp_out;
 
                 /* PHY config will finish before releasing the semaphore */
-                ret_val = ixgbe_acquire_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM);
+                ret_val = hw->mac.ops.acquire_swfw_sync(hw,
+                                                        IXGBE_GSSR_MAC_CSR_SM);
                 if (ret_val != 0) {
                         ret_val = IXGBE_ERR_SWFW_SYNC;
                         goto setup_sfp_out;
@@ -329,11 +330,14 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)
         enum ixgbe_media_type media_type;
 
         /* Detect if there is a copper PHY attached. */
-        if (hw->phy.type == ixgbe_phy_cu_unknown ||
-            hw->phy.type == ixgbe_phy_tn ||
-            hw->phy.type == ixgbe_phy_aq) {
+        switch (hw->phy.type) {
+        case ixgbe_phy_cu_unknown:
+        case ixgbe_phy_tn:
+        case ixgbe_phy_aq:
                 media_type = ixgbe_media_type_copper;
                 goto out;
+        default:
+                break;
         }
 
         switch (hw->device_id) {
@@ -354,6 +358,9 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)
         case IXGBE_DEV_ID_82599_CX4:
                 media_type = ixgbe_media_type_cx4;
                 break;
+        case IXGBE_DEV_ID_82599_T3_LOM:
+                media_type = ixgbe_media_type_copper;
+                break;
         default:
                 media_type = ixgbe_media_type_unknown;
                 break;
@@ -411,14 +418,14 @@ static s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,
         return status;
 }
 
- /**
-  *  ixgbe_disable_tx_laser_multispeed_fiber - Disable Tx laser
-  *  @hw: pointer to hardware structure
-  *
-  *  The base drivers may require better control over SFP+ module
-  *  PHY states.  This includes selectively shutting down the Tx
-  *  laser on the PHY, effectively halting physical link.
-  **/
+/**
+ *  ixgbe_disable_tx_laser_multispeed_fiber - Disable Tx laser
+ *  @hw: pointer to hardware structure
+ *
+ *  The base drivers may require better control over SFP+ module
+ *  PHY states.  This includes selectively shutting down the Tx
+ *  laser on the PHY, effectively halting physical link.
+ **/
 static void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
 {
         u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
@@ -463,8 +470,6 @@ static void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
  **/
 static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)
 {
-        hw_dbg(hw, "ixgbe_flap_tx_laser_multispeed_fiber\n");
-
         if (hw->mac.autotry_restart) {
                 ixgbe_disable_tx_laser_multispeed_fiber(hw);
                 ixgbe_enable_tx_laser_multispeed_fiber(hw);
@@ -487,17 +492,21 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
                                           bool autoneg_wait_to_complete)
 {
         s32 status = 0;
-        ixgbe_link_speed phy_link_speed;
+        ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_UNKNOWN;
         ixgbe_link_speed highest_link_speed = IXGBE_LINK_SPEED_UNKNOWN;
         u32 speedcnt = 0;
         u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
+        u32 i = 0;
         bool link_up = false;
         bool negotiation;
-        int i;
 
         /* Mask off requested but non-supported speeds */
-        hw->mac.ops.get_link_capabilities(hw, &phy_link_speed, &negotiation);
-        speed &= phy_link_speed;
+        status = hw->mac.ops.get_link_capabilities(hw, &link_speed,
+                                                   &negotiation);
+        if (status != 0)
+                return status;
+
+        speed &= link_speed;
 
         /*
          * Try each speed one by one, highest priority first.  We do this in
@@ -508,9 +517,12 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
                 highest_link_speed = IXGBE_LINK_SPEED_10GB_FULL;
 
                 /* If we already have link at this speed, just jump out */
-                hw->mac.ops.check_link(hw, &phy_link_speed, &link_up, false);
+                status = hw->mac.ops.check_link(hw, &link_speed, &link_up,
+                                                false);
+                if (status != 0)
+                        return status;
 
-                if ((phy_link_speed == IXGBE_LINK_SPEED_10GB_FULL) && link_up)
+                if ((link_speed == IXGBE_LINK_SPEED_10GB_FULL) && link_up)
                         goto out;
 
                 /* Set the module link speed */
@@ -522,9 +534,9 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
                 msleep(40);
 
                 status = ixgbe_setup_mac_link_82599(hw,
-                                               IXGBE_LINK_SPEED_10GB_FULL,
-                                               autoneg,
-                                               autoneg_wait_to_complete);
+                                                    IXGBE_LINK_SPEED_10GB_FULL,
+                                                    autoneg,
+                                                    autoneg_wait_to_complete);
                 if (status != 0)
                         return status;
 
@@ -536,14 +548,16 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
                  * Section 73.10.2, we may have to wait up to 500ms if KR is
                  * attempted.  82599 uses the same timing for 10g SFI.
                  */
-
                 for (i = 0; i < 5; i++) {
                         /* Wait for the link partner to also set speed */
                         msleep(100);
 
                         /* If we have link, just jump out */
-                        hw->mac.ops.check_link(hw, &phy_link_speed,
-                                               &link_up, false);
+                        status = hw->mac.ops.check_link(hw, &link_speed,
+                                                        &link_up, false);
+                        if (status != 0)
+                                return status;
+
                         if (link_up)
                                 goto out;
                 }
@@ -555,9 +569,12 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
                         highest_link_speed = IXGBE_LINK_SPEED_1GB_FULL;
 
                 /* If we already have link at this speed, just jump out */
-                hw->mac.ops.check_link(hw, &phy_link_speed, &link_up, false);
+                status = hw->mac.ops.check_link(hw, &link_speed, &link_up,
+                                                false);
+                if (status != 0)
+                        return status;
 
-                if ((phy_link_speed == IXGBE_LINK_SPEED_1GB_FULL) && link_up)
+                if ((link_speed == IXGBE_LINK_SPEED_1GB_FULL) && link_up)
                         goto out;
 
                 /* Set the module link speed */
@@ -570,9 +587,9 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
                 msleep(40);
 
                 status = ixgbe_setup_mac_link_82599(hw,
-                                                      IXGBE_LINK_SPEED_1GB_FULL,
-                                                      autoneg,
-                                                      autoneg_wait_to_complete);
+                                                    IXGBE_LINK_SPEED_1GB_FULL,
+                                                    autoneg,
+                                                    autoneg_wait_to_complete);
                 if (status != 0)
                         return status;
 
@@ -583,7 +600,11 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
                 msleep(100);
 
                 /* If we have link, just jump out */
-                hw->mac.ops.check_link(hw, &phy_link_speed, &link_up, false);
+                status = hw->mac.ops.check_link(hw, &link_speed, &link_up,
+                                                false);
+                if (status != 0)
+                        return status;
+
                 if (link_up)
                         goto out;
         }
@@ -626,13 +647,10 @@ static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,
                                      bool autoneg_wait_to_complete)
 {
         s32 status = 0;
-        ixgbe_link_speed link_speed;
+        ixgbe_link_speed link_speed = IXGBE_LINK_SPEED_UNKNOWN;
         s32 i, j;
         bool link_up = false;
         u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-        struct ixgbe_adapter *adapter = hw->back;
-
-        hw_dbg(hw, "ixgbe_setup_mac_link_smartspeed.\n");
 
          /* Set autoneg_advertised value based on input link speed */
         hw->phy.autoneg_advertised = 0;
@@ -658,7 +676,7 @@ static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,
         for (j = 0; j < IXGBE_SMARTSPEED_MAX_RETRIES; j++) {
                 status = ixgbe_setup_mac_link_82599(hw, speed, autoneg,
                                                     autoneg_wait_to_complete);
-                if (status)
+                if (status != 0)
                         goto out;
 
                 /*
@@ -671,8 +689,11 @@ static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,
                         mdelay(100);
 
                         /* If we have link, just jump out */
-                        hw->mac.ops.check_link(hw, &link_speed,
-                                               &link_up, false);
+                        status = hw->mac.ops.check_link(hw, &link_speed,
+                                                        &link_up, false);
+                        if (status != 0)
+                                goto out;
+
                         if (link_up)
                                 goto out;
                 }
@@ -690,7 +711,7 @@ static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,
         hw->phy.smart_speed_active = true;
         status = ixgbe_setup_mac_link_82599(hw, speed, autoneg,
                                             autoneg_wait_to_complete);
-        if (status)
+        if (status != 0)
                 goto out;
 
         /*
@@ -703,8 +724,11 @@ static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,
                 mdelay(100);
 
                 /* If we have link, just jump out */
-                hw->mac.ops.check_link(hw, &link_speed,
-                                       &link_up, false);
+                status = hw->mac.ops.check_link(hw, &link_speed,
+                                                &link_up, false);
+                if (status != 0)
+                        goto out;
+
                 if (link_up)
                         goto out;
         }
@@ -716,7 +740,7 @@ static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw,
 
 out:
         if (link_up && (link_speed == IXGBE_LINK_SPEED_1GB_FULL))
-                e_info(hw, "Smartspeed has downgraded the link speed from "
+                hw_dbg(hw, "Smartspeed has downgraded the link speed from "
                        "the maximum advertised\n");
         return status;
 }
@@ -748,6 +772,9 @@ static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
 
         /* Check to see if speed passed in is supported. */
         hw->mac.ops.get_link_capabilities(hw, &link_capabilities, &autoneg);
+        if (status != 0)
+                goto out;
+
         speed &= link_capabilities;
 
         if (speed == IXGBE_LINK_SPEED_UNKNOWN) {
@@ -761,7 +788,6 @@ static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
         else
                 orig_autoc = autoc;
 
-
         if (link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR ||
             link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN ||
             link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
@@ -878,7 +904,7 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
 
         /* PHY ops must be identified and initialized prior to reset */
 
-        /* Init PHY and function pointers, perform SFP setup */
+        /* Identify PHY and related function pointers */
         status = hw->phy.ops.init(hw);
 
         if (status == IXGBE_ERR_SFP_NOT_SUPPORTED)
@@ -890,6 +916,9 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
                 hw->phy.sfp_setup_needed = false;
         }
 
+        if (status == IXGBE_ERR_SFP_NOT_SUPPORTED)
+                goto reset_hw_out;
+
         /* Reset PHY */
         if (hw->phy.reset_disable == false && hw->phy.ops.reset != NULL)
                 hw->phy.ops.reset(hw);
@@ -898,12 +927,9 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
          * Prevent the PCI-E bus from from hanging by disabling PCI-E master
          * access and verify no pending requests before reset
          */
-        status = ixgbe_disable_pcie_master(hw);
-        if (status != 0) {
-                status = IXGBE_ERR_MASTER_REQUESTS_PENDING;
-                hw_dbg(hw, "PCI-E Master disable polling has failed.\n");
-        }
+        ixgbe_disable_pcie_master(hw);
 
+mac_reset_top:
         /*
          * Issue global reset to the MAC.  This needs to be a SW reset.
          * If link reset is used, it might reset the MAC when mng is using it
@@ -924,6 +950,19 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
                 hw_dbg(hw, "Reset polling failed to complete.\n");
         }
 
+        /*
+         * Double resets are required for recovery from certain error
+         * conditions.  Between resets, it is necessary to stall to allow time
+         * for any pending HW events to complete.  We use 1usec since that is
+         * what is needed for ixgbe_disable_pcie_master().  The second reset
+         * then clears out any effects of those events.
+         */
+        if (hw->mac.flags & IXGBE_FLAGS_DOUBLE_RESET_REQUIRED) {
+                hw->mac.flags &= ~IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
+                udelay(1);
+                goto mac_reset_top;
+        }
+
         msleep(50);
 
         /*
@@ -951,6 +990,9 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
                 }
         }
 
+        /* Store the permanent mac address */
+        hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
+
         /*
          * Store MAC address from RAR0, clear receive address registers, and
          * clear the multicast table.  Also reset num_rar_entries to 128,
@@ -959,9 +1001,6 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
         hw->mac.num_rar_entries = 128;
         hw->mac.ops.init_rx_addrs(hw);
 
-        /* Store the permanent mac address */
-        hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
-
         /* Store the permanent SAN mac address */
         hw->mac.ops.get_san_mac_addr(hw, hw->mac.san_addr);
 
@@ -1733,13 +1772,34 @@ static s32 ixgbe_start_hw_82599(struct ixgbe_hw *hw)
  *  @hw: pointer to hardware structure
  *
  *  Determines the physical layer module found on the current adapter.
+ *  If PHY already detected, maintains current PHY type in hw struct,
+ *  otherwise executes the PHY detection routine.
  **/
-static s32 ixgbe_identify_phy_82599(struct ixgbe_hw *hw)
+s32 ixgbe_identify_phy_82599(struct ixgbe_hw *hw)
 {
         s32 status = IXGBE_ERR_PHY_ADDR_INVALID;
+
+        /* Detect PHY if not unknown - returns success if already detected. */
         status = ixgbe_identify_phy_generic(hw);
-        if (status != 0)
-                status = ixgbe_identify_sfp_module_generic(hw);
+        if (status != 0) {
+                /* 82599 10GBASE-T requires an external PHY */
+                if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_copper)
+                        goto out;
+                else
+                        status = ixgbe_identify_sfp_module_generic(hw);
+        }
+
+        /* Set PHY type none if no PHY detected */
+        if (hw->phy.type == ixgbe_phy_unknown) {
+                hw->phy.type = ixgbe_phy_none;
+                status = 0;
+        }
+
+        /* Return error if SFP module has been detected but is not supported */
+        if (hw->phy.type == ixgbe_phy_sfp_unsupported)
+                status = IXGBE_ERR_SFP_NOT_SUPPORTED;
+
+out:
         return status;
 }
 
@@ -1763,11 +1823,12 @@ static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw)
 
         hw->phy.ops.identify(hw);
 
-        if (hw->phy.type == ixgbe_phy_tn ||
-            hw->phy.type == ixgbe_phy_aq ||
-            hw->phy.type == ixgbe_phy_cu_unknown) {
+        switch (hw->phy.type) {
+        case ixgbe_phy_tn:
+        case ixgbe_phy_aq:
+        case ixgbe_phy_cu_unknown:
                 hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE, MDIO_MMD_PMAPMD,
-                                     &ext_ability);
+                                                         &ext_ability);
                 if (ext_ability & MDIO_PMA_EXTABLE_10GBT)
                         physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_T;
                 if (ext_ability & MDIO_PMA_EXTABLE_1000BT)
@@ -1775,6 +1836,8 @@ static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw)
                 if (ext_ability & MDIO_PMA_EXTABLE_100BTX)
                         physical_layer |= IXGBE_PHYSICAL_LAYER_100BASE_TX;
                 goto out;
+        default:
+                break;
         }
 
         switch (autoc & IXGBE_AUTOC_LMS_MASK) {
@@ -1886,6 +1949,7 @@ static s32 ixgbe_enable_rx_dma_82599(struct ixgbe_hw *hw, u32 regval)
                 if (secrxreg & IXGBE_SECRXSTAT_SECRX_RDY)
                         break;
                 else
+                        /* Use interrupt-safe sleep just in case */
                         udelay(10);
         }
 
@@ -1995,7 +2059,6 @@ static struct ixgbe_mac_operations mac_ops_82599 = {
         .set_vmdq               = &ixgbe_set_vmdq_generic,
         .clear_vmdq             = &ixgbe_clear_vmdq_generic,
         .init_rx_addrs          = &ixgbe_init_rx_addrs_generic,
-        .update_uc_addr_list    = &ixgbe_update_uc_addr_list_generic,
         .update_mc_addr_list    = &ixgbe_update_mc_addr_list_generic,
         .enable_mc              = &ixgbe_enable_mc_generic,
         .disable_mc             = &ixgbe_disable_mc_generic,
@@ -2006,31 +2069,34 @@ static struct ixgbe_mac_operations mac_ops_82599 = {
         .setup_sfp              = &ixgbe_setup_sfp_modules_82599,
         .set_mac_anti_spoofing  = &ixgbe_set_mac_anti_spoofing,
         .set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing,
+        .acquire_swfw_sync      = &ixgbe_acquire_swfw_sync,
+        .release_swfw_sync      = &ixgbe_release_swfw_sync,
+
 };
 
 static struct ixgbe_eeprom_operations eeprom_ops_82599 = {
-        .init_params            = &ixgbe_init_eeprom_params_generic,
-        .read                   = &ixgbe_read_eerd_generic,
-        .write                  = &ixgbe_write_eeprom_generic,
-        .calc_checksum          = &ixgbe_calc_eeprom_checksum_generic,
-        .validate_checksum      = &ixgbe_validate_eeprom_checksum_generic,
-        .update_checksum        = &ixgbe_update_eeprom_checksum_generic,
+        .init_params            = &ixgbe_init_eeprom_params_generic,
+        .read                   = &ixgbe_read_eerd_generic,
+        .write                  = &ixgbe_write_eeprom_generic,
+        .calc_checksum          = &ixgbe_calc_eeprom_checksum_generic,
+        .validate_checksum      = &ixgbe_validate_eeprom_checksum_generic,
+        .update_checksum        = &ixgbe_update_eeprom_checksum_generic,
 };
 
 static struct ixgbe_phy_operations phy_ops_82599 = {
-        .identify               = &ixgbe_identify_phy_82599,
-        .identify_sfp           = &ixgbe_identify_sfp_module_generic,
-        .init                               = &ixgbe_init_phy_ops_82599,
-        .reset                  = &ixgbe_reset_phy_generic,
-        .read_reg               = &ixgbe_read_phy_reg_generic,
-        .write_reg              = &ixgbe_write_phy_reg_generic,
-        .setup_link             = &ixgbe_setup_phy_link_generic,
-        .setup_link_speed       = &ixgbe_setup_phy_link_speed_generic,
-        .read_i2c_byte          = &ixgbe_read_i2c_byte_generic,
-        .write_i2c_byte         = &ixgbe_write_i2c_byte_generic,
-        .read_i2c_eeprom        = &ixgbe_read_i2c_eeprom_generic,
-        .write_i2c_eeprom       = &ixgbe_write_i2c_eeprom_generic,
-        .check_overtemp         = &ixgbe_tn_check_overtemp,
+        .identify               = &ixgbe_identify_phy_82599,
+        .identify_sfp           = &ixgbe_identify_sfp_module_generic,
+        .init                   = &ixgbe_init_phy_ops_82599,
+        .reset                  = &ixgbe_reset_phy_generic,
+        .read_reg               = &ixgbe_read_phy_reg_generic,
+        .write_reg              = &ixgbe_write_phy_reg_generic,
+        .setup_link             = &ixgbe_setup_phy_link_generic,
+        .setup_link_speed       = &ixgbe_setup_phy_link_speed_generic,
+        .read_i2c_byte          = &ixgbe_read_i2c_byte_generic,
+        .write_i2c_byte         = &ixgbe_write_i2c_byte_generic,
+        .read_i2c_eeprom        = &ixgbe_read_i2c_eeprom_generic,
+        .write_i2c_eeprom       = &ixgbe_write_i2c_eeprom_generic,
+        .check_overtemp         = &ixgbe_tn_check_overtemp,
 };
 
 struct ixgbe_info ixgbe_82599_info = {
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index d5ede2df3e4..bcd952916eb 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -46,10 +46,13 @@ static void ixgbe_raise_eeprom_clk(struct ixgbe_hw *hw, u32 *eec);
 static void ixgbe_lower_eeprom_clk(struct ixgbe_hw *hw, u32 *eec);
 static void ixgbe_release_eeprom(struct ixgbe_hw *hw);
 
-static void ixgbe_enable_rar(struct ixgbe_hw *hw, u32 index);
-static void ixgbe_disable_rar(struct ixgbe_hw *hw, u32 index);
 static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr);
-static void ixgbe_add_uc_addr(struct ixgbe_hw *hw, u8 *addr, u32 vmdq);
+static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw);
+static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw);
+static s32 ixgbe_fc_autoneg_copper(struct ixgbe_hw *hw);
+static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw);
+static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,
+                              u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm);
 static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num);
 
 /**
@@ -139,17 +142,29 @@ s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw)
         IXGBE_READ_REG(hw, IXGBE_MRFC);
         IXGBE_READ_REG(hw, IXGBE_RLEC);
         IXGBE_READ_REG(hw, IXGBE_LXONTXC);
-        IXGBE_READ_REG(hw, IXGBE_LXONRXC);
         IXGBE_READ_REG(hw, IXGBE_LXOFFTXC);
-        IXGBE_READ_REG(hw, IXGBE_LXOFFRXC);
+        if (hw->mac.type >= ixgbe_mac_82599EB) {
+                IXGBE_READ_REG(hw, IXGBE_LXONRXCNT);
+                IXGBE_READ_REG(hw, IXGBE_LXOFFRXCNT);
+        } else {
+                IXGBE_READ_REG(hw, IXGBE_LXONRXC);
+                IXGBE_READ_REG(hw, IXGBE_LXOFFRXC);
+        }
 
         for (i = 0; i < 8; i++) {
                 IXGBE_READ_REG(hw, IXGBE_PXONTXC(i));
-                IXGBE_READ_REG(hw, IXGBE_PXONRXC(i));
                 IXGBE_READ_REG(hw, IXGBE_PXOFFTXC(i));
-                IXGBE_READ_REG(hw, IXGBE_PXOFFRXC(i));
+                if (hw->mac.type >= ixgbe_mac_82599EB) {
+                        IXGBE_READ_REG(hw, IXGBE_PXONRXCNT(i));
+                        IXGBE_READ_REG(hw, IXGBE_PXOFFRXCNT(i));
+                } else {
+                        IXGBE_READ_REG(hw, IXGBE_PXONRXC(i));
+                        IXGBE_READ_REG(hw, IXGBE_PXOFFRXC(i));
+                }
         }
-
+        if (hw->mac.type >= ixgbe_mac_82599EB)
+                for (i = 0; i < 8; i++)
+                        IXGBE_READ_REG(hw, IXGBE_PXON2OFFCNT(i));
         IXGBE_READ_REG(hw, IXGBE_PRC64);
         IXGBE_READ_REG(hw, IXGBE_PRC127);
         IXGBE_READ_REG(hw, IXGBE_PRC255);
@@ -187,9 +202,26 @@ s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw)
         IXGBE_READ_REG(hw, IXGBE_BPTC);
         for (i = 0; i < 16; i++) {
                 IXGBE_READ_REG(hw, IXGBE_QPRC(i));
-                IXGBE_READ_REG(hw, IXGBE_QBRC(i));
                 IXGBE_READ_REG(hw, IXGBE_QPTC(i));
-                IXGBE_READ_REG(hw, IXGBE_QBTC(i));
+                if (hw->mac.type >= ixgbe_mac_82599EB) {
+                        IXGBE_READ_REG(hw, IXGBE_QBRC_L(i));
+                        IXGBE_READ_REG(hw, IXGBE_QBRC_H(i));
+                        IXGBE_READ_REG(hw, IXGBE_QBTC_L(i));
+                        IXGBE_READ_REG(hw, IXGBE_QBTC_H(i));
+                        IXGBE_READ_REG(hw, IXGBE_QPRDC(i));
+                } else {
+                        IXGBE_READ_REG(hw, IXGBE_QBRC(i));
+                        IXGBE_READ_REG(hw, IXGBE_QBTC(i));
+                }
+        }
+
+        if (hw->mac.type == ixgbe_mac_X540) {
+                if (hw->phy.id == 0)
+                        hw->phy.ops.identify(hw);
+                hw->phy.ops.read_reg(hw, 0x3, IXGBE_PCRC8ECL, &i);
+                hw->phy.ops.read_reg(hw, 0x3, IXGBE_PCRC8ECH, &i);
+                hw->phy.ops.read_reg(hw, 0x3, IXGBE_LDPCECL, &i);
+                hw->phy.ops.read_reg(hw, 0x3, IXGBE_LDPCECH, &i);
         }
 
         return 0;
@@ -454,8 +486,7 @@ s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw)
          * Prevent the PCI-E bus from from hanging by disabling PCI-E master
          * access and verify no pending requests
          */
-        if (ixgbe_disable_pcie_master(hw) != 0)
-                hw_dbg(hw, "PCI-E Master disable polling has failed.\n");
+        ixgbe_disable_pcie_master(hw);
 
         return 0;
 }
@@ -603,7 +634,6 @@ s32 ixgbe_write_eeprom_generic(struct ixgbe_hw *hw, u16 offset, u16 data)
                 ixgbe_shift_out_eeprom_bits(hw, data, 16);
                 ixgbe_standby_eeprom(hw);
 
-                msleep(hw->eeprom.semaphore_delay);
                 /* Done with writing - release the EEPROM */
                 ixgbe_release_eeprom(hw);
         }
@@ -747,10 +777,10 @@ s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg)
 static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw)
 {
         s32 status = 0;
-        u32 eec = 0;
+        u32 eec;
         u32 i;
 
-        if (ixgbe_acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) != 0)
+        if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) != 0)
                 status = IXGBE_ERR_SWFW_SYNC;
 
         if (status == 0) {
@@ -773,18 +803,18 @@ static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw)
                         IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
                         hw_dbg(hw, "Could not acquire EEPROM grant\n");
 
-                        ixgbe_release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+                        hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
                         status = IXGBE_ERR_EEPROM;
                 }
-        }
 
-        /* Setup EEPROM for Read/Write */
-        if (status == 0) {
-                /* Clear CS and SK */
-                eec &= ~(IXGBE_EEC_CS | IXGBE_EEC_SK);
-                IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
-                IXGBE_WRITE_FLUSH(hw);
-                udelay(1);
+                /* Setup EEPROM for Read/Write */
+                if (status == 0) {
+                        /* Clear CS and SK */
+                        eec &= ~(IXGBE_EEC_CS | IXGBE_EEC_SK);
+                        IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
+                        IXGBE_WRITE_FLUSH(hw);
+                        udelay(1);
+                }
         }
         return status;
 }
@@ -798,13 +828,10 @@ static s32 ixgbe_acquire_eeprom(struct ixgbe_hw *hw)
 static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw)
 {
         s32 status = IXGBE_ERR_EEPROM;
-        u32 timeout;
+        u32 timeout = 2000;
         u32 i;
         u32 swsm;
 
-        /* Set timeout value based on size of EEPROM */
-        timeout = hw->eeprom.word_size + 1;
-
         /* Get SMBI software semaphore between device drivers first */
         for (i = 0; i < timeout; i++) {
                 /*
@@ -816,7 +843,7 @@ static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw)
                         status = 0;
                         break;
                 }
-                msleep(1);
+                udelay(50);
         }
 
         /* Now get the semaphore between SW/FW through the SWESMBI bit */
@@ -844,11 +871,14 @@ static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw)
                  * was not granted because we don't have access to the EEPROM
                  */
                 if (i >= timeout) {
-                        hw_dbg(hw, "Driver can't access the Eeprom - Semaphore "
+                        hw_dbg(hw, "SWESMBI Software EEPROM semaphore "
                                "not granted.\n");
                         ixgbe_release_eeprom_semaphore(hw);
                         status = IXGBE_ERR_EEPROM;
                 }
+        } else {
+                hw_dbg(hw, "Software semaphore SMBI between device drivers "
+                       "not granted.\n");
         }
 
         return status;
@@ -1080,11 +1110,14 @@ static void ixgbe_release_eeprom(struct ixgbe_hw *hw)
         eec &= ~IXGBE_EEC_REQ;
         IXGBE_WRITE_REG(hw, IXGBE_EEC, eec);
 
-        ixgbe_release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+        hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
+
+        /* Delay before attempt to obtain semaphore again to allow FW access */
+        msleep(hw->eeprom.semaphore_delay);
 }
 
 /**
- *  ixgbe_calc_eeprom_checksum - Calculates and returns the checksum
+ *  ixgbe_calc_eeprom_checksum_generic - Calculates and returns the checksum
  *  @hw: pointer to hardware structure
  **/
 u16 ixgbe_calc_eeprom_checksum_generic(struct ixgbe_hw *hw)
@@ -1190,7 +1223,7 @@ s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw)
         if (status == 0) {
                 checksum = hw->eeprom.ops.calc_checksum(hw);
                 status = hw->eeprom.ops.write(hw, IXGBE_EEPROM_CHECKSUM,
-                                            checksum);
+                                              checksum);
         } else {
                 hw_dbg(hw, "EEPROM read failed\n");
         }
@@ -1238,37 +1271,37 @@ s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
         u32 rar_low, rar_high;
         u32 rar_entries = hw->mac.num_rar_entries;
 
+        /* Make sure we are using a valid rar index range */
+        if (index >= rar_entries) {
+                hw_dbg(hw, "RAR index %d is out of range.\n", index);
+                return IXGBE_ERR_INVALID_ARGUMENT;
+        }
+
         /* setup VMDq pool selection before this RAR gets enabled */
         hw->mac.ops.set_vmdq(hw, index, vmdq);
 
-        /* Make sure we are using a valid rar index range */
-        if (index < rar_entries) {
-                /*
-                 * HW expects these in little endian so we reverse the byte
-                 * order from network order (big endian) to little endian
-                 */
-                rar_low = ((u32)addr[0] |
-                           ((u32)addr[1] << 8) |
-                           ((u32)addr[2] << 16) |
-                           ((u32)addr[3] << 24));
-                /*
-                 * Some parts put the VMDq setting in the extra RAH bits,
-                 * so save everything except the lower 16 bits that hold part
-                 * of the address and the address valid bit.
-                 */
-                rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));
-                rar_high &= ~(0x0000FFFF | IXGBE_RAH_AV);
-                rar_high |= ((u32)addr[4] | ((u32)addr[5] << 8));
+        /*
+         * HW expects these in little endian so we reverse the byte
+         * order from network order (big endian) to little endian
+         */
+        rar_low = ((u32)addr[0] |
+                   ((u32)addr[1] << 8) |
+                   ((u32)addr[2] << 16) |
+                   ((u32)addr[3] << 24));
+        /*
+         * Some parts put the VMDq setting in the extra RAH bits,
+         * so save everything except the lower 16 bits that hold part
+         * of the address and the address valid bit.
+         */
+        rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));
+        rar_high &= ~(0x0000FFFF | IXGBE_RAH_AV);
+        rar_high |= ((u32)addr[4] | ((u32)addr[5] << 8));
 
-                if (enable_addr != 0)
-                        rar_high |= IXGBE_RAH_AV;
+        if (enable_addr != 0)
+                rar_high |= IXGBE_RAH_AV;
 
-                IXGBE_WRITE_REG(hw, IXGBE_RAL(index), rar_low);
-                IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
-        } else {
-                hw_dbg(hw, "RAR index %d is out of range.\n", index);
-                return IXGBE_ERR_RAR_INDEX;
-        }
+        IXGBE_WRITE_REG(hw, IXGBE_RAL(index), rar_low);
+        IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
 
         return 0;
 }
@@ -1286,58 +1319,26 @@ s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index)
         u32 rar_entries = hw->mac.num_rar_entries;
 
         /* Make sure we are using a valid rar index range */
-        if (index < rar_entries) {
-                /*
-                 * Some parts put the VMDq setting in the extra RAH bits,
-                 * so save everything except the lower 16 bits that hold part
-                 * of the address and the address valid bit.
-                 */
-                rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));
-                rar_high &= ~(0x0000FFFF | IXGBE_RAH_AV);
-
-                IXGBE_WRITE_REG(hw, IXGBE_RAL(index), 0);
-                IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
-        } else {
+        if (index >= rar_entries) {
                 hw_dbg(hw, "RAR index %d is out of range.\n", index);
-                return IXGBE_ERR_RAR_INDEX;
+                return IXGBE_ERR_INVALID_ARGUMENT;
         }
 
-        /* clear VMDq pool/queue selection for this RAR */
-        hw->mac.ops.clear_vmdq(hw, index, IXGBE_CLEAR_VMDQ_ALL);
-
-        return 0;
-}
-
-/**
- *  ixgbe_enable_rar - Enable Rx address register
- *  @hw: pointer to hardware structure
- *  @index: index into the RAR table
- *
- *  Enables the select receive address register.
- **/
-static void ixgbe_enable_rar(struct ixgbe_hw *hw, u32 index)
-{
-        u32 rar_high;
-
+        /*
+         * Some parts put the VMDq setting in the extra RAH bits,
+         * so save everything except the lower 16 bits that hold part
+         * of the address and the address valid bit.
+         */
         rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));
-        rar_high |= IXGBE_RAH_AV;
+        rar_high &= ~(0x0000FFFF | IXGBE_RAH_AV);
+
+        IXGBE_WRITE_REG(hw, IXGBE_RAL(index), 0);
         IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
-}
 
-/**
- *  ixgbe_disable_rar - Disable Rx address register
- *  @hw: pointer to hardware structure
- *  @index: index into the RAR table
- *
- *  Disables the select receive address register.
- **/
-static void ixgbe_disable_rar(struct ixgbe_hw *hw, u32 index)
-{
-        u32 rar_high;
+        /* clear VMDq pool/queue selection for this RAR */
+        hw->mac.ops.clear_vmdq(hw, index, IXGBE_CLEAR_VMDQ_ALL);
 
-        rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(index));
-        rar_high &= (~IXGBE_RAH_AV);
-        IXGBE_WRITE_REG(hw, IXGBE_RAH(index), rar_high);
+        return 0;
 }
 
 /**
@@ -1370,6 +1371,9 @@ s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw)
                 hw_dbg(hw, " New MAC Addr =%pM\n", hw->mac.addr);
 
                 hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0, IXGBE_RAH_AV);
+
+                /*  clear VMDq pool/queue selection for RAR 0 */
+                hw->mac.ops.clear_vmdq(hw, 0, IXGBE_CLEAR_VMDQ_ALL);
         }
         hw->addr_ctrl.overflow_promisc = 0;
 
@@ -1383,7 +1387,6 @@ s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw)
         }
 
         /* Clear the MTA */
-        hw->addr_ctrl.mc_addr_in_rar_count = 0;
         hw->addr_ctrl.mta_in_use = 0;
         IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL, hw->mac.mc_filter_type);
 
@@ -1398,105 +1401,6 @@ s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw)
 }
 
 /**
- *  ixgbe_add_uc_addr - Adds a secondary unicast address.
- *  @hw: pointer to hardware structure
- *  @addr: new address
- *
- *  Adds it to unused receive address register or goes into promiscuous mode.
- **/
-static void ixgbe_add_uc_addr(struct ixgbe_hw *hw, u8 *addr, u32 vmdq)
-{
-        u32 rar_entries = hw->mac.num_rar_entries;
-        u32 rar;
-
-        hw_dbg(hw, " UC Addr = %.2X %.2X %.2X %.2X %.2X %.2X\n",
-                  addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
-
-        /*
-         * Place this address in the RAR if there is room,
-         * else put the controller into promiscuous mode
-         */
-        if (hw->addr_ctrl.rar_used_count < rar_entries) {
-                rar = hw->addr_ctrl.rar_used_count -
-                      hw->addr_ctrl.mc_addr_in_rar_count;
-                hw->mac.ops.set_rar(hw, rar, addr, vmdq, IXGBE_RAH_AV);
-                hw_dbg(hw, "Added a secondary address to RAR[%d]\n", rar);
-                hw->addr_ctrl.rar_used_count++;
-        } else {
-                hw->addr_ctrl.overflow_promisc++;
-        }
-
-        hw_dbg(hw, "ixgbe_add_uc_addr Complete\n");
-}
-
-/**
- *  ixgbe_update_uc_addr_list_generic - Updates MAC list of secondary addresses
- *  @hw: pointer to hardware structure
- *  @netdev: pointer to net device structure
- *
- *  The given list replaces any existing list.  Clears the secondary addrs from
- *  receive address registers.  Uses unused receive address registers for the
- *  first secondary addresses, and falls back to promiscuous mode as needed.
- *
- *  Drivers using secondary unicast addresses must set user_set_promisc when
- *  manually putting the device into promiscuous mode.
- **/
-s32 ixgbe_update_uc_addr_list_generic(struct ixgbe_hw *hw,
-                                      struct net_device *netdev)
-{
-        u32 i;
-        u32 old_promisc_setting = hw->addr_ctrl.overflow_promisc;
-        u32 uc_addr_in_use;
-        u32 fctrl;
-        struct netdev_hw_addr *ha;
-
-        /*
-         * Clear accounting of old secondary address list,
-         * don't count RAR[0]
-         */
-        uc_addr_in_use = hw->addr_ctrl.rar_used_count - 1;
-        hw->addr_ctrl.rar_used_count -= uc_addr_in_use;
-        hw->addr_ctrl.overflow_promisc = 0;
-
-        /* Zero out the other receive addresses */
-        hw_dbg(hw, "Clearing RAR[1-%d]\n", uc_addr_in_use + 1);
-        for (i = 0; i < uc_addr_in_use; i++) {
-                IXGBE_WRITE_REG(hw, IXGBE_RAL(1+i), 0);
-                IXGBE_WRITE_REG(hw, IXGBE_RAH(1+i), 0);
-        }
-
-        /* Add the new addresses */
-        netdev_for_each_uc_addr(ha, netdev) {
-                hw_dbg(hw, " Adding the secondary addresses:\n");
-                ixgbe_add_uc_addr(hw, ha->addr, 0);
-        }
-
-        if (hw->addr_ctrl.overflow_promisc) {
-                /* enable promisc if not already in overflow or set by user */
-                if (!old_promisc_setting && !hw->addr_ctrl.user_set_promisc) {
-                        hw_dbg(hw, " Entering address overflow promisc mode\n");
-                        fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
-                        fctrl |= IXGBE_FCTRL_UPE;
-                        IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
-                        hw->addr_ctrl.uc_set_promisc = true;
-                }
-        } else {
-                /* only disable if set by overflow, not by user */
-                if ((old_promisc_setting && hw->addr_ctrl.uc_set_promisc) &&
-                   !(hw->addr_ctrl.user_set_promisc)) {
-                        hw_dbg(hw, " Leaving address overflow promisc mode\n");
-                        fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL);
-                        fctrl &= ~IXGBE_FCTRL_UPE;
-                        IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl);
-                        hw->addr_ctrl.uc_set_promisc = false;
-                }
-        }
-
-        hw_dbg(hw, "ixgbe_update_uc_addr_list_generic Complete\n");
-        return 0;
-}
-
-/**
  *  ixgbe_mta_vector - Determines bit-vector in multicast table to set
  *  @hw: pointer to hardware structure
  *  @mc_addr: the multicast address
@@ -1547,7 +1451,6 @@ static void ixgbe_set_mta(struct ixgbe_hw *hw, u8 *mc_addr)
         u32 vector;
         u32 vector_bit;
         u32 vector_reg;
-        u32 mta_reg;
 
         hw->addr_ctrl.mta_in_use++;
 
@@ -1565,9 +1468,7 @@ static void ixgbe_set_mta(struct ixgbe_hw *hw, u8 *mc_addr)
          */
         vector_reg = (vector >> 5) & 0x7F;
         vector_bit = vector & 0x1F;
-        mta_reg = IXGBE_READ_REG(hw, IXGBE_MTA(vector_reg));
-        mta_reg |= (1 << vector_bit);
-        IXGBE_WRITE_REG(hw, IXGBE_MTA(vector_reg), mta_reg);
+        hw->mac.mta_shadow[vector_reg] |= (1 << vector_bit);
 }
 
 /**
@@ -1593,18 +1494,21 @@ s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw,
         hw->addr_ctrl.num_mc_addrs = netdev_mc_count(netdev);
         hw->addr_ctrl.mta_in_use = 0;
 
-        /* Clear the MTA */
+        /* Clear mta_shadow */
         hw_dbg(hw, " Clearing MTA\n");
-        for (i = 0; i < hw->mac.mcft_size; i++)
-                IXGBE_WRITE_REG(hw, IXGBE_MTA(i), 0);
+        memset(&hw->mac.mta_shadow, 0, sizeof(hw->mac.mta_shadow));
 
-        /* Add the new addresses */
+        /* Update mta shadow */
         netdev_for_each_mc_addr(ha, netdev) {
                 hw_dbg(hw, " Adding the multicast addresses:\n");
                 ixgbe_set_mta(hw, ha->addr);
         }
 
         /* Enable mta */
+        for (i = 0; i < hw->mac.mcft_size; i++)
+                IXGBE_WRITE_REG_ARRAY(hw, IXGBE_MTA(0), i,
+                                      hw->mac.mta_shadow[i]);
+
         if (hw->addr_ctrl.mta_in_use > 0)
                 IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL,
                                 IXGBE_MCSTCTRL_MFE | hw->mac.mc_filter_type);
@@ -1621,15 +1525,8 @@ s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw,
  **/
 s32 ixgbe_enable_mc_generic(struct ixgbe_hw *hw)
 {
-        u32 i;
-        u32 rar_entries = hw->mac.num_rar_entries;
         struct ixgbe_addr_filter_info *a = &hw->addr_ctrl;
 
-        if (a->mc_addr_in_rar_count > 0)
-                for (i = (rar_entries - a->mc_addr_in_rar_count);
-                     i < rar_entries; i++)
-                        ixgbe_enable_rar(hw, i);
-
         if (a->mta_in_use > 0)
                 IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL, IXGBE_MCSTCTRL_MFE |
                                 hw->mac.mc_filter_type);
@@ -1645,15 +1542,8 @@ s32 ixgbe_enable_mc_generic(struct ixgbe_hw *hw)
  **/
 s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw)
 {
-        u32 i;
-        u32 rar_entries = hw->mac.num_rar_entries;
         struct ixgbe_addr_filter_info *a = &hw->addr_ctrl;
 
-        if (a->mc_addr_in_rar_count > 0)
-                for (i = (rar_entries - a->mc_addr_in_rar_count);
-                     i < rar_entries; i++)
-                        ixgbe_disable_rar(hw, i);
-
         if (a->mta_in_use > 0)
                 IXGBE_WRITE_REG(hw, IXGBE_MCSTCTRL, hw->mac.mc_filter_type);
 
@@ -1682,7 +1572,7 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num)
 #endif /* CONFIG_DCB */
         /* Negotiate the fc mode to use */
         ret_val = ixgbe_fc_autoneg(hw);
-        if (ret_val)
+        if (ret_val == IXGBE_ERR_FLOW_CONTROL)
                 goto out;
 
         /* Disable any previous flow control settings */
@@ -1700,7 +1590,9 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw, s32 packetbuf_num)
          * 2: Tx flow control is enabled (we can send pause frames but
          *    we do not support receiving pause frames).
          * 3: Both Rx and Tx flow control (symmetric) are enabled.
+#ifdef CONFIG_DCB
          * 4: Priority Flow Control is enabled.
+#endif
          * other: Invalid.
          */
         switch (hw->fc.current_mode) {
@@ -1788,12 +1680,13 @@ out:
  **/
 s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw)
 {
-        s32 ret_val = 0;
+        s32 ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
         ixgbe_link_speed speed;
-        u32 pcs_anadv_reg, pcs_lpab_reg, linkstat;
-        u32 links2, anlp1_reg, autoc_reg, links;
         bool link_up;
 
+        if (hw->fc.disable_fc_autoneg)
+                goto out;
+
         /*
          * AN should have completed when the cable was plugged in.
          * Look for reasons to bail out.  Bail out if:
@@ -1804,153 +1697,199 @@ s32 ixgbe_fc_autoneg(struct ixgbe_hw *hw)
          * So use link_up_wait_to_complete=false.
          */
         hw->mac.ops.check_link(hw, &speed, &link_up, false);
-
-        if (hw->fc.disable_fc_autoneg || (!link_up)) {
-                hw->fc.fc_was_autonegged = false;
-                hw->fc.current_mode = hw->fc.requested_mode;
+        if (!link_up) {
+                ret_val = IXGBE_ERR_FLOW_CONTROL;
                 goto out;
         }
 
-        /*
-         * On backplane, bail out if
-         * - backplane autoneg was not completed, or if
-         * - we are 82599 and link partner is not AN enabled
-         */
-        if (hw->phy.media_type == ixgbe_media_type_backplane) {
-                links = IXGBE_READ_REG(hw, IXGBE_LINKS);
-                if ((links & IXGBE_LINKS_KX_AN_COMP) == 0) {
-                        hw->fc.fc_was_autonegged = false;
-                        hw->fc.current_mode = hw->fc.requested_mode;
-                        goto out;
-                }
+        switch (hw->phy.media_type) {
+        /* Autoneg flow control on fiber adapters */
+        case ixgbe_media_type_fiber:
+                if (speed == IXGBE_LINK_SPEED_1GB_FULL)
+                        ret_val = ixgbe_fc_autoneg_fiber(hw);
+                break;
 
-                if (hw->mac.type == ixgbe_mac_82599EB) {
-                        links2 = IXGBE_READ_REG(hw, IXGBE_LINKS2);
-                        if ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0) {
-                                hw->fc.fc_was_autonegged = false;
-                                hw->fc.current_mode = hw->fc.requested_mode;
-                                goto out;
-                        }
-                }
+        /* Autoneg flow control on backplane adapters */
+        case ixgbe_media_type_backplane:
+                ret_val = ixgbe_fc_autoneg_backplane(hw);
+                break;
+
+        /* Autoneg flow control on copper adapters */
+        case ixgbe_media_type_copper:
+                if (ixgbe_device_supports_autoneg_fc(hw) == 0)
+                        ret_val = ixgbe_fc_autoneg_copper(hw);
+                break;
+
+        default:
+                break;
         }
 
+out:
+        if (ret_val == 0) {
+                hw->fc.fc_was_autonegged = true;
+        } else {
+                hw->fc.fc_was_autonegged = false;
+                hw->fc.current_mode = hw->fc.requested_mode;
+        }
+        return ret_val;
+}
+
+/**
+ *  ixgbe_fc_autoneg_fiber - Enable flow control on 1 gig fiber
+ *  @hw: pointer to hardware structure
+ *
+ *  Enable flow control according on 1 gig fiber.
+ **/
+static s32 ixgbe_fc_autoneg_fiber(struct ixgbe_hw *hw)
+{
+        u32 pcs_anadv_reg, pcs_lpab_reg, linkstat;
+        s32 ret_val;
+
         /*
          * On multispeed fiber at 1g, bail out if
          * - link is up but AN did not complete, or if
          * - link is up and AN completed but timed out
          */
-        if (hw->phy.multispeed_fiber && (speed == IXGBE_LINK_SPEED_1GB_FULL)) {
-                linkstat = IXGBE_READ_REG(hw, IXGBE_PCS1GLSTA);
-                if (((linkstat & IXGBE_PCS1GLSTA_AN_COMPLETE) == 0) ||
-                    ((linkstat & IXGBE_PCS1GLSTA_AN_TIMED_OUT) == 1)) {
-                        hw->fc.fc_was_autonegged = false;
-                        hw->fc.current_mode = hw->fc.requested_mode;
-                        goto out;
-                }
+
+        linkstat = IXGBE_READ_REG(hw, IXGBE_PCS1GLSTA);
+        if (((linkstat & IXGBE_PCS1GLSTA_AN_COMPLETE) == 0) ||
+            ((linkstat & IXGBE_PCS1GLSTA_AN_TIMED_OUT) == 1)) {
+                ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
+                goto out;
         }
 
+        pcs_anadv_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
+        pcs_lpab_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANLP);
+
+        ret_val =  ixgbe_negotiate_fc(hw, pcs_anadv_reg,
+                               pcs_lpab_reg, IXGBE_PCS1GANA_SYM_PAUSE,
+                               IXGBE_PCS1GANA_ASM_PAUSE,
+                               IXGBE_PCS1GANA_SYM_PAUSE,
+                               IXGBE_PCS1GANA_ASM_PAUSE);
+
+out:
+        return ret_val;
+}
+
+/**
+ *  ixgbe_fc_autoneg_backplane - Enable flow control IEEE clause 37
+ *  @hw: pointer to hardware structure
+ *
+ *  Enable flow control according to IEEE clause 37.
+ **/
+static s32 ixgbe_fc_autoneg_backplane(struct ixgbe_hw *hw)
+{
+        u32 links2, anlp1_reg, autoc_reg, links;
+        s32 ret_val;
+
         /*
-         * Bail out on
-         * - copper or CX4 adapters
-         * - fiber adapters running at 10gig
+         * On backplane, bail out if
+         * - backplane autoneg was not completed, or if
+         * - we are 82599 and link partner is not AN enabled
          */
-        if ((hw->phy.media_type == ixgbe_media_type_copper) ||
-             (hw->phy.media_type == ixgbe_media_type_cx4) ||
-             ((hw->phy.media_type == ixgbe_media_type_fiber) &&
-             (speed == IXGBE_LINK_SPEED_10GB_FULL))) {
+        links = IXGBE_READ_REG(hw, IXGBE_LINKS);
+        if ((links & IXGBE_LINKS_KX_AN_COMP) == 0) {
                 hw->fc.fc_was_autonegged = false;
                 hw->fc.current_mode = hw->fc.requested_mode;
+                ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
                 goto out;
         }
 
+        if (hw->mac.type == ixgbe_mac_82599EB) {
+                links2 = IXGBE_READ_REG(hw, IXGBE_LINKS2);
+                if ((links2 & IXGBE_LINKS2_AN_SUPPORTED) == 0) {
+                        hw->fc.fc_was_autonegged = false;
+                        hw->fc.current_mode = hw->fc.requested_mode;
+                        ret_val = IXGBE_ERR_FC_NOT_NEGOTIATED;
+                        goto out;
+                }
+        }
         /*
-         * Read the AN advertisement and LP ability registers and resolve
+         * Read the 10g AN autoc and LP ability registers and resolve
          * local flow control settings accordingly
          */
-        if ((speed == IXGBE_LINK_SPEED_1GB_FULL) &&
-            (hw->phy.media_type != ixgbe_media_type_backplane)) {
-                pcs_anadv_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
-                pcs_lpab_reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANLP);
-                if ((pcs_anadv_reg & IXGBE_PCS1GANA_SYM_PAUSE) &&
-                    (pcs_lpab_reg & IXGBE_PCS1GANA_SYM_PAUSE)) {
-                        /*
-                         * Now we need to check if the user selected Rx ONLY
-                         * of pause frames.  In this case, we had to advertise
-                         * FULL flow control because we could not advertise RX
-                         * ONLY. Hence, we must now check to see if we need to
-                         * turn OFF the TRANSMISSION of PAUSE frames.
-                         */
-                        if (hw->fc.requested_mode == ixgbe_fc_full) {
-                                hw->fc.current_mode = ixgbe_fc_full;
-                                hw_dbg(hw, "Flow Control = FULL.\n");
-                        } else {
-                                hw->fc.current_mode = ixgbe_fc_rx_pause;
-                                hw_dbg(hw, "Flow Control=RX PAUSE only\n");
-                        }
-                } else if (!(pcs_anadv_reg & IXGBE_PCS1GANA_SYM_PAUSE) &&
-                           (pcs_anadv_reg & IXGBE_PCS1GANA_ASM_PAUSE) &&
-                           (pcs_lpab_reg & IXGBE_PCS1GANA_SYM_PAUSE) &&
-                           (pcs_lpab_reg & IXGBE_PCS1GANA_ASM_PAUSE)) {
-                        hw->fc.current_mode = ixgbe_fc_tx_pause;
-                        hw_dbg(hw, "Flow Control = TX PAUSE frames only.\n");
-                } else if ((pcs_anadv_reg & IXGBE_PCS1GANA_SYM_PAUSE) &&
-                           (pcs_anadv_reg & IXGBE_PCS1GANA_ASM_PAUSE) &&
-                           !(pcs_lpab_reg & IXGBE_PCS1GANA_SYM_PAUSE) &&
-                           (pcs_lpab_reg & IXGBE_PCS1GANA_ASM_PAUSE)) {
-                        hw->fc.current_mode = ixgbe_fc_rx_pause;
-                        hw_dbg(hw, "Flow Control = RX PAUSE frames only.\n");
-                } else {
-                        hw->fc.current_mode = ixgbe_fc_none;
-                        hw_dbg(hw, "Flow Control = NONE.\n");
-                }
-        }
+        autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+        anlp1_reg = IXGBE_READ_REG(hw, IXGBE_ANLP1);
 
-        if (hw->phy.media_type == ixgbe_media_type_backplane) {
+        ret_val = ixgbe_negotiate_fc(hw, autoc_reg,
+                anlp1_reg, IXGBE_AUTOC_SYM_PAUSE, IXGBE_AUTOC_ASM_PAUSE,
+                IXGBE_ANLP1_SYM_PAUSE, IXGBE_ANLP1_ASM_PAUSE);
+
+out:
+        return ret_val;
+}
+
+/**
+ *  ixgbe_fc_autoneg_copper - Enable flow control IEEE clause 37
+ *  @hw: pointer to hardware structure
+ *
+ *  Enable flow control according to IEEE clause 37.
+ **/
+static s32 ixgbe_fc_autoneg_copper(struct ixgbe_hw *hw)
+{
+        u16 technology_ability_reg = 0;
+        u16 lp_technology_ability_reg = 0;
+
+        hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
+                             MDIO_MMD_AN,
+                             &technology_ability_reg);
+        hw->phy.ops.read_reg(hw, MDIO_AN_LPA,
+                             MDIO_MMD_AN,
+                             &lp_technology_ability_reg);
+
+        return ixgbe_negotiate_fc(hw, (u32)technology_ability_reg,
+                                  (u32)lp_technology_ability_reg,
+                                  IXGBE_TAF_SYM_PAUSE, IXGBE_TAF_ASM_PAUSE,
+                                  IXGBE_TAF_SYM_PAUSE, IXGBE_TAF_ASM_PAUSE);
+}
+
+/**
+ *  ixgbe_negotiate_fc - Negotiate flow control
+ *  @hw: pointer to hardware structure
+ *  @adv_reg: flow control advertised settings
+ *  @lp_reg: link partner's flow control settings
+ *  @adv_sym: symmetric pause bit in advertisement
+ *  @adv_asm: asymmetric pause bit in advertisement
+ *  @lp_sym: symmetric pause bit in link partner advertisement
+ *  @lp_asm: asymmetric pause bit in link partner advertisement
+ *
+ *  Find the intersection between advertised settings and link partner's
+ *  advertised settings
+ **/
+static s32 ixgbe_negotiate_fc(struct ixgbe_hw *hw, u32 adv_reg, u32 lp_reg,
+                              u32 adv_sym, u32 adv_asm, u32 lp_sym, u32 lp_asm)
+{
+        if ((!(adv_reg)) ||  (!(lp_reg)))
+                return IXGBE_ERR_FC_NOT_NEGOTIATED;
+
+        if ((adv_reg & adv_sym) && (lp_reg & lp_sym)) {
                 /*
-                 * Read the 10g AN autoc and LP ability registers and resolve
-                 * local flow control settings accordingly
+                 * Now we need to check if the user selected Rx ONLY
+                 * of pause frames.  In this case, we had to advertise
+                 * FULL flow control because we could not advertise RX
+                 * ONLY. Hence, we must now check to see if we need to
+                 * turn OFF the TRANSMISSION of PAUSE frames.
                  */
-                autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
-                anlp1_reg = IXGBE_READ_REG(hw, IXGBE_ANLP1);
-
-                if ((autoc_reg & IXGBE_AUTOC_SYM_PAUSE) &&
-                    (anlp1_reg & IXGBE_ANLP1_SYM_PAUSE)) {
-                        /*
-                         * Now we need to check if the user selected Rx ONLY
-                         * of pause frames.  In this case, we had to advertise
-                         * FULL flow control because we could not advertise RX
-                         * ONLY. Hence, we must now check to see if we need to
-                         * turn OFF the TRANSMISSION of PAUSE frames.
-                         */
-                        if (hw->fc.requested_mode == ixgbe_fc_full) {
-                                hw->fc.current_mode = ixgbe_fc_full;
-                                hw_dbg(hw, "Flow Control = FULL.\n");
-                        } else {
-                                hw->fc.current_mode = ixgbe_fc_rx_pause;
-                                hw_dbg(hw, "Flow Control=RX PAUSE only\n");
-                        }
-                } else if (!(autoc_reg & IXGBE_AUTOC_SYM_PAUSE) &&
-                           (autoc_reg & IXGBE_AUTOC_ASM_PAUSE) &&
-                           (anlp1_reg & IXGBE_ANLP1_SYM_PAUSE) &&
-                           (anlp1_reg & IXGBE_ANLP1_ASM_PAUSE)) {
-                        hw->fc.current_mode = ixgbe_fc_tx_pause;
-                        hw_dbg(hw, "Flow Control = TX PAUSE frames only.\n");
-                } else if ((autoc_reg & IXGBE_AUTOC_SYM_PAUSE) &&
-                           (autoc_reg & IXGBE_AUTOC_ASM_PAUSE) &&
-                           !(anlp1_reg & IXGBE_ANLP1_SYM_PAUSE) &&
-                           (anlp1_reg & IXGBE_ANLP1_ASM_PAUSE)) {
-                        hw->fc.current_mode = ixgbe_fc_rx_pause;
-                        hw_dbg(hw, "Flow Control = RX PAUSE frames only.\n");
+                if (hw->fc.requested_mode == ixgbe_fc_full) {
+                        hw->fc.current_mode = ixgbe_fc_full;
+                        hw_dbg(hw, "Flow Control = FULL.\n");
                 } else {
-                        hw->fc.current_mode = ixgbe_fc_none;
-                        hw_dbg(hw, "Flow Control = NONE.\n");
+                        hw->fc.current_mode = ixgbe_fc_rx_pause;
+                        hw_dbg(hw, "Flow Control=RX PAUSE frames only\n");
                 }
+        } else if (!(adv_reg & adv_sym) && (adv_reg & adv_asm) &&
+                   (lp_reg & lp_sym) && (lp_reg & lp_asm)) {
+                hw->fc.current_mode = ixgbe_fc_tx_pause;
+                hw_dbg(hw, "Flow Control = TX PAUSE frames only.\n");
+        } else if ((adv_reg & adv_sym) && (adv_reg & adv_asm) &&
+                   !(lp_reg & lp_sym) && (lp_reg & lp_asm)) {
+                hw->fc.current_mode = ixgbe_fc_rx_pause;
+                hw_dbg(hw, "Flow Control = RX PAUSE frames only.\n");
+        } else {
+                hw->fc.current_mode = ixgbe_fc_none;
+                hw_dbg(hw, "Flow Control = NONE.\n");
         }
-        /* Record that current_mode is the result of a successful autoneg */
-        hw->fc.fc_was_autonegged = true;
-
-out:
-        return ret_val;
+        return 0;
 }
 
 /**
@@ -1962,7 +1901,8 @@ out:
 static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)
 {
         s32 ret_val = 0;
-        u32 reg;
+        u32 reg = 0, reg_bp = 0;
+        u16 reg_cu = 0;
 
 #ifdef CONFIG_DCB
         if (hw->fc.requested_mode == ixgbe_fc_pfc) {
@@ -1970,7 +1910,7 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)
                 goto out;
         }
 
-#endif
+#endif /* CONFIG_DCB */
         /* Validate the packetbuf configuration */
         if (packetbuf_num < 0 || packetbuf_num > 7) {
                 hw_dbg(hw, "Invalid packet buffer number [%d], expected range "
@@ -2008,11 +1948,26 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)
                 hw->fc.requested_mode = ixgbe_fc_full;
 
         /*
-         * Set up the 1G flow control advertisement registers so the HW will be
-         * able to do fc autoneg once the cable is plugged in.  If we end up
-         * using 10g instead, this is harmless.
+         * Set up the 1G and 10G flow control advertisement registers so the
+         * HW will be able to do fc autoneg once the cable is plugged in.  If
+         * we link at 10G, the 1G advertisement is harmless and vice versa.
          */
-        reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
+
+        switch (hw->phy.media_type) {
+        case ixgbe_media_type_fiber:
+        case ixgbe_media_type_backplane:
+                reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
+                reg_bp = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+                break;
+
+        case ixgbe_media_type_copper:
+                hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
+                                        MDIO_MMD_AN, &reg_cu);
+                break;
+
+        default:
+                ;
+        }
 
         /*
          * The possible values of fc.requested_mode are:
@@ -2031,6 +1986,11 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)
         case ixgbe_fc_none:
                 /* Flow control completely disabled by software override. */
                 reg &= ~(IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
+                if (hw->phy.media_type == ixgbe_media_type_backplane)
+                        reg_bp &= ~(IXGBE_AUTOC_SYM_PAUSE |
+                                    IXGBE_AUTOC_ASM_PAUSE);
+                else if (hw->phy.media_type == ixgbe_media_type_copper)
+                        reg_cu &= ~(IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
                 break;
         case ixgbe_fc_rx_pause:
                 /*
@@ -2042,6 +2002,11 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)
                  * disable the adapter's ability to send PAUSE frames.
                  */
                 reg |= (IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
+                if (hw->phy.media_type == ixgbe_media_type_backplane)
+                        reg_bp |= (IXGBE_AUTOC_SYM_PAUSE |
+                                   IXGBE_AUTOC_ASM_PAUSE);
+                else if (hw->phy.media_type == ixgbe_media_type_copper)
+                        reg_cu |= (IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
                 break;
         case ixgbe_fc_tx_pause:
                 /*
@@ -2050,10 +2015,22 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)
                  */
                 reg |= (IXGBE_PCS1GANA_ASM_PAUSE);
                 reg &= ~(IXGBE_PCS1GANA_SYM_PAUSE);
+                if (hw->phy.media_type == ixgbe_media_type_backplane) {
+                        reg_bp |= (IXGBE_AUTOC_ASM_PAUSE);
+                        reg_bp &= ~(IXGBE_AUTOC_SYM_PAUSE);
+                } else if (hw->phy.media_type == ixgbe_media_type_copper) {
+                        reg_cu |= (IXGBE_TAF_ASM_PAUSE);
+                        reg_cu &= ~(IXGBE_TAF_SYM_PAUSE);
+                }
                 break;
         case ixgbe_fc_full:
                 /* Flow control (both Rx and Tx) is enabled by SW override. */
                 reg |= (IXGBE_PCS1GANA_SYM_PAUSE | IXGBE_PCS1GANA_ASM_PAUSE);
+                if (hw->phy.media_type == ixgbe_media_type_backplane)
+                        reg_bp |= (IXGBE_AUTOC_SYM_PAUSE |
+                                   IXGBE_AUTOC_ASM_PAUSE);
+                else if (hw->phy.media_type == ixgbe_media_type_copper)
+                        reg_cu |= (IXGBE_TAF_SYM_PAUSE | IXGBE_TAF_ASM_PAUSE);
                 break;
 #ifdef CONFIG_DCB
         case ixgbe_fc_pfc:
@@ -2067,80 +2044,37 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num)
                 break;
         }
 
-        IXGBE_WRITE_REG(hw, IXGBE_PCS1GANA, reg);
-        reg = IXGBE_READ_REG(hw, IXGBE_PCS1GLCTL);
-
-        /* Disable AN timeout */
-        if (hw->fc.strict_ieee)
-                reg &= ~IXGBE_PCS1GLCTL_AN_1G_TIMEOUT_EN;
+        if (hw->mac.type != ixgbe_mac_X540) {
+                /*
+                 * Enable auto-negotiation between the MAC & PHY;
+                 * the MAC will advertise clause 37 flow control.
+                 */
+                IXGBE_WRITE_REG(hw, IXGBE_PCS1GANA, reg);
+                reg = IXGBE_READ_REG(hw, IXGBE_PCS1GLCTL);
 
-        IXGBE_WRITE_REG(hw, IXGBE_PCS1GLCTL, reg);
-        hw_dbg(hw, "Set up FC; PCS1GLCTL = 0x%08X\n", reg);
+                /* Disable AN timeout */
+                if (hw->fc.strict_ieee)
+                        reg &= ~IXGBE_PCS1GLCTL_AN_1G_TIMEOUT_EN;
 
-        /*
-         * Set up the 10G flow control advertisement registers so the HW
-         * can do fc autoneg once the cable is plugged in.  If we end up
-         * using 1g instead, this is harmless.
-         */
-        reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);
+                IXGBE_WRITE_REG(hw, IXGBE_PCS1GLCTL, reg);
+                hw_dbg(hw, "Set up FC; PCS1GLCTL = 0x%08X\n", reg);
+        }
 
         /*
-         * The possible values of fc.requested_mode are:
-         * 0: Flow control is completely disabled
-         * 1: Rx flow control is enabled (we can receive pause frames,
-         *    but not send pause frames).
-         * 2: Tx flow control is enabled (we can send pause frames but
-         *    we do not support receiving pause frames).
-         * 3: Both Rx and Tx flow control (symmetric) are enabled.
-         * other: Invalid.
+         * AUTOC restart handles negotiation of 1G and 10G on backplane
+         * and copper. There is no need to set the PCS1GCTL register.
+         *
          */
-        switch (hw->fc.requested_mode) {
-        case ixgbe_fc_none:
-                /* Flow control completely disabled by software override. */
-                reg &= ~(IXGBE_AUTOC_SYM_PAUSE | IXGBE_AUTOC_ASM_PAUSE);
-                break;
-        case ixgbe_fc_rx_pause:
-                /*
-                 * Rx Flow control is enabled and Tx Flow control is
-                 * disabled by software override. Since there really
-                 * isn't a way to advertise that we are capable of RX
-                 * Pause ONLY, we will advertise that we support both
-                 * symmetric and asymmetric Rx PAUSE.  Later, we will
-                 * disable the adapter's ability to send PAUSE frames.
-                 */
-                reg |= (IXGBE_AUTOC_SYM_PAUSE | IXGBE_AUTOC_ASM_PAUSE);
-                break;
-        case ixgbe_fc_tx_pause:
-                /*
-                 * Tx Flow control is enabled, and Rx Flow control is
-                 * disabled by software override.
-                 */
-                reg |= (IXGBE_AUTOC_ASM_PAUSE);
-                reg &= ~(IXGBE_AUTOC_SYM_PAUSE);
-                break;
-        case ixgbe_fc_full:
-                /* Flow control (both Rx and Tx) is enabled by SW override. */
-                reg |= (IXGBE_AUTOC_SYM_PAUSE | IXGBE_AUTOC_ASM_PAUSE);
-                break;
-#ifdef CONFIG_DCB
-        case ixgbe_fc_pfc:
-                goto out;
-                break;
-#endif /* CONFIG_DCB */
-        default:
-                hw_dbg(hw, "Flow control param set incorrectly\n");
-                ret_val = IXGBE_ERR_CONFIG;
-                goto out;
-                break;
+        if (hw->phy.media_type == ixgbe_media_type_backplane) {
+                reg_bp |= IXGBE_AUTOC_AN_RESTART;
+                IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg_bp);
+        } else if ((hw->phy.media_type == ixgbe_media_type_copper) &&
+                    (ixgbe_device_supports_autoneg_fc(hw) == 0)) {
+                hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE,
+                                      MDIO_MMD_AN, reg_cu);
         }
-        /*
-         * AUTOC restart handles negotiation of 1G and 10G. There is
-         * no need to set the PCS1GCTL register.
-         */
-        reg |= IXGBE_AUTOC_AN_RESTART;
-        IXGBE_WRITE_REG(hw, IXGBE_AUTOC, reg);
-        hw_dbg(hw, "Set up FC; IXGBE_AUTOC = 0x%08X\n", reg);
 
+        hw_dbg(hw, "Set up FC; IXGBE_AUTOC = 0x%08X\n", reg);
 out:
         return ret_val;
 }
@@ -2156,10 +2090,16 @@ out:
  **/
 s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw)
 {
+        struct ixgbe_adapter *adapter = hw->back;
         u32 i;
         u32 reg_val;
         u32 number_of_queues;
-        s32 status = IXGBE_ERR_MASTER_REQUESTS_PENDING;
+        s32 status = 0;
+        u16 dev_status = 0;
+
+        /* Just jump out if bus mastering is already disabled */
+        if (!(IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_GIO))
+                goto out;
 
         /* Disable the receive unit by stopping each queue */
         number_of_queues = hw->mac.max_rx_queues;
@@ -2176,13 +2116,43 @@ s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw)
         IXGBE_WRITE_REG(hw, IXGBE_CTRL, reg_val);
 
         for (i = 0; i < IXGBE_PCI_MASTER_DISABLE_TIMEOUT; i++) {
-                if (!(IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_GIO)) {
-                        status = 0;
+                if (!(IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_GIO))
+                        goto check_device_status;
+                udelay(100);
+        }
+
+        hw_dbg(hw, "GIO Master Disable bit didn't clear - requesting resets\n");
+        status = IXGBE_ERR_MASTER_REQUESTS_PENDING;
+
+        /*
+         * Before proceeding, make sure that the PCIe block does not have
+         * transactions pending.
+         */
+check_device_status:
+        for (i = 0; i < IXGBE_PCI_MASTER_DISABLE_TIMEOUT; i++) {
+                pci_read_config_word(adapter->pdev, IXGBE_PCI_DEVICE_STATUS,
+                                                         &dev_status);
+                if (!(dev_status & IXGBE_PCI_DEVICE_STATUS_TRANSACTION_PENDING))
                         break;
-                }
                 udelay(100);
         }
 
+        if (i == IXGBE_PCI_MASTER_DISABLE_TIMEOUT)
+                hw_dbg(hw, "PCIe transaction pending bit also did not clear.\n");
+        else
+                goto out;
+
+        /*
+         * Two consecutive resets are required via CTRL.RST per datasheet
+         * 5.2.5.3.2 Master Disable.  We set a flag to inform the reset routine
+         * of this need.  The first reset prevents new master requests from
+         * being issued by our device.  We then must wait 1usec for any
+         * remaining completions from the PCIe bus to trickle in, and then reset
+         * again to clear out any effects they may have had on our device.
+         */
+         hw->mac.flags |= IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
+
+out:
         return status;
 }
 
@@ -2192,7 +2162,7 @@ s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw)
  *  @hw: pointer to hardware structure
  *  @mask: Mask to specify which semaphore to acquire
  *
- *  Acquires the SWFW semaphore thought the GSSR register for the specified
+ *  Acquires the SWFW semaphore through the GSSR register for the specified
  *  function (CSR, PHY0, PHY1, EEPROM, Flash)
  **/
 s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask)
@@ -2203,6 +2173,10 @@ s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask)
         s32 timeout = 200;
 
         while (timeout) {
+                /*
+                 * SW EEPROM semaphore bit is used for access to all
+                 * SW_FW_SYNC/GSSR bits (not just EEPROM)
+                 */
                 if (ixgbe_get_eeprom_semaphore(hw))
                         return IXGBE_ERR_SWFW_SYNC;
 
@@ -2220,7 +2194,7 @@ s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask)
         }
 
         if (!timeout) {
-                hw_dbg(hw, "Driver can't access resource, GSSR timeout.\n");
+                hw_dbg(hw, "Driver can't access resource, SW_FW_SYNC timeout.\n");
                 return IXGBE_ERR_SWFW_SYNC;
         }
 
@@ -2236,7 +2210,7 @@ s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask)
  *  @hw: pointer to hardware structure
  *  @mask: Mask to specify which semaphore to release
  *
- *  Releases the SWFW semaphore thought the GSSR register for the specified
+ *  Releases the SWFW semaphore through the GSSR register for the specified
  *  function (CSR, PHY0, PHY1, EEPROM, Flash)
  **/
 void ixgbe_release_swfw_sync(struct ixgbe_hw *hw, u16 mask)
@@ -2424,37 +2398,38 @@ s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
         u32 mpsar_lo, mpsar_hi;
         u32 rar_entries = hw->mac.num_rar_entries;
 
-        if (rar < rar_entries) {
-                mpsar_lo = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar));
-                mpsar_hi = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar));
+        /* Make sure we are using a valid rar index range */
+        if (rar >= rar_entries) {
+                hw_dbg(hw, "RAR index %d is out of range.\n", rar);
+                return IXGBE_ERR_INVALID_ARGUMENT;
+        }
 
-                if (!mpsar_lo && !mpsar_hi)
-                        goto done;
+        mpsar_lo = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar));
+        mpsar_hi = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar));
 
-                if (vmdq == IXGBE_CLEAR_VMDQ_ALL) {
-                        if (mpsar_lo) {
-                                IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), 0);
-                                mpsar_lo = 0;
-                        }
-                        if (mpsar_hi) {
-                                IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), 0);
-                                mpsar_hi = 0;
-                        }
-                } else if (vmdq < 32) {
-                        mpsar_lo &= ~(1 << vmdq);
-                        IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), mpsar_lo);
-                } else {
-                        mpsar_hi &= ~(1 << (vmdq - 32));
-                        IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), mpsar_hi);
-                }
+        if (!mpsar_lo && !mpsar_hi)
+                goto done;
 
-                /* was that the last pool using this rar? */
-                if (mpsar_lo == 0 && mpsar_hi == 0 && rar != 0)
-                        hw->mac.ops.clear_rar(hw, rar);
+        if (vmdq == IXGBE_CLEAR_VMDQ_ALL) {
+                if (mpsar_lo) {
+                        IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), 0);
+                        mpsar_lo = 0;
+                }
+                if (mpsar_hi) {
+                        IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), 0);
+                        mpsar_hi = 0;
+                }
+        } else if (vmdq < 32) {
+                mpsar_lo &= ~(1 << vmdq);
+                IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), mpsar_lo);
         } else {
-                hw_dbg(hw, "RAR index %d is out of range.\n", rar);
+                mpsar_hi &= ~(1 << (vmdq - 32));
+                IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), mpsar_hi);
         }
 
+        /* was that the last pool using this rar? */
+        if (mpsar_lo == 0 && mpsar_hi == 0 && rar != 0)
+                hw->mac.ops.clear_rar(hw, rar);
 done:
         return 0;
 }
@@ -2470,18 +2445,20 @@ s32 ixgbe_set_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
         u32 mpsar;
         u32 rar_entries = hw->mac.num_rar_entries;
 
-        if (rar < rar_entries) {
-                if (vmdq < 32) {
-                        mpsar = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar));
-                        mpsar |= 1 << vmdq;
-                        IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), mpsar);
-                } else {
-                        mpsar = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar));
-                        mpsar |= 1 << (vmdq - 32);
-                        IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), mpsar);
-                }
-        } else {
+        /* Make sure we are using a valid rar index range */
+        if (rar >= rar_entries) {
                 hw_dbg(hw, "RAR index %d is out of range.\n", rar);
+                return IXGBE_ERR_INVALID_ARGUMENT;
+        }
+
+        if (vmdq < 32) {
+                mpsar = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar));
+                mpsar |= 1 << vmdq;
+                IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), mpsar);
+        } else {
+                mpsar = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar));
+                mpsar |= 1 << (vmdq - 32);
+                IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), mpsar);
         }
         return 0;
 }
@@ -2494,7 +2471,6 @@ s32 ixgbe_init_uta_tables_generic(struct ixgbe_hw *hw)
 {
         int i;
 
-
         for (i = 0; i < 128; i++)
                 IXGBE_WRITE_REG(hw, IXGBE_UTA(i), 0);
 
@@ -2723,12 +2699,21 @@ s32 ixgbe_clear_vfta_generic(struct ixgbe_hw *hw)
  *  Reads the links register to determine if link is up and the current speed
  **/
 s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
-                               bool *link_up, bool link_up_wait_to_complete)
+                                 bool *link_up, bool link_up_wait_to_complete)
 {
-        u32 links_reg;
+        u32 links_reg, links_orig;
         u32 i;
 
+        /* clear the old state */
+        links_orig = IXGBE_READ_REG(hw, IXGBE_LINKS);
+
         links_reg = IXGBE_READ_REG(hw, IXGBE_LINKS);
+
+        if (links_orig != links_reg) {
+                hw_dbg(hw, "LINKS changed from %08X to %08X\n",
+                       links_orig, links_reg);
+        }
+
         if (link_up_wait_to_complete) {
                 for (i = 0; i < IXGBE_LINK_UP_TIME; i++) {
                         if (links_reg & IXGBE_LINKS_UP) {
@@ -2751,10 +2736,13 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
             IXGBE_LINKS_SPEED_10G_82599)
                 *speed = IXGBE_LINK_SPEED_10GB_FULL;
         else if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
-                 IXGBE_LINKS_SPEED_1G_82599)
+                 IXGBE_LINKS_SPEED_1G_82599)
                 *speed = IXGBE_LINK_SPEED_1GB_FULL;
-        else
+        else if ((links_reg & IXGBE_LINKS_SPEED_82599) ==
+                 IXGBE_LINKS_SPEED_100_82599)
                 *speed = IXGBE_LINK_SPEED_100_FULL;
+        else
+                *speed = IXGBE_LINK_SPEED_UNKNOWN;
 
         /* if link is down, zero out the current_mode */
         if (*link_up == false) {
@@ -2811,6 +2799,28 @@ wwn_prefix_out:
 }
 
 /**
+ *  ixgbe_device_supports_autoneg_fc - Check if phy supports autoneg flow
+ *  control
+ *  @hw: pointer to hardware structure
+ *
+ *  There are several phys that do not support autoneg flow control. This
+ *  function check the device id to see if the associated phy supports
+ *  autoneg flow control.
+ **/
+static s32 ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw)
+{
+
+        switch (hw->device_id) {
+        case IXGBE_DEV_ID_X540T:
+                return 0;
+        case IXGBE_DEV_ID_82599_T3_LOM:
+                return 0;
+        default:
+                return IXGBE_ERR_FC_NOT_SUPPORTED;
+        }
+}
+
+/**
  *  ixgbe_set_mac_anti_spoofing - Enable/Disable MAC anti-spoofing
  *  @hw: pointer to hardware structure
  *  @enable: enable or disable switch for anti-spoofing
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h
index 66ed045a8cf..508f635fc2c 100644
--- a/drivers/net/ixgbe/ixgbe_common.h
+++ b/drivers/net/ixgbe/ixgbe_common.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -29,6 +29,7 @@
 #define _IXGBE_COMMON_H_
 
 #include "ixgbe_type.h"
+#include "ixgbe.h"
 
 u32 ixgbe_get_pcie_msix_count_generic(struct ixgbe_hw *hw);
 s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw);
@@ -62,8 +63,6 @@ s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index);
 s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw);
 s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw,
                                       struct net_device *netdev);
-s32 ixgbe_update_uc_addr_list_generic(struct ixgbe_hw *hw,
-                                      struct net_device *netdev);
 s32 ixgbe_enable_mc_generic(struct ixgbe_hw *hw);
 s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw);
 s32 ixgbe_enable_rx_dma_generic(struct ixgbe_hw *hw, u32 regval);
@@ -110,9 +109,8 @@ void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf);
 
 #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS)
 
-extern struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw);
 #define hw_dbg(hw, format, arg...) \
-        netdev_dbg(ixgbe_get_hw_dev(hw), format, ##arg)
+        netdev_dbg(((struct ixgbe_adapter *)(hw->back))->netdev, format, ##arg)
 #define e_dev_info(format, arg...) \
         dev_info(&adapter->pdev->dev, format, ## arg)
 #define e_dev_warn(format, arg...) \
diff --git a/drivers/net/ixgbe/ixgbe_dcb.c b/drivers/net/ixgbe/ixgbe_dcb.c
index d16c260c1f5..41c529fac0a 100644
--- a/drivers/net/ixgbe/ixgbe_dcb.c
+++ b/drivers/net/ixgbe/ixgbe_dcb.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -34,6 +34,42 @@
 #include "ixgbe_dcb_82599.h"
 
 /**
+ * ixgbe_ieee_credits - This calculates the ieee traffic class
+ * credits from the configured bandwidth percentages. Credits
+ * are the smallest unit programable into the underlying
+ * hardware. The IEEE 802.1Qaz specification do not use bandwidth
+ * groups so this is much simplified from the CEE case.
+ */
+s32 ixgbe_ieee_credits(__u8 *bw, __u16 *refill, __u16 *max, int max_frame)
+{
+        int min_percent = 100;
+        int min_credit, multiplier;
+        int i;
+
+        min_credit = ((max_frame / 2) + DCB_CREDIT_QUANTUM - 1) /
+                        DCB_CREDIT_QUANTUM;
+
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                if (bw[i] < min_percent && bw[i])
+                        min_percent = bw[i];
+        }
+
+        multiplier = (min_credit / min_percent) + 1;
+
+        /* Find out the hw credits for each TC */
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                int val = min(bw[i] * multiplier, MAX_CREDIT_REFILL);
+
+                if (val < min_credit)
+                        val = min_credit;
+                refill[i] = val;
+
+                max[i] = bw[i] ? (bw[i] * MAX_CREDIT)/100 : min_credit;
+        }
+        return 0;
+}
+
+/**
  * ixgbe_dcb_calculate_tc_credits - Calculates traffic class credits
  * @ixgbe_dcb_config: Struct containing DCB settings.
  * @direction: Configuring either Tx or Rx.
@@ -141,6 +177,59 @@ out:
         return ret_val;
 }
 
+void ixgbe_dcb_unpack_pfc(struct ixgbe_dcb_config *cfg, u8 *pfc_en)
+{
+        int i;
+
+        *pfc_en = 0;
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
+                *pfc_en |= (cfg->tc_config[i].dcb_pfc & 0xF) << i;
+}
+
+void ixgbe_dcb_unpack_refill(struct ixgbe_dcb_config *cfg, int direction,
+                             u16 *refill)
+{
+        struct tc_bw_alloc *p;
+        int i;
+
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                p = &cfg->tc_config[i].path[direction];
+                refill[i] = p->data_credits_refill;
+        }
+}
+
+void ixgbe_dcb_unpack_max(struct ixgbe_dcb_config *cfg, u16 *max)
+{
+        int i;
+
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
+                max[i] = cfg->tc_config[i].desc_credits_max;
+}
+
+void ixgbe_dcb_unpack_bwgid(struct ixgbe_dcb_config *cfg, int direction,
+                            u8 *bwgid)
+{
+        struct tc_bw_alloc *p;
+        int i;
+
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                p = &cfg->tc_config[i].path[direction];
+                bwgid[i] = p->bwg_id;
+        }
+}
+
+void ixgbe_dcb_unpack_prio(struct ixgbe_dcb_config *cfg, int direction,
+                            u8 *ptype)
+{
+        struct tc_bw_alloc *p;
+        int i;
+
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                p = &cfg->tc_config[i].path[direction];
+                ptype[i] = p->prio_type;
+        }
+}
+
 /**
  * ixgbe_dcb_hw_config - Config and enable DCB
  * @hw: pointer to hardware structure
@@ -152,13 +241,32 @@ s32 ixgbe_dcb_hw_config(struct ixgbe_hw *hw,
                         struct ixgbe_dcb_config *dcb_config)
 {
         s32 ret = 0;
+        u8 pfc_en;
+        u8 ptype[MAX_TRAFFIC_CLASS];
+        u8 bwgid[MAX_TRAFFIC_CLASS];
+        u16 refill[MAX_TRAFFIC_CLASS];
+        u16 max[MAX_TRAFFIC_CLASS];
+        /* CEE does not define a priority to tc mapping so map 1:1 */
+        u8 prio_tc[MAX_TRAFFIC_CLASS] = {0, 1, 2, 3, 4, 5, 6, 7};
+
+        /* Unpack CEE standard containers */
+        ixgbe_dcb_unpack_pfc(dcb_config, &pfc_en);
+        ixgbe_dcb_unpack_refill(dcb_config, DCB_TX_CONFIG, refill);
+        ixgbe_dcb_unpack_max(dcb_config, max);
+        ixgbe_dcb_unpack_bwgid(dcb_config, DCB_TX_CONFIG, bwgid);
+        ixgbe_dcb_unpack_prio(dcb_config, DCB_TX_CONFIG, ptype);
+
         switch (hw->mac.type) {
         case ixgbe_mac_82598EB:
-                ret = ixgbe_dcb_hw_config_82598(hw, dcb_config);
+                ret = ixgbe_dcb_hw_config_82598(hw, dcb_config->rx_pba_cfg,
+                                                pfc_en, refill, max, bwgid,
+                                                ptype);
                 break;
         case ixgbe_mac_82599EB:
         case ixgbe_mac_X540:
-                ret = ixgbe_dcb_hw_config_82599(hw, dcb_config);
+                ret = ixgbe_dcb_hw_config_82599(hw, dcb_config->rx_pba_cfg,
+                                                pfc_en, refill, max, bwgid,
+                                                ptype, prio_tc);
                 break;
         default:
                 break;
@@ -166,3 +274,49 @@ s32 ixgbe_dcb_hw_config(struct ixgbe_hw *hw,
         return ret;
 }
 
+/* Helper routines to abstract HW specifics from DCB netlink ops */
+s32 ixgbe_dcb_hw_pfc_config(struct ixgbe_hw *hw, u8 pfc_en)
+{
+        int ret = -EINVAL;
+
+        switch (hw->mac.type) {
+        case ixgbe_mac_82598EB:
+                ret = ixgbe_dcb_config_pfc_82598(hw, pfc_en);
+                break;
+        case ixgbe_mac_82599EB:
+        case ixgbe_mac_X540:
+                ret = ixgbe_dcb_config_pfc_82599(hw, pfc_en);
+                break;
+        default:
+                break;
+        }
+        return ret;
+}
+
+s32 ixgbe_dcb_hw_ets_config(struct ixgbe_hw *hw,
+                            u16 *refill, u16 *max, u8 *bwg_id,
+                            u8 *prio_type, u8 *prio_tc)
+{
+        switch (hw->mac.type) {
+        case ixgbe_mac_82598EB:
+                ixgbe_dcb_config_rx_arbiter_82598(hw, refill, max,
+                                                        prio_type);
+                ixgbe_dcb_config_tx_desc_arbiter_82598(hw, refill, max,
+                                                             bwg_id, prio_type);
+                ixgbe_dcb_config_tx_data_arbiter_82598(hw, refill, max,
+                                                             bwg_id, prio_type);
+                break;
+        case ixgbe_mac_82599EB:
+        case ixgbe_mac_X540:
+                ixgbe_dcb_config_rx_arbiter_82599(hw, refill, max,
+                                                  bwg_id, prio_type, prio_tc);
+                ixgbe_dcb_config_tx_desc_arbiter_82599(hw, refill, max,
+                                                       bwg_id, prio_type);
+                ixgbe_dcb_config_tx_data_arbiter_82599(hw, refill, max, bwg_id,
+                                                       prio_type, prio_tc);
+                break;
+        default:
+                break;
+        }
+        return 0;
+}
diff --git a/drivers/net/ixgbe/ixgbe_dcb.h b/drivers/net/ixgbe/ixgbe_dcb.h
index 1cfe38ee164..944838fc7b5 100644
--- a/drivers/net/ixgbe/ixgbe_dcb.h
+++ b/drivers/net/ixgbe/ixgbe_dcb.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -139,7 +139,6 @@ struct ixgbe_dcb_config {
         struct tc_configuration tc_config[MAX_TRAFFIC_CLASS];
         u8     bw_percentage[2][MAX_BW_GROUP]; /* One each for Tx/Rx */
         bool   pfc_mode_enable;
-        bool   round_robin_enable;
 
         enum dcb_rx_pba_cfg rx_pba_cfg;
 
@@ -148,12 +147,21 @@ struct ixgbe_dcb_config {
 };
 
 /* DCB driver APIs */
+void ixgbe_dcb_unpack_pfc(struct ixgbe_dcb_config *cfg, u8 *pfc_en);
+void ixgbe_dcb_unpack_refill(struct ixgbe_dcb_config *, int, u16 *);
+void ixgbe_dcb_unpack_max(struct ixgbe_dcb_config *, u16 *);
+void ixgbe_dcb_unpack_bwgid(struct ixgbe_dcb_config *, int, u8 *);
+void ixgbe_dcb_unpack_prio(struct ixgbe_dcb_config *, int, u8 *);
 
 /* DCB credits calculation */
+s32 ixgbe_ieee_credits(__u8 *bw, __u16 *refill, __u16 *max, int max_frame);
 s32 ixgbe_dcb_calculate_tc_credits(struct ixgbe_hw *,
                                    struct ixgbe_dcb_config *, int, u8);
 
 /* DCB hw initialization */
+s32 ixgbe_dcb_hw_ets_config(struct ixgbe_hw *hw, u16 *refill, u16 *max,
+                            u8 *bwg_id, u8 *prio_type, u8 *tc_prio);
+s32 ixgbe_dcb_hw_pfc_config(struct ixgbe_hw *hw, u8 pfc_en);
 s32 ixgbe_dcb_hw_config(struct ixgbe_hw *, struct ixgbe_dcb_config *);
 
 /* DCB definitions for credit calculation */
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ixgbe/ixgbe_dcb_82598.c
index 9a5e89c12e0..1bc57e52cee 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82598.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_82598.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -38,15 +38,14 @@
  *
  * Configure packet buffers for DCB mode.
  */
-static s32 ixgbe_dcb_config_packet_buffers_82598(struct ixgbe_hw *hw,
-                                                 struct ixgbe_dcb_config *dcb_config)
+static s32 ixgbe_dcb_config_packet_buffers_82598(struct ixgbe_hw *hw, u8 rx_pba)
 {
         s32 ret_val = 0;
         u32 value = IXGBE_RXPBSIZE_64KB;
         u8  i = 0;
 
         /* Setup Rx packet buffer sizes */
-        switch (dcb_config->rx_pba_cfg) {
+        switch (rx_pba) {
         case pba_80_48:
                 /* Setup the first four at 80KB */
                 value = IXGBE_RXPBSIZE_80KB;
@@ -78,10 +77,11 @@ static s32 ixgbe_dcb_config_packet_buffers_82598(struct ixgbe_hw *hw,
  *
  * Configure Rx Data Arbiter and credits for each traffic class.
  */
-static s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
-                                      struct ixgbe_dcb_config *dcb_config)
+s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
+                                        u16 *refill,
+                                        u16 *max,
+                                        u8 *prio_type)
 {
-        struct tc_bw_alloc    *p;
         u32    reg           = 0;
         u32    credit_refill = 0;
         u32    credit_max    = 0;
@@ -102,13 +102,12 @@ static s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
 
         /* Configure traffic class credits and priority */
         for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                p = &dcb_config->tc_config[i].path[DCB_RX_CONFIG];
-                credit_refill = p->data_credits_refill;
-                credit_max    = p->data_credits_max;
+                credit_refill = refill[i];
+                credit_max    = max[i];
 
                 reg = credit_refill | (credit_max << IXGBE_RT2CR_MCL_SHIFT);
 
-                if (p->prio_type == prio_link)
+                if (prio_type[i] == prio_link)
                         reg |= IXGBE_RT2CR_LSP;
 
                 IXGBE_WRITE_REG(hw, IXGBE_RT2CR(i), reg);
@@ -135,10 +134,12 @@ static s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
  *
  * Configure Tx Descriptor Arbiter and credits for each traffic class.
  */
-static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
-                                           struct ixgbe_dcb_config *dcb_config)
+s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
+                                                u16 *refill,
+                                                u16 *max,
+                                                u8 *bwg_id,
+                                                u8 *prio_type)
 {
-        struct tc_bw_alloc *p;
         u32    reg, max_credits;
         u8     i;
 
@@ -146,10 +147,8 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
 
         /* Enable arbiter */
         reg &= ~IXGBE_DPMCS_ARBDIS;
-        if (!(dcb_config->round_robin_enable)) {
-                /* Enable DFP and Recycle mode */
-                reg |= (IXGBE_DPMCS_TDPAC | IXGBE_DPMCS_TRM);
-        }
+        /* Enable DFP and Recycle mode */
+        reg |= (IXGBE_DPMCS_TDPAC | IXGBE_DPMCS_TRM);
         reg |= IXGBE_DPMCS_TSOEF;
         /* Configure Max TSO packet size 34KB including payload and headers */
         reg |= (0x4 << IXGBE_DPMCS_MTSOS_SHIFT);
@@ -158,16 +157,15 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
 
         /* Configure traffic class credits and priority */
         for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                p = &dcb_config->tc_config[i].path[DCB_TX_CONFIG];
-                max_credits = dcb_config->tc_config[i].desc_credits_max;
+                max_credits = max[i];
                 reg = max_credits << IXGBE_TDTQ2TCCR_MCL_SHIFT;
-                reg |= p->data_credits_refill;
-                reg |= (u32)(p->bwg_id) << IXGBE_TDTQ2TCCR_BWG_SHIFT;
+                reg |= refill[i];
+                reg |= (u32)(bwg_id[i]) << IXGBE_TDTQ2TCCR_BWG_SHIFT;
 
-                if (p->prio_type == prio_group)
+                if (prio_type[i] == prio_group)
                         reg |= IXGBE_TDTQ2TCCR_GSP;
 
-                if (p->prio_type == prio_link)
+                if (prio_type[i] == prio_link)
                         reg |= IXGBE_TDTQ2TCCR_LSP;
 
                 IXGBE_WRITE_REG(hw, IXGBE_TDTQ2TCCR(i), reg);
@@ -183,10 +181,12 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
  *
  * Configure Tx Data Arbiter and credits for each traffic class.
  */
-static s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
-                                           struct ixgbe_dcb_config *dcb_config)
+s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
+                                                u16 *refill,
+                                                u16 *max,
+                                                u8 *bwg_id,
+                                                u8 *prio_type)
 {
-        struct tc_bw_alloc *p;
         u32 reg;
         u8 i;
 
@@ -200,15 +200,14 @@ static s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
 
         /* Configure traffic class credits and priority */
         for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                p = &dcb_config->tc_config[i].path[DCB_TX_CONFIG];
-                reg = p->data_credits_refill;
-                reg |= (u32)(p->data_credits_max) << IXGBE_TDPT2TCCR_MCL_SHIFT;
-                reg |= (u32)(p->bwg_id) << IXGBE_TDPT2TCCR_BWG_SHIFT;
+                reg = refill[i];
+                reg |= (u32)(max[i]) << IXGBE_TDPT2TCCR_MCL_SHIFT;
+                reg |= (u32)(bwg_id[i]) << IXGBE_TDPT2TCCR_BWG_SHIFT;
 
-                if (p->prio_type == prio_group)
+                if (prio_type[i] == prio_group)
                         reg |= IXGBE_TDPT2TCCR_GSP;
 
-                if (p->prio_type == prio_link)
+                if (prio_type[i] == prio_link)
                         reg |= IXGBE_TDPT2TCCR_LSP;
 
                 IXGBE_WRITE_REG(hw, IXGBE_TDPT2TCCR(i), reg);
@@ -229,59 +228,57 @@ static s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
  *
  * Configure Priority Flow Control for each traffic class.
  */
-s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *hw,
-                               struct ixgbe_dcb_config *dcb_config)
+s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *hw, u8 pfc_en)
 {
         u32 reg, rx_pba_size;
         u8  i;
 
-        if (!dcb_config->pfc_mode_enable)
-                goto out;
-
-        /* Enable Transmit Priority Flow Control */
-        reg = IXGBE_READ_REG(hw, IXGBE_RMCS);
-        reg &= ~IXGBE_RMCS_TFCE_802_3X;
-        /* correct the reporting of our flow control status */
-        reg |= IXGBE_RMCS_TFCE_PRIORITY;
-        IXGBE_WRITE_REG(hw, IXGBE_RMCS, reg);
-
-        /* Enable Receive Priority Flow Control */
-        reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);
-        reg &= ~IXGBE_FCTRL_RFCE;
-        reg |= IXGBE_FCTRL_RPFCE;
-        IXGBE_WRITE_REG(hw, IXGBE_FCTRL, reg);
+        if (pfc_en) {
+                /* Enable Transmit Priority Flow Control */
+                reg = IXGBE_READ_REG(hw, IXGBE_RMCS);
+                reg &= ~IXGBE_RMCS_TFCE_802_3X;
+                /* correct the reporting of our flow control status */
+                reg |= IXGBE_RMCS_TFCE_PRIORITY;
+                IXGBE_WRITE_REG(hw, IXGBE_RMCS, reg);
+
+                /* Enable Receive Priority Flow Control */
+                reg = IXGBE_READ_REG(hw, IXGBE_FCTRL);
+                reg &= ~IXGBE_FCTRL_RFCE;
+                reg |= IXGBE_FCTRL_RPFCE;
+                IXGBE_WRITE_REG(hw, IXGBE_FCTRL, reg);
+
+                /* Configure pause time */
+                for (i = 0; i < (MAX_TRAFFIC_CLASS >> 1); i++)
+                        IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), 0x68006800);
+
+                /* Configure flow control refresh threshold value */
+                IXGBE_WRITE_REG(hw, IXGBE_FCRTV, 0x3400);
+        }
 
         /*
          * Configure flow control thresholds and enable priority flow control
          * for each traffic class.
          */
         for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                int enabled = pfc_en & (1 << i);
                 rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
                 rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT;
                 reg = (rx_pba_size - hw->fc.low_water) << 10;
 
-                if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx ||
-                    dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full)
+                if (enabled == pfc_enabled_tx ||
+                    enabled == pfc_enabled_full)
                         reg |= IXGBE_FCRTL_XONE;
 
                 IXGBE_WRITE_REG(hw, IXGBE_FCRTL(i), reg);
 
                 reg = (rx_pba_size - hw->fc.high_water) << 10;
-                if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx ||
-                    dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full)
+                if (enabled == pfc_enabled_tx ||
+                    enabled == pfc_enabled_full)
                         reg |= IXGBE_FCRTH_FCEN;
 
                 IXGBE_WRITE_REG(hw, IXGBE_FCRTH(i), reg);
         }
 
-        /* Configure pause time */
-        for (i = 0; i < (MAX_TRAFFIC_CLASS >> 1); i++)
-                IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), 0x68006800);
-
-        /* Configure flow control refresh threshold value */
-        IXGBE_WRITE_REG(hw, IXGBE_FCRTV, 0x3400);
-
-out:
         return 0;
 }
 
@@ -292,7 +289,7 @@ out:
  * Configure queue statistics registers, all queues belonging to same traffic
  * class uses a single set of queue statistics counters.
  */
-static s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)
+s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)
 {
         u32 reg = 0;
         u8  i   = 0;
@@ -325,13 +322,16 @@ static s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)
  * Configure dcb settings and enable dcb mode.
  */
 s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *hw,
-                              struct ixgbe_dcb_config *dcb_config)
+                              u8 rx_pba, u8 pfc_en, u16 *refill,
+                              u16 *max, u8 *bwg_id, u8 *prio_type)
 {
-        ixgbe_dcb_config_packet_buffers_82598(hw, dcb_config);
-        ixgbe_dcb_config_rx_arbiter_82598(hw, dcb_config);
-        ixgbe_dcb_config_tx_desc_arbiter_82598(hw, dcb_config);
-        ixgbe_dcb_config_tx_data_arbiter_82598(hw, dcb_config);
-        ixgbe_dcb_config_pfc_82598(hw, dcb_config);
+        ixgbe_dcb_config_packet_buffers_82598(hw, rx_pba);
+        ixgbe_dcb_config_rx_arbiter_82598(hw, refill, max, prio_type);
+        ixgbe_dcb_config_tx_desc_arbiter_82598(hw, refill, max,
+                                               bwg_id, prio_type);
+        ixgbe_dcb_config_tx_data_arbiter_82598(hw, refill, max,
+                                               bwg_id, prio_type);
+        ixgbe_dcb_config_pfc_82598(hw, pfc_en);
         ixgbe_dcb_config_tc_stats_82598(hw);
 
         return 0;
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.h b/drivers/net/ixgbe/ixgbe_dcb_82598.h
index abc03ccfa08..1e9750c2b46 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82598.h
+++ b/drivers/net/ixgbe/ixgbe_dcb_82598.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -71,9 +71,28 @@
 /* DCB hardware-specific driver APIs */
 
 /* DCB PFC functions */
-s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *);
+s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *, u8 pfc_en);
 
 /* DCB hw initialization */
-s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *);
+s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,
+                                        u16 *refill,
+                                        u16 *max,
+                                        u8 *prio_type);
+
+s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,
+                                                u16 *refill,
+                                                u16 *max,
+                                                u8 *bwg_id,
+                                                u8 *prio_type);
+
+s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,
+                                                u16 *refill,
+                                                u16 *max,
+                                                u8 *bwg_id,
+                                                u8 *prio_type);
+
+s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *hw,
+                              u8 rx_pba, u8 pfc_en, u16 *refill,
+                              u16 *max, u8 *bwg_id, u8 *prio_type);
 
 #endif /* _DCB_82598_CONFIG_H */
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.c b/drivers/net/ixgbe/ixgbe_dcb_82599.c
index 374e1f74d0f..025af8c53dd 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82599.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_82599.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -33,19 +33,18 @@
 /**
  * ixgbe_dcb_config_packet_buffers_82599 - Configure DCB packet buffers
  * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
+ * @rx_pba: method to distribute packet buffer
  *
  * Configure packet buffers for DCB mode.
  */
-static s32 ixgbe_dcb_config_packet_buffers_82599(struct ixgbe_hw *hw,
-                                          struct ixgbe_dcb_config *dcb_config)
+static s32 ixgbe_dcb_config_packet_buffers_82599(struct ixgbe_hw *hw, u8 rx_pba)
 {
         s32 ret_val = 0;
         u32 value = IXGBE_RXPBSIZE_64KB;
         u8  i = 0;
 
         /* Setup Rx packet buffer sizes */
-        switch (dcb_config->rx_pba_cfg) {
+        switch (rx_pba) {
         case pba_80_48:
                 /* Setup the first four at 80KB */
                 value = IXGBE_RXPBSIZE_80KB;
@@ -75,14 +74,20 @@ static s32 ixgbe_dcb_config_packet_buffers_82599(struct ixgbe_hw *hw,
 /**
  * ixgbe_dcb_config_rx_arbiter_82599 - Config Rx Data arbiter
  * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
+ * @refill: refill credits index by traffic class
+ * @max: max credits index by traffic class
+ * @bwg_id: bandwidth grouping indexed by traffic class
+ * @prio_type: priority type indexed by traffic class
  *
  * Configure Rx Packet Arbiter and credits for each traffic class.
  */
-static s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
-                                      struct ixgbe_dcb_config *dcb_config)
+s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
+                                      u16 *refill,
+                                      u16 *max,
+                                      u8 *bwg_id,
+                                      u8 *prio_type,
+                                      u8 *prio_tc)
 {
-        struct tc_bw_alloc    *p;
         u32    reg           = 0;
         u32    credit_refill = 0;
         u32    credit_max    = 0;
@@ -98,20 +103,18 @@ static s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
         /* Map all traffic classes to their UP, 1 to 1 */
         reg = 0;
         for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
-                reg |= (i << (i * IXGBE_RTRUP2TC_UP_SHIFT));
+                reg |= (prio_tc[i] << (i * IXGBE_RTRUP2TC_UP_SHIFT));
         IXGBE_WRITE_REG(hw, IXGBE_RTRUP2TC, reg);
 
         /* Configure traffic class credits and priority */
         for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                p = &dcb_config->tc_config[i].path[DCB_RX_CONFIG];
-
-                credit_refill = p->data_credits_refill;
-                credit_max    = p->data_credits_max;
+                credit_refill = refill[i];
+                credit_max    = max[i];
                 reg = credit_refill | (credit_max << IXGBE_RTRPT4C_MCL_SHIFT);
 
-                reg |= (u32)(p->bwg_id) << IXGBE_RTRPT4C_BWG_SHIFT;
+                reg |= (u32)(bwg_id[i]) << IXGBE_RTRPT4C_BWG_SHIFT;
 
-                if (p->prio_type == prio_link)
+                if (prio_type[i] == prio_link)
                         reg |= IXGBE_RTRPT4C_LSP;
 
                 IXGBE_WRITE_REG(hw, IXGBE_RTRPT4C(i), reg);
@@ -130,14 +133,19 @@ static s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
 /**
  * ixgbe_dcb_config_tx_desc_arbiter_82599 - Config Tx Desc. arbiter
  * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
+ * @refill: refill credits index by traffic class
+ * @max: max credits index by traffic class
+ * @bwg_id: bandwidth grouping indexed by traffic class
+ * @prio_type: priority type indexed by traffic class
  *
  * Configure Tx Descriptor Arbiter and credits for each traffic class.
  */
-static s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
-                                           struct ixgbe_dcb_config *dcb_config)
+s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
+                                           u16 *refill,
+                                           u16 *max,
+                                           u8 *bwg_id,
+                                           u8 *prio_type)
 {
-        struct tc_bw_alloc *p;
         u32    reg, max_credits;
         u8     i;
 
@@ -149,16 +157,15 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
 
         /* Configure traffic class credits and priority */
         for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                p = &dcb_config->tc_config[i].path[DCB_TX_CONFIG];
-                max_credits = dcb_config->tc_config[i].desc_credits_max;
+                max_credits = max[i];
                 reg = max_credits << IXGBE_RTTDT2C_MCL_SHIFT;
-                reg |= p->data_credits_refill;
-                reg |= (u32)(p->bwg_id) << IXGBE_RTTDT2C_BWG_SHIFT;
+                reg |= refill[i];
+                reg |= (u32)(bwg_id[i]) << IXGBE_RTTDT2C_BWG_SHIFT;
 
-                if (p->prio_type == prio_group)
+                if (prio_type[i] == prio_group)
                         reg |= IXGBE_RTTDT2C_GSP;
 
-                if (p->prio_type == prio_link)
+                if (prio_type[i] == prio_link)
                         reg |= IXGBE_RTTDT2C_LSP;
 
                 IXGBE_WRITE_REG(hw, IXGBE_RTTDT2C(i), reg);
@@ -177,14 +184,20 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
 /**
  * ixgbe_dcb_config_tx_data_arbiter_82599 - Config Tx Data arbiter
  * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
+ * @refill: refill credits index by traffic class
+ * @max: max credits index by traffic class
+ * @bwg_id: bandwidth grouping indexed by traffic class
+ * @prio_type: priority type indexed by traffic class
  *
  * Configure Tx Packet Arbiter and credits for each traffic class.
  */
-static s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
-                                           struct ixgbe_dcb_config *dcb_config)
+s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
+                                           u16 *refill,
+                                           u16 *max,
+                                           u8 *bwg_id,
+                                           u8 *prio_type,
+                                           u8 *prio_tc)
 {
-        struct tc_bw_alloc *p;
         u32 reg;
         u8 i;
 
@@ -200,20 +213,19 @@ static s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
         /* Map all traffic classes to their UP, 1 to 1 */
         reg = 0;
         for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
-                reg |= (i << (i * IXGBE_RTTUP2TC_UP_SHIFT));
+                reg |= (prio_tc[i] << (i * IXGBE_RTTUP2TC_UP_SHIFT));
         IXGBE_WRITE_REG(hw, IXGBE_RTTUP2TC, reg);
 
         /* Configure traffic class credits and priority */
         for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
-                p = &dcb_config->tc_config[i].path[DCB_TX_CONFIG];
-                reg = p->data_credits_refill;
-                reg |= (u32)(p->data_credits_max) << IXGBE_RTTPT2C_MCL_SHIFT;
-                reg |= (u32)(p->bwg_id) << IXGBE_RTTPT2C_BWG_SHIFT;
+                reg = refill[i];
+                reg |= (u32)(max[i]) << IXGBE_RTTPT2C_MCL_SHIFT;
+                reg |= (u32)(bwg_id[i]) << IXGBE_RTTPT2C_BWG_SHIFT;
 
-                if (p->prio_type == prio_group)
+                if (prio_type[i] == prio_group)
                         reg |= IXGBE_RTTPT2C_GSP;
 
-                if (p->prio_type == prio_link)
+                if (prio_type[i] == prio_link)
                         reg |= IXGBE_RTTPT2C_LSP;
 
                 IXGBE_WRITE_REG(hw, IXGBE_RTTPT2C(i), reg);
@@ -233,63 +245,59 @@ static s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
 /**
  * ixgbe_dcb_config_pfc_82599 - Configure priority flow control
  * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
+ * @pfc_en: enabled pfc bitmask
  *
  * Configure Priority Flow Control (PFC) for each traffic class.
  */
-s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw,
-                               struct ixgbe_dcb_config *dcb_config)
+s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en)
 {
         u32 i, reg, rx_pba_size;
 
-        /* If PFC is disabled globally then fall back to LFC. */
-        if (!dcb_config->pfc_mode_enable) {
-                for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
-                        hw->mac.ops.fc_enable(hw, i);
-                goto out;
-        }
-
         /* Configure PFC Tx thresholds per TC */
         for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                int enabled = pfc_en & (1 << i);
                 rx_pba_size = IXGBE_READ_REG(hw, IXGBE_RXPBSIZE(i));
                 rx_pba_size >>= IXGBE_RXPBSIZE_SHIFT;
 
                 reg = (rx_pba_size - hw->fc.low_water) << 10;
 
-                if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full ||
-                    dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx)
+                if (enabled)
                         reg |= IXGBE_FCRTL_XONE;
                 IXGBE_WRITE_REG(hw, IXGBE_FCRTL_82599(i), reg);
 
                 reg = (rx_pba_size - hw->fc.high_water) << 10;
-                if (dcb_config->tc_config[i].dcb_pfc == pfc_enabled_full ||
-                    dcb_config->tc_config[i].dcb_pfc == pfc_enabled_tx)
+                if (enabled)
                         reg |= IXGBE_FCRTH_FCEN;
                 IXGBE_WRITE_REG(hw, IXGBE_FCRTH_82599(i), reg);
         }
 
-        /* Configure pause time (2 TCs per register) */
-        reg = hw->fc.pause_time | (hw->fc.pause_time << 16);
-        for (i = 0; i < (MAX_TRAFFIC_CLASS / 2); i++)
-                IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), reg);
-
-        /* Configure flow control refresh threshold value */
-        IXGBE_WRITE_REG(hw, IXGBE_FCRTV, hw->fc.pause_time / 2);
-
-        /* Enable Transmit PFC */
-        reg = IXGBE_FCCFG_TFCE_PRIORITY;
-        IXGBE_WRITE_REG(hw, IXGBE_FCCFG, reg);
+        if (pfc_en) {
+                /* Configure pause time (2 TCs per register) */
+                reg = hw->fc.pause_time | (hw->fc.pause_time << 16);
+                for (i = 0; i < (MAX_TRAFFIC_CLASS / 2); i++)
+                        IXGBE_WRITE_REG(hw, IXGBE_FCTTV(i), reg);
+
+                /* Configure flow control refresh threshold value */
+                IXGBE_WRITE_REG(hw, IXGBE_FCRTV, hw->fc.pause_time / 2);
+
+
+                reg = IXGBE_FCCFG_TFCE_PRIORITY;
+                IXGBE_WRITE_REG(hw, IXGBE_FCCFG, reg);
+                /*
+                 * Enable Receive PFC
+                 * We will always honor XOFF frames we receive when
+                 * we are in PFC mode.
+                 */
+                reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
+                reg &= ~IXGBE_MFLCN_RFCE;
+                reg |= IXGBE_MFLCN_RPFCE | IXGBE_MFLCN_DPF;
+                IXGBE_WRITE_REG(hw, IXGBE_MFLCN, reg);
+
+        } else {
+                for (i = 0; i < MAX_TRAFFIC_CLASS; i++)
+                        hw->mac.ops.fc_enable(hw, i);
+        }
 
-        /*
-         * Enable Receive PFC
-         * We will always honor XOFF frames we receive when
-         * we are in PFC mode.
-         */
-        reg = IXGBE_READ_REG(hw, IXGBE_MFLCN);
-        reg &= ~IXGBE_MFLCN_RFCE;
-        reg |= IXGBE_MFLCN_RPFCE | IXGBE_MFLCN_DPF;
-        IXGBE_WRITE_REG(hw, IXGBE_MFLCN, reg);
-out:
         return 0;
 }
 
@@ -349,7 +357,6 @@ static s32 ixgbe_dcb_config_tc_stats_82599(struct ixgbe_hw *hw)
 /**
  * ixgbe_dcb_config_82599 - Configure general DCB parameters
  * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
  *
  * Configure general DCB parameters.
  */
@@ -406,19 +413,28 @@ static s32 ixgbe_dcb_config_82599(struct ixgbe_hw *hw)
 /**
  * ixgbe_dcb_hw_config_82599 - Configure and enable DCB
  * @hw: pointer to hardware structure
- * @dcb_config: pointer to ixgbe_dcb_config structure
+ * @rx_pba: method to distribute packet buffer
+ * @refill: refill credits index by traffic class
+ * @max: max credits index by traffic class
+ * @bwg_id: bandwidth grouping indexed by traffic class
+ * @prio_type: priority type indexed by traffic class
+ * @pfc_en: enabled pfc bitmask
  *
  * Configure dcb settings and enable dcb mode.
  */
 s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw,
-                              struct ixgbe_dcb_config *dcb_config)
+                              u8 rx_pba, u8 pfc_en, u16 *refill,
+                              u16 *max, u8 *bwg_id, u8 *prio_type, u8 *prio_tc)
 {
-        ixgbe_dcb_config_packet_buffers_82599(hw, dcb_config);
+        ixgbe_dcb_config_packet_buffers_82599(hw, rx_pba);
         ixgbe_dcb_config_82599(hw);
-        ixgbe_dcb_config_rx_arbiter_82599(hw, dcb_config);
-        ixgbe_dcb_config_tx_desc_arbiter_82599(hw, dcb_config);
-        ixgbe_dcb_config_tx_data_arbiter_82599(hw, dcb_config);
-        ixgbe_dcb_config_pfc_82599(hw, dcb_config);
+        ixgbe_dcb_config_rx_arbiter_82599(hw, refill, max, bwg_id,
+                                          prio_type, prio_tc);
+        ixgbe_dcb_config_tx_desc_arbiter_82599(hw, refill, max,
+                                               bwg_id, prio_type);
+        ixgbe_dcb_config_tx_data_arbiter_82599(hw, refill, max,
+                                               bwg_id, prio_type, prio_tc);
+        ixgbe_dcb_config_pfc_82599(hw, pfc_en);
         ixgbe_dcb_config_tc_stats_82599(hw);
 
         return 0;
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82599.h b/drivers/net/ixgbe/ixgbe_dcb_82599.h
index 3841649fb95..148fd8b477a 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_82599.h
+++ b/drivers/net/ixgbe/ixgbe_dcb_82599.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -102,11 +102,32 @@
 /* DCB hardware-specific driver APIs */
 
 /* DCB PFC functions */
-s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw,
-                               struct ixgbe_dcb_config *dcb_config);
+s32 ixgbe_dcb_config_pfc_82599(struct ixgbe_hw *hw, u8 pfc_en);
 
 /* DCB hw initialization */
+s32 ixgbe_dcb_config_rx_arbiter_82599(struct ixgbe_hw *hw,
+                                        u16 *refill,
+                                        u16 *max,
+                                        u8 *bwg_id,
+                                        u8 *prio_type,
+                                        u8 *prio_tc);
+
+s32 ixgbe_dcb_config_tx_desc_arbiter_82599(struct ixgbe_hw *hw,
+                                                u16 *refill,
+                                                u16 *max,
+                                                u8 *bwg_id,
+                                                u8 *prio_type);
+
+s32 ixgbe_dcb_config_tx_data_arbiter_82599(struct ixgbe_hw *hw,
+                                                u16 *refill,
+                                                u16 *max,
+                                                u8 *bwg_id,
+                                                u8 *prio_type,
+                                                u8 *prio_tc);
+
 s32 ixgbe_dcb_hw_config_82599(struct ixgbe_hw *hw,
-                              struct ixgbe_dcb_config *config);
+                              u8 rx_pba, u8 pfc_en, u16 *refill,
+                              u16 *max, u8 *bwg_id, u8 *prio_type,
+                              u8 *prio_tc);
 
 #endif /* _DCB_82599_CONFIG_H */
diff --git a/drivers/net/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ixgbe/ixgbe_dcb_nl.c
index bf566e8a455..fec4c724c37 100644
--- a/drivers/net/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -37,7 +37,6 @@
 #define BIT_PG_RX       0x04
 #define BIT_PG_TX       0x08
 #define BIT_APP_UPCHG   0x10
-#define BIT_RESETLINK   0x40
 #define BIT_LINKSPEED   0x80
 
 /* Responses for the DCB_C_SET_ALL command */
@@ -130,7 +129,6 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
                         netdev->netdev_ops->ndo_stop(netdev);
                 ixgbe_clear_interrupt_scheme(adapter);
 
-                adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED;
                 switch (adapter->hw.mac.type) {
                 case ixgbe_mac_82598EB:
                         adapter->last_lfc_mode = adapter->hw.fc.current_mode;
@@ -146,6 +144,9 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
                 }
 
                 adapter->flags |= IXGBE_FLAG_DCB_ENABLED;
+                if (!netdev_get_num_tc(netdev))
+                        ixgbe_setup_tc(netdev, MAX_TRAFFIC_CLASS);
+
                 ixgbe_init_interrupt_scheme(adapter);
                 if (netif_running(netdev))
                         netdev->netdev_ops->ndo_open(netdev);
@@ -160,7 +161,6 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
                         adapter->temp_dcb_cfg.pfc_mode_enable = false;
                         adapter->dcb_cfg.pfc_mode_enable = false;
                         adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED;
-                        adapter->flags |= IXGBE_FLAG_RSS_ENABLED;
                         switch (adapter->hw.mac.type) {
                         case ixgbe_mac_82599EB:
                         case ixgbe_mac_X540:
@@ -170,6 +170,8 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
                                 break;
                         }
 
+                        ixgbe_setup_tc(netdev, 0);
+
                         ixgbe_init_interrupt_scheme(adapter);
                         if (netif_running(netdev))
                                 netdev->netdev_ops->ndo_open(netdev);
@@ -225,10 +227,8 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_tx(struct net_device *netdev, int tc,
             (adapter->temp_dcb_cfg.tc_config[tc].path[0].bwg_percent !=
              adapter->dcb_cfg.tc_config[tc].path[0].bwg_percent) ||
             (adapter->temp_dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap !=
-             adapter->dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap)) {
+             adapter->dcb_cfg.tc_config[tc].path[0].up_to_tc_bitmap))
                 adapter->dcb_set_bitmap |= BIT_PG_TX;
-                adapter->dcb_set_bitmap |= BIT_RESETLINK;
-        }
 }
 
 static void ixgbe_dcbnl_set_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,
@@ -239,10 +239,8 @@ static void ixgbe_dcbnl_set_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,
         adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] = bw_pct;
 
         if (adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] !=
-            adapter->dcb_cfg.bw_percentage[0][bwg_id]) {
+            adapter->dcb_cfg.bw_percentage[0][bwg_id])
                 adapter->dcb_set_bitmap |= BIT_PG_TX;
-                adapter->dcb_set_bitmap |= BIT_RESETLINK;
-        }
 }
 
 static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc,
@@ -269,10 +267,8 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc,
             (adapter->temp_dcb_cfg.tc_config[tc].path[1].bwg_percent !=
              adapter->dcb_cfg.tc_config[tc].path[1].bwg_percent) ||
             (adapter->temp_dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap !=
-             adapter->dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap)) {
+             adapter->dcb_cfg.tc_config[tc].path[1].up_to_tc_bitmap))
                 adapter->dcb_set_bitmap |= BIT_PG_RX;
-                adapter->dcb_set_bitmap |= BIT_RESETLINK;
-        }
 }
 
 static void ixgbe_dcbnl_set_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,
@@ -283,10 +279,8 @@ static void ixgbe_dcbnl_set_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,
         adapter->temp_dcb_cfg.bw_percentage[1][bwg_id] = bw_pct;
 
         if (adapter->temp_dcb_cfg.bw_percentage[1][bwg_id] !=
-            adapter->dcb_cfg.bw_percentage[1][bwg_id]) {
+            adapter->dcb_cfg.bw_percentage[1][bwg_id])
                 adapter->dcb_set_bitmap |= BIT_PG_RX;
-                adapter->dcb_set_bitmap |= BIT_RESETLINK;
-        }
 }
 
 static void ixgbe_dcbnl_get_pg_tc_cfg_tx(struct net_device *netdev, int tc,
@@ -355,31 +349,28 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         int ret;
 
-        if (!adapter->dcb_set_bitmap)
+        if (!adapter->dcb_set_bitmap ||
+            !(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))
                 return DCB_NO_HW_CHG;
 
         ret = ixgbe_copy_dcb_cfg(&adapter->temp_dcb_cfg, &adapter->dcb_cfg,
-                                 adapter->ring_feature[RING_F_DCB].indices);
+                                 MAX_TRAFFIC_CLASS);
 
         if (ret)
                 return DCB_NO_HW_CHG;
 
         /*
-         * Only take down the adapter if the configuration change
-         * requires a reset.
+         * Only take down the adapter if an app change occured. FCoE
+         * may shuffle tx rings in this case and this can not be done
+         * without a reset currently.
          */
-        if (adapter->dcb_set_bitmap & BIT_RESETLINK) {
+        if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {
                 while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
                         msleep(1);
 
-                if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {
-                        if (netif_running(netdev))
-                                netdev->netdev_ops->ndo_stop(netdev);
-                        ixgbe_clear_interrupt_scheme(adapter);
-                } else {
-                        if (netif_running(netdev))
-                                ixgbe_down(adapter);
-                }
+                if (netif_running(netdev))
+                        netdev->netdev_ops->ndo_stop(netdev);
+                ixgbe_clear_interrupt_scheme(adapter);
         }
 
         if (adapter->dcb_cfg.pfc_mode_enable) {
@@ -408,29 +399,53 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
                 }
         }
 
-        if (adapter->dcb_set_bitmap & BIT_RESETLINK) {
-                if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {
-                        ixgbe_init_interrupt_scheme(adapter);
-                        if (netif_running(netdev))
-                                netdev->netdev_ops->ndo_open(netdev);
-                } else {
-                        if (netif_running(netdev))
-                                ixgbe_up(adapter);
-                }
+        if (adapter->dcb_set_bitmap & BIT_APP_UPCHG) {
+                ixgbe_init_interrupt_scheme(adapter);
+                if (netif_running(netdev))
+                        netdev->netdev_ops->ndo_open(netdev);
                 ret = DCB_HW_CHG_RST;
-        } else if (adapter->dcb_set_bitmap & BIT_PFC) {
-                if (adapter->hw.mac.type == ixgbe_mac_82598EB)
-                        ixgbe_dcb_config_pfc_82598(&adapter->hw,
-                                                   &adapter->dcb_cfg);
-                else if (adapter->hw.mac.type == ixgbe_mac_82599EB)
-                        ixgbe_dcb_config_pfc_82599(&adapter->hw,
-                                                   &adapter->dcb_cfg);
+        }
+
+        if (adapter->dcb_set_bitmap & BIT_PFC) {
+                u8 pfc_en;
+                ixgbe_dcb_unpack_pfc(&adapter->dcb_cfg, &pfc_en);
+                ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc_en);
                 ret = DCB_HW_CHG;
         }
+
+        if (adapter->dcb_set_bitmap & (BIT_PG_TX|BIT_PG_RX)) {
+                u16 refill[MAX_TRAFFIC_CLASS], max[MAX_TRAFFIC_CLASS];
+                u8 bwg_id[MAX_TRAFFIC_CLASS], prio_type[MAX_TRAFFIC_CLASS];
+                /* Priority to TC mapping in CEE case default to 1:1 */
+                u8 prio_tc[MAX_TRAFFIC_CLASS] = {0, 1, 2, 3, 4, 5, 6, 7};
+                int max_frame = adapter->netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+
+#ifdef CONFIG_FCOE
+                if (adapter->netdev->features & NETIF_F_FCOE_MTU)
+                        max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
+#endif
+
+                ixgbe_dcb_calculate_tc_credits(&adapter->hw, &adapter->dcb_cfg,
+                                               max_frame, DCB_TX_CONFIG);
+                ixgbe_dcb_calculate_tc_credits(&adapter->hw, &adapter->dcb_cfg,
+                                               max_frame, DCB_RX_CONFIG);
+
+                ixgbe_dcb_unpack_refill(&adapter->dcb_cfg,
+                                        DCB_TX_CONFIG, refill);
+                ixgbe_dcb_unpack_max(&adapter->dcb_cfg, max);
+                ixgbe_dcb_unpack_bwgid(&adapter->dcb_cfg,
+                                       DCB_TX_CONFIG, bwg_id);
+                ixgbe_dcb_unpack_prio(&adapter->dcb_cfg,
+                                      DCB_TX_CONFIG, prio_type);
+
+                ixgbe_dcb_hw_ets_config(&adapter->hw, refill, max,
+                                        bwg_id, prio_type, prio_tc);
+        }
+
         if (adapter->dcb_cfg.pfc_mode_enable)
                 adapter->hw.fc.current_mode = ixgbe_fc_pfc;
 
-        if (adapter->dcb_set_bitmap & BIT_RESETLINK)
+        if (adapter->dcb_set_bitmap & BIT_APP_UPCHG)
                 clear_bit(__IXGBE_RESETTING, &adapter->state);
         adapter->dcb_set_bitmap = 0x00;
         return ret;
@@ -439,40 +454,38 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
 static u8 ixgbe_dcbnl_getcap(struct net_device *netdev, int capid, u8 *cap)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
-        u8 rval = 0;
 
-        if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                switch (capid) {
-                case DCB_CAP_ATTR_PG:
-                        *cap = true;
-                        break;
-                case DCB_CAP_ATTR_PFC:
-                        *cap = true;
-                        break;
-                case DCB_CAP_ATTR_UP2TC:
-                        *cap = false;
-                        break;
-                case DCB_CAP_ATTR_PG_TCS:
-                        *cap = 0x80;
-                        break;
-                case DCB_CAP_ATTR_PFC_TCS:
-                        *cap = 0x80;
-                        break;
-                case DCB_CAP_ATTR_GSP:
-                        *cap = true;
-                        break;
-                case DCB_CAP_ATTR_BCN:
-                        *cap = false;
-                        break;
-                default:
-                        rval = -EINVAL;
-                        break;
-                }
-        } else {
-                rval = -EINVAL;
+        switch (capid) {
+        case DCB_CAP_ATTR_PG:
+                *cap = true;
+                break;
+        case DCB_CAP_ATTR_PFC:
+                *cap = true;
+                break;
+        case DCB_CAP_ATTR_UP2TC:
+                *cap = false;
+                break;
+        case DCB_CAP_ATTR_PG_TCS:
+                *cap = 0x80;
+                break;
+        case DCB_CAP_ATTR_PFC_TCS:
+                *cap = 0x80;
+                break;
+        case DCB_CAP_ATTR_GSP:
+                *cap = true;
+                break;
+        case DCB_CAP_ATTR_BCN:
+                *cap = false;
+                break;
+        case DCB_CAP_ATTR_DCBX:
+                *cap = adapter->dcbx_cap;
+                break;
+        default:
+                *cap = false;
+                break;
         }
 
-        return rval;
+        return 0;
 }
 
 static u8 ixgbe_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num)
@@ -533,21 +546,16 @@ static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)
  */
 static u8 ixgbe_dcbnl_getapp(struct net_device *netdev, u8 idtype, u16 id)
 {
-        u8 rval = 0;
+        struct ixgbe_adapter *adapter = netdev_priv(netdev);
+        struct dcb_app app = {
+                                .selector = idtype,
+                                .protocol = id,
+                             };
 
-        switch (idtype) {
-        case DCB_APP_IDTYPE_ETHTYPE:
-#ifdef IXGBE_FCOE
-                if (id == ETH_P_FCOE)
-                        rval = ixgbe_fcoe_getapp(netdev_priv(netdev));
-#endif
-                break;
-        case DCB_APP_IDTYPE_PORTNUM:
-                break;
-        default:
-                break;
-        }
-        return rval;
+        if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))
+                return 0;
+
+        return dcb_getapp(netdev, &app);
 }
 
 /**
@@ -562,24 +570,45 @@ static u8 ixgbe_dcbnl_getapp(struct net_device *netdev, u8 idtype, u16 id)
 static u8 ixgbe_dcbnl_setapp(struct net_device *netdev,
                              u8 idtype, u16 id, u8 up)
 {
+        struct ixgbe_adapter *adapter = netdev_priv(netdev);
         u8 rval = 1;
+        struct dcb_app app = {
+                              .selector = idtype,
+                              .protocol = id,
+                              .priority = up
+                             };
+
+        if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))
+                return rval;
+
+        rval = dcb_setapp(netdev, &app);
 
         switch (idtype) {
         case DCB_APP_IDTYPE_ETHTYPE:
 #ifdef IXGBE_FCOE
                 if (id == ETH_P_FCOE) {
-                        u8 tc;
-                        struct ixgbe_adapter *adapter;
+                        u8 old_tc;
 
-                        adapter = netdev_priv(netdev);
-                        tc = adapter->fcoe.tc;
+                        /* Get current programmed tc */
+                        old_tc = adapter->fcoe.tc;
                         rval = ixgbe_fcoe_setapp(adapter, up);
-                        if ((!rval) && (tc != adapter->fcoe.tc) &&
-                            (adapter->flags & IXGBE_FLAG_DCB_ENABLED) &&
-                            (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)) {
+
+                        if (rval ||
+                           !(adapter->flags & IXGBE_FLAG_DCB_ENABLED) ||
+                           !(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
+                                break;
+
+                        /* The FCoE application priority may be changed multiple
+                         * times in quick sucession with switches that build up
+                         * TLVs. To avoid creating uneeded device resets this
+                         * checks the actual HW configuration and clears
+                         * BIT_APP_UPCHG if a HW configuration change is not
+                         * need
+                         */
+                        if (old_tc == adapter->fcoe.tc)
+                                adapter->dcb_set_bitmap &= ~BIT_APP_UPCHG;
+                        else
                                 adapter->dcb_set_bitmap |= BIT_APP_UPCHG;
-                                adapter->dcb_set_bitmap |= BIT_RESETLINK;
-                        }
                 }
 #endif
                 break;
@@ -591,7 +620,204 @@ static u8 ixgbe_dcbnl_setapp(struct net_device *netdev,
         return rval;
 }
 
+static int ixgbe_dcbnl_ieee_getets(struct net_device *dev,
+                                   struct ieee_ets *ets)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+        struct ieee_ets *my_ets = adapter->ixgbe_ieee_ets;
+
+        /* No IEEE PFC settings available */
+        if (!my_ets)
+                return -EINVAL;
+
+        ets->ets_cap = MAX_TRAFFIC_CLASS;
+        ets->cbs = my_ets->cbs;
+        memcpy(ets->tc_tx_bw, my_ets->tc_tx_bw, sizeof(ets->tc_tx_bw));
+        memcpy(ets->tc_rx_bw, my_ets->tc_rx_bw, sizeof(ets->tc_rx_bw));
+        memcpy(ets->tc_tsa, my_ets->tc_tsa, sizeof(ets->tc_tsa));
+        memcpy(ets->prio_tc, my_ets->prio_tc, sizeof(ets->prio_tc));
+        return 0;
+}
+
+static int ixgbe_dcbnl_ieee_setets(struct net_device *dev,
+                                   struct ieee_ets *ets)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+        __u16 refill[IEEE_8021QAZ_MAX_TCS], max[IEEE_8021QAZ_MAX_TCS];
+        __u8 prio_type[IEEE_8021QAZ_MAX_TCS];
+        int max_frame = dev->mtu + ETH_HLEN + ETH_FCS_LEN;
+        int i, err;
+        __u64 *p = (__u64 *) ets->prio_tc;
+        /* naively give each TC a bwg to map onto CEE hardware */
+        __u8 bwg_id[IEEE_8021QAZ_MAX_TCS] = {0, 1, 2, 3, 4, 5, 6, 7};
+
+        if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
+                return -EINVAL;
+
+        if (!adapter->ixgbe_ieee_ets) {
+                adapter->ixgbe_ieee_ets = kmalloc(sizeof(struct ieee_ets),
+                                                  GFP_KERNEL);
+                if (!adapter->ixgbe_ieee_ets)
+                        return -ENOMEM;
+        }
+
+        memcpy(adapter->ixgbe_ieee_ets, ets, sizeof(*adapter->ixgbe_ieee_ets));
+
+        /* Map TSA onto CEE prio type */
+        for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
+                switch (ets->tc_tsa[i]) {
+                case IEEE_8021QAZ_TSA_STRICT:
+                        prio_type[i] = 2;
+                        break;
+                case IEEE_8021QAZ_TSA_ETS:
+                        prio_type[i] = 0;
+                        break;
+                default:
+                        /* Hardware only supports priority strict or
+                         * ETS transmission selection algorithms if
+                         * we receive some other value from dcbnl
+                         * throw an error
+                         */
+                        return -EINVAL;
+                }
+        }
+
+        if (*p)
+                ixgbe_dcbnl_set_state(dev, 1);
+        else
+                ixgbe_dcbnl_set_state(dev, 0);
+
+        ixgbe_ieee_credits(ets->tc_tx_bw, refill, max, max_frame);
+        err = ixgbe_dcb_hw_ets_config(&adapter->hw, refill, max,
+                                      bwg_id, prio_type, ets->prio_tc);
+        return err;
+}
+
+static int ixgbe_dcbnl_ieee_getpfc(struct net_device *dev,
+                                   struct ieee_pfc *pfc)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+        struct ieee_pfc *my_pfc = adapter->ixgbe_ieee_pfc;
+        int i;
+
+        /* No IEEE PFC settings available */
+        if (!my_pfc)
+                return -EINVAL;
+
+        pfc->pfc_cap = MAX_TRAFFIC_CLASS;
+        pfc->pfc_en = my_pfc->pfc_en;
+        pfc->mbc = my_pfc->mbc;
+        pfc->delay = my_pfc->delay;
+
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                pfc->requests[i] = adapter->stats.pxoffrxc[i];
+                pfc->indications[i] = adapter->stats.pxofftxc[i];
+        }
+
+        return 0;
+}
+
+static int ixgbe_dcbnl_ieee_setpfc(struct net_device *dev,
+                                   struct ieee_pfc *pfc)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+        int err;
+
+        if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
+                return -EINVAL;
+
+        if (!adapter->ixgbe_ieee_pfc) {
+                adapter->ixgbe_ieee_pfc = kmalloc(sizeof(struct ieee_pfc),
+                                                  GFP_KERNEL);
+                if (!adapter->ixgbe_ieee_pfc)
+                        return -ENOMEM;
+        }
+
+        memcpy(adapter->ixgbe_ieee_pfc, pfc, sizeof(*adapter->ixgbe_ieee_pfc));
+        err = ixgbe_dcb_hw_pfc_config(&adapter->hw, pfc->pfc_en);
+        return err;
+}
+
+static int ixgbe_dcbnl_ieee_setapp(struct net_device *dev,
+                                   struct dcb_app *app)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+
+        if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
+                return -EINVAL;
+#ifdef IXGBE_FCOE
+        if (app->selector == 1 && app->protocol == ETH_P_FCOE) {
+                if (adapter->fcoe.tc == app->priority)
+                        goto setapp;
+
+                /* In IEEE mode map up to tc 1:1 */
+                adapter->fcoe.tc = app->priority;
+                adapter->fcoe.up = app->priority;
+
+                /* Force hardware reset required to push FCoE
+                 * setup on {tx|rx}_rings
+                 */
+                adapter->dcb_set_bitmap |= BIT_APP_UPCHG;
+                ixgbe_dcbnl_set_all(dev);
+        }
+
+setapp:
+#endif
+        dcb_setapp(dev, app);
+        return 0;
+}
+
+static u8 ixgbe_dcbnl_getdcbx(struct net_device *dev)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+        return adapter->dcbx_cap;
+}
+
+static u8 ixgbe_dcbnl_setdcbx(struct net_device *dev, u8 mode)
+{
+        struct ixgbe_adapter *adapter = netdev_priv(dev);
+        struct ieee_ets ets = {0};
+        struct ieee_pfc pfc = {0};
+
+        /* no support for LLD_MANAGED modes or CEE+IEEE */
+        if ((mode & DCB_CAP_DCBX_LLD_MANAGED) ||
+            ((mode & DCB_CAP_DCBX_VER_IEEE) && (mode & DCB_CAP_DCBX_VER_CEE)) ||
+            !(mode & DCB_CAP_DCBX_HOST))
+                return 1;
+
+        if (mode == adapter->dcbx_cap)
+                return 0;
+
+        adapter->dcbx_cap = mode;
+
+        /* ETS and PFC defaults */
+        ets.ets_cap = 8;
+        pfc.pfc_cap = 8;
+
+        if (mode & DCB_CAP_DCBX_VER_IEEE) {
+                ixgbe_dcbnl_ieee_setets(dev, &ets);
+                ixgbe_dcbnl_ieee_setpfc(dev, &pfc);
+        } else if (mode & DCB_CAP_DCBX_VER_CEE) {
+                adapter->dcb_set_bitmap |= (BIT_PFC & BIT_PG_TX & BIT_PG_RX);
+                ixgbe_dcbnl_set_all(dev);
+        } else {
+                /* Drop into single TC mode strict priority as this
+                 * indicates CEE and IEEE versions are disabled
+                 */
+                ixgbe_dcbnl_ieee_setets(dev, &ets);
+                ixgbe_dcbnl_ieee_setpfc(dev, &pfc);
+                ixgbe_dcbnl_set_state(dev, 0);
+        }
+
+        return 0;
+}
+
 const struct dcbnl_rtnl_ops dcbnl_ops = {
+        .ieee_getets    = ixgbe_dcbnl_ieee_getets,
+        .ieee_setets    = ixgbe_dcbnl_ieee_setets,
+        .ieee_getpfc    = ixgbe_dcbnl_ieee_getpfc,
+        .ieee_setpfc    = ixgbe_dcbnl_ieee_setpfc,
+        .ieee_setapp    = ixgbe_dcbnl_ieee_setapp,
         .getstate       = ixgbe_dcbnl_get_state,
         .setstate       = ixgbe_dcbnl_set_state,
         .getpermhwaddr  = ixgbe_dcbnl_get_perm_hw_addr,
@@ -613,5 +839,6 @@ const struct dcbnl_rtnl_ops dcbnl_ops = {
         .setpfcstate    = ixgbe_dcbnl_setpfcstate,
         .getapp         = ixgbe_dcbnl_getapp,
         .setapp         = ixgbe_dcbnl_setapp,
+        .getdcbx        = ixgbe_dcbnl_getdcbx,
+        .setdcbx        = ixgbe_dcbnl_setdcbx,
 };
-
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 2002ea88ca2..76380a2b35a 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -152,20 +152,35 @@ static int ixgbe_get_settings(struct net_device *netdev,
                 ecmd->supported |= (SUPPORTED_1000baseT_Full |
                                     SUPPORTED_Autoneg);
 
+                switch (hw->mac.type) {
+                case ixgbe_mac_X540:
+                        ecmd->supported |= SUPPORTED_100baseT_Full;
+                        break;
+                default:
+                        break;
+                }
+
                 ecmd->advertising = ADVERTISED_Autoneg;
-                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL)
-                        ecmd->advertising |= ADVERTISED_10000baseT_Full;
-                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL)
-                        ecmd->advertising |= ADVERTISED_1000baseT_Full;
-                /*
-                 * It's possible that phy.autoneg_advertised may not be
-                 * set yet.  If so display what the default would be -
-                 * both 1G and 10G supported.
-                 */
-                if (!(ecmd->advertising & (ADVERTISED_1000baseT_Full |
-                                           ADVERTISED_10000baseT_Full)))
+                if (hw->phy.autoneg_advertised) {
+                        if (hw->phy.autoneg_advertised &
+                            IXGBE_LINK_SPEED_100_FULL)
+                                ecmd->advertising |= ADVERTISED_100baseT_Full;
+                        if (hw->phy.autoneg_advertised &
+                            IXGBE_LINK_SPEED_10GB_FULL)
+                                ecmd->advertising |= ADVERTISED_10000baseT_Full;
+                        if (hw->phy.autoneg_advertised &
+                            IXGBE_LINK_SPEED_1GB_FULL)
+                                ecmd->advertising |= ADVERTISED_1000baseT_Full;
+                } else {
+                        /*
+                         * Default advertised modes in case
+                         * phy.autoneg_advertised isn't set.
+                         */
                         ecmd->advertising |= (ADVERTISED_10000baseT_Full |
                                               ADVERTISED_1000baseT_Full);
+                        if (hw->mac.type == ixgbe_mac_X540)
+                                ecmd->advertising |= ADVERTISED_100baseT_Full;
+                }
 
                 if (hw->phy.media_type == ixgbe_media_type_copper) {
                         ecmd->supported |= SUPPORTED_TP;
@@ -271,8 +286,19 @@ static int ixgbe_get_settings(struct net_device *netdev,
 
         hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
         if (link_up) {
-                ecmd->speed = (link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?
-                               SPEED_10000 : SPEED_1000;
+                switch (link_speed) {
+                case IXGBE_LINK_SPEED_10GB_FULL:
+                        ecmd->speed = SPEED_10000;
+                        break;
+                case IXGBE_LINK_SPEED_1GB_FULL:
+                        ecmd->speed = SPEED_1000;
+                        break;
+                case IXGBE_LINK_SPEED_100_FULL:
+                        ecmd->speed = SPEED_100;
+                        break;
+                default:
+                        break;
+                }
                 ecmd->duplex = DUPLEX_FULL;
         } else {
                 ecmd->speed = -1;
@@ -306,6 +332,9 @@ static int ixgbe_set_settings(struct net_device *netdev,
                 if (ecmd->advertising & ADVERTISED_1000baseT_Full)
                         advertised |= IXGBE_LINK_SPEED_1GB_FULL;
 
+                if (ecmd->advertising & ADVERTISED_100baseT_Full)
+                        advertised |= IXGBE_LINK_SPEED_100_FULL;
+
                 if (old == advertised)
                         return err;
                 /* this sets the link speed and restarts auto-neg */
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c
index 6342d485979..dba7d77588e 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ixgbe/ixgbe_fcoe.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -135,22 +135,19 @@ out_ddp_put:
         return len;
 }
 
+
 /**
- * ixgbe_fcoe_ddp_get - called to set up ddp context
+ * ixgbe_fcoe_ddp_setup - called to set up ddp context
  * @netdev: the corresponding net_device
  * @xid: the exchange id requesting ddp
  * @sgl: the scatter-gather list for this request
  * @sgc: the number of scatter-gather items
  *
- * This is the implementation of net_device_ops.ndo_fcoe_ddp_setup
- * and is expected to be called from ULD, e.g., FCP layer of libfc
- * to set up ddp for the corresponding xid of the given sglist for
- * the corresponding I/O.
- *
  * Returns : 1 for success and 0 for no ddp
  */
-int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
-                       struct scatterlist *sgl, unsigned int sgc)
+static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid,
+                                struct scatterlist *sgl, unsigned int sgc,
+                                int target_mode)
 {
         struct ixgbe_adapter *adapter;
         struct ixgbe_hw *hw;
@@ -159,13 +156,13 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
         struct scatterlist *sg;
         unsigned int i, j, dmacount;
         unsigned int len;
-        static const unsigned int bufflen = 4096;
+        static const unsigned int bufflen = IXGBE_FCBUFF_MIN;
         unsigned int firstoff = 0;
         unsigned int lastsize;
         unsigned int thisoff = 0;
         unsigned int thislen = 0;
-        u32 fcbuff, fcdmarw, fcfltrw;
-        dma_addr_t addr;
+        u32 fcbuff, fcdmarw, fcfltrw, fcrxctl;
+        dma_addr_t addr = 0;
 
         if (!netdev || !sgl)
                 return 0;
@@ -254,9 +251,30 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
         /* only the last buffer may have non-full bufflen */
         lastsize = thisoff + thislen;
 
+        /*
+         * lastsize can not be buffer len.
+         * If it is then adding another buffer with lastsize = 1.
+         */
+        if (lastsize == bufflen) {
+                if (j >= IXGBE_BUFFCNT_MAX) {
+                        e_err(drv, "xid=%x:%d,%d,%d:addr=%llx "
+                                "not enough user buffers. We need an extra "
+                                "buffer because lastsize is bufflen.\n",
+                                xid, i, j, dmacount, (u64)addr);
+                        goto out_noddp_free;
+                }
+
+                ddp->udl[j] = (u64)(fcoe->extra_ddp_buffer_dma);
+                j++;
+                lastsize = 1;
+        }
+
         fcbuff = (IXGBE_FCBUFF_4KB << IXGBE_FCBUFF_BUFFSIZE_SHIFT);
         fcbuff |= ((j & 0xff) << IXGBE_FCBUFF_BUFFCNT_SHIFT);
         fcbuff |= (firstoff << IXGBE_FCBUFF_OFFSET_SHIFT);
+        /* Set WRCONTX bit to allow DDP for target */
+        if (target_mode)
+                fcbuff |= (IXGBE_FCBUFF_WRCONTX);
         fcbuff |= (IXGBE_FCBUFF_VALID);
 
         fcdmarw = xid;
@@ -269,6 +287,16 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
         /* program DMA context */
         hw = &adapter->hw;
         spin_lock_bh(&fcoe->lock);
+
+        /* turn on last frame indication for target mode as FCP_RSPtarget is
+         * supposed to send FCP_RSP when it is done. */
+        if (target_mode && !test_bit(__IXGBE_FCOE_TARGET, &fcoe->mode)) {
+                set_bit(__IXGBE_FCOE_TARGET, &fcoe->mode);
+                fcrxctl = IXGBE_READ_REG(hw, IXGBE_FCRXCTRL);
+                fcrxctl |= IXGBE_FCRXCTRL_LASTSEQH;
+                IXGBE_WRITE_REG(hw, IXGBE_FCRXCTRL, fcrxctl);
+        }
+
         IXGBE_WRITE_REG(hw, IXGBE_FCPTRL, ddp->udp & DMA_BIT_MASK(32));
         IXGBE_WRITE_REG(hw, IXGBE_FCPTRH, (u64)ddp->udp >> 32);
         IXGBE_WRITE_REG(hw, IXGBE_FCBUFF, fcbuff);
@@ -277,6 +305,7 @@ int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
         IXGBE_WRITE_REG(hw, IXGBE_FCPARAM, 0);
         IXGBE_WRITE_REG(hw, IXGBE_FCFLT, IXGBE_FCFLT_VALID);
         IXGBE_WRITE_REG(hw, IXGBE_FCFLTRW, fcfltrw);
+
         spin_unlock_bh(&fcoe->lock);
 
         return 1;
@@ -291,6 +320,47 @@ out_noddp_unmap:
 }
 
 /**
+ * ixgbe_fcoe_ddp_get - called to set up ddp context in initiator mode
+ * @netdev: the corresponding net_device
+ * @xid: the exchange id requesting ddp
+ * @sgl: the scatter-gather list for this request
+ * @sgc: the number of scatter-gather items
+ *
+ * This is the implementation of net_device_ops.ndo_fcoe_ddp_setup
+ * and is expected to be called from ULD, e.g., FCP layer of libfc
+ * to set up ddp for the corresponding xid of the given sglist for
+ * the corresponding I/O.
+ *
+ * Returns : 1 for success and 0 for no ddp
+ */
+int ixgbe_fcoe_ddp_get(struct net_device *netdev, u16 xid,
+                       struct scatterlist *sgl, unsigned int sgc)
+{
+        return ixgbe_fcoe_ddp_setup(netdev, xid, sgl, sgc, 0);
+}
+
+/**
+ * ixgbe_fcoe_ddp_target - called to set up ddp context in target mode
+ * @netdev: the corresponding net_device
+ * @xid: the exchange id requesting ddp
+ * @sgl: the scatter-gather list for this request
+ * @sgc: the number of scatter-gather items
+ *
+ * This is the implementation of net_device_ops.ndo_fcoe_ddp_target
+ * and is expected to be called from ULD, e.g., FCP layer of libfc
+ * to set up ddp for the corresponding xid of the given sglist for
+ * the corresponding I/O. The DDP in target mode is a write I/O request
+ * from the initiator.
+ *
+ * Returns : 1 for success and 0 for no ddp
+ */
+int ixgbe_fcoe_ddp_target(struct net_device *netdev, u16 xid,
+                            struct scatterlist *sgl, unsigned int sgc)
+{
+        return ixgbe_fcoe_ddp_setup(netdev, xid, sgl, sgc, 1);
+}
+
+/**
  * ixgbe_fcoe_ddp - check ddp status and mark it done
  * @adapter: ixgbe adapter
  * @rx_desc: advanced rx descriptor
@@ -313,6 +383,7 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
         struct ixgbe_fcoe *fcoe;
         struct ixgbe_fcoe_ddp *ddp;
         struct fc_frame_header *fh;
+        struct fcoe_crc_eof *crc;
 
         if (!ixgbe_rx_is_fcoe(rx_desc))
                 goto ddp_out;
@@ -366,7 +437,18 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
                 else if (ddp->len)
                         rc = ddp->len;
         }
-
+        /* In target mode, check the last data frame of the sequence.
+         * For DDP in target mode, data is already DDPed but the header
+         * indication of the last data frame ould allow is to tell if we
+         * got all the data and the ULP can send FCP_RSP back, as this is
+         * not a full fcoe frame, we fill the trailer here so it won't be
+         * dropped by the ULP stack.
+         */
+        if ((fh->fh_r_ctl == FC_RCTL_DD_SOL_DATA) &&
+            (fctl & FC_FC_END_SEQ)) {
+                crc = (struct fcoe_crc_eof *)skb_put(skb, sizeof(*crc));
+                crc->fcoe_eof = FC_EOF_T;
+        }
 ddp_out:
         return rc;
 }
@@ -532,6 +614,24 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter)
                         e_err(drv, "failed to allocated FCoE DDP pool\n");
 
                 spin_lock_init(&fcoe->lock);
+
+                /* Extra buffer to be shared by all DDPs for HW work around */
+                fcoe->extra_ddp_buffer = kmalloc(IXGBE_FCBUFF_MIN, GFP_ATOMIC);
+                if (fcoe->extra_ddp_buffer == NULL) {
+                        e_err(drv, "failed to allocated extra DDP buffer\n");
+                        goto out_extra_ddp_buffer_alloc;
+                }
+
+                fcoe->extra_ddp_buffer_dma =
+                        dma_map_single(&adapter->pdev->dev,
+                                       fcoe->extra_ddp_buffer,
+                                       IXGBE_FCBUFF_MIN,
+                                       DMA_FROM_DEVICE);
+                if (dma_mapping_error(&adapter->pdev->dev,
+                                      fcoe->extra_ddp_buffer_dma)) {
+                        e_err(drv, "failed to map extra DDP buffer\n");
+                        goto out_extra_ddp_buffer_dma;
+                }
         }
 
         /* Enable L2 eth type filter for FCoE */
@@ -581,6 +681,14 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter)
                 }
         }
 #endif
+
+        return;
+
+out_extra_ddp_buffer_dma:
+        kfree(fcoe->extra_ddp_buffer);
+out_extra_ddp_buffer_alloc:
+        pci_pool_destroy(fcoe->pool);
+        fcoe->pool = NULL;
 }
 
 /**
@@ -600,6 +708,11 @@ void ixgbe_cleanup_fcoe(struct ixgbe_adapter *adapter)
         if (fcoe->pool) {
                 for (i = 0; i < IXGBE_FCOE_DDP_MAX; i++)
                         ixgbe_fcoe_ddp_put(adapter->netdev, i);
+                dma_unmap_single(&adapter->pdev->dev,
+                                 fcoe->extra_ddp_buffer_dma,
+                                 IXGBE_FCBUFF_MIN,
+                                 DMA_FROM_DEVICE);
+                kfree(fcoe->extra_ddp_buffer);
                 pci_pool_destroy(fcoe->pool);
                 fcoe->pool = NULL;
         }
@@ -700,21 +813,6 @@ out_disable:
 
 #ifdef CONFIG_IXGBE_DCB
 /**
- * ixgbe_fcoe_getapp - retrieves current user priority bitmap for FCoE
- * @adapter : ixgbe adapter
- *
- * Finds out the corresponding user priority bitmap from the current
- * traffic class that FCoE belongs to. Returns 0 as the invalid user
- * priority bitmap to indicate an error.
- *
- * Returns : 802.1p user priority bitmap for FCoE
- */
-u8 ixgbe_fcoe_getapp(struct ixgbe_adapter *adapter)
-{
-        return 1 << adapter->fcoe.up;
-}
-
-/**
  * ixgbe_fcoe_setapp - sets the user priority bitmap for FCoE
  * @adapter : ixgbe adapter
  * @up : 802.1p user priority bitmap
@@ -791,5 +889,3 @@ int ixgbe_fcoe_get_wwn(struct net_device *netdev, u64 *wwn, int type)
         }
         return rc;
 }
-
-
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.h b/drivers/net/ixgbe/ixgbe_fcoe.h
index 4bc2c551c8d..5a650a4ace6 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.h
+++ b/drivers/net/ixgbe/ixgbe_fcoe.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -52,6 +52,9 @@
 /* fcerr */
 #define IXGBE_FCERR_BADCRC       0x00100000
 
+/* FCoE DDP for target mode */
+#define __IXGBE_FCOE_TARGET     1
+
 struct ixgbe_fcoe_ddp {
         int len;
         u32 err;
@@ -66,10 +69,13 @@ struct ixgbe_fcoe {
         u8 tc;
         u8 up;
 #endif
+        unsigned long mode;
         atomic_t refcnt;
         spinlock_t lock;
         struct pci_pool *pool;
         struct ixgbe_fcoe_ddp ddp[IXGBE_FCOE_DDP_MAX];
+        unsigned char *extra_ddp_buffer;
+        dma_addr_t extra_ddp_buffer_dma;
 };
 
 #endif /* _IXGBE_FCOE_H */
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 602078b8489..f17e4a7ee73 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -52,9 +52,10 @@ char ixgbe_driver_name[] = "ixgbe";
 static const char ixgbe_driver_string[] =
                               "Intel(R) 10 Gigabit PCI Express Network Driver";
 
-#define DRV_VERSION "3.0.12-k2"
+#define DRV_VERSION "3.2.9-k2"
 const char ixgbe_driver_version[] = DRV_VERSION;
-static char ixgbe_copyright[] = "Copyright (c) 1999-2010 Intel Corporation.";
+static const char ixgbe_copyright[] =
+                                "Copyright (c) 1999-2011 Intel Corporation.";
 
 static const struct ixgbe_info *ixgbe_info_tbl[] = {
         [board_82598] = &ixgbe_82598_info,
@@ -648,10 +649,10 @@ void ixgbe_unmap_and_free_tx_resource(struct ixgbe_ring *tx_ring,
  *
  * Returns : a tc index for use in range 0-7, or 0-3
  */
-u8 ixgbe_dcb_txq_to_tc(struct ixgbe_adapter *adapter, u8 reg_idx)
+static u8 ixgbe_dcb_txq_to_tc(struct ixgbe_adapter *adapter, u8 reg_idx)
 {
         int tc = -1;
-        int dcb_i = adapter->ring_feature[RING_F_DCB].indices;
+        int dcb_i = netdev_get_num_tc(adapter->netdev);
 
         /* if DCB is not enabled the queues have no TC */
         if (!(adapter->flags & IXGBE_FLAG_DCB_ENABLED))
@@ -2597,6 +2598,11 @@ static void ixgbe_free_irq(struct ixgbe_adapter *adapter)
 
                 i--;
                 for (; i >= 0; i--) {
+                        /* free only the irqs that were actually requested */
+                        if (!adapter->q_vector[i]->rxr_count &&
+                            !adapter->q_vector[i]->txr_count)
+                                continue;
+
                         free_irq(adapter->msix_entries[i].vector,
                                  adapter->q_vector[i]);
                 }
@@ -2886,17 +2892,20 @@ static void ixgbe_setup_mrqc(struct ixgbe_adapter *adapter)
                                         );
 
         switch (mask) {
+#ifdef CONFIG_IXGBE_DCB
+        case (IXGBE_FLAG_DCB_ENABLED | IXGBE_FLAG_RSS_ENABLED):
+                mrqc = IXGBE_MRQC_RTRSS8TCEN;
+                break;
+        case (IXGBE_FLAG_DCB_ENABLED):
+                mrqc = IXGBE_MRQC_RT8TCEN;
+                break;
+#endif /* CONFIG_IXGBE_DCB */
         case (IXGBE_FLAG_RSS_ENABLED):
                 mrqc = IXGBE_MRQC_RSSEN;
                 break;
         case (IXGBE_FLAG_SRIOV_ENABLED):
                 mrqc = IXGBE_MRQC_VMDQEN;
                 break;
-#ifdef CONFIG_IXGBE_DCB
-        case (IXGBE_FLAG_DCB_ENABLED):
-                mrqc = IXGBE_MRQC_RT8TCEN;
-                break;
-#endif /* CONFIG_IXGBE_DCB */
         default:
                 break;
         }
@@ -3077,6 +3086,14 @@ void ixgbe_configure_rx_ring(struct ixgbe_adapter *adapter,
         ixgbe_configure_srrctl(adapter, ring);
         ixgbe_configure_rscctl(adapter, ring);
 
+        /* If operating in IOV mode set RLPML for X540 */
+        if ((adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) &&
+            hw->mac.type == ixgbe_mac_X540) {
+                rxdctl &= ~IXGBE_RXDCTL_RLPMLMASK;
+                rxdctl |= ((ring->netdev->mtu + ETH_HLEN +
+                            ETH_FCS_LEN + VLAN_HLEN) | IXGBE_RXDCTL_RLPML_EN);
+        }
+
         if (hw->mac.type == ixgbe_mac_82598EB) {
                 /*
                  * enable cache line friendly hardware writes:
@@ -3176,9 +3193,16 @@ static void ixgbe_set_rx_buffer_len(struct ixgbe_adapter *adapter)
         u32 mhadd, hlreg0;
 
         /* Decide whether to use packet split mode or not */
+        /* On by default */
+        adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;
+
         /* Do not use packet split if we're in SR-IOV Mode */
-        if (!adapter->num_vfs)
-                adapter->flags |= IXGBE_FLAG_RX_PS_ENABLED;
+        if (adapter->num_vfs)
+                adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
+
+        /* Disable packet split due to 82599 erratum #45 */
+        if (hw->mac.type == ixgbe_mac_82599EB)
+                adapter->flags &= ~IXGBE_FLAG_RX_PS_ENABLED;
 
         /* Set the RX buffer length according to the mode */
         if (adapter->flags & IXGBE_FLAG_RX_PS_ENABLED) {
@@ -3634,15 +3658,6 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter)
         if (hw->mac.type == ixgbe_mac_82598EB)
                 netif_set_gso_max_size(adapter->netdev, 32768);
 
-#ifdef CONFIG_FCOE
-        if (adapter->netdev->features & NETIF_F_FCOE_MTU)
-                max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
-#endif
-
-        ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame,
-                                        DCB_TX_CONFIG);
-        ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame,
-                                        DCB_RX_CONFIG);
 
         /* Enable VLAN tag insert/strip */
         adapter->netdev->features |= NETIF_F_HW_VLAN_RX;
@@ -3650,7 +3665,43 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter)
         hw->mac.ops.set_vfta(&adapter->hw, 0, 0, true);
 
         /* reconfigure the hardware */
-        ixgbe_dcb_hw_config(hw, &adapter->dcb_cfg);
+        if (adapter->dcbx_cap & (DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_CEE)) {
+#ifdef CONFIG_FCOE
+                if (adapter->netdev->features & NETIF_F_FCOE_MTU)
+                        max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE);
+#endif
+                ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame,
+                                                DCB_TX_CONFIG);
+                ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame,
+                                                DCB_RX_CONFIG);
+                ixgbe_dcb_hw_config(hw, &adapter->dcb_cfg);
+        } else {
+                struct net_device *dev = adapter->netdev;
+
+                if (adapter->ixgbe_ieee_ets)
+                        dev->dcbnl_ops->ieee_setets(dev,
+                                                    adapter->ixgbe_ieee_ets);
+                if (adapter->ixgbe_ieee_pfc)
+                        dev->dcbnl_ops->ieee_setpfc(dev,
+                                                    adapter->ixgbe_ieee_pfc);
+        }
+
+        /* Enable RSS Hash per TC */
+        if (hw->mac.type != ixgbe_mac_82598EB) {
+                int i;
+                u32 reg = 0;
+
+                for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                        u8 msb = 0;
+                        u8 cnt = adapter->netdev->tc_to_txq[i].count;
+
+                        while (cnt >>= 1)
+                                msb++;
+
+                        reg |= msb << IXGBE_RQTC_SHIFT_TC(i);
+                }
+                IXGBE_WRITE_REG(hw, IXGBE_RQTC, reg);
+        }
 }
 
 #endif
@@ -3721,7 +3772,8 @@ static void ixgbe_sfp_link_config(struct ixgbe_adapter *adapter)
                          * We need to try and force an autonegotiation
                          * session, then bring up link.
                          */
-                        hw->mac.ops.setup_sfp(hw);
+                        if (hw->mac.ops.setup_sfp)
+                                hw->mac.ops.setup_sfp(hw);
                         if (!(adapter->flags & IXGBE_FLAG_IN_SFP_LINK_TASK))
                                 schedule_work(&adapter->multispeed_fiber_task);
                 } else {
@@ -3753,7 +3805,8 @@ static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw)
         if (ret)
                 goto link_cfg_out;
 
-        if (hw->mac.ops.get_link_capabilities)
+        autoneg = hw->phy.autoneg_advertised;
+        if ((!autoneg) && (hw->mac.ops.get_link_capabilities))
                 ret = hw->mac.ops.get_link_capabilities(hw, &autoneg,
                                                         &negotiation);
         if (ret)
@@ -3868,7 +3921,7 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)
          * If we're not hot-pluggable SFP+, we just need to configure link
          * and bring it up.
          */
-        if (hw->phy.type == ixgbe_phy_unknown)
+        if (hw->phy.type == ixgbe_phy_none)
                 schedule_work(&adapter->sfp_config_module_task);
 
         /* enable transmits */
@@ -4235,24 +4288,6 @@ static void ixgbe_reset_task(struct work_struct *work)
         ixgbe_reinit_locked(adapter);
 }
 
-#ifdef CONFIG_IXGBE_DCB
-static inline bool ixgbe_set_dcb_queues(struct ixgbe_adapter *adapter)
-{
-        bool ret = false;
-        struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_DCB];
-
-        if (!(adapter->flags & IXGBE_FLAG_DCB_ENABLED))
-                return ret;
-
-        f->mask = 0x7 << 3;
-        adapter->num_rx_queues = f->indices;
-        adapter->num_tx_queues = f->indices;
-        ret = true;
-
-        return ret;
-}
-#endif
-
 /**
  * ixgbe_set_rss_queues: Allocate queues for RSS
  * @adapter: board private structure to initialize
@@ -4323,19 +4358,26 @@ static inline bool ixgbe_set_fdir_queues(struct ixgbe_adapter *adapter)
  **/
 static inline bool ixgbe_set_fcoe_queues(struct ixgbe_adapter *adapter)
 {
-        bool ret = false;
         struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_FCOE];
 
-        f->indices = min((int)num_online_cpus(), f->indices);
-        if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED) {
-                adapter->num_rx_queues = 1;
-                adapter->num_tx_queues = 1;
+        if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
+                return false;
+
+        if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
 #ifdef CONFIG_IXGBE_DCB
-                if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                        e_info(probe, "FCoE enabled with DCB\n");
-                        ixgbe_set_dcb_queues(adapter);
-                }
+                int tc;
+                struct net_device *dev = adapter->netdev;
+
+                tc = netdev_get_prio_tc_map(dev, adapter->fcoe.up);
+                f->indices = dev->tc_to_txq[tc].count;
+                f->mask = dev->tc_to_txq[tc].offset;
 #endif
+        } else {
+                f->indices = min((int)num_online_cpus(), f->indices);
+
+                adapter->num_rx_queues = 1;
+                adapter->num_tx_queues = 1;
+
                 if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
                         e_info(probe, "FCoE enabled with RSS\n");
                         if ((adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) ||
@@ -4348,14 +4390,45 @@ static inline bool ixgbe_set_fcoe_queues(struct ixgbe_adapter *adapter)
                 f->mask = adapter->num_rx_queues;
                 adapter->num_rx_queues += f->indices;
                 adapter->num_tx_queues += f->indices;
+        }
 
-                ret = true;
+        return true;
+}
+#endif /* IXGBE_FCOE */
+
+#ifdef CONFIG_IXGBE_DCB
+static inline bool ixgbe_set_dcb_queues(struct ixgbe_adapter *adapter)
+{
+        bool ret = false;
+        struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_DCB];
+        int i, q;
+
+        if (!(adapter->flags & IXGBE_FLAG_DCB_ENABLED))
+                return ret;
+
+        f->indices = 0;
+        for (i = 0; i < MAX_TRAFFIC_CLASS; i++) {
+                q = min((int)num_online_cpus(), MAX_TRAFFIC_CLASS);
+                f->indices += q;
         }
 
+        f->mask = 0x7 << 3;
+        adapter->num_rx_queues = f->indices;
+        adapter->num_tx_queues = f->indices;
+        ret = true;
+
+#ifdef IXGBE_FCOE
+        /* FCoE enabled queues require special configuration done through
+         * configure_fcoe() and others. Here we map FCoE indices onto the
+         * DCB queue pairs allowing FCoE to own configuration later.
+         */
+        ixgbe_set_fcoe_queues(adapter);
+#endif
+
         return ret;
 }
+#endif
 
-#endif /* IXGBE_FCOE */
 /**
  * ixgbe_set_sriov_queues: Allocate queues for IOV use
  * @adapter: board private structure to initialize
@@ -4391,16 +4464,16 @@ static int ixgbe_set_num_queues(struct ixgbe_adapter *adapter)
         if (ixgbe_set_sriov_queues(adapter))
                 goto done;
 
-#ifdef IXGBE_FCOE
-        if (ixgbe_set_fcoe_queues(adapter))
-                goto done;
-
-#endif /* IXGBE_FCOE */
 #ifdef CONFIG_IXGBE_DCB
         if (ixgbe_set_dcb_queues(adapter))
                 goto done;
 
 #endif
+#ifdef IXGBE_FCOE
+        if (ixgbe_set_fcoe_queues(adapter))
+                goto done;
+
+#endif /* IXGBE_FCOE */
         if (ixgbe_set_fdir_queues(adapter))
                 goto done;
 
@@ -4492,6 +4565,110 @@ static inline bool ixgbe_cache_ring_rss(struct ixgbe_adapter *adapter)
 }
 
 #ifdef CONFIG_IXGBE_DCB
+
+/* ixgbe_get_first_reg_idx - Return first register index associated with ring */
+void ixgbe_get_first_reg_idx(struct ixgbe_adapter *adapter, u8 tc,
+                             unsigned int *tx, unsigned int *rx)
+{
+        struct net_device *dev = adapter->netdev;
+        struct ixgbe_hw *hw = &adapter->hw;
+        u8 num_tcs = netdev_get_num_tc(dev);
+
+        *tx = 0;
+        *rx = 0;
+
+        switch (hw->mac.type) {
+        case ixgbe_mac_82598EB:
+                *tx = tc << 3;
+                *rx = tc << 2;
+                break;
+        case ixgbe_mac_82599EB:
+        case ixgbe_mac_X540:
+                if (num_tcs == 8) {
+                        if (tc < 3) {
+                                *tx = tc << 5;
+                                *rx = tc << 4;
+                        } else if (tc <  5) {
+                                *tx = ((tc + 2) << 4);
+                                *rx = tc << 4;
+                        } else if (tc < num_tcs) {
+                                *tx = ((tc + 8) << 3);
+                                *rx = tc << 4;
+                        }
+                } else if (num_tcs == 4) {
+                        *rx =  tc << 5;
+                        switch (tc) {
+                        case 0:
+                                *tx =  0;
+                                break;
+                        case 1:
+                                *tx = 64;
+                                break;
+                        case 2:
+                                *tx = 96;
+                                break;
+                        case 3:
+                                *tx = 112;
+                                break;
+                        default:
+                                break;
+                        }
+                }
+                break;
+        default:
+                break;
+        }
+}
+
+#define IXGBE_MAX_Q_PER_TC      (IXGBE_MAX_DCB_INDICES / MAX_TRAFFIC_CLASS)
+
+/* ixgbe_setup_tc - routine to configure net_device for multiple traffic
+ * classes.
+ *
+ * @netdev: net device to configure
+ * @tc: number of traffic classes to enable
+ */
+int ixgbe_setup_tc(struct net_device *dev, u8 tc)
+{
+        int i;
+        unsigned int q, offset = 0;
+
+        if (!tc) {
+                netdev_reset_tc(dev);
+        } else {
+                struct ixgbe_adapter *adapter = netdev_priv(dev);
+
+                /* Hardware supports up to 8 traffic classes */
+                if (tc > MAX_TRAFFIC_CLASS || netdev_set_num_tc(dev, tc))
+                        return -EINVAL;
+
+                /* Partition Tx queues evenly amongst traffic classes */
+                for (i = 0; i < tc; i++) {
+                        q = min((int)num_online_cpus(), IXGBE_MAX_Q_PER_TC);
+                        netdev_set_prio_tc_map(dev, i, i);
+                        netdev_set_tc_queue(dev, i, q, offset);
+                        offset += q;
+                }
+
+                /* This enables multiple traffic class support in the hardware
+                 * which defaults to strict priority transmission by default.
+                 * If traffic classes are already enabled perhaps through DCB
+                 * code path then existing configuration will be used.
+                 */
+                if (!(adapter->flags & IXGBE_FLAG_DCB_ENABLED) &&
+                    dev->dcbnl_ops && dev->dcbnl_ops->setdcbx) {
+                        struct ieee_ets ets = {
+                                        .prio_tc = {0, 1, 2, 3, 4, 5, 6, 7},
+                                              };
+                        u8 mode = DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_IEEE;
+
+                        dev->dcbnl_ops->setdcbx(dev, mode);
+                        dev->dcbnl_ops->ieee_setets(dev, &ets);
+                }
+        }
+        return 0;
+}
+
 /**
  * ixgbe_cache_ring_dcb - Descriptor ring to register mapping for DCB
  * @adapter: board private structure to initialize
@@ -4501,72 +4678,27 @@ static inline bool ixgbe_cache_ring_rss(struct ixgbe_adapter *adapter)
  **/
 static inline bool ixgbe_cache_ring_dcb(struct ixgbe_adapter *adapter)
 {
-        int i;
-        bool ret = false;
-        int dcb_i = adapter->ring_feature[RING_F_DCB].indices;
+        struct net_device *dev = adapter->netdev;
+        int i, j, k;
+        u8 num_tcs = netdev_get_num_tc(dev);
 
         if (!(adapter->flags & IXGBE_FLAG_DCB_ENABLED))
                 return false;
 
-        /* the number of queues is assumed to be symmetric */
-        switch (adapter->hw.mac.type) {
-        case ixgbe_mac_82598EB:
-                for (i = 0; i < dcb_i; i++) {
-                        adapter->rx_ring[i]->reg_idx = i << 3;
-                        adapter->tx_ring[i]->reg_idx = i << 2;
-                }
-                ret = true;
-                break;
-        case ixgbe_mac_82599EB:
-        case ixgbe_mac_X540:
-                if (dcb_i == 8) {
-                        /*
-                         * Tx TC0 starts at: descriptor queue 0
-                         * Tx TC1 starts at: descriptor queue 32
-                         * Tx TC2 starts at: descriptor queue 64
-                         * Tx TC3 starts at: descriptor queue 80
-                         * Tx TC4 starts at: descriptor queue 96
-                         * Tx TC5 starts at: descriptor queue 104
-                         * Tx TC6 starts at: descriptor queue 112
-                         * Tx TC7 starts at: descriptor queue 120
-                         *
-                         * Rx TC0-TC7 are offset by 16 queues each
-                         */
-                        for (i = 0; i < 3; i++) {
-                                adapter->tx_ring[i]->reg_idx = i << 5;
-                                adapter->rx_ring[i]->reg_idx = i << 4;
-                        }
-                        for ( ; i < 5; i++) {
-                                adapter->tx_ring[i]->reg_idx = ((i + 2) << 4);
-                                adapter->rx_ring[i]->reg_idx = i << 4;
-                        }
-                        for ( ; i < dcb_i; i++) {
-                                adapter->tx_ring[i]->reg_idx = ((i + 8) << 3);
-                                adapter->rx_ring[i]->reg_idx = i << 4;
-                        }
-                        ret = true;
-                } else if (dcb_i == 4) {
-                        /*
-                         * Tx TC0 starts at: descriptor queue 0
-                         * Tx TC1 starts at: descriptor queue 64
-                         * Tx TC2 starts at: descriptor queue 96
-                         * Tx TC3 starts at: descriptor queue 112
-                         *
-                         * Rx TC0-TC3 are offset by 32 queues each
-                         */
-                        adapter->tx_ring[0]->reg_idx = 0;
-                        adapter->tx_ring[1]->reg_idx = 64;
-                        adapter->tx_ring[2]->reg_idx = 96;
-                        adapter->tx_ring[3]->reg_idx = 112;
-                        for (i = 0 ; i < dcb_i; i++)
-                                adapter->rx_ring[i]->reg_idx = i << 5;
-                        ret = true;
+        for (i = 0, k = 0; i < num_tcs; i++) {
+                unsigned int tx_s, rx_s;
+                u16 count = dev->tc_to_txq[i].count;
+
+                ixgbe_get_first_reg_idx(adapter, i, &tx_s, &rx_s);
+                for (j = 0; j < count; j++, k++) {
+                        adapter->tx_ring[k]->reg_idx = tx_s + j;
+                        adapter->rx_ring[k]->reg_idx = rx_s + j;
+                        adapter->tx_ring[k]->dcb_tc = i;
+                        adapter->rx_ring[k]->dcb_tc = i;
                 }
-                break;
-        default:
-                break;
         }
-        return ret;
+
+        return true;
 }
 #endif
 
@@ -4612,33 +4744,6 @@ static inline bool ixgbe_cache_ring_fcoe(struct ixgbe_adapter *adapter)
         if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
                 return false;
 
-#ifdef CONFIG_IXGBE_DCB
-        if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                struct ixgbe_fcoe *fcoe = &adapter->fcoe;
-
-                ixgbe_cache_ring_dcb(adapter);
-                /* find out queues in TC for FCoE */
-                fcoe_rx_i = adapter->rx_ring[fcoe->tc]->reg_idx + 1;
-                fcoe_tx_i = adapter->tx_ring[fcoe->tc]->reg_idx + 1;
-                /*
-                 * In 82599, the number of Tx queues for each traffic
-                 * class for both 8-TC and 4-TC modes are:
-                 * TCs  : TC0 TC1 TC2 TC3 TC4 TC5 TC6 TC7
-                 * 8 TCs:  32  32  16  16   8   8   8   8
-                 * 4 TCs:  64  64  32  32
-                 * We have max 8 queues for FCoE, where 8 the is
-                 * FCoE redirection table size. If TC for FCoE is
-                 * less than or equal to TC3, we have enough queues
-                 * to add max of 8 queues for FCoE, so we start FCoE
-                 * Tx queue from the next one, i.e., reg_idx + 1.
-                 * If TC for FCoE is above TC3, implying 8 TC mode,
-                 * and we need 8 for FCoE, we have to take all queues
-                 * in that traffic class for FCoE.
-                 */
-                if ((f->indices == IXGBE_FCRETA_SIZE) && (fcoe->tc > 3))
-                        fcoe_tx_i--;
-        }
-#endif /* CONFIG_IXGBE_DCB */
         if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) {
                 if ((adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) ||
                     (adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE))
@@ -4695,16 +4800,16 @@ static void ixgbe_cache_ring_register(struct ixgbe_adapter *adapter)
         if (ixgbe_cache_ring_sriov(adapter))
                 return;
 
+#ifdef CONFIG_IXGBE_DCB
+        if (ixgbe_cache_ring_dcb(adapter))
+                return;
+#endif
+
 #ifdef IXGBE_FCOE
         if (ixgbe_cache_ring_fcoe(adapter))
                 return;
-
 #endif /* IXGBE_FCOE */
-#ifdef CONFIG_IXGBE_DCB
-        if (ixgbe_cache_ring_dcb(adapter))
-                return;
 
-#endif
         if (ixgbe_cache_ring_fdir(adapter))
                 return;
 
@@ -4863,16 +4968,13 @@ static int ixgbe_alloc_q_vectors(struct ixgbe_adapter *adapter)
 {
         int q_idx, num_q_vectors;
         struct ixgbe_q_vector *q_vector;
-        int napi_vectors;
         int (*poll)(struct napi_struct *, int);
 
         if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
                 num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
-                napi_vectors = adapter->num_rx_queues;
                 poll = &ixgbe_clean_rxtx_many;
         } else {
                 num_q_vectors = 1;
-                napi_vectors = 1;
                 poll = &ixgbe_poll;
         }
 
@@ -5169,10 +5271,10 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
         adapter->dcb_cfg.bw_percentage[DCB_RX_CONFIG][0] = 100;
         adapter->dcb_cfg.rx_pba_cfg = pba_equal;
         adapter->dcb_cfg.pfc_mode_enable = false;
-        adapter->dcb_cfg.round_robin_enable = false;
         adapter->dcb_set_bitmap = 0x00;
+        adapter->dcbx_cap = DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_CEE;
         ixgbe_copy_dcb_cfg(&adapter->dcb_cfg, &adapter->temp_dcb_cfg,
-                           adapter->ring_feature[RING_F_DCB].indices);
+                           MAX_TRAFFIC_CLASS);
 
 #endif
 
@@ -5437,8 +5539,14 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu)
         int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
 
         /* MTU < 68 is an error and causes problems on some kernels */
-        if ((new_mtu < 68) || (max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE))
-                return -EINVAL;
+        if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED &&
+            hw->mac.type != ixgbe_mac_X540) {
+                if ((new_mtu < 68) || (max_frame > MAXIMUM_ETHERNET_VLAN_SIZE))
+                        return -EINVAL;
+        } else {
+                if ((new_mtu < 68) || (max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE))
+                        return -EINVAL;
+        }
 
         e_info(probe, "changing MTU from %d to %d\n", netdev->mtu, new_mtu);
         /* must set new MTU before calling down or up */
@@ -5606,6 +5714,10 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
         }
 
         ixgbe_clear_interrupt_scheme(adapter);
+#ifdef CONFIG_DCB
+        kfree(adapter->ixgbe_ieee_pfc);
+        kfree(adapter->ixgbe_ieee_ets);
+#endif
 
 #ifdef CONFIG_PM
         retval = pci_save_state(pdev);
@@ -5964,7 +6076,8 @@ static void ixgbe_sfp_config_module_task(struct work_struct *work)
                 unregister_netdev(adapter->netdev);
                 return;
         }
-        hw->mac.ops.setup_sfp(hw);
+        if (hw->mac.ops.setup_sfp)
+                hw->mac.ops.setup_sfp(hw);
 
         if (!(adapter->flags & IXGBE_FLAG_IN_SFP_LINK_TASK))
                 /* This will also work for DA Twinax connections */
@@ -6095,12 +6208,16 @@ static void ixgbe_watchdog_task(struct work_struct *work)
                                (link_speed == IXGBE_LINK_SPEED_10GB_FULL ?
                                "10 Gbps" :
                                (link_speed == IXGBE_LINK_SPEED_1GB_FULL ?
-                               "1 Gbps" : "unknown speed")),
+                               "1 Gbps" :
+                               (link_speed == IXGBE_LINK_SPEED_100_FULL ?
+                               "100 Mbps" :
+                               "unknown speed"))),
                                ((flow_rx && flow_tx) ? "RX/TX" :
                                (flow_rx ? "RX" :
                                (flow_tx ? "TX" : "None"))));
 
                         netif_carrier_on(netdev);
+                        ixgbe_check_vf_rate_limit(adapter);
                 } else {
                         /* Force detection of hung controller */
                         for (i = 0; i < adapter->num_tx_queues; i++) {
@@ -6630,18 +6747,12 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb)
 
         protocol = vlan_get_protocol(skb);
 
-        if ((protocol == htons(ETH_P_FCOE)) ||
-            (protocol == htons(ETH_P_FIP))) {
-                if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED) {
-                        txq &= (adapter->ring_feature[RING_F_FCOE].indices - 1);
-                        txq += adapter->ring_feature[RING_F_FCOE].mask;
-                        return txq;
-#ifdef CONFIG_IXGBE_DCB
-                } else if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                        txq = adapter->fcoe.up;
-                        return txq;
-#endif
-                }
+        if (((protocol == htons(ETH_P_FCOE)) ||
+            (protocol == htons(ETH_P_FIP))) &&
+            (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)) {
+                txq &= (adapter->ring_feature[RING_F_FCOE].indices - 1);
+                txq += adapter->ring_feature[RING_F_FCOE].mask;
+                return txq;
         }
 #endif
 
@@ -6651,15 +6762,6 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb)
                 return txq;
         }
 
-        if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                if (skb->priority == TC_PRIO_CONTROL)
-                        txq = adapter->ring_feature[RING_F_DCB].indices-1;
-                else
-                        txq = (skb->vlan_tci & IXGBE_TX_FLAGS_VLAN_PRIO_MASK)
-                               >> 13;
-                return txq;
-        }
-
         return skb_tx_hash(dev, skb);
 }
 
@@ -6681,13 +6783,13 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
                 tx_flags |= vlan_tx_tag_get(skb);
                 if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
                         tx_flags &= ~IXGBE_TX_FLAGS_VLAN_PRIO_MASK;
-                        tx_flags |= ((skb->queue_mapping & 0x7) << 13);
+                        tx_flags |= tx_ring->dcb_tc << 13;
                 }
                 tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT;
                 tx_flags |= IXGBE_TX_FLAGS_VLAN;
         } else if (adapter->flags & IXGBE_FLAG_DCB_ENABLED &&
                    skb->priority != TC_PRIO_CONTROL) {
-                tx_flags |= ((skb->queue_mapping & 0x7) << 13);
+                tx_flags |= tx_ring->dcb_tc << 13;
                 tx_flags <<= IXGBE_TX_FLAGS_VLAN_SHIFT;
                 tx_flags |= IXGBE_TX_FLAGS_VLAN;
         }
@@ -6696,20 +6798,8 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
         /* for FCoE with DCB, we force the priority to what
          * was specified by the switch */
         if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED &&
-            (protocol == htons(ETH_P_FCOE) ||
-             protocol == htons(ETH_P_FIP))) {
-#ifdef CONFIG_IXGBE_DCB
-                if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
-                        tx_flags &= ~(IXGBE_TX_FLAGS_VLAN_PRIO_MASK
-                                      << IXGBE_TX_FLAGS_VLAN_SHIFT);
-                        tx_flags |= ((adapter->fcoe.up << 13)
-                                      << IXGBE_TX_FLAGS_VLAN_SHIFT);
-                }
-#endif
-                /* flag for FCoE offloads */
-                if (protocol == htons(ETH_P_FCOE))
-                        tx_flags |= IXGBE_TX_FLAGS_FCOE;
-        }
+            (protocol == htons(ETH_P_FCOE)))
+                tx_flags |= IXGBE_TX_FLAGS_FCOE;
 #endif
 
         /* four things can cause us to need a context descriptor */
@@ -6982,11 +7072,15 @@ static const struct net_device_ops ixgbe_netdev_ops = {
         .ndo_set_vf_tx_rate     = ixgbe_ndo_set_vf_bw,
         .ndo_get_vf_config      = ixgbe_ndo_get_vf_config,
         .ndo_get_stats64        = ixgbe_get_stats64,
+#ifdef CONFIG_IXGBE_DCB
+        .ndo_setup_tc           = ixgbe_setup_tc,
+#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = ixgbe_netpoll,
 #endif
 #ifdef IXGBE_FCOE
         .ndo_fcoe_ddp_setup = ixgbe_fcoe_ddp_get,
+        .ndo_fcoe_ddp_target = ixgbe_fcoe_ddp_target,
         .ndo_fcoe_ddp_done = ixgbe_fcoe_ddp_put,
         .ndo_fcoe_enable = ixgbe_fcoe_enable,
         .ndo_fcoe_disable = ixgbe_fcoe_disable,
@@ -7122,8 +7216,9 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         else
                 indices = min_t(unsigned int, indices, IXGBE_MAX_FDIR_INDICES);
 
+#if defined(CONFIG_DCB)
         indices = max_t(unsigned int, indices, IXGBE_MAX_DCB_INDICES);
-#ifdef IXGBE_FCOE
+#elif defined(IXGBE_FCOE)
         indices += min_t(unsigned int, num_possible_cpus(),
                          IXGBE_MAX_FCOE_INDICES);
 #endif
@@ -7279,8 +7374,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
                 adapter->flags &= ~(IXGBE_FLAG_RSS_ENABLED |
                                     IXGBE_FLAG_DCB_ENABLED);
-        if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)
-                adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED;
 
 #ifdef CONFIG_IXGBE_DCB
         netdev->dcbnl_ops = &dcbnl_ops;
@@ -7700,16 +7793,6 @@ static int ixgbe_notify_dca(struct notifier_block *nb, unsigned long event,
 
 #endif /* CONFIG_IXGBE_DCA */
 
-/**
- * ixgbe_get_hw_dev return device
- * used by hardware layer to print debugging information
- **/
-struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw)
-{
-        struct ixgbe_adapter *adapter = hw->back;
-        return adapter->netdev;
-}
-
 module_exit(ixgbe_exit_module);
 
 /* ixgbe_main.c */
diff --git a/drivers/net/ixgbe/ixgbe_mbx.c b/drivers/net/ixgbe/ixgbe_mbx.c
index ea82c5a1cd3..1ff0eefcfd0 100644
--- a/drivers/net/ixgbe/ixgbe_mbx.c
+++ b/drivers/net/ixgbe/ixgbe_mbx.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -154,9 +154,6 @@ static s32 ixgbe_poll_for_msg(struct ixgbe_hw *hw, u16 mbx_id)
                 udelay(mbx->usec_delay);
         }
 
-        /* if we failed, all future posted messages fail until reset */
-        if (!countdown)
-                mbx->timeout = 0;
 out:
         return countdown ? 0 : IXGBE_ERR_MBX;
 }
@@ -183,9 +180,6 @@ static s32 ixgbe_poll_for_ack(struct ixgbe_hw *hw, u16 mbx_id)
                 udelay(mbx->usec_delay);
         }
 
-        /* if we failed, all future posted messages fail until reset */
-        if (!countdown)
-                mbx->timeout = 0;
 out:
         return countdown ? 0 : IXGBE_ERR_MBX;
 }
@@ -437,6 +431,7 @@ out_no_read:
         return ret_val;
 }
 
+#ifdef CONFIG_PCI_IOV
 /**
  *  ixgbe_init_mbx_params_pf - set initial values for pf mailbox
  *  @hw: pointer to the HW structure
@@ -447,24 +442,22 @@ void ixgbe_init_mbx_params_pf(struct ixgbe_hw *hw)
 {
         struct ixgbe_mbx_info *mbx = &hw->mbx;
 
-        switch (hw->mac.type) {
-        case ixgbe_mac_82599EB:
-        case ixgbe_mac_X540:
-                mbx->timeout = 0;
-                mbx->usec_delay = 0;
+        if (hw->mac.type != ixgbe_mac_82599EB &&
+            hw->mac.type != ixgbe_mac_X540)
+                return;
 
-                mbx->size = IXGBE_VFMAILBOX_SIZE;
+        mbx->timeout = 0;
+        mbx->usec_delay = 0;
 
-                mbx->stats.msgs_tx = 0;
-                mbx->stats.msgs_rx = 0;
-                mbx->stats.reqs = 0;
-                mbx->stats.acks = 0;
-                mbx->stats.rsts = 0;
-                break;
-        default:
-                break;
-        }
+        mbx->stats.msgs_tx = 0;
+        mbx->stats.msgs_rx = 0;
+        mbx->stats.reqs = 0;
+        mbx->stats.acks = 0;
+        mbx->stats.rsts = 0;
+
+        mbx->size = IXGBE_VFMAILBOX_SIZE;
 }
+#endif /* CONFIG_PCI_IOV */
 
 struct ixgbe_mbx_operations mbx_ops_generic = {
         .read                   = ixgbe_read_mbx_pf,
diff --git a/drivers/net/ixgbe/ixgbe_mbx.h b/drivers/net/ixgbe/ixgbe_mbx.h
index 3df9b159021..fe6ea81dc7f 100644
--- a/drivers/net/ixgbe/ixgbe_mbx.h
+++ b/drivers/net/ixgbe/ixgbe_mbx.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -86,7 +86,9 @@ s32 ixgbe_write_mbx(struct ixgbe_hw *, u32 *, u16, u16);
 s32 ixgbe_check_for_msg(struct ixgbe_hw *, u16);
 s32 ixgbe_check_for_ack(struct ixgbe_hw *, u16);
 s32 ixgbe_check_for_rst(struct ixgbe_hw *, u16);
+#ifdef CONFIG_PCI_IOV
 void ixgbe_init_mbx_params_pf(struct ixgbe_hw *);
+#endif /* CONFIG_PCI_IOV */
 
 extern struct ixgbe_mbx_operations mbx_ops_generic;
 
diff --git a/drivers/net/ixgbe/ixgbe_phy.c b/drivers/net/ixgbe/ixgbe_phy.c
index 8f7123e8fc0..f72f705f618 100644
--- a/drivers/net/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ixgbe/ixgbe_phy.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -57,6 +57,7 @@ s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw)
 {
         s32 status = IXGBE_ERR_PHY_ADDR_INVALID;
         u32 phy_addr;
+        u16 ext_ability = 0;
 
         if (hw->phy.type == ixgbe_phy_unknown) {
                 for (phy_addr = 0; phy_addr < IXGBE_MAX_PHY_ADDR; phy_addr++) {
@@ -65,12 +66,29 @@ s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw)
                                 ixgbe_get_phy_id(hw);
                                 hw->phy.type =
                                         ixgbe_get_phy_type_from_id(hw->phy.id);
+
+                                if (hw->phy.type == ixgbe_phy_unknown) {
+                                        hw->phy.ops.read_reg(hw,
+                                                             MDIO_PMA_EXTABLE,
+                                                             MDIO_MMD_PMAPMD,
+                                                             &ext_ability);
+                                        if (ext_ability &
+                                            (MDIO_PMA_EXTABLE_10GBT |
+                                             MDIO_PMA_EXTABLE_1000BT))
+                                                hw->phy.type =
+                                                         ixgbe_phy_cu_unknown;
+                                        else
+                                                hw->phy.type =
+                                                         ixgbe_phy_generic;
+                                }
+
                                 status = 0;
                                 break;
                         }
                 }
                 /* clear value if nothing found */
-                hw->phy.mdio.prtad = 0;
+                if (status != 0)
+                        hw->phy.mdio.prtad = 0;
         } else {
                 status = 0;
         }
@@ -138,17 +156,51 @@ static enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id)
  **/
 s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw)
 {
+        u32 i;
+        u16 ctrl = 0;
+        s32 status = 0;
+
+        if (hw->phy.type == ixgbe_phy_unknown)
+                status = ixgbe_identify_phy_generic(hw);
+
+        if (status != 0 || hw->phy.type == ixgbe_phy_none)
+                goto out;
+
         /* Don't reset PHY if it's shut down due to overtemp. */
         if (!hw->phy.reset_if_overtemp &&
             (IXGBE_ERR_OVERTEMP == hw->phy.ops.check_overtemp(hw)))
-                return 0;
+                goto out;
 
         /*
          * Perform soft PHY reset to the PHY_XS.
          * This will cause a soft reset to the PHY
          */
-        return hw->phy.ops.write_reg(hw, MDIO_CTRL1, MDIO_MMD_PHYXS,
-                                     MDIO_CTRL1_RESET);
+        hw->phy.ops.write_reg(hw, MDIO_CTRL1,
+                              MDIO_MMD_PHYXS,
+                              MDIO_CTRL1_RESET);
+
+        /*
+         * Poll for reset bit to self-clear indicating reset is complete.
+         * Some PHYs could take up to 3 seconds to complete and need about
+         * 1.7 usec delay after the reset is complete.
+         */
+        for (i = 0; i < 30; i++) {
+                msleep(100);
+                hw->phy.ops.read_reg(hw, MDIO_CTRL1,
+                                     MDIO_MMD_PHYXS, &ctrl);
+                if (!(ctrl & MDIO_CTRL1_RESET)) {
+                        udelay(2);
+                        break;
+                }
+        }
+
+        if (ctrl & MDIO_CTRL1_RESET) {
+                status = IXGBE_ERR_RESET_FAILED;
+                hw_dbg(hw, "PHY reset polling failed to complete.\n");
+        }
+
+out:
+        return status;
 }
 
 /**
@@ -171,7 +223,7 @@ s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
         else
                 gssr = IXGBE_GSSR_PHY0_SM;
 
-        if (ixgbe_acquire_swfw_sync(hw, gssr) != 0)
+        if (hw->mac.ops.acquire_swfw_sync(hw, gssr) != 0)
                 status = IXGBE_ERR_SWFW_SYNC;
 
         if (status == 0) {
@@ -243,7 +295,7 @@ s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
                         }
                 }
 
-                ixgbe_release_swfw_sync(hw, gssr);
+                hw->mac.ops.release_swfw_sync(hw, gssr);
         }
 
         return status;
@@ -269,7 +321,7 @@ s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
         else
                 gssr = IXGBE_GSSR_PHY0_SM;
 
-        if (ixgbe_acquire_swfw_sync(hw, gssr) != 0)
+        if (hw->mac.ops.acquire_swfw_sync(hw, gssr) != 0)
                 status = IXGBE_ERR_SWFW_SYNC;
 
         if (status == 0) {
@@ -336,7 +388,7 @@ s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
                         }
                 }
 
-                ixgbe_release_swfw_sync(hw, gssr);
+                hw->mac.ops.release_swfw_sync(hw, gssr);
         }
 
         return status;
@@ -350,49 +402,89 @@ s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
  **/
 s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw)
 {
-        s32 status = IXGBE_NOT_IMPLEMENTED;
+        s32 status = 0;
         u32 time_out;
         u32 max_time_out = 10;
-        u16 autoneg_reg;
+        u16 autoneg_reg = IXGBE_MII_AUTONEG_REG;
+        bool autoneg = false;
+        ixgbe_link_speed speed;
 
-        /*
-         * Set advertisement settings in PHY based on autoneg_advertised
-         * settings. If autoneg_advertised = 0, then advertise default values
-         * tnx devices cannot be "forced" to a autoneg 10G and fail.  But can
-         * for a 1G.
-         */
-        hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE, MDIO_MMD_AN, &autoneg_reg);
+        ixgbe_get_copper_link_capabilities_generic(hw, &speed, &autoneg);
+
+        if (speed & IXGBE_LINK_SPEED_10GB_FULL) {
+                /* Set or unset auto-negotiation 10G advertisement */
+                hw->phy.ops.read_reg(hw, MDIO_AN_10GBT_CTRL,
+                                     MDIO_MMD_AN,
+                                     &autoneg_reg);
 
-        if (hw->phy.autoneg_advertised == IXGBE_LINK_SPEED_1GB_FULL)
                 autoneg_reg &= ~MDIO_AN_10GBT_CTRL_ADV10G;
-        else
-                autoneg_reg |= MDIO_AN_10GBT_CTRL_ADV10G;
+                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL)
+                        autoneg_reg |= MDIO_AN_10GBT_CTRL_ADV10G;
+
+                hw->phy.ops.write_reg(hw, MDIO_AN_10GBT_CTRL,
+                                      MDIO_MMD_AN,
+                                      autoneg_reg);
+        }
+
+        if (speed & IXGBE_LINK_SPEED_1GB_FULL) {
+                /* Set or unset auto-negotiation 1G advertisement */
+                hw->phy.ops.read_reg(hw,
+                                     IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG,
+                                     MDIO_MMD_AN,
+                                     &autoneg_reg);
+
+                autoneg_reg &= ~IXGBE_MII_1GBASE_T_ADVERTISE;
+                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL)
+                        autoneg_reg |= IXGBE_MII_1GBASE_T_ADVERTISE;
+
+                hw->phy.ops.write_reg(hw,
+                                      IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG,
+                                      MDIO_MMD_AN,
+                                      autoneg_reg);
+        }
+
+        if (speed & IXGBE_LINK_SPEED_100_FULL) {
+                /* Set or unset auto-negotiation 100M advertisement */
+                hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
+                                     MDIO_MMD_AN,
+                                     &autoneg_reg);
 
-        hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE, MDIO_MMD_AN, autoneg_reg);
+                autoneg_reg &= ~ADVERTISE_100FULL;
+                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL)
+                        autoneg_reg |= ADVERTISE_100FULL;
+
+                hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE,
+                                      MDIO_MMD_AN,
+                                      autoneg_reg);
+        }
 
         /* Restart PHY autonegotiation and wait for completion */
-        hw->phy.ops.read_reg(hw, MDIO_CTRL1, MDIO_MMD_AN, &autoneg_reg);
+        hw->phy.ops.read_reg(hw, MDIO_CTRL1,
+                             MDIO_MMD_AN, &autoneg_reg);
 
         autoneg_reg |= MDIO_AN_CTRL1_RESTART;
 
-        hw->phy.ops.write_reg(hw, MDIO_CTRL1, MDIO_MMD_AN, autoneg_reg);
+        hw->phy.ops.write_reg(hw, MDIO_CTRL1,
+                              MDIO_MMD_AN, autoneg_reg);
 
         /* Wait for autonegotiation to finish */
         for (time_out = 0; time_out < max_time_out; time_out++) {
                 udelay(10);
                 /* Restart PHY autonegotiation and wait for completion */
-                status = hw->phy.ops.read_reg(hw, MDIO_STAT1, MDIO_MMD_AN,
-                                              &autoneg_reg);
+                status = hw->phy.ops.read_reg(hw, MDIO_STAT1,
+                                              MDIO_MMD_AN,
+                                              &autoneg_reg);
 
                 autoneg_reg &= MDIO_AN_STAT1_COMPLETE;
                 if (autoneg_reg == MDIO_AN_STAT1_COMPLETE) {
-                        status = 0;
                         break;
                 }
         }
 
-        if (time_out == max_time_out)
+        if (time_out == max_time_out) {
                 status = IXGBE_ERR_LINK_SETUP;
+                hw_dbg(hw, "ixgbe_setup_phy_link_generic: time out");
+        }
 
         return status;
 }
@@ -421,6 +513,9 @@ s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,
         if (speed & IXGBE_LINK_SPEED_1GB_FULL)
                 hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_1GB_FULL;
 
+        if (speed & IXGBE_LINK_SPEED_100_FULL)
+                hw->phy.autoneg_advertised |= IXGBE_LINK_SPEED_100_FULL;
+
         /* Setup link based on the new speed settings */
         hw->phy.ops.setup_link(hw);
 
@@ -461,6 +556,180 @@ s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw,
 }
 
 /**
+ *  ixgbe_check_phy_link_tnx - Determine link and speed status
+ *  @hw: pointer to hardware structure
+ *
+ *  Reads the VS1 register to determine if link is up and the current speed for
+ *  the PHY.
+ **/
+s32 ixgbe_check_phy_link_tnx(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
+                             bool *link_up)
+{
+        s32 status = 0;
+        u32 time_out;
+        u32 max_time_out = 10;
+        u16 phy_link = 0;
+        u16 phy_speed = 0;
+        u16 phy_data = 0;
+
+        /* Initialize speed and link to default case */
+        *link_up = false;
+        *speed = IXGBE_LINK_SPEED_10GB_FULL;
+
+        /*
+         * Check current speed and link status of the PHY register.
+         * This is a vendor specific register and may have to
+         * be changed for other copper PHYs.
+         */
+        for (time_out = 0; time_out < max_time_out; time_out++) {
+                udelay(10);
+                status = hw->phy.ops.read_reg(hw,
+                                              MDIO_STAT1,
+                                              MDIO_MMD_VEND1,
+                                              &phy_data);
+                phy_link = phy_data &
+                            IXGBE_MDIO_VENDOR_SPECIFIC_1_LINK_STATUS;
+                phy_speed = phy_data &
+                            IXGBE_MDIO_VENDOR_SPECIFIC_1_SPEED_STATUS;
+                if (phy_link == IXGBE_MDIO_VENDOR_SPECIFIC_1_LINK_STATUS) {
+                        *link_up = true;
+                        if (phy_speed ==
+                            IXGBE_MDIO_VENDOR_SPECIFIC_1_SPEED_STATUS)
+                                *speed = IXGBE_LINK_SPEED_1GB_FULL;
+                        break;
+                }
+        }
+
+        return status;
+}
+
+/**
+ *      ixgbe_setup_phy_link_tnx - Set and restart autoneg
+ *      @hw: pointer to hardware structure
+ *
+ *      Restart autonegotiation and PHY and waits for completion.
+ **/
+s32 ixgbe_setup_phy_link_tnx(struct ixgbe_hw *hw)
+{
+        s32 status = 0;
+        u32 time_out;
+        u32 max_time_out = 10;
+        u16 autoneg_reg = IXGBE_MII_AUTONEG_REG;
+        bool autoneg = false;
+        ixgbe_link_speed speed;
+
+        ixgbe_get_copper_link_capabilities_generic(hw, &speed, &autoneg);
+
+        if (speed & IXGBE_LINK_SPEED_10GB_FULL) {
+                /* Set or unset auto-negotiation 10G advertisement */
+                hw->phy.ops.read_reg(hw, MDIO_AN_10GBT_CTRL,
+                                     MDIO_MMD_AN,
+                                     &autoneg_reg);
+
+                autoneg_reg &= ~MDIO_AN_10GBT_CTRL_ADV10G;
+                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL)
+                        autoneg_reg |= MDIO_AN_10GBT_CTRL_ADV10G;
+
+                hw->phy.ops.write_reg(hw, MDIO_AN_10GBT_CTRL,
+                                      MDIO_MMD_AN,
+                                      autoneg_reg);
+        }
+
+        if (speed & IXGBE_LINK_SPEED_1GB_FULL) {
+                /* Set or unset auto-negotiation 1G advertisement */
+                hw->phy.ops.read_reg(hw, IXGBE_MII_AUTONEG_XNP_TX_REG,
+                                     MDIO_MMD_AN,
+                                     &autoneg_reg);
+
+                autoneg_reg &= ~IXGBE_MII_1GBASE_T_ADVERTISE_XNP_TX;
+                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL)
+                        autoneg_reg |= IXGBE_MII_1GBASE_T_ADVERTISE_XNP_TX;
+
+                hw->phy.ops.write_reg(hw, IXGBE_MII_AUTONEG_XNP_TX_REG,
+                                      MDIO_MMD_AN,
+                                      autoneg_reg);
+        }
+
+        if (speed & IXGBE_LINK_SPEED_100_FULL) {
+                /* Set or unset auto-negotiation 100M advertisement */
+                hw->phy.ops.read_reg(hw, MDIO_AN_ADVERTISE,
+                                     MDIO_MMD_AN,
+                                     &autoneg_reg);
+
+                autoneg_reg &= ~ADVERTISE_100FULL;
+                if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_100_FULL)
+                        autoneg_reg |= ADVERTISE_100FULL;
+
+                hw->phy.ops.write_reg(hw, MDIO_AN_ADVERTISE,
+                                      MDIO_MMD_AN,
+                                      autoneg_reg);
+        }
+
+        /* Restart PHY autonegotiation and wait for completion */
+        hw->phy.ops.read_reg(hw, MDIO_CTRL1,
+                             MDIO_MMD_AN, &autoneg_reg);
+
+        autoneg_reg |= MDIO_AN_CTRL1_RESTART;
+
+        hw->phy.ops.write_reg(hw, MDIO_CTRL1,
+                              MDIO_MMD_AN, autoneg_reg);
+
+        /* Wait for autonegotiation to finish */
+        for (time_out = 0; time_out < max_time_out; time_out++) {
+                udelay(10);
+                /* Restart PHY autonegotiation and wait for completion */
+                status = hw->phy.ops.read_reg(hw, MDIO_STAT1,
+                                              MDIO_MMD_AN,
+                                              &autoneg_reg);
+
+                autoneg_reg &= MDIO_AN_STAT1_COMPLETE;
+                if (autoneg_reg == MDIO_AN_STAT1_COMPLETE)
+                        break;
+        }
+
+        if (time_out == max_time_out) {
+                status = IXGBE_ERR_LINK_SETUP;
+                hw_dbg(hw, "ixgbe_setup_phy_link_tnx: time out");
+        }
+
+        return status;
+}
+
+/**
+ *  ixgbe_get_phy_firmware_version_tnx - Gets the PHY Firmware Version
+ *  @hw: pointer to hardware structure
+ *  @firmware_version: pointer to the PHY Firmware Version
+ **/
+s32 ixgbe_get_phy_firmware_version_tnx(struct ixgbe_hw *hw,
+                                       u16 *firmware_version)
+{
+        s32 status = 0;
+
+        status = hw->phy.ops.read_reg(hw, TNX_FW_REV,
+                                      MDIO_MMD_VEND1,
+                                      firmware_version);
+
+        return status;
+}
+
+/**
+ *  ixgbe_get_phy_firmware_version_generic - Gets the PHY Firmware Version
+ *  @hw: pointer to hardware structure
+ *  @firmware_version: pointer to the PHY Firmware Version
+ **/
+s32 ixgbe_get_phy_firmware_version_generic(struct ixgbe_hw *hw,
+                                           u16 *firmware_version)
+{
+        s32 status = 0;
+
+        status = hw->phy.ops.read_reg(hw, AQ_FW_REV,
+                                      MDIO_MMD_VEND1,
+                                      firmware_version);
+
+        return status;
+}
+
+/**
  *  ixgbe_reset_phy_nl - Performs a PHY reset
  *  @hw: pointer to hardware structure
  **/
@@ -556,11 +825,10 @@ out:
 }
 
 /**
- *  ixgbe_identify_sfp_module_generic - Identifies SFP module and assigns
- *                                      the PHY type.
+ *  ixgbe_identify_sfp_module_generic - Identifies SFP modules
  *  @hw: pointer to hardware structure
  *
- *  Searches for and indentifies the SFP module.  Assings appropriate PHY type.
+ *  Searches for and identifies the SFP module and assigns appropriate PHY type.
  **/
 s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
 {
@@ -581,41 +849,62 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                 goto out;
         }
 
-        status = hw->phy.ops.read_i2c_eeprom(hw, IXGBE_SFF_IDENTIFIER,
+        status = hw->phy.ops.read_i2c_eeprom(hw,
+                                             IXGBE_SFF_IDENTIFIER,
                                              &identifier);
 
-        if (status == IXGBE_ERR_SFP_NOT_PRESENT || status == IXGBE_ERR_I2C) {
-                status = IXGBE_ERR_SFP_NOT_PRESENT;
-                hw->phy.sfp_type = ixgbe_sfp_type_not_present;
-                if (hw->phy.type != ixgbe_phy_nl) {
-                        hw->phy.id = 0;
-                        hw->phy.type = ixgbe_phy_unknown;
-                }
-                goto out;
-        }
+        if (status == IXGBE_ERR_SWFW_SYNC ||
+            status == IXGBE_ERR_I2C ||
+            status == IXGBE_ERR_SFP_NOT_PRESENT)
+                goto err_read_i2c_eeprom;
 
-        if (identifier == IXGBE_SFF_IDENTIFIER_SFP) {
-                hw->phy.ops.read_i2c_eeprom(hw, IXGBE_SFF_1GBE_COMP_CODES,
-                                            &comp_codes_1g);
-                hw->phy.ops.read_i2c_eeprom(hw, IXGBE_SFF_10GBE_COMP_CODES,
-                                            &comp_codes_10g);
-                hw->phy.ops.read_i2c_eeprom(hw, IXGBE_SFF_CABLE_TECHNOLOGY,
-                                            &cable_tech);
-
-                /* ID Module
-                 * =========
-                 * 0    SFP_DA_CU
-                 * 1    SFP_SR
-                 * 2    SFP_LR
-                 * 3    SFP_DA_CORE0 - 82599-specific
-                 * 4    SFP_DA_CORE1 - 82599-specific
-                 * 5    SFP_SR/LR_CORE0 - 82599-specific
-                 * 6    SFP_SR/LR_CORE1 - 82599-specific
-                 * 7    SFP_act_lmt_DA_CORE0 - 82599-specific
-                 * 8    SFP_act_lmt_DA_CORE1 - 82599-specific
-                 * 9    SFP_1g_cu_CORE0 - 82599-specific
-                 * 10   SFP_1g_cu_CORE1 - 82599-specific
-                 */
+        /* LAN ID is needed for sfp_type determination */
+        hw->mac.ops.set_lan_id(hw);
+
+        if (identifier != IXGBE_SFF_IDENTIFIER_SFP) {
+                hw->phy.type = ixgbe_phy_sfp_unsupported;
+                status = IXGBE_ERR_SFP_NOT_SUPPORTED;
+        } else {
+                status = hw->phy.ops.read_i2c_eeprom(hw,
+                                                     IXGBE_SFF_1GBE_COMP_CODES,
+                                                     &comp_codes_1g);
+
+                if (status == IXGBE_ERR_SWFW_SYNC ||
+                    status == IXGBE_ERR_I2C ||
+                    status == IXGBE_ERR_SFP_NOT_PRESENT)
+                        goto err_read_i2c_eeprom;
+
+                status = hw->phy.ops.read_i2c_eeprom(hw,
+                                                     IXGBE_SFF_10GBE_COMP_CODES,
+                                                     &comp_codes_10g);
+
+                if (status == IXGBE_ERR_SWFW_SYNC ||
+                    status == IXGBE_ERR_I2C ||
+                    status == IXGBE_ERR_SFP_NOT_PRESENT)
+                        goto err_read_i2c_eeprom;
+                status = hw->phy.ops.read_i2c_eeprom(hw,
+                                                     IXGBE_SFF_CABLE_TECHNOLOGY,
+                                                     &cable_tech);
+
+                if (status == IXGBE_ERR_SWFW_SYNC ||
+                    status == IXGBE_ERR_I2C ||
+                    status == IXGBE_ERR_SFP_NOT_PRESENT)
+                        goto err_read_i2c_eeprom;
+
+                 /* ID Module
+                  * =========
+                  * 0   SFP_DA_CU
+                  * 1   SFP_SR
+                  * 2   SFP_LR
+                  * 3   SFP_DA_CORE0 - 82599-specific
+                  * 4   SFP_DA_CORE1 - 82599-specific
+                  * 5   SFP_SR/LR_CORE0 - 82599-specific
+                  * 6   SFP_SR/LR_CORE1 - 82599-specific
+                  * 7   SFP_act_lmt_DA_CORE0 - 82599-specific
+                  * 8   SFP_act_lmt_DA_CORE1 - 82599-specific
+                  * 9   SFP_1g_cu_CORE0 - 82599-specific
+                  * 10  SFP_1g_cu_CORE1 - 82599-specific
+                  */
                 if (hw->mac.type == ixgbe_mac_82598EB) {
                         if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
                                 hw->phy.sfp_type = ixgbe_sfp_type_da_cu;
@@ -647,31 +936,27 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                                                 ixgbe_sfp_type_da_act_lmt_core1;
                                 } else {
                                         hw->phy.sfp_type =
-                                                ixgbe_sfp_type_unknown;
+                                                        ixgbe_sfp_type_unknown;
                                 }
-                        } else if (comp_codes_10g & IXGBE_SFF_10GBASESR_CAPABLE)
+                        } else if (comp_codes_10g &
+                                   (IXGBE_SFF_10GBASESR_CAPABLE |
+                                    IXGBE_SFF_10GBASELR_CAPABLE)) {
                                 if (hw->bus.lan_id == 0)
                                         hw->phy.sfp_type =
                                                       ixgbe_sfp_type_srlr_core0;
                                 else
                                         hw->phy.sfp_type =
                                                       ixgbe_sfp_type_srlr_core1;
-                        else if (comp_codes_10g & IXGBE_SFF_10GBASELR_CAPABLE)
-                                if (hw->bus.lan_id == 0)
-                                        hw->phy.sfp_type =
-                                                      ixgbe_sfp_type_srlr_core0;
-                                else
-                                        hw->phy.sfp_type =
-                                                      ixgbe_sfp_type_srlr_core1;
-                        else if (comp_codes_1g & IXGBE_SFF_1GBASET_CAPABLE)
+                        } else if (comp_codes_1g & IXGBE_SFF_1GBASET_CAPABLE) {
                                 if (hw->bus.lan_id == 0)
                                         hw->phy.sfp_type =
                                                 ixgbe_sfp_type_1g_cu_core0;
                                 else
                                         hw->phy.sfp_type =
                                                 ixgbe_sfp_type_1g_cu_core1;
-                        else
+                        } else {
                                 hw->phy.sfp_type = ixgbe_sfp_type_unknown;
+                        }
                 }
 
                 if (hw->phy.sfp_type != stored_sfp_type)
@@ -688,16 +973,33 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                 /* Determine PHY vendor */
                 if (hw->phy.type != ixgbe_phy_nl) {
                         hw->phy.id = identifier;
-                        hw->phy.ops.read_i2c_eeprom(hw,
+                        status = hw->phy.ops.read_i2c_eeprom(hw,
                                                     IXGBE_SFF_VENDOR_OUI_BYTE0,
                                                     &oui_bytes[0]);
-                        hw->phy.ops.read_i2c_eeprom(hw,
+
+                        if (status == IXGBE_ERR_SWFW_SYNC ||
+                            status == IXGBE_ERR_I2C ||
+                            status == IXGBE_ERR_SFP_NOT_PRESENT)
+                                goto err_read_i2c_eeprom;
+
+                        status = hw->phy.ops.read_i2c_eeprom(hw,
                                                     IXGBE_SFF_VENDOR_OUI_BYTE1,
                                                     &oui_bytes[1]);
-                        hw->phy.ops.read_i2c_eeprom(hw,
+
+                        if (status == IXGBE_ERR_SWFW_SYNC ||
+                            status == IXGBE_ERR_I2C ||
+                            status == IXGBE_ERR_SFP_NOT_PRESENT)
+                                goto err_read_i2c_eeprom;
+
+                        status = hw->phy.ops.read_i2c_eeprom(hw,
                                                     IXGBE_SFF_VENDOR_OUI_BYTE2,
                                                     &oui_bytes[2]);
 
+                        if (status == IXGBE_ERR_SWFW_SYNC ||
+                            status == IXGBE_ERR_I2C ||
+                            status == IXGBE_ERR_SFP_NOT_PRESENT)
+                                goto err_read_i2c_eeprom;
+
                         vendor_oui =
                           ((oui_bytes[0] << IXGBE_SFF_VENDOR_OUI_BYTE0_SHIFT) |
                            (oui_bytes[1] << IXGBE_SFF_VENDOR_OUI_BYTE1_SHIFT) |
@@ -707,7 +1009,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                         case IXGBE_SFF_VENDOR_OUI_TYCO:
                                 if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
                                         hw->phy.type =
-                                                ixgbe_phy_sfp_passive_tyco;
+                                                    ixgbe_phy_sfp_passive_tyco;
                                 break;
                         case IXGBE_SFF_VENDOR_OUI_FTL:
                                 if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE)
@@ -724,7 +1026,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                         default:
                                 if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
                                         hw->phy.type =
-                                                ixgbe_phy_sfp_passive_unknown;
+                                                 ixgbe_phy_sfp_passive_unknown;
                                 else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE)
                                         hw->phy.type =
                                                 ixgbe_phy_sfp_active_unknown;
@@ -734,7 +1036,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                         }
                 }
 
-                /* All passive DA cables are supported */
+                /* Allow any DA cable vendor */
                 if (cable_tech & (IXGBE_SFF_DA_PASSIVE_CABLE |
                     IXGBE_SFF_DA_ACTIVE_CABLE)) {
                         status = 0;
@@ -756,7 +1058,6 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
                         goto out;
                 }
 
-                /* This is guaranteed to be 82599, no need to check for NULL */
                 hw->mac.ops.get_device_caps(hw, &enforce_sfp);
                 if (!(enforce_sfp & IXGBE_DEVICE_CAPS_ALLOW_ANY_SFP) &&
                     !((hw->phy.sfp_type == ixgbe_sfp_type_1g_cu_core0) ||
@@ -776,15 +1077,24 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
 
 out:
         return status;
+
+err_read_i2c_eeprom:
+        hw->phy.sfp_type = ixgbe_sfp_type_not_present;
+        if (hw->phy.type != ixgbe_phy_nl) {
+                hw->phy.id = 0;
+                hw->phy.type = ixgbe_phy_unknown;
+        }
+        return IXGBE_ERR_SFP_NOT_PRESENT;
 }
 
 /**
- *  ixgbe_get_sfp_init_sequence_offsets - Checks the MAC's EEPROM to see
- *  if it supports a given SFP+ module type, if so it returns the offsets to the
- *  phy init sequence block.
+ *  ixgbe_get_sfp_init_sequence_offsets - Provides offset of PHY init sequence
  *  @hw: pointer to hardware structure
  *  @list_offset: offset to the SFP ID list
  *  @data_offset: offset to the SFP data block
+ *
+ *  Checks the MAC's EEPROM to see if it supports a given SFP+ module type, if
+ *  so it returns the offsets to the phy init sequence block.
  **/
 s32 ixgbe_get_sfp_init_sequence_offsets(struct ixgbe_hw *hw,
                                         u16 *list_offset,
@@ -899,11 +1209,22 @@ s32 ixgbe_read_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,
                                 u8 dev_addr, u8 *data)
 {
         s32 status = 0;
-        u32 max_retry = 1;
+        u32 max_retry = 10;
         u32 retry = 0;
+        u16 swfw_mask = 0;
         bool nack = 1;
 
+        if (IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1)
+                swfw_mask = IXGBE_GSSR_PHY1_SM;
+        else
+                swfw_mask = IXGBE_GSSR_PHY0_SM;
+
         do {
+                if (ixgbe_acquire_swfw_sync(hw, swfw_mask) != 0) {
+                        status = IXGBE_ERR_SWFW_SYNC;
+                        goto read_byte_out;
+                }
+
                 ixgbe_i2c_start(hw);
 
                 /* Device Address and write indication */
@@ -946,6 +1267,8 @@ s32 ixgbe_read_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,
                 break;
 
 fail:
+                ixgbe_release_swfw_sync(hw, swfw_mask);
+                msleep(100);
                 ixgbe_i2c_bus_clear(hw);
                 retry++;
                 if (retry < max_retry)
@@ -955,6 +1278,9 @@ fail:
 
         } while (retry < max_retry);
 
+        ixgbe_release_swfw_sync(hw, swfw_mask);
+
+read_byte_out:
         return status;
 }
 
@@ -973,6 +1299,17 @@ s32 ixgbe_write_i2c_byte_generic(struct ixgbe_hw *hw, u8 byte_offset,
         s32 status = 0;
         u32 max_retry = 1;
         u32 retry = 0;
+        u16 swfw_mask = 0;
+
+        if (IXGBE_READ_REG(hw, IXGBE_STATUS) & IXGBE_STATUS_LAN_ID_1)
+                swfw_mask = IXGBE_GSSR_PHY1_SM;
+        else
+                swfw_mask = IXGBE_GSSR_PHY0_SM;
+
+        if (ixgbe_acquire_swfw_sync(hw, swfw_mask) != 0) {
+                status = IXGBE_ERR_SWFW_SYNC;
+                goto write_byte_out;
+        }
 
         do {
                 ixgbe_i2c_start(hw);
@@ -1013,6 +1350,9 @@ fail:
                         hw_dbg(hw, "I2C byte write error.\n");
         } while (retry < max_retry);
 
+        ixgbe_release_swfw_sync(hw, swfw_mask);
+
+write_byte_out:
         return status;
 }
 
@@ -1331,6 +1671,8 @@ static void ixgbe_i2c_bus_clear(struct ixgbe_hw *hw)
         u32 i2cctl = IXGBE_READ_REG(hw, IXGBE_I2CCTL);
         u32 i;
 
+        ixgbe_i2c_start(hw);
+
         ixgbe_set_i2c_data(hw, &i2cctl, 1);
 
         for (i = 0; i < 9; i++) {
@@ -1345,91 +1687,13 @@ static void ixgbe_i2c_bus_clear(struct ixgbe_hw *hw)
                 udelay(IXGBE_I2C_T_LOW);
         }
 
+        ixgbe_i2c_start(hw);
+
         /* Put the i2c bus back to default state */
         ixgbe_i2c_stop(hw);
 }
 
 /**
- *  ixgbe_check_phy_link_tnx - Determine link and speed status
- *  @hw: pointer to hardware structure
- *
- *  Reads the VS1 register to determine if link is up and the current speed for
- *  the PHY.
- **/
-s32 ixgbe_check_phy_link_tnx(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
-                             bool *link_up)
-{
-        s32 status = 0;
-        u32 time_out;
-        u32 max_time_out = 10;
-        u16 phy_link = 0;
-        u16 phy_speed = 0;
-        u16 phy_data = 0;
-
-        /* Initialize speed and link to default case */
-        *link_up = false;
-        *speed = IXGBE_LINK_SPEED_10GB_FULL;
-
-        /*
-         * Check current speed and link status of the PHY register.
-         * This is a vendor specific register and may have to
-         * be changed for other copper PHYs.
-         */
-        for (time_out = 0; time_out < max_time_out; time_out++) {
-                udelay(10);
-                status = hw->phy.ops.read_reg(hw,
-                                        IXGBE_MDIO_VENDOR_SPECIFIC_1_STATUS,
-                                        MDIO_MMD_VEND1,
-                                        &phy_data);
-                phy_link = phy_data &
-                           IXGBE_MDIO_VENDOR_SPECIFIC_1_LINK_STATUS;
-                phy_speed = phy_data &
-                            IXGBE_MDIO_VENDOR_SPECIFIC_1_SPEED_STATUS;
-                if (phy_link == IXGBE_MDIO_VENDOR_SPECIFIC_1_LINK_STATUS) {
-                        *link_up = true;
-                        if (phy_speed ==
-                            IXGBE_MDIO_VENDOR_SPECIFIC_1_SPEED_STATUS)
-                                *speed = IXGBE_LINK_SPEED_1GB_FULL;
-                        break;
-                }
-        }
-
-        return status;
-}
-
-/**
- *  ixgbe_get_phy_firmware_version_tnx - Gets the PHY Firmware Version
- *  @hw: pointer to hardware structure
- *  @firmware_version: pointer to the PHY Firmware Version
- **/
-s32 ixgbe_get_phy_firmware_version_tnx(struct ixgbe_hw *hw,
-                                       u16 *firmware_version)
-{
-        s32 status = 0;
-
-        status = hw->phy.ops.read_reg(hw, TNX_FW_REV, MDIO_MMD_VEND1,
-                                      firmware_version);
-
-        return status;
-}
-
-/**
- *  ixgbe_get_phy_firmware_version_generic - Gets the PHY Firmware Version
- *  @hw: pointer to hardware structure
- *  @firmware_version: pointer to the PHY Firmware Version
-**/
-s32 ixgbe_get_phy_firmware_version_generic(struct ixgbe_hw *hw,
-                                           u16 *firmware_version)
-{
-        s32 status = 0;
-
-        status = hw->phy.ops.read_reg(hw, AQ_FW_REV, MDIO_MMD_VEND1,
-                                      firmware_version);
-
-        return status;
-}
-
-/**
  *  ixgbe_tn_check_overtemp - Checks if an overtemp occured.
  *  @hw: pointer to hardware structure
  *
diff --git a/drivers/net/ixgbe/ixgbe_phy.h b/drivers/net/ixgbe/ixgbe_phy.h
index e2c6b7eac64..197bdd13106 100644
--- a/drivers/net/ixgbe/ixgbe_phy.h
+++ b/drivers/net/ixgbe/ixgbe_phy.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -58,6 +58,10 @@
 #define IXGBE_I2C_EEPROM_STATUS_FAIL         0x2
 #define IXGBE_I2C_EEPROM_STATUS_IN_PROGRESS  0x3
 
+/* Flow control defines */
+#define IXGBE_TAF_SYM_PAUSE                  0x400
+#define IXGBE_TAF_ASM_PAUSE                  0x800
+
 /* Bit-shift macros */
 #define IXGBE_SFF_VENDOR_OUI_BYTE0_SHIFT    24
 #define IXGBE_SFF_VENDOR_OUI_BYTE1_SHIFT    16
@@ -104,6 +108,7 @@ s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw,
 s32 ixgbe_check_phy_link_tnx(struct ixgbe_hw *hw,
                              ixgbe_link_speed *speed,
                              bool *link_up);
+s32 ixgbe_setup_phy_link_tnx(struct ixgbe_hw *hw);
 s32 ixgbe_get_phy_firmware_version_tnx(struct ixgbe_hw *hw,
                                        u16 *firmware_version);
 s32 ixgbe_get_phy_firmware_version_generic(struct ixgbe_hw *hw,
diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ixgbe/ixgbe_sriov.c
index 47b15738b00..6e50d832894 100644
--- a/drivers/net/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ixgbe/ixgbe_sriov.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -110,12 +110,37 @@ static int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid,
         return adapter->hw.mac.ops.set_vfta(&adapter->hw, vid, vf, (bool)add);
 }
 
+void ixgbe_set_vf_lpe(struct ixgbe_adapter *adapter, u32 *msgbuf)
+{
+        struct ixgbe_hw *hw = &adapter->hw;
+        int new_mtu = msgbuf[1];
+        u32 max_frs;
+        int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
+
+        /* Only X540 supports jumbo frames in IOV mode */
+        if (adapter->hw.mac.type != ixgbe_mac_X540)
+                return;
+
+        /* MTU < 68 is an error and causes problems on some kernels */
+        if ((new_mtu < 68) || (max_frame > IXGBE_MAX_JUMBO_FRAME_SIZE)) {
+                e_err(drv, "VF mtu %d out of range\n", new_mtu);
+                return;
+        }
+
+        max_frs = (IXGBE_READ_REG(hw, IXGBE_MAXFRS) &
+                   IXGBE_MHADD_MFS_MASK) >> IXGBE_MHADD_MFS_SHIFT;
+        if (max_frs < new_mtu) {
+                max_frs = new_mtu << IXGBE_MHADD_MFS_SHIFT;
+                IXGBE_WRITE_REG(hw, IXGBE_MAXFRS, max_frs);
+        }
+
+        e_info(hw, "VF requests change max MTU to %d\n", new_mtu);
+}
 
 static void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf, bool aupe)
 {
         u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));
         vmolr |= (IXGBE_VMOLR_ROMPE |
-                  IXGBE_VMOLR_ROPE |
                   IXGBE_VMOLR_BAM);
         if (aupe)
                 vmolr |= IXGBE_VMOLR_AUPE;
@@ -304,7 +329,7 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)
                                                  hash_list, vf);
                 break;
         case IXGBE_VF_SET_LPE:
-                WARN_ON((msgbuf[0] & 0xFFFF) == IXGBE_VF_SET_LPE);
+                ixgbe_set_vf_lpe(adapter, msgbuf);
                 break;
         case IXGBE_VF_SET_VLAN:
                 add = (msgbuf[0] & IXGBE_VT_MSGINFO_MASK)
@@ -453,9 +478,90 @@ out:
        return err;
 }
 
+static int ixgbe_link_mbps(int internal_link_speed)
+{
+        switch (internal_link_speed) {
+        case IXGBE_LINK_SPEED_100_FULL:
+                return 100;
+        case IXGBE_LINK_SPEED_1GB_FULL:
+                return 1000;
+        case IXGBE_LINK_SPEED_10GB_FULL:
+                return 10000;
+        default:
+                return 0;
+        }
+}
+
+static void ixgbe_set_vf_rate_limit(struct ixgbe_hw *hw, int vf, int tx_rate,
+                                    int link_speed)
+{
+        int rf_dec, rf_int;
+        u32 bcnrc_val;
+
+        if (tx_rate != 0) {
+                /* Calculate the rate factor values to set */
+                rf_int = link_speed / tx_rate;
+                rf_dec = (link_speed - (rf_int * tx_rate));
+                rf_dec = (rf_dec * (1<<IXGBE_RTTBCNRC_RF_INT_SHIFT)) / tx_rate;
+
+                bcnrc_val = IXGBE_RTTBCNRC_RS_ENA;
+                bcnrc_val |= ((rf_int<<IXGBE_RTTBCNRC_RF_INT_SHIFT) &
+                               IXGBE_RTTBCNRC_RF_INT_MASK);
+                bcnrc_val |= (rf_dec & IXGBE_RTTBCNRC_RF_DEC_MASK);
+        } else {
+                bcnrc_val = 0;
+        }
+
+        IXGBE_WRITE_REG(hw, IXGBE_RTTDQSEL, 2*vf); /* vf Y uses queue 2*Y */
+        IXGBE_WRITE_REG(hw, IXGBE_RTTBCNRC, bcnrc_val);
+}
+
+void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter)
+{
+        int actual_link_speed, i;
+        bool reset_rate = false;
+
+        /* VF Tx rate limit was not set */
+        if (adapter->vf_rate_link_speed == 0)
+                return;
+
+        actual_link_speed = ixgbe_link_mbps(adapter->link_speed);
+        if (actual_link_speed != adapter->vf_rate_link_speed) {
+                reset_rate = true;
+                adapter->vf_rate_link_speed = 0;
+                dev_info(&adapter->pdev->dev,
+                         "Link speed has been changed. VF Transmit rate "
+                         "is disabled\n");
+        }
+
+        for (i = 0; i < adapter->num_vfs; i++) {
+                if (reset_rate)
+                        adapter->vfinfo[i].tx_rate = 0;
+
+                ixgbe_set_vf_rate_limit(&adapter->hw, i,
+                                        adapter->vfinfo[i].tx_rate,
+                                        actual_link_speed);
+        }
+}
+
 int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate)
 {
-        return -EOPNOTSUPP;
+        struct ixgbe_adapter *adapter = netdev_priv(netdev);
+        struct ixgbe_hw *hw = &adapter->hw;
+        int actual_link_speed;
+
+        actual_link_speed = ixgbe_link_mbps(adapter->link_speed);
+        if ((vf >= adapter->num_vfs) || (!adapter->link_up) ||
+            (tx_rate > actual_link_speed) || (actual_link_speed != 10000) ||
+            ((tx_rate != 0) && (tx_rate <= 10)))
+            /* rate limit cannot be set to 10Mb or less in 10Gb adapters */
+                return -EINVAL;
+
+        adapter->vf_rate_link_speed = actual_link_speed;
+        adapter->vfinfo[vf].tx_rate = (u16)tx_rate;
+        ixgbe_set_vf_rate_limit(hw, vf, tx_rate, actual_link_speed);
+
+        return 0;
 }
 
 int ixgbe_ndo_get_vf_config(struct net_device *netdev,
@@ -466,7 +572,7 @@ int ixgbe_ndo_get_vf_config(struct net_device *netdev,
                 return -EINVAL;
         ivi->vf = vf;
         memcpy(&ivi->mac, adapter->vfinfo[vf].vf_mac_addresses, ETH_ALEN);
-        ivi->tx_rate = 0;
+        ivi->tx_rate = adapter->vfinfo[vf].tx_rate;
         ivi->vlan = adapter->vfinfo[vf].pf_vlan;
         ivi->qos = adapter->vfinfo[vf].pf_qos;
         return 0;
diff --git a/drivers/net/ixgbe/ixgbe_sriov.h b/drivers/net/ixgbe/ixgbe_sriov.h
index 49dc14debef..34175564bb7 100644
--- a/drivers/net/ixgbe/ixgbe_sriov.h
+++ b/drivers/net/ixgbe/ixgbe_sriov.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -40,6 +40,7 @@ int ixgbe_ndo_set_vf_vlan(struct net_device *netdev, int queue, u16 vlan,
 int ixgbe_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate);
 int ixgbe_ndo_get_vf_config(struct net_device *netdev,
                             int vf, struct ifla_vf_info *ivi);
+void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter);
 
 #endif /* _IXGBE_SRIOV_H_ */
 
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index fd3358f5413..25c1fb7eda0 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -91,7 +91,7 @@
 
 /* General Receive Control */
 #define IXGBE_GRC_MNG  0x00000001 /* Manageability Enable */
-#define IXGBE_GRC_APME 0x00000002 /* Advanced Power Management Enable */
+#define IXGBE_GRC_APME 0x00000002 /* APM enabled in EEPROM */
 
 #define IXGBE_VPDDIAG0  0x10204
 #define IXGBE_VPDDIAG1  0x10208
@@ -342,7 +342,7 @@
 /* Wake Up Control */
 #define IXGBE_WUC_PME_EN     0x00000002 /* PME Enable */
 #define IXGBE_WUC_PME_STATUS 0x00000004 /* PME Status */
-#define IXGBE_WUC_ADVD3WUC   0x00000010 /* D3Cold wake up cap. enable*/
+#define IXGBE_WUC_WKEN       0x00000010 /* Enable PE_WAKE_N pin assertion  */
 
 /* Wake Up Filter Control */
 #define IXGBE_WUFC_LNKC 0x00000001 /* Link Status Change Wakeup Enable */
@@ -533,6 +533,12 @@
 #define IXGBE_RTTDTECC    0x04990
 #define IXGBE_RTTDTECC_NO_BCN   0x00000100
 #define IXGBE_RTTBCNRC    0x04984
+#define IXGBE_RTTBCNRC_RS_ENA   0x80000000
+#define IXGBE_RTTBCNRC_RF_DEC_MASK      0x00003FFF
+#define IXGBE_RTTBCNRC_RF_INT_SHIFT     14
+#define IXGBE_RTTBCNRC_RF_INT_MASK      \
+        (IXGBE_RTTBCNRC_RF_DEC_MASK << IXGBE_RTTBCNRC_RF_INT_SHIFT)
+
 
 /* FCoE registers */
 #define IXGBE_FCPTRL    0x02410 /* FC User Desc. PTR Low */
@@ -659,6 +665,8 @@
 #define IXGBE_QPTC(_i) (0x06030 + ((_i) * 0x40)) /* 16 of these */
 #define IXGBE_QBRC(_i) (0x01034 + ((_i) * 0x40)) /* 16 of these */
 #define IXGBE_QBTC(_i) (0x06034 + ((_i) * 0x40)) /* 16 of these */
+#define IXGBE_QBRC_L(_i) (0x01034 + ((_i) * 0x40)) /* 16 of these */
+#define IXGBE_QBRC_H(_i) (0x01038 + ((_i) * 0x40)) /* 16 of these */
 #define IXGBE_QPRDC(_i) (0x01430 + ((_i) * 0x40)) /* 16 of these */
 #define IXGBE_QBTC_L(_i) (0x08700 + ((_i) * 0x8)) /* 16 of these */
 #define IXGBE_QBTC_H(_i) (0x08704 + ((_i) * 0x8)) /* 16 of these */
@@ -669,6 +677,11 @@
 #define IXGBE_FCOEDWRC  0x0242C /* Number of FCoE DWords Received */
 #define IXGBE_FCOEPTC   0x08784 /* Number of FCoE Packets Transmitted */
 #define IXGBE_FCOEDWTC  0x08788 /* Number of FCoE DWords Transmitted */
+#define IXGBE_PCRC8ECL  0x0E810
+#define IXGBE_PCRC8ECH  0x0E811
+#define IXGBE_PCRC8ECH_MASK     0x1F
+#define IXGBE_LDPCECL   0x0E820
+#define IXGBE_LDPCECH   0x0E821
 
 /* Management */
 #define IXGBE_MAVTV(_i) (0x05010 + ((_i) * 4)) /* 8 of these (0-7) */
@@ -1002,6 +1015,13 @@
 #define IXGBE_MDIO_PMA_PMD_SDA_SCL_DATA     0xC30B /* PHY_XS SDA/SCL Data Reg */
 #define IXGBE_MDIO_PMA_PMD_SDA_SCL_STAT     0xC30C /* PHY_XS SDA/SCL Status Reg */
 
+/* MII clause 22/28 definitions */
+#define IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG 0xC400 /* 1G Provisioning 1 */
+#define IXGBE_MII_AUTONEG_XNP_TX_REG             0x17   /* 1G XNP Transmit */
+#define IXGBE_MII_1GBASE_T_ADVERTISE_XNP_TX      0x4000 /* full duplex, bit:14*/
+#define IXGBE_MII_1GBASE_T_ADVERTISE             0x8000 /* full duplex, bit:15*/
+#define IXGBE_MII_AUTONEG_REG                    0x0
+
 #define IXGBE_PHY_REVISION_MASK        0xFFFFFFF0
 #define IXGBE_MAX_PHY_ADDR             32
 
@@ -1614,6 +1634,8 @@
 #define IXGBE_ALT_SAN_MAC_ADDR_CAPS_ALTWWN  0x1 /* Alt. WWN base exists */
 
 /* PCI Bus Info */
+#define IXGBE_PCI_DEVICE_STATUS   0xAA
+#define IXGBE_PCI_DEVICE_STATUS_TRANSACTION_PENDING   0x0020
 #define IXGBE_PCI_LINK_STATUS     0xB2
 #define IXGBE_PCI_DEVICE_CONTROL2 0xC8
 #define IXGBE_PCI_LINK_WIDTH      0x3F0
@@ -1680,6 +1702,8 @@
 #define IXGBE_RXCTRL_DMBYPS     0x00000002  /* Descriptor Monitor Bypass */
 #define IXGBE_RXDCTL_ENABLE     0x02000000  /* Enable specific Rx Queue */
 #define IXGBE_RXDCTL_VME        0x40000000  /* VLAN mode enable */
+#define IXGBE_RXDCTL_RLPMLMASK  0x00003FFF  /* Only supported on the X540 */
+#define IXGBE_RXDCTL_RLPML_EN   0x00008000
 
 #define IXGBE_FCTRL_SBP 0x00000002 /* Store Bad Packet */
 #define IXGBE_FCTRL_MPE 0x00000100 /* Multicast Promiscuous Ena*/
@@ -2240,6 +2264,7 @@ enum ixgbe_mac_type {
 
 enum ixgbe_phy_type {
         ixgbe_phy_unknown = 0,
+        ixgbe_phy_none,
         ixgbe_phy_tn,
         ixgbe_phy_aq,
         ixgbe_phy_cu_unknown,
@@ -2328,32 +2353,31 @@ enum ixgbe_bus_type {
 /* PCI bus speeds */
 enum ixgbe_bus_speed {
         ixgbe_bus_speed_unknown = 0,
-        ixgbe_bus_speed_33,
-        ixgbe_bus_speed_66,
-        ixgbe_bus_speed_100,
-        ixgbe_bus_speed_120,
-        ixgbe_bus_speed_133,
-        ixgbe_bus_speed_2500,
-        ixgbe_bus_speed_5000,
+        ixgbe_bus_speed_33      = 33,
+        ixgbe_bus_speed_66      = 66,
+        ixgbe_bus_speed_100     = 100,
+        ixgbe_bus_speed_120     = 120,
+        ixgbe_bus_speed_133     = 133,
+        ixgbe_bus_speed_2500    = 2500,
+        ixgbe_bus_speed_5000    = 5000,
         ixgbe_bus_speed_reserved
 };
 
 /* PCI bus widths */
 enum ixgbe_bus_width {
         ixgbe_bus_width_unknown = 0,
-        ixgbe_bus_width_pcie_x1,
-        ixgbe_bus_width_pcie_x2,
+        ixgbe_bus_width_pcie_x1 = 1,
+        ixgbe_bus_width_pcie_x2 = 2,
         ixgbe_bus_width_pcie_x4 = 4,
         ixgbe_bus_width_pcie_x8 = 8,
-        ixgbe_bus_width_32,
-        ixgbe_bus_width_64,
+        ixgbe_bus_width_32      = 32,
+        ixgbe_bus_width_64      = 64,
         ixgbe_bus_width_reserved
 };
 
 struct ixgbe_addr_filter_info {
         u32 num_mc_addrs;
         u32 rar_used_count;
-        u32 mc_addr_in_rar_count;
         u32 mta_in_use;
         u32 overflow_promisc;
         bool uc_set_promisc;
@@ -2491,6 +2515,8 @@ struct ixgbe_mac_operations {
         s32 (*write_analog_reg8)(struct ixgbe_hw*, u32, u8);
         s32 (*setup_sfp)(struct ixgbe_hw *);
         s32 (*enable_rx_dma)(struct ixgbe_hw *, u32);
+        s32 (*acquire_swfw_sync)(struct ixgbe_hw *, u16);
+        void (*release_swfw_sync)(struct ixgbe_hw *, u16);
 
         /* Link */
         void (*disable_tx_laser)(struct ixgbe_hw *);
@@ -2513,7 +2539,6 @@ struct ixgbe_mac_operations {
         s32 (*set_vmdq)(struct ixgbe_hw *, u32, u32);
         s32 (*clear_vmdq)(struct ixgbe_hw *, u32, u32);
         s32 (*init_rx_addrs)(struct ixgbe_hw *);
-        s32 (*update_uc_addr_list)(struct ixgbe_hw *, struct net_device *);
         s32 (*update_mc_addr_list)(struct ixgbe_hw *, struct net_device *);
         s32 (*enable_mc)(struct ixgbe_hw *);
         s32 (*disable_mc)(struct ixgbe_hw *);
@@ -2554,6 +2579,7 @@ struct ixgbe_eeprom_info {
         u16                             address_bits;
 };
 
+#define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED       0x01
 struct ixgbe_mac_info {
         struct ixgbe_mac_operations     ops;
         enum ixgbe_mac_type             type;
@@ -2564,6 +2590,8 @@ struct ixgbe_mac_info {
         u16                             wwnn_prefix;
         /* prefix for World Wide Port Name (WWPN) */
         u16                             wwpn_prefix;
+#define IXGBE_MAX_MTA                   128
+        u32                             mta_shadow[IXGBE_MAX_MTA];
         s32                             mc_filter_type;
         u32                             mcft_size;
         u32                             vft_size;
@@ -2576,6 +2604,7 @@ struct ixgbe_mac_info {
         u32                             orig_autoc2;
         bool                            orig_link_settings_stored;
         bool                            autotry_restart;
+        u8                              flags;
 };
 
 struct ixgbe_phy_info {
@@ -2682,7 +2711,9 @@ struct ixgbe_info {
 #define IXGBE_ERR_EEPROM_VERSION                -24
 #define IXGBE_ERR_NO_SPACE                      -25
 #define IXGBE_ERR_OVERTEMP                      -26
-#define IXGBE_ERR_RAR_INDEX                     -27
+#define IXGBE_ERR_FC_NOT_NEGOTIATED             -27
+#define IXGBE_ERR_FC_NOT_SUPPORTED              -28
+#define IXGBE_ERR_FLOW_CONTROL                  -29
 #define IXGBE_ERR_SFP_SETUP_NOT_COMPLETE        -30
 #define IXGBE_ERR_PBA_SECTION                   -31
 #define IXGBE_ERR_INVALID_ARGUMENT              -32
diff --git a/drivers/net/ixgbe/ixgbe_x540.c b/drivers/net/ixgbe/ixgbe_x540.c
index 3a8923993ce..f47e93fe32b 100644
--- a/drivers/net/ixgbe/ixgbe_x540.c
+++ b/drivers/net/ixgbe/ixgbe_x540.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -31,7 +31,6 @@
 
 #include "ixgbe.h"
 #include "ixgbe_phy.h"
-//#include "ixgbe_mbx.h"
 
 #define IXGBE_X540_MAX_TX_QUEUES 128
 #define IXGBE_X540_MAX_RX_QUEUES 128
@@ -110,12 +109,9 @@ static s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw)
          * Prevent the PCI-E bus from from hanging by disabling PCI-E master
          * access and verify no pending requests before reset
          */
-        status = ixgbe_disable_pcie_master(hw);
-        if (status != 0) {
-                status = IXGBE_ERR_MASTER_REQUESTS_PENDING;
-                hw_dbg(hw, "PCI-E Master disable polling has failed.\n");
-        }
+        ixgbe_disable_pcie_master(hw);
 
+mac_reset_top:
         /*
          * Issue global reset to the MAC.  Needs to be SW reset if link is up.
          * If link reset is used when link is up, it might reset the PHY when
@@ -133,21 +129,34 @@ static s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw)
         }
 
         ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
-        IXGBE_WRITE_REG(hw, IXGBE_CTRL, (ctrl | IXGBE_CTRL_RST));
+        IXGBE_WRITE_REG(hw, IXGBE_CTRL, (ctrl | reset_bit));
         IXGBE_WRITE_FLUSH(hw);
 
         /* Poll for reset bit to self-clear indicating reset is complete */
         for (i = 0; i < 10; i++) {
                 udelay(1);
                 ctrl = IXGBE_READ_REG(hw, IXGBE_CTRL);
-                if (!(ctrl & IXGBE_CTRL_RST))
+                if (!(ctrl & reset_bit))
                         break;
         }
-        if (ctrl & IXGBE_CTRL_RST) {
+        if (ctrl & reset_bit) {
                 status = IXGBE_ERR_RESET_FAILED;
                 hw_dbg(hw, "Reset polling failed to complete.\n");
         }
 
+        /*
+         * Double resets are required for recovery from certain error
+         * conditions.  Between resets, it is necessary to stall to allow time
+         * for any pending HW events to complete.  We use 1usec since that is
+         * what is needed for ixgbe_disable_pcie_master().  The second reset
+         * then clears out any effects of those events.
+         */
+        if (hw->mac.flags & IXGBE_FLAGS_DOUBLE_RESET_REQUIRED) {
+                hw->mac.flags &= ~IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
+                udelay(1);
+                goto mac_reset_top;
+        }
+
         /* Clear PF Reset Done bit so PF/VF Mail Ops can work */
         ctrl_ext = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT);
         ctrl_ext |= IXGBE_CTRL_EXT_PFRSTD;
@@ -191,7 +200,7 @@ static s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw)
          * clear the multicast table.  Also reset num_rar_entries to 128,
          * since we modify this value when programming the SAN MAC address.
          */
-        hw->mac.num_rar_entries = 128;
+        hw->mac.num_rar_entries = IXGBE_X540_MAX_TX_QUEUES;
         hw->mac.ops.init_rx_addrs(hw);
 
         /* Store the permanent mac address */
@@ -242,8 +251,11 @@ static u32 ixgbe_get_supported_physical_layer_X540(struct ixgbe_hw *hw)
 }
 
 /**
- * ixgbe_init_eeprom_params_X540 - Initialize EEPROM params
- * @hw: pointer to hardware structure
+ *  ixgbe_init_eeprom_params_X540 - Initialize EEPROM params
+ *  @hw: pointer to hardware structure
+ *
+ *  Initializes the EEPROM parameters ixgbe_eeprom_info within the
+ *  ixgbe_hw struct in order to set up EEPROM access.
  **/
 static s32 ixgbe_init_eeprom_params_X540(struct ixgbe_hw *hw)
 {
@@ -262,7 +274,7 @@ static s32 ixgbe_init_eeprom_params_X540(struct ixgbe_hw *hw)
                                           IXGBE_EEPROM_WORD_SIZE_SHIFT);
 
                 hw_dbg(hw, "Eeprom params: type = %d, size = %d\n",
-                        eeprom->type, eeprom->word_size);
+                       eeprom->type, eeprom->word_size);
         }
 
         return 0;
@@ -278,7 +290,7 @@ static s32 ixgbe_read_eerd_X540(struct ixgbe_hw *hw, u16 offset, u16 *data)
 {
         s32 status;
 
-        if (ixgbe_acquire_swfw_sync_X540(hw, IXGBE_GSSR_EEP_SM) == 0)
+        if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) == 0)
                 status = ixgbe_read_eerd_generic(hw, offset, data);
         else
                 status = IXGBE_ERR_SWFW_SYNC;
@@ -311,7 +323,7 @@ static s32 ixgbe_write_eewr_X540(struct ixgbe_hw *hw, u16 offset, u16 data)
                (data << IXGBE_EEPROM_RW_REG_DATA) |
                IXGBE_EEPROM_RW_REG_START;
 
-        if (ixgbe_acquire_swfw_sync_X540(hw, IXGBE_GSSR_EEP_SM) == 0) {
+        if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_EEP_SM) == 0) {
                 status = ixgbe_poll_eerd_eewr_done(hw, IXGBE_NVM_POLL_WRITE);
                 if (status != 0) {
                         hw_dbg(hw, "Eeprom write EEWR timed out\n");
@@ -676,7 +688,6 @@ static struct ixgbe_mac_operations mac_ops_X540 = {
         .set_vmdq               = &ixgbe_set_vmdq_generic,
         .clear_vmdq             = &ixgbe_clear_vmdq_generic,
         .init_rx_addrs          = &ixgbe_init_rx_addrs_generic,
-        .update_uc_addr_list    = &ixgbe_update_uc_addr_list_generic,
         .update_mc_addr_list    = &ixgbe_update_mc_addr_list_generic,
         .enable_mc              = &ixgbe_enable_mc_generic,
         .disable_mc             = &ixgbe_disable_mc_generic,
@@ -687,6 +698,8 @@ static struct ixgbe_mac_operations mac_ops_X540 = {
         .setup_sfp              = NULL,
         .set_mac_anti_spoofing  = &ixgbe_set_mac_anti_spoofing,
         .set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing,
+        .acquire_swfw_sync      = &ixgbe_acquire_swfw_sync_X540,
+        .release_swfw_sync      = &ixgbe_release_swfw_sync_X540,
 };
 
 static struct ixgbe_eeprom_operations eeprom_ops_X540 = {
@@ -702,7 +715,7 @@ static struct ixgbe_phy_operations phy_ops_X540 = {
         .identify               = &ixgbe_identify_phy_generic,
         .identify_sfp           = &ixgbe_identify_sfp_module_generic,
         .init                   = NULL,
-        .reset                  = &ixgbe_reset_phy_generic,
+        .reset                  = NULL,
         .read_reg               = &ixgbe_read_phy_reg_generic,
         .write_reg              = &ixgbe_write_phy_reg_generic,
         .setup_link             = &ixgbe_setup_phy_link_generic,
diff --git a/drivers/net/ixgbevf/defines.h b/drivers/net/ixgbevf/defines.h
index de643eb2ada..78abb6f1a86 100644
--- a/drivers/net/ixgbevf/defines.h
+++ b/drivers/net/ixgbevf/defines.h
@@ -65,6 +65,8 @@ typedef u32 ixgbe_link_speed;
 #define IXGBE_RXCTRL_DMBYPS     0x00000002  /* Descriptor Monitor Bypass */
 #define IXGBE_RXDCTL_ENABLE     0x02000000  /* Enable specific Rx Queue */
 #define IXGBE_RXDCTL_VME        0x40000000  /* VLAN mode enable */
+#define IXGBE_RXDCTL_RLPMLMASK  0x00003FFF  /* Only supported on the X540 */
+#define IXGBE_RXDCTL_RLPML_EN   0x00008000
 
 /* DCA Control */
 #define IXGBE_DCA_TXCTRL_TX_WB_RO_EN (1 << 11) /* Tx Desc writeback RO bit */
diff --git a/drivers/net/ixgbevf/ethtool.c b/drivers/net/ixgbevf/ethtool.c
index fa29b3c8c46..0563ab29264 100644
--- a/drivers/net/ixgbevf/ethtool.c
+++ b/drivers/net/ixgbevf/ethtool.c
@@ -172,7 +172,7 @@ static char *ixgbevf_reg_names[] = {
         "IXGBE_VFSTATUS",
         "IXGBE_VFLINKS",
         "IXGBE_VFRXMEMWRAP",
-        "IXGBE_VFRTIMER",
+        "IXGBE_VFFRTIMER",
         "IXGBE_VTEICR",
         "IXGBE_VTEICS",
         "IXGBE_VTEIMS",
@@ -240,7 +240,7 @@ static void ixgbevf_get_regs(struct net_device *netdev,
         regs_buff[1] = IXGBE_READ_REG(hw, IXGBE_VFSTATUS);
         regs_buff[2] = IXGBE_READ_REG(hw, IXGBE_VFLINKS);
         regs_buff[3] = IXGBE_READ_REG(hw, IXGBE_VFRXMEMWRAP);
-        regs_buff[4] = IXGBE_READ_REG(hw, IXGBE_VFRTIMER);
+        regs_buff[4] = IXGBE_READ_REG(hw, IXGBE_VFFRTIMER);
 
         /* Interrupt */
         /* don't read EICR because it can clear interrupt causes, instead
diff --git a/drivers/net/ixgbevf/ixgbevf.h b/drivers/net/ixgbevf/ixgbevf.h
index a63efcb2cf1..b703f60be3b 100644
--- a/drivers/net/ixgbevf/ixgbevf.h
+++ b/drivers/net/ixgbevf/ixgbevf.h
@@ -207,7 +207,6 @@ struct ixgbevf_adapter {
         u64 hw_tso_ctxt;
         u64 hw_tso6_ctxt;
         u32 tx_timeout_count;
-        bool detect_tx_hung;
 
         /* RX */
         struct ixgbevf_ring *rx_ring;   /* One per active queue */
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c
index 464e6c9d3fc..054ab05b7c6 100644
--- a/drivers/net/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ixgbevf/ixgbevf_main.c
@@ -49,9 +49,9 @@
 
 char ixgbevf_driver_name[] = "ixgbevf";
 static const char ixgbevf_driver_string[] =
-        "Intel(R) 82599 Virtual Function";
+        "Intel(R) 10 Gigabit PCI Express Virtual Function Network Driver";
 
-#define DRV_VERSION "1.0.19-k0"
+#define DRV_VERSION "2.0.0-k2"
 const char ixgbevf_driver_version[] = DRV_VERSION;
 static char ixgbevf_copyright[] =
         "Copyright (c) 2009 - 2010 Intel Corporation.";
@@ -107,7 +107,7 @@ static inline void ixgbevf_release_rx_desc(struct ixgbe_hw *hw,
 }
 
 /*
- * ixgbe_set_ivar - set the IVAR registers, mapping interrupt causes to vectors
+ * ixgbevf_set_ivar - set IVAR registers - maps interrupt causes to vectors
  * @adapter: pointer to adapter struct
  * @direction: 0 for Rx, 1 for Tx, -1 for other causes
  * @queue: queue to map the corresponding interrupt to
@@ -162,42 +162,6 @@ static void ixgbevf_unmap_and_free_tx_resource(struct ixgbevf_adapter *adapter,
         /* tx_buffer_info must be completely set up in the transmit path */
 }
 
-static inline bool ixgbevf_check_tx_hang(struct ixgbevf_adapter *adapter,
-                                         struct ixgbevf_ring *tx_ring,
-                                         unsigned int eop)
-{
-        struct ixgbe_hw *hw = &adapter->hw;
-        u32 head, tail;
-
-        /* Detect a transmit hang in hardware, this serializes the
-         * check with the clearing of time_stamp and movement of eop */
-        head = readl(hw->hw_addr + tx_ring->head);
-        tail = readl(hw->hw_addr + tx_ring->tail);
-        adapter->detect_tx_hung = false;
-        if ((head != tail) &&
-            tx_ring->tx_buffer_info[eop].time_stamp &&
-            time_after(jiffies, tx_ring->tx_buffer_info[eop].time_stamp + HZ)) {
-                /* detected Tx unit hang */
-                union ixgbe_adv_tx_desc *tx_desc;
-                tx_desc = IXGBE_TX_DESC_ADV(*tx_ring, eop);
-                printk(KERN_ERR "Detected Tx Unit Hang\n"
-                       "  Tx Queue             <%d>\n"
-                       "  TDH, TDT             <%x>, <%x>\n"
-                       "  next_to_use          <%x>\n"
-                       "  next_to_clean        <%x>\n"
-                       "tx_buffer_info[next_to_clean]\n"
-                       "  time_stamp           <%lx>\n"
-                       "  jiffies              <%lx>\n",
-                       tx_ring->queue_index,
-                       head, tail,
-                       tx_ring->next_to_use, eop,
-                       tx_ring->tx_buffer_info[eop].time_stamp, jiffies);
-                return true;
-        }
-
-        return false;
-}
-
 #define IXGBE_MAX_TXD_PWR       14
 #define IXGBE_MAX_DATA_PER_TXD  (1 << IXGBE_MAX_TXD_PWR)
 
@@ -293,16 +257,6 @@ static bool ixgbevf_clean_tx_irq(struct ixgbevf_adapter *adapter,
 #endif
         }
 
-        if (adapter->detect_tx_hung) {
-                if (ixgbevf_check_tx_hang(adapter, tx_ring, i)) {
-                        /* schedule immediate reset if we believe we hung */
-                        printk(KERN_INFO
-                               "tx hang %d detected, resetting adapter\n",
-                               adapter->tx_timeout_count + 1);
-                        ixgbevf_tx_timeout(adapter->netdev);
-                }
-        }
-
         /* re-arm the interrupt */
         if ((count >= tx_ring->work_limit) &&
             (!test_bit(__IXGBEVF_DOWN, &adapter->state))) {
@@ -334,7 +288,6 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector,
         struct ixgbevf_adapter *adapter = q_vector->adapter;
         bool is_vlan = (status & IXGBE_RXD_STAT_VP);
         u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);
-        int ret;
 
         if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL)) {
                 if (adapter->vlgrp && is_vlan)
@@ -345,9 +298,9 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector,
                         napi_gro_receive(&q_vector->napi, skb);
         } else {
                 if (adapter->vlgrp && is_vlan)
-                        ret = vlan_hwaccel_rx(skb, adapter->vlgrp, tag);
+                        vlan_hwaccel_rx(skb, adapter->vlgrp, tag);
                 else
-                        ret = netif_rx(skb);
+                        netif_rx(skb);
         }
 }
 
@@ -1017,7 +970,7 @@ static irqreturn_t ixgbevf_msix_clean_tx(int irq, void *data)
 }
 
 /**
- * ixgbe_msix_clean_rx - single unshared vector rx clean (all queues)
+ * ixgbevf_msix_clean_rx - single unshared vector rx clean (all queues)
  * @irq: unused
  * @data: pointer to our q_vector struct for this interrupt vector
  **/
@@ -1665,6 +1618,11 @@ static int ixgbevf_up_complete(struct ixgbevf_adapter *adapter)
                 j = adapter->rx_ring[i].reg_idx;
                 rxdctl = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(j));
                 rxdctl |= IXGBE_RXDCTL_ENABLE;
+                if (hw->mac.type == ixgbe_mac_X540_vf) {
+                        rxdctl &= ~IXGBE_RXDCTL_RLPMLMASK;
+                        rxdctl |= ((netdev->mtu + ETH_HLEN + ETH_FCS_LEN) |
+                                   IXGBE_RXDCTL_RLPML_EN);
+                }
                 IXGBE_WRITE_REG(hw, IXGBE_VFRXDCTL(j), rxdctl);
                 ixgbevf_rx_desc_queue_enable(adapter, i);
         }
@@ -1967,7 +1925,7 @@ static void ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter,
 }
 
 /*
- * ixgbe_set_num_queues: Allocate queues for device, feature dependant
+ * ixgbevf_set_num_queues: Allocate queues for device, feature dependant
  * @adapter: board private structure to initialize
  *
  * This is the top level queue allocation routine.  The order here is very
@@ -2216,7 +2174,7 @@ static int __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
 
         hw->vendor_id = pdev->vendor;
         hw->device_id = pdev->device;
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
+        hw->revision_id = pdev->revision;
         hw->subsystem_vendor_id = pdev->subsystem_vendor;
         hw->subsystem_device_id = pdev->subsystem_device;
 
@@ -2410,9 +2368,6 @@ static void ixgbevf_watchdog_task(struct work_struct *work)
                                10 : 1);
                         netif_carrier_on(netdev);
                         netif_tx_wake_all_queues(netdev);
-                } else {
-                        /* Force detection of hung controller */
-                        adapter->detect_tx_hung = true;
                 }
         } else {
                 adapter->link_up = false;
@@ -2427,9 +2382,6 @@ static void ixgbevf_watchdog_task(struct work_struct *work)
         ixgbevf_update_stats(adapter);
 
 pf_has_reset:
-        /* Force detection of hung controller every watchdog period */
-        adapter->detect_tx_hung = true;
-
         /* Reset the timer */
         if (!test_bit(__IXGBEVF_DOWN, &adapter->state))
                 mod_timer(&adapter->watchdog_timer,
@@ -3217,10 +3169,16 @@ static int ixgbevf_set_mac(struct net_device *netdev, void *p)
 static int ixgbevf_change_mtu(struct net_device *netdev, int new_mtu)
 {
         struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+        struct ixgbe_hw *hw = &adapter->hw;
         int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
+        int max_possible_frame = MAXIMUM_ETHERNET_VLAN_SIZE;
+        u32 msg[2];
+
+        if (adapter->hw.mac.type == ixgbe_mac_X540_vf)
+                max_possible_frame = IXGBE_MAX_JUMBO_FRAME_SIZE;
 
         /* MTU < 68 is an error and causes problems on some kernels */
-        if ((new_mtu < 68) || (max_frame > MAXIMUM_ETHERNET_VLAN_SIZE))
+        if ((new_mtu < 68) || (max_frame > max_possible_frame))
                 return -EINVAL;
 
         hw_dbg(&adapter->hw, "changing MTU from %d to %d\n",
@@ -3228,6 +3186,10 @@ static int ixgbevf_change_mtu(struct net_device *netdev, int new_mtu)
         /* must set new MTU before calling down or up */
         netdev->mtu = new_mtu;
 
+        msg[0] = IXGBE_VF_SET_LPE;
+        msg[1] = max_frame;
+        hw->mbx.ops.write_posted(hw, msg, 2);
+
         if (netif_running(netdev))
                 ixgbevf_reinit_locked(adapter);
 
@@ -3272,8 +3234,6 @@ static const struct net_device_ops ixgbe_netdev_ops = {
 
 static void ixgbevf_assign_netdev_ops(struct net_device *dev)
 {
-        struct ixgbevf_adapter *adapter;
-        adapter = netdev_priv(dev);
         dev->netdev_ops = &ixgbe_netdev_ops;
         ixgbevf_set_ethtool_ops(dev);
         dev->watchdog_timeo = 5 * HZ;
@@ -3519,9 +3479,9 @@ static struct pci_driver ixgbevf_driver = {
 };
 
 /**
- * ixgbe_init_module - Driver Registration Routine
+ * ixgbevf_init_module - Driver Registration Routine
  *
- * ixgbe_init_module is the first routine called when the driver is
+ * ixgbevf_init_module is the first routine called when the driver is
  * loaded. All it does is register with the PCI subsystem.
  **/
 static int __init ixgbevf_init_module(void)
@@ -3539,9 +3499,9 @@ static int __init ixgbevf_init_module(void)
 module_init(ixgbevf_init_module);
 
 /**
- * ixgbe_exit_module - Driver Exit Cleanup Routine
+ * ixgbevf_exit_module - Driver Exit Cleanup Routine
  *
- * ixgbe_exit_module is called just before the driver is removed
+ * ixgbevf_exit_module is called just before the driver is removed
  * from memory.
  **/
 static void __exit ixgbevf_exit_module(void)
@@ -3551,7 +3511,7 @@ static void __exit ixgbevf_exit_module(void)
 
 #ifdef DEBUG
 /**
- * ixgbe_get_hw_dev_name - return device name string
+ * ixgbevf_get_hw_dev_name - return device name string
  * used by hardware layer to print debugging information
  **/
 char *ixgbevf_get_hw_dev_name(struct ixgbe_hw *hw)
diff --git a/drivers/net/ixgbevf/regs.h b/drivers/net/ixgbevf/regs.h
index fb80ca1bcc9..189200eeca2 100644
--- a/drivers/net/ixgbevf/regs.h
+++ b/drivers/net/ixgbevf/regs.h
@@ -31,7 +31,7 @@
 #define IXGBE_VFCTRL           0x00000
 #define IXGBE_VFSTATUS         0x00008
 #define IXGBE_VFLINKS          0x00010
-#define IXGBE_VFRTIMER         0x00048
+#define IXGBE_VFFRTIMER        0x00048
 #define IXGBE_VFRXMEMWRAP      0x03190
 #define IXGBE_VTEICR           0x00100
 #define IXGBE_VTEICS           0x00104
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index e97ebef3cf4..994c80939c7 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -161,6 +161,67 @@ jme_setup_wakeup_frame(struct jme_adapter *jme,
 }
 
 static inline void
+jme_mac_rxclk_off(struct jme_adapter *jme)
+{
+        jme->reg_gpreg1 |= GPREG1_RXCLKOFF;
+        jwrite32f(jme, JME_GPREG1, jme->reg_gpreg1);
+}
+
+static inline void
+jme_mac_rxclk_on(struct jme_adapter *jme)
+{
+        jme->reg_gpreg1 &= ~GPREG1_RXCLKOFF;
+        jwrite32f(jme, JME_GPREG1, jme->reg_gpreg1);
+}
+
+static inline void
+jme_mac_txclk_off(struct jme_adapter *jme)
+{
+        jme->reg_ghc &= ~(GHC_TO_CLK_SRC | GHC_TXMAC_CLK_SRC);
+        jwrite32f(jme, JME_GHC, jme->reg_ghc);
+}
+
+static inline void
+jme_mac_txclk_on(struct jme_adapter *jme)
+{
+        u32 speed = jme->reg_ghc & GHC_SPEED;
+        if (speed == GHC_SPEED_1000M)
+                jme->reg_ghc |= GHC_TO_CLK_GPHY | GHC_TXMAC_CLK_GPHY;
+        else
+                jme->reg_ghc |= GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE;
+        jwrite32f(jme, JME_GHC, jme->reg_ghc);
+}
+
+static inline void
+jme_reset_ghc_speed(struct jme_adapter *jme)
+{
+        jme->reg_ghc &= ~(GHC_SPEED | GHC_DPX);
+        jwrite32f(jme, JME_GHC, jme->reg_ghc);
+}
+
+static inline void
+jme_reset_250A2_workaround(struct jme_adapter *jme)
+{
+        jme->reg_gpreg1 &= ~(GPREG1_HALFMODEPATCH |
+                             GPREG1_RSSPATCH);
+        jwrite32(jme, JME_GPREG1, jme->reg_gpreg1);
+}
+
+static inline void
+jme_assert_ghc_reset(struct jme_adapter *jme)
+{
+        jme->reg_ghc |= GHC_SWRST;
+        jwrite32f(jme, JME_GHC, jme->reg_ghc);
+}
+
+static inline void
+jme_clear_ghc_reset(struct jme_adapter *jme)
+{
+        jme->reg_ghc &= ~GHC_SWRST;
+        jwrite32f(jme, JME_GHC, jme->reg_ghc);
+}
+
+static inline void
 jme_reset_mac_processor(struct jme_adapter *jme)
 {
         static const u32 mask[WAKEUP_FRAME_MASK_DWNR] = {0, 0, 0, 0};
@@ -168,9 +229,24 @@ jme_reset_mac_processor(struct jme_adapter *jme)
         u32 gpreg0;
         int i;
 
-        jwrite32(jme, JME_GHC, jme->reg_ghc | GHC_SWRST);
-        udelay(2);
-        jwrite32(jme, JME_GHC, jme->reg_ghc);
+        jme_reset_ghc_speed(jme);
+        jme_reset_250A2_workaround(jme);
+
+        jme_mac_rxclk_on(jme);
+        jme_mac_txclk_on(jme);
+        udelay(1);
+        jme_assert_ghc_reset(jme);
+        udelay(1);
+        jme_mac_rxclk_off(jme);
+        jme_mac_txclk_off(jme);
+        udelay(1);
+        jme_clear_ghc_reset(jme);
+        udelay(1);
+        jme_mac_rxclk_on(jme);
+        jme_mac_txclk_on(jme);
+        udelay(1);
+        jme_mac_rxclk_off(jme);
+        jme_mac_txclk_off(jme);
 
         jwrite32(jme, JME_RXDBA_LO, 0x00000000);
         jwrite32(jme, JME_RXDBA_HI, 0x00000000);
@@ -190,14 +266,6 @@ jme_reset_mac_processor(struct jme_adapter *jme)
         else
                 gpreg0 = GPREG0_DEFAULT;
         jwrite32(jme, JME_GPREG0, gpreg0);
-        jwrite32(jme, JME_GPREG1, GPREG1_DEFAULT);
-}
-
-static inline void
-jme_reset_ghc_speed(struct jme_adapter *jme)
-{
-        jme->reg_ghc &= ~(GHC_SPEED_1000M | GHC_DPX);
-        jwrite32(jme, JME_GHC, jme->reg_ghc);
 }
 
 static inline void
@@ -205,7 +273,7 @@ jme_clear_pm(struct jme_adapter *jme)
 {
         jwrite32(jme, JME_PMCS, 0xFFFF0000 | jme->reg_pmcs);
         pci_set_power_state(jme->pdev, PCI_D0);
-        pci_enable_wake(jme->pdev, PCI_D0, false);
+        device_set_wakeup_enable(&jme->pdev->dev, false);
 }
 
 static int
@@ -336,13 +404,13 @@ jme_linkstat_from_phy(struct jme_adapter *jme)
 }
 
 static inline void
-jme_set_phyfifoa(struct jme_adapter *jme)
+jme_set_phyfifo_5level(struct jme_adapter *jme)
 {
         jme_mdio_write(jme->dev, jme->mii_if.phy_id, 27, 0x0004);
 }
 
 static inline void
-jme_set_phyfifob(struct jme_adapter *jme)
+jme_set_phyfifo_8level(struct jme_adapter *jme)
 {
         jme_mdio_write(jme->dev, jme->mii_if.phy_id, 27, 0x0000);
 }
@@ -351,7 +419,7 @@ static int
 jme_check_link(struct net_device *netdev, int testonly)
 {
         struct jme_adapter *jme = netdev_priv(netdev);
-        u32 phylink, ghc, cnt = JME_SPDRSV_TIMEOUT, bmcr, gpreg1;
+        u32 phylink, cnt = JME_SPDRSV_TIMEOUT, bmcr;
         char linkmsg[64];
         int rc = 0;
 
@@ -414,23 +482,21 @@ jme_check_link(struct net_device *netdev, int testonly)
 
                 jme->phylink = phylink;
 
-                ghc = jme->reg_ghc & ~(GHC_SPEED | GHC_DPX |
-                                GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE |
-                                GHC_TO_CLK_GPHY | GHC_TXMAC_CLK_GPHY);
+                /*
+                 * The speed/duplex setting of jme->reg_ghc already cleared
+                 * by jme_reset_mac_processor()
+                 */
                 switch (phylink & PHY_LINK_SPEED_MASK) {
                 case PHY_LINK_SPEED_10M:
-                        ghc |= GHC_SPEED_10M |
-                                GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE;
+                        jme->reg_ghc |= GHC_SPEED_10M;
                         strcat(linkmsg, "10 Mbps, ");
                         break;
                 case PHY_LINK_SPEED_100M:
-                        ghc |= GHC_SPEED_100M |
-                                GHC_TO_CLK_PCIE | GHC_TXMAC_CLK_PCIE;
+                        jme->reg_ghc |= GHC_SPEED_100M;
                         strcat(linkmsg, "100 Mbps, ");
                         break;
                 case PHY_LINK_SPEED_1000M:
-                        ghc |= GHC_SPEED_1000M |
-                                GHC_TO_CLK_GPHY | GHC_TXMAC_CLK_GPHY;
+                        jme->reg_ghc |= GHC_SPEED_1000M;
                         strcat(linkmsg, "1000 Mbps, ");
                         break;
                 default:
@@ -439,42 +505,40 @@ jme_check_link(struct net_device *netdev, int testonly)
 
                 if (phylink & PHY_LINK_DUPLEX) {
                         jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT);
-                        ghc |= GHC_DPX;
+                        jwrite32(jme, JME_TXTRHD, TXTRHD_FULLDUPLEX);
+                        jme->reg_ghc |= GHC_DPX;
                 } else {
                         jwrite32(jme, JME_TXMCS, TXMCS_DEFAULT |
                                                 TXMCS_BACKOFF |
                                                 TXMCS_CARRIERSENSE |
                                                 TXMCS_COLLISION);
-                        jwrite32(jme, JME_TXTRHD, TXTRHD_TXPEN |
-                                ((0x2000 << TXTRHD_TXP_SHIFT) & TXTRHD_TXP) |
-                                TXTRHD_TXREN |
-                                ((8 << TXTRHD_TXRL_SHIFT) & TXTRHD_TXRL));
+                        jwrite32(jme, JME_TXTRHD, TXTRHD_HALFDUPLEX);
                 }
 
-                gpreg1 = GPREG1_DEFAULT;
+                jwrite32(jme, JME_GHC, jme->reg_ghc);
+
                 if (is_buggy250(jme->pdev->device, jme->chiprev)) {
+                        jme->reg_gpreg1 &= ~(GPREG1_HALFMODEPATCH |
+                                             GPREG1_RSSPATCH);
                         if (!(phylink & PHY_LINK_DUPLEX))
-                                gpreg1 |= GPREG1_HALFMODEPATCH;
+                                jme->reg_gpreg1 |= GPREG1_HALFMODEPATCH;
                         switch (phylink & PHY_LINK_SPEED_MASK) {
                         case PHY_LINK_SPEED_10M:
-                                jme_set_phyfifoa(jme);
-                                gpreg1 |= GPREG1_RSSPATCH;
+                                jme_set_phyfifo_8level(jme);
+                                jme->reg_gpreg1 |= GPREG1_RSSPATCH;
                                 break;
                         case PHY_LINK_SPEED_100M:
-                                jme_set_phyfifob(jme);
-                                gpreg1 |= GPREG1_RSSPATCH;
+                                jme_set_phyfifo_5level(jme);
+                                jme->reg_gpreg1 |= GPREG1_RSSPATCH;
                                 break;
                         case PHY_LINK_SPEED_1000M:
-                                jme_set_phyfifoa(jme);
+                                jme_set_phyfifo_8level(jme);
                                 break;
                         default:
                                 break;
                         }
                 }
-
-                jwrite32(jme, JME_GPREG1, gpreg1);
-                jwrite32(jme, JME_GHC, ghc);
-                jme->reg_ghc = ghc;
+                jwrite32(jme, JME_GPREG1, jme->reg_gpreg1);
 
                 strcat(linkmsg, (phylink & PHY_LINK_DUPLEX) ?
                                         "Full-Duplex, " :
@@ -613,10 +677,14 @@ jme_enable_tx_engine(struct jme_adapter *jme)
          * Enable TX Engine
          */
         wmb();
-        jwrite32(jme, JME_TXCS, jme->reg_txcs |
+        jwrite32f(jme, JME_TXCS, jme->reg_txcs |
                                 TXCS_SELECT_QUEUE0 |
                                 TXCS_ENABLE);
 
+        /*
+         * Start clock for TX MAC Processor
+         */
+        jme_mac_txclk_on(jme);
 }
 
 static inline void
@@ -651,6 +719,11 @@ jme_disable_tx_engine(struct jme_adapter *jme)
 
         if (!i)
                 pr_err("Disable TX engine timeout\n");
+
+        /*
+         * Stop clock for TX MAC Processor
+         */
+        jme_mac_txclk_off(jme);
 }
 
 static void
@@ -825,16 +898,22 @@ jme_enable_rx_engine(struct jme_adapter *jme)
         /*
          * Setup Unicast Filter
          */
+        jme_set_unicastaddr(jme->dev);
         jme_set_multi(jme->dev);
 
         /*
          * Enable RX Engine
          */
         wmb();
-        jwrite32(jme, JME_RXCS, jme->reg_rxcs |
+        jwrite32f(jme, JME_RXCS, jme->reg_rxcs |
                                 RXCS_QUEUESEL_Q0 |
                                 RXCS_ENABLE |
                                 RXCS_QST);
+
+        /*
+         * Start clock for RX MAC Processor
+         */
+        jme_mac_rxclk_on(jme);
 }
 
 static inline void
@@ -871,10 +950,40 @@ jme_disable_rx_engine(struct jme_adapter *jme)
         if (!i)
                 pr_err("Disable RX engine timeout\n");
 
+        /*
+         * Stop clock for RX MAC Processor
+         */
+        jme_mac_rxclk_off(jme);
+}
+
+static u16
+jme_udpsum(struct sk_buff *skb)
+{
+        u16 csum = 0xFFFFu;
+
+        if (skb->len < (ETH_HLEN + sizeof(struct iphdr)))
+                return csum;
+        if (skb->protocol != htons(ETH_P_IP))
+                return csum;
+        skb_set_network_header(skb, ETH_HLEN);
+        if ((ip_hdr(skb)->protocol != IPPROTO_UDP) ||
+            (skb->len < (ETH_HLEN +
+                        (ip_hdr(skb)->ihl << 2) +
+                        sizeof(struct udphdr)))) {
+                skb_reset_network_header(skb);
+                return csum;
+        }
+        skb_set_transport_header(skb,
+                        ETH_HLEN + (ip_hdr(skb)->ihl << 2));
+        csum = udp_hdr(skb)->check;
+        skb_reset_transport_header(skb);
+        skb_reset_network_header(skb);
+
+        return csum;
 }
 
 static int
-jme_rxsum_ok(struct jme_adapter *jme, u16 flags)
+jme_rxsum_ok(struct jme_adapter *jme, u16 flags, struct sk_buff *skb)
 {
         if (!(flags & (RXWBFLAG_TCPON | RXWBFLAG_UDPON | RXWBFLAG_IPV4)))
                 return false;
@@ -887,7 +996,7 @@ jme_rxsum_ok(struct jme_adapter *jme, u16 flags)
         }
 
         if (unlikely((flags & (RXWBFLAG_MF | RXWBFLAG_UDPON | RXWBFLAG_UDPCS))
-                        == RXWBFLAG_UDPON)) {
+                        == RXWBFLAG_UDPON) && jme_udpsum(skb)) {
                 if (flags & RXWBFLAG_IPV4)
                         netif_err(jme, rx_err, jme->dev, "UDP Checksum error\n");
                 return false;
@@ -935,7 +1044,7 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
                 skb_put(skb, framesize);
                 skb->protocol = eth_type_trans(skb, jme->dev);
 
-                if (jme_rxsum_ok(jme, le16_to_cpu(rxdesc->descwb.flags)))
+                if (jme_rxsum_ok(jme, le16_to_cpu(rxdesc->descwb.flags), skb))
                         skb->ip_summed = CHECKSUM_UNNECESSARY;
                 else
                         skb_checksum_none_assert(skb);
@@ -1207,7 +1316,6 @@ jme_link_change_tasklet(unsigned long arg)
         tasklet_disable(&jme->rxempty_task);
 
         if (netif_carrier_ok(netdev)) {
-                jme_reset_ghc_speed(jme);
                 jme_disable_rx_engine(jme);
                 jme_disable_tx_engine(jme);
                 jme_reset_mac_processor(jme);
@@ -1577,6 +1685,38 @@ jme_free_irq(struct jme_adapter *jme)
 }
 
 static inline void
+jme_new_phy_on(struct jme_adapter *jme)
+{
+        u32 reg;
+
+        reg = jread32(jme, JME_PHY_PWR);
+        reg &= ~(PHY_PWR_DWN1SEL | PHY_PWR_DWN1SW |
+                 PHY_PWR_DWN2 | PHY_PWR_CLKSEL);
+        jwrite32(jme, JME_PHY_PWR, reg);
+
+        pci_read_config_dword(jme->pdev, PCI_PRIV_PE1, &reg);
+        reg &= ~PE1_GPREG0_PBG;
+        reg |= PE1_GPREG0_ENBG;
+        pci_write_config_dword(jme->pdev, PCI_PRIV_PE1, reg);
+}
+
+static inline void
+jme_new_phy_off(struct jme_adapter *jme)
+{
+        u32 reg;
+
+        reg = jread32(jme, JME_PHY_PWR);
+        reg |= PHY_PWR_DWN1SEL | PHY_PWR_DWN1SW |
+               PHY_PWR_DWN2 | PHY_PWR_CLKSEL;
+        jwrite32(jme, JME_PHY_PWR, reg);
+
+        pci_read_config_dword(jme->pdev, PCI_PRIV_PE1, &reg);
+        reg &= ~PE1_GPREG0_PBG;
+        reg |= PE1_GPREG0_PDD3COLD;
+        pci_write_config_dword(jme->pdev, PCI_PRIV_PE1, reg);
+}
+
+static inline void
 jme_phy_on(struct jme_adapter *jme)
 {
         u32 bmcr;
@@ -1584,6 +1724,22 @@ jme_phy_on(struct jme_adapter *jme)
         bmcr = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_BMCR);
         bmcr &= ~BMCR_PDOWN;
         jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_BMCR, bmcr);
+
+        if (new_phy_power_ctrl(jme->chip_main_rev))
+                jme_new_phy_on(jme);
+}
+
+static inline void
+jme_phy_off(struct jme_adapter *jme)
+{
+        u32 bmcr;
+
+        bmcr = jme_mdio_read(jme->dev, jme->mii_if.phy_id, MII_BMCR);
+        bmcr |= BMCR_PDOWN;
+        jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_BMCR, bmcr);
+
+        if (new_phy_power_ctrl(jme->chip_main_rev))
+                jme_new_phy_off(jme);
 }
 
 static int
@@ -1606,12 +1762,11 @@ jme_open(struct net_device *netdev)
 
         jme_start_irq(jme);
 
-        if (test_bit(JME_FLAG_SSET, &jme->flags)) {
-                jme_phy_on(jme);
+        jme_phy_on(jme);
+        if (test_bit(JME_FLAG_SSET, &jme->flags))
                 jme_set_settings(netdev, &jme->old_ecmd);
-        } else {
+        else
                 jme_reset_phy_processor(jme);
-        }
 
         jme_reset_link(jme);
 
@@ -1657,12 +1812,6 @@ jme_wait_link(struct jme_adapter *jme)
         }
 }
 
-static inline void
-jme_phy_off(struct jme_adapter *jme)
-{
-        jme_mdio_write(jme->dev, jme->mii_if.phy_id, MII_BMCR, BMCR_PDOWN);
-}
-
 static void
 jme_powersave_phy(struct jme_adapter *jme)
 {
@@ -1696,7 +1845,6 @@ jme_close(struct net_device *netdev)
         tasklet_disable(&jme->rxclean_task);
         tasklet_disable(&jme->rxempty_task);
 
-        jme_reset_ghc_speed(jme);
         jme_disable_rx_engine(jme);
         jme_disable_tx_engine(jme);
         jme_reset_mac_processor(jme);
@@ -1993,27 +2141,34 @@ jme_start_xmit(struct sk_buff *skb, struct net_device *netdev)
         return NETDEV_TX_OK;
 }
 
+static void
+jme_set_unicastaddr(struct net_device *netdev)
+{
+        struct jme_adapter *jme = netdev_priv(netdev);
+        u32 val;
+
+        val = (netdev->dev_addr[3] & 0xff) << 24 |
+              (netdev->dev_addr[2] & 0xff) << 16 |
+              (netdev->dev_addr[1] & 0xff) <<  8 |
+              (netdev->dev_addr[0] & 0xff);
+        jwrite32(jme, JME_RXUMA_LO, val);
+        val = (netdev->dev_addr[5] & 0xff) << 8 |
+              (netdev->dev_addr[4] & 0xff);
+        jwrite32(jme, JME_RXUMA_HI, val);
+}
+
 static int
 jme_set_macaddr(struct net_device *netdev, void *p)
 {
         struct jme_adapter *jme = netdev_priv(netdev);
         struct sockaddr *addr = p;
-        u32 val;
 
         if (netif_running(netdev))
                 return -EBUSY;
 
         spin_lock_bh(&jme->macaddr_lock);
         memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
-
-        val = (addr->sa_data[3] & 0xff) << 24 |
-              (addr->sa_data[2] & 0xff) << 16 |
-              (addr->sa_data[1] & 0xff) <<  8 |
-              (addr->sa_data[0] & 0xff);
-        jwrite32(jme, JME_RXUMA_LO, val);
-        val = (addr->sa_data[5] & 0xff) << 8 |
-              (addr->sa_data[4] & 0xff);
-        jwrite32(jme, JME_RXUMA_HI, val);
+        jme_set_unicastaddr(netdev);
         spin_unlock_bh(&jme->macaddr_lock);
 
         return 0;
@@ -2383,6 +2538,8 @@ jme_set_wol(struct net_device *netdev,
 
         jwrite32(jme, JME_PMCS, jme->reg_pmcs);
 
+        device_set_wakeup_enable(&jme->pdev->dev, jme->reg_pmcs);
+
         return 0;
 }
 
@@ -2731,6 +2888,8 @@ jme_check_hw_ver(struct jme_adapter *jme)
 
         jme->fpgaver = (chipmode & CM_FPGAVER_MASK) >> CM_FPGAVER_SHIFT;
         jme->chiprev = (chipmode & CM_CHIPREV_MASK) >> CM_CHIPREV_SHIFT;
+        jme->chip_main_rev = jme->chiprev & 0xF;
+        jme->chip_sub_rev = (jme->chiprev >> 4) & 0xF;
 }
 
 static const struct net_device_ops jme_netdev_ops = {
@@ -2880,6 +3039,7 @@ jme_init_one(struct pci_dev *pdev,
         jme->reg_rxmcs = RXMCS_DEFAULT;
         jme->reg_txpfc = 0;
         jme->reg_pmcs = PMCS_MFEN;
+        jme->reg_gpreg1 = GPREG1_DEFAULT;
         set_bit(JME_FLAG_TXCSUM, &jme->flags);
         set_bit(JME_FLAG_TSO, &jme->flags);
 
@@ -2936,8 +3096,8 @@ jme_init_one(struct pci_dev *pdev,
         jme->mii_if.mdio_write = jme_mdio_write;
 
         jme_clear_pm(jme);
-        jme_set_phyfifoa(jme);
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &jme->rev);
+        jme_set_phyfifo_5level(jme);
+        jme->pcirev = pdev->revision;
         if (!jme->fpgaver)
                 jme_phy_init(jme);
         jme_phy_off(jme);
@@ -2964,14 +3124,14 @@ jme_init_one(struct pci_dev *pdev,
                 goto err_out_unmap;
         }
 
-        netif_info(jme, probe, jme->dev, "%s%s ver:%x rev:%x macaddr:%pM\n",
+        netif_info(jme, probe, jme->dev, "%s%s chiprev:%x pcirev:%x macaddr:%pM\n",
                    (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC250) ?
                    "JMC250 Gigabit Ethernet" :
                    (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC260) ?
                    "JMC260 Fast Ethernet" : "Unknown",
                    (jme->fpgaver != 0) ? " (FPGA)" : "",
                    (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev,
-                   jme->rev, netdev->dev_addr);
+                   jme->pcirev, netdev->dev_addr);
 
         return 0;
 
@@ -3014,9 +3174,9 @@ jme_shutdown(struct pci_dev *pdev)
 }
 
 #ifdef CONFIG_PM
-static int
-jme_suspend(struct pci_dev *pdev, pm_message_t state)
+static int jme_suspend(struct device *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct jme_adapter *jme = netdev_priv(netdev);
 
@@ -3035,7 +3195,6 @@ jme_suspend(struct pci_dev *pdev, pm_message_t state)
                         jme_polling_mode(jme);
 
                 jme_stop_pcc_timer(jme);
-                jme_reset_ghc_speed(jme);
                 jme_disable_rx_engine(jme);
                 jme_disable_tx_engine(jme);
                 jme_reset_mac_processor(jme);
@@ -3049,29 +3208,24 @@ jme_suspend(struct pci_dev *pdev, pm_message_t state)
         tasklet_hi_enable(&jme->rxclean_task);
         tasklet_hi_enable(&jme->rxempty_task);
 
-        pci_save_state(pdev);
         jme_powersave_phy(jme);
-        pci_enable_wake(jme->pdev, PCI_D3hot, true);
-        pci_set_power_state(pdev, PCI_D3hot);
 
         return 0;
 }
 
-static int
-jme_resume(struct pci_dev *pdev)
+static int jme_resume(struct device *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct jme_adapter *jme = netdev_priv(netdev);
 
-        jme_clear_pm(jme);
-        pci_restore_state(pdev);
+        jwrite32(jme, JME_PMCS, 0xFFFF0000 | jme->reg_pmcs);
 
-        if (test_bit(JME_FLAG_SSET, &jme->flags)) {
-                jme_phy_on(jme);
+        jme_phy_on(jme);
+        if (test_bit(JME_FLAG_SSET, &jme->flags))
                 jme_set_settings(netdev, &jme->old_ecmd);
-        } else {
+        else
                 jme_reset_phy_processor(jme);
-        }
 
         jme_start_irq(jme);
         netif_device_attach(netdev);
@@ -3082,6 +3236,13 @@ jme_resume(struct pci_dev *pdev)
 
         return 0;
 }
+
+static SIMPLE_DEV_PM_OPS(jme_pm_ops, jme_suspend, jme_resume);
+#define JME_PM_OPS (&jme_pm_ops)
+
+#else
+
+#define JME_PM_OPS NULL
 #endif
 
 static DEFINE_PCI_DEVICE_TABLE(jme_pci_tbl) = {
@@ -3095,11 +3256,8 @@ static struct pci_driver jme_driver = {
         .id_table       = jme_pci_tbl,
         .probe          = jme_init_one,
         .remove         = __devexit_p(jme_remove_one),
-#ifdef CONFIG_PM
-        .suspend        = jme_suspend,
-        .resume         = jme_resume,
-#endif /* CONFIG_PM */
         .shutdown       = jme_shutdown,
+        .driver.pm      = JME_PM_OPS,
 };
 
 static int __init
diff --git a/drivers/net/jme.h b/drivers/net/jme.h
index eac09264bf2..8bf30451e82 100644
--- a/drivers/net/jme.h
+++ b/drivers/net/jme.h
@@ -26,7 +26,7 @@
 #define __JME_H_INCLUDED__
 
 #define DRV_NAME        "jme"
-#define DRV_VERSION     "1.0.7"
+#define DRV_VERSION     "1.0.8"
 #define PFX             DRV_NAME ": "
 
 #define PCI_DEVICE_ID_JMICRON_JMC250    0x0250
@@ -103,6 +103,37 @@ enum jme_spi_op_bits {
 #define HALF_US 500     /* 500 ns */
 #define JMESPIIOCTL     SIOCDEVPRIVATE
 
+#define PCI_PRIV_PE1            0xE4
+
+enum pci_priv_pe1_bit_masks {
+        PE1_ASPMSUPRT   = 0x00000003, /*
+                                       * RW:
+                                       * Aspm_support[1:0]
+                                       * (R/W Port of 5C[11:10])
+                                       */
+        PE1_MULTIFUN    = 0x00000004, /* RW: Multi_fun_bit */
+        PE1_RDYDMA      = 0x00000008, /* RO: ~link.rdy_for_dma */
+        PE1_ASPMOPTL    = 0x00000030, /* RW: link.rx10s_option[1:0] */
+        PE1_ASPMOPTH    = 0x000000C0, /* RW: 10_req=[3]?HW:[2] */
+        PE1_GPREG0      = 0x0000FF00, /*
+                                       * SRW:
+                                       * Cfg_gp_reg0
+                                       * [7:6] phy_giga BG control
+                                       * [5] CREQ_N as CREQ_N1 (CPPE# as CREQ#)
+                                       * [4:0] Reserved
+                                       */
+        PE1_GPREG0_PBG  = 0x0000C000, /* phy_giga BG control */
+        PE1_GPREG1      = 0x00FF0000, /* RW: Cfg_gp_reg1 */
+        PE1_REVID       = 0xFF000000, /* RO: Rev ID */
+};
+
+enum pci_priv_pe1_values {
+        PE1_GPREG0_ENBG         = 0x00000000, /* en BG */
+        PE1_GPREG0_PDD3COLD     = 0x00004000, /* giga_PD + d3cold */
+        PE1_GPREG0_PDPCIESD     = 0x00008000, /* giga_PD + pcie_shutdown */
+        PE1_GPREG0_PDPCIEIDDQ   = 0x0000C000, /* giga_PD + pcie_iddq */
+};
+
 /*
  * Dynamic(adaptive)/Static PCC values
  */
@@ -403,6 +434,7 @@ struct jme_adapter {
         u32                     reg_rxmcs;
         u32                     reg_ghc;
         u32                     reg_pmcs;
+        u32                     reg_gpreg1;
         u32                     phylink;
         u32                     tx_ring_size;
         u32                     tx_ring_mask;
@@ -411,8 +443,10 @@ struct jme_adapter {
         u32                     rx_ring_mask;
         u8                      mrrs;
         unsigned int            fpgaver;
-        unsigned int            chiprev;
-        u8                      rev;
+        u8                      chiprev;
+        u8                      chip_main_rev;
+        u8                      chip_sub_rev;
+        u8                      pcirev;
         u32                     msg_enable;
         struct ethtool_cmd      old_ecmd;
         unsigned int            old_mtu;
@@ -497,6 +531,7 @@ enum jme_iomap_regs {
         JME_PMCS        = JME_MAC | 0x60, /* Power Management Control/Stat */
 
 
+        JME_PHY_PWR     = JME_PHY | 0x24, /* New PHY Power Ctrl Register */
         JME_PHY_CS      = JME_PHY | 0x28, /* PHY Ctrl and Status Register */
         JME_PHY_LINK    = JME_PHY | 0x30, /* PHY Link Status Register */
         JME_SMBCSR      = JME_PHY | 0x40, /* SMB Control and Status */
@@ -624,6 +659,14 @@ enum jme_txtrhd_shifts {
         TXTRHD_TXRL_SHIFT       = 0,
 };
 
+enum jme_txtrhd_values {
+        TXTRHD_FULLDUPLEX       = 0x00000000,
+        TXTRHD_HALFDUPLEX       = TXTRHD_TXPEN |
+                                  ((0x2000 << TXTRHD_TXP_SHIFT) & TXTRHD_TXP) |
+                                  TXTRHD_TXREN |
+                                  ((8 << TXTRHD_TXRL_SHIFT) & TXTRHD_TXRL),
+};
+
 /*
  * RX Control/Status Bits
  */
@@ -779,6 +822,8 @@ static inline u32 smi_phy_addr(int x)
  */
 enum jme_ghc_bit_mask {
         GHC_SWRST               = 0x40000000,
+        GHC_TO_CLK_SRC          = 0x00C00000,
+        GHC_TXMAC_CLK_SRC       = 0x00300000,
         GHC_DPX                 = 0x00000040,
         GHC_SPEED               = 0x00000030,
         GHC_LINK_POLL           = 0x00000001,
@@ -833,6 +878,21 @@ enum jme_pmcs_bit_masks {
 };
 
 /*
+ * New PHY Power Control Register
+ */
+enum jme_phy_pwr_bit_masks {
+        PHY_PWR_DWN1SEL = 0x01000000, /* Phy_giga.p_PWR_DOWN1_SEL */
+        PHY_PWR_DWN1SW  = 0x02000000, /* Phy_giga.p_PWR_DOWN1_SW */
+        PHY_PWR_DWN2    = 0x04000000, /* Phy_giga.p_PWR_DOWN2 */
+        PHY_PWR_CLKSEL  = 0x08000000, /*
+                                       * XTL_OUT Clock select
+                                       * (an internal free-running clock)
+                                       * 0: xtl_out = phy_giga.A_XTL25_O
+                                       * 1: xtl_out = phy_giga.PD_OSC
+                                       */
+};
+
+/*
  * Giga PHY Status Registers
  */
 enum jme_phy_link_bit_mask {
@@ -942,18 +1002,17 @@ enum jme_gpreg0_vals {
 
 /*
  * General Purpose REG-1
- * Note: All theses bits defined here are for
- *       Chip mode revision 0x11 only
  */
-enum jme_gpreg1_masks {
+enum jme_gpreg1_bit_masks {
+        GPREG1_RXCLKOFF         = 0x04000000,
+        GPREG1_PCREQN           = 0x00020000,
+        GPREG1_HALFMODEPATCH    = 0x00000040, /* For Chip revision 0x11 only */
+        GPREG1_RSSPATCH         = 0x00000020, /* For Chip revision 0x11 only */
         GPREG1_INTRDELAYUNIT    = 0x00000018,
         GPREG1_INTRDELAYENABLE  = 0x00000007,
 };
 
 enum jme_gpreg1_vals {
-        GPREG1_RSSPATCH         = 0x00000040,
-        GPREG1_HALFMODEPATCH    = 0x00000020,
-
         GPREG1_INTDLYUNIT_16NS  = 0x00000000,
         GPREG1_INTDLYUNIT_256NS = 0x00000008,
         GPREG1_INTDLYUNIT_1US   = 0x00000010,
@@ -967,7 +1026,7 @@ enum jme_gpreg1_vals {
         GPREG1_INTDLYEN_6U      = 0x00000006,
         GPREG1_INTDLYEN_7U      = 0x00000007,
 
-        GPREG1_DEFAULT          = 0x00000000,
+        GPREG1_DEFAULT          = GPREG1_PCREQN,
 };
 
 /*
@@ -1184,16 +1243,22 @@ enum jme_phy_reg17_vals {
 /*
  * Workaround
  */
-static inline int is_buggy250(unsigned short device, unsigned int chiprev)
+static inline int is_buggy250(unsigned short device, u8 chiprev)
 {
         return device == PCI_DEVICE_ID_JMICRON_JMC250 && chiprev == 0x11;
 }
 
+static inline int new_phy_power_ctrl(u8 chip_main_rev)
+{
+        return chip_main_rev >= 5;
+}
+
 /*
  * Function prototypes
  */
 static int jme_set_settings(struct net_device *netdev,
                                 struct ethtool_cmd *ecmd);
+static void jme_set_unicastaddr(struct net_device *netdev);
 static void jme_set_multi(struct net_device *netdev);
 
 #endif
diff --git a/drivers/net/ks8842.c b/drivers/net/ks8842.c
index 928b2b83cef..efd44afeae8 100644
--- a/drivers/net/ks8842.c
+++ b/drivers/net/ks8842.c
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/mfd/core.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
@@ -1145,7 +1146,7 @@ static int __devinit ks8842_probe(struct platform_device *pdev)
         struct resource *iomem;
         struct net_device *netdev;
         struct ks8842_adapter *adapter;
-        struct ks8842_platform_data *pdata = pdev->dev.platform_data;
+        struct ks8842_platform_data *pdata = mfd_get_data(pdev);
         u16 id;
         unsigned i;
 
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c
index 540a8dcbcc4..7f7d5708a65 100644
--- a/drivers/net/ksz884x.c
+++ b/drivers/net/ksz884x.c
@@ -4898,7 +4898,7 @@ static netdev_tx_t netdev_tx(struct sk_buff *skb, struct net_device *dev)
                                 goto unlock;
                         }
                         skb_copy_and_csum_dev(org_skb, skb->data);
-                        org_skb->ip_summed = 0;
+                        org_skb->ip_summed = CHECKSUM_NONE;
                         skb->len = org_skb->len;
                         copy_old_skb(org_skb, skb);
                 }
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index f35554d1144..b7948ccfcf7 100644
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -952,8 +952,7 @@ static const struct attribute_group temac_attr_group = {
         .attrs = temac_device_attrs,
 };
 
-static int __devinit
-temac_of_probe(struct platform_device *op, const struct of_device_id *match)
+static int __devinit temac_of_probe(struct platform_device *op)
 {
         struct device_node *np;
         struct temac_local *lp;
@@ -1123,7 +1122,7 @@ static struct of_device_id temac_of_match[] __devinitdata = {
 };
 MODULE_DEVICE_TABLE(of, temac_of_match);
 
-static struct of_platform_driver temac_of_driver = {
+static struct platform_driver temac_of_driver = {
         .probe = temac_of_probe,
         .remove = __devexit_p(temac_of_remove),
         .driver = {
@@ -1135,13 +1134,13 @@ static struct of_platform_driver temac_of_driver = {
 
 static int __init temac_init(void)
 {
-        return of_register_platform_driver(&temac_of_driver);
+        return platform_driver_register(&temac_of_driver);
 }
 module_init(temac_init);
 
 static void __exit temac_exit(void)
 {
-        of_unregister_platform_driver(&temac_of_driver);
+        platform_driver_unregister(&temac_of_driver);
 }
 module_exit(temac_exit);
 
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 2d9663a1c54..ea0dc451da9 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -129,10 +129,6 @@ static u32 always_on(struct net_device *dev)
 
 static const struct ethtool_ops loopback_ethtool_ops = {
         .get_link               = always_on,
-        .set_tso                = ethtool_op_set_tso,
-        .get_tx_csum            = always_on,
-        .get_sg                 = always_on,
-        .get_rx_csum            = always_on,
 };
 
 static int loopback_dev_init(struct net_device *dev)
@@ -169,9 +165,12 @@ static void loopback_setup(struct net_device *dev)
         dev->type               = ARPHRD_LOOPBACK;      /* 0x0001*/
         dev->flags              = IFF_LOOPBACK;
         dev->priv_flags        &= ~IFF_XMIT_DST_RELEASE;
+        dev->hw_features        = NETIF_F_ALL_TSO | NETIF_F_UFO;
         dev->features           = NETIF_F_SG | NETIF_F_FRAGLIST
-                | NETIF_F_TSO
+                | NETIF_F_ALL_TSO
+                | NETIF_F_UFO
                 | NETIF_F_NO_CSUM
+                | NETIF_F_RXCSUM
                 | NETIF_F_HIGHDMA
                 | NETIF_F_LLTX
                 | NETIF_F_NETNS_LOCAL;
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index f69e73e2191..79ccb54ab00 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -260,7 +260,7 @@ static int macb_mii_init(struct macb *bp)
         for (i = 0; i < PHY_MAX_ADDR; i++)
                 bp->mii_bus->irq[i] = PHY_POLL;
 
-        platform_set_drvdata(bp->dev, bp->mii_bus);
+        dev_set_drvdata(&bp->dev->dev, bp->mii_bus);
 
         if (mdiobus_register(bp->mii_bus))
                 goto err_out_free_mdio_irq;
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 6ed577b065d..78e34e9e4f0 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -39,8 +39,11 @@ struct macvlan_port {
         struct list_head        vlans;
         struct rcu_head         rcu;
         bool                    passthru;
+        int                     count;
 };
 
+static void macvlan_port_destroy(struct net_device *dev);
+
 #define macvlan_port_get_rcu(dev) \
         ((struct macvlan_port *) rcu_dereference(dev->rx_handler_data))
 #define macvlan_port_get(dev) ((struct macvlan_port *) dev->rx_handler_data)
@@ -152,9 +155,10 @@ static void macvlan_broadcast(struct sk_buff *skb,
 }
 
 /* called under rcu_read_lock() from netif_receive_skb */
-static struct sk_buff *macvlan_handle_frame(struct sk_buff *skb)
+static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb)
 {
         struct macvlan_port *port;
+        struct sk_buff *skb = *pskb;
         const struct ethhdr *eth = eth_hdr(skb);
         const struct macvlan_dev *vlan;
         const struct macvlan_dev *src;
@@ -184,7 +188,7 @@ static struct sk_buff *macvlan_handle_frame(struct sk_buff *skb)
                          */
                         macvlan_broadcast(skb, port, src->dev,
                                           MACVLAN_MODE_VEPA);
-                return skb;
+                return RX_HANDLER_PASS;
         }
 
         if (port->passthru)
@@ -192,12 +196,12 @@ static struct sk_buff *macvlan_handle_frame(struct sk_buff *skb)
         else
                 vlan = macvlan_hash_lookup(port, eth->h_dest);
         if (vlan == NULL)
-                return skb;
+                return RX_HANDLER_PASS;
 
         dev = vlan->dev;
         if (unlikely(!(dev->flags & IFF_UP))) {
                 kfree_skb(skb);
-                return NULL;
+                return RX_HANDLER_CONSUMED;
         }
         len = skb->len + ETH_HLEN;
         skb = skb_share_check(skb, GFP_ATOMIC);
@@ -211,7 +215,7 @@ static struct sk_buff *macvlan_handle_frame(struct sk_buff *skb)
 
 out:
         macvlan_count_rx(vlan, len, ret == NET_RX_SUCCESS, 0);
-        return NULL;
+        return RX_HANDLER_CONSUMED;
 }
 
 static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -219,9 +223,11 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
         const struct macvlan_dev *vlan = netdev_priv(dev);
         const struct macvlan_port *port = vlan->port;
         const struct macvlan_dev *dest;
+        __u8 ip_summed = skb->ip_summed;
 
         if (vlan->mode == MACVLAN_MODE_BRIDGE) {
                 const struct ethhdr *eth = (void *)skb->data;
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
 
                 /* send to other bridge ports directly */
                 if (is_multicast_ether_addr(eth->h_dest)) {
@@ -241,6 +247,7 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
 xmit_world:
+        skb->ip_summed = ip_summed;
         skb_set_dev(skb, vlan->lowerdev);
         return dev_queue_xmit(skb);
 }
@@ -453,8 +460,13 @@ static int macvlan_init(struct net_device *dev)
 static void macvlan_uninit(struct net_device *dev)
 {
         struct macvlan_dev *vlan = netdev_priv(dev);
+        struct macvlan_port *port = vlan->port;
 
         free_percpu(vlan->pcpu_stats);
+
+        port->count -= 1;
+        if (!port->count)
+                macvlan_port_destroy(port->dev);
 }
 
 static struct rtnl_link_stats64 *macvlan_dev_get_stats64(struct net_device *dev,
@@ -687,12 +699,13 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
                 vlan->mode = nla_get_u32(data[IFLA_MACVLAN_MODE]);
 
         if (vlan->mode == MACVLAN_MODE_PASSTHRU) {
-                if (!list_empty(&port->vlans))
+                if (port->count)
                         return -EINVAL;
                 port->passthru = true;
                 memcpy(dev->dev_addr, lowerdev->dev_addr, ETH_ALEN);
         }
 
+        port->count += 1;
         err = register_netdevice(dev);
         if (err < 0)
                 goto destroy_port;
@@ -703,7 +716,8 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
         return 0;
 
 destroy_port:
-        if (list_empty(&port->vlans))
+        port->count -= 1;
+        if (!port->count)
                 macvlan_port_destroy(lowerdev);
 
         return err;
@@ -721,13 +735,9 @@ static int macvlan_newlink(struct net *src_net, struct net_device *dev,
 void macvlan_dellink(struct net_device *dev, struct list_head *head)
 {
         struct macvlan_dev *vlan = netdev_priv(dev);
-        struct macvlan_port *port = vlan->port;
 
         list_del(&vlan->list);
         unregister_netdevice_queue(dev, head);
-
-        if (list_empty(&port->vlans))
-                macvlan_port_destroy(port->dev);
 }
 EXPORT_SYMBOL_GPL(macvlan_dellink);
 
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 5933621ac3f..6696e56e632 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -39,7 +39,7 @@ struct macvtap_queue {
         struct socket sock;
         struct socket_wq wq;
         int vnet_hdr_sz;
-        struct macvlan_dev *vlan;
+        struct macvlan_dev __rcu *vlan;
         struct file *file;
         unsigned int flags;
 };
@@ -141,7 +141,8 @@ static void macvtap_put_queue(struct macvtap_queue *q)
         struct macvlan_dev *vlan;
 
         spin_lock(&macvtap_lock);
-        vlan = rcu_dereference(q->vlan);
+        vlan = rcu_dereference_protected(q->vlan,
+                                         lockdep_is_held(&macvtap_lock));
         if (vlan) {
                 int index = get_slot(vlan, q);
 
@@ -219,7 +220,8 @@ static void macvtap_del_queues(struct net_device *dev)
         /* macvtap_put_queue can free some slots, so go through all slots */
         spin_lock(&macvtap_lock);
         for (i = 0; i < MAX_MACVTAP_QUEUES && vlan->numvtaps; i++) {
-                q = rcu_dereference(vlan->taps[i]);
+                q = rcu_dereference_protected(vlan->taps[i],
+                                              lockdep_is_held(&macvtap_lock));
                 if (q) {
                         qlist[j++] = q;
                         rcu_assign_pointer(vlan->taps[i], NULL);
@@ -528,8 +530,9 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q,
                 vnet_hdr_len = q->vnet_hdr_sz;
 
                 err = -EINVAL;
-                if ((len -= vnet_hdr_len) < 0)
+                if (len < vnet_hdr_len)
                         goto err;
+                len -= vnet_hdr_len;
 
                 err = memcpy_fromiovecend((void *)&vnet_hdr, iv, 0,
                                            sizeof(vnet_hdr));
@@ -569,7 +572,7 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q,
         }
 
         rcu_read_lock_bh();
-        vlan = rcu_dereference(q->vlan);
+        vlan = rcu_dereference_bh(q->vlan);
         if (vlan)
                 macvlan_start_xmit(skb, vlan->dev);
         else
@@ -583,7 +586,7 @@ err_kfree:
 
 err:
         rcu_read_lock_bh();
-        vlan = rcu_dereference(q->vlan);
+        vlan = rcu_dereference_bh(q->vlan);
         if (vlan)
                 vlan->dev->stats.tx_dropped++;
         rcu_read_unlock_bh();
@@ -631,7 +634,7 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
         ret = skb_copy_datagram_const_iovec(skb, 0, iv, vnet_hdr_len, len);
 
         rcu_read_lock_bh();
-        vlan = rcu_dereference(q->vlan);
+        vlan = rcu_dereference_bh(q->vlan);
         if (vlan)
                 macvlan_count_rx(vlan, len, ret == 0, 0);
         rcu_read_unlock_bh();
@@ -727,7 +730,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
 
         case TUNGETIFF:
                 rcu_read_lock_bh();
-                vlan = rcu_dereference(q->vlan);
+                vlan = rcu_dereference_bh(q->vlan);
                 if (vlan)
                         dev_hold(vlan->dev);
                 rcu_read_unlock_bh();
@@ -736,7 +739,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
                         return -ENOLINK;
 
                 ret = 0;
-                if (copy_to_user(&ifr->ifr_name, q->vlan->dev->name, IFNAMSIZ) ||
+                if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
                     put_user(q->flags, &ifr->ifr_flags))
                         ret = -EFAULT;
                 dev_put(vlan->dev);
diff --git a/drivers/net/mii.c b/drivers/net/mii.c
index 210b2b164b3..0a6c6a2e755 100644
--- a/drivers/net/mii.c
+++ b/drivers/net/mii.c
@@ -354,7 +354,7 @@ unsigned int mii_check_media (struct mii_if_info *mii,
         if (!new_carrier) {
                 netif_carrier_off(mii->dev);
                 if (ok_to_print)
-                        printk(KERN_INFO "%s: link down\n", mii->dev->name);
+                        netdev_info(mii->dev, "link down\n");
                 return 0; /* duplex did not change */
         }
 
@@ -381,12 +381,12 @@ unsigned int mii_check_media (struct mii_if_info *mii,
                 duplex = 1;
 
         if (ok_to_print)
-                printk(KERN_INFO "%s: link up, %sMbps, %s-duplex, lpa 0x%04X\n",
-                       mii->dev->name,
-                       lpa2 & (LPA_1000FULL | LPA_1000HALF) ? "1000" :
-                       media & (ADVERTISE_100FULL | ADVERTISE_100HALF) ? "100" : "10",
-                       duplex ? "full" : "half",
-                       lpa);
+                netdev_info(mii->dev, "link up, %uMbps, %s-duplex, lpa 0x%04X\n",
+                            lpa2 & (LPA_1000FULL | LPA_1000HALF) ? 1000 :
+                            media & (ADVERTISE_100FULL | ADVERTISE_100HALF) ?
+                            100 : 10,
+                            duplex ? "full" : "half",
+                            lpa);
 
         if ((init_media) || (mii->full_duplex != duplex)) {
                 mii->full_duplex = duplex;
diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/mlx4/alloc.c
index 3a4277f6fac..116cae334da 100644
--- a/drivers/net/mlx4/alloc.c
+++ b/drivers/net/mlx4/alloc.c
@@ -62,6 +62,9 @@ u32 mlx4_bitmap_alloc(struct mlx4_bitmap *bitmap)
         } else
                 obj = -1;
 
+        if (obj != -1)
+                --bitmap->avail;
+
         spin_unlock(&bitmap->lock);
 
         return obj;
@@ -101,11 +104,19 @@ u32 mlx4_bitmap_alloc_range(struct mlx4_bitmap *bitmap, int cnt, int align)
         } else
                 obj = -1;
 
+        if (obj != -1)
+                bitmap->avail -= cnt;
+
         spin_unlock(&bitmap->lock);
 
         return obj;
 }
 
+u32 mlx4_bitmap_avail(struct mlx4_bitmap *bitmap)
+{
+        return bitmap->avail;
+}
+
 void mlx4_bitmap_free_range(struct mlx4_bitmap *bitmap, u32 obj, int cnt)
 {
         obj &= bitmap->max + bitmap->reserved_top - 1;
@@ -115,6 +126,7 @@ void mlx4_bitmap_free_range(struct mlx4_bitmap *bitmap, u32 obj, int cnt)
         bitmap->last = min(bitmap->last, obj);
         bitmap->top = (bitmap->top + bitmap->max + bitmap->reserved_top)
                         & bitmap->mask;
+        bitmap->avail += cnt;
         spin_unlock(&bitmap->lock);
 }
 
@@ -130,6 +142,7 @@ int mlx4_bitmap_init(struct mlx4_bitmap *bitmap, u32 num, u32 mask,
         bitmap->max  = num - reserved_top;
         bitmap->mask = mask;
         bitmap->reserved_top = reserved_top;
+        bitmap->avail = num - reserved_top - reserved_bot;
         spin_lock_init(&bitmap->lock);
         bitmap->table = kzalloc(BITS_TO_LONGS(bitmap->max) *
                                 sizeof (long), GFP_KERNEL);
diff --git a/drivers/net/mlx4/cq.c b/drivers/net/mlx4/cq.c
index 7cd34e9c7c7..bd8ef9f2fa7 100644
--- a/drivers/net/mlx4/cq.c
+++ b/drivers/net/mlx4/cq.c
@@ -198,7 +198,7 @@ int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,
         u64 mtt_addr;
         int err;
 
-        if (vector >= dev->caps.num_comp_vectors)
+        if (vector > dev->caps.num_comp_vectors + dev->caps.comp_pool)
                 return -EINVAL;
 
         cq->vector = vector;
diff --git a/drivers/net/mlx4/en_cq.c b/drivers/net/mlx4/en_cq.c
index 21786ad4455..ec4b6d047fe 100644
--- a/drivers/net/mlx4/en_cq.c
+++ b/drivers/net/mlx4/en_cq.c
@@ -51,13 +51,10 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv,
         int err;
 
         cq->size = entries;
-        if (mode == RX) {
+        if (mode == RX)
                 cq->buf_size = cq->size * sizeof(struct mlx4_cqe);
-                cq->vector   = ring % mdev->dev->caps.num_comp_vectors;
-        } else {
+        else
                 cq->buf_size = sizeof(struct mlx4_cqe);
-                cq->vector   = 0;
-        }
 
         cq->ring = ring;
         cq->is_tx = mode;
@@ -80,7 +77,8 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv,
 int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
 {
         struct mlx4_en_dev *mdev = priv->mdev;
-        int err;
+        int err = 0;
+        char name[25];
 
         cq->dev = mdev->pndev[priv->port];
         cq->mcq.set_ci_db  = cq->wqres.db.db;
@@ -89,6 +87,29 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
         *cq->mcq.arm_db    = 0;
         memset(cq->buf, 0, cq->buf_size);
 
+        if (cq->is_tx == RX) {
+                if (mdev->dev->caps.comp_pool) {
+                        if (!cq->vector) {
+                                sprintf(name , "%s-rx-%d", priv->dev->name, cq->ring);
+                                if (mlx4_assign_eq(mdev->dev, name, &cq->vector)) {
+                                        cq->vector = (cq->ring + 1 + priv->port) %
+                                                mdev->dev->caps.num_comp_vectors;
+                                        mlx4_warn(mdev, "Failed Assigning an EQ to "
+                                                  "%s_rx-%d ,Falling back to legacy EQ's\n",
+                                                  priv->dev->name, cq->ring);
+                                }
+                        }
+                } else {
+                        cq->vector = (cq->ring + 1 + priv->port) %
+                                mdev->dev->caps.num_comp_vectors;
+                }
+        } else {
+                if (!cq->vector || !mdev->dev->caps.comp_pool) {
+                        /*Fallback to legacy pool in case of error*/
+                        cq->vector   = 0;
+                }
+        }
+
         if (!cq->is_tx)
                 cq->size = priv->rx_ring[cq->ring].actual_size;
 
@@ -112,12 +133,15 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
         return 0;
 }
 
-void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq)
+void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,
+                        bool reserve_vectors)
 {
         struct mlx4_en_dev *mdev = priv->mdev;
 
         mlx4_en_unmap_buffer(&cq->wqres.buf);
         mlx4_free_hwq_res(mdev->dev, &cq->wqres, cq->buf_size);
+        if (priv->mdev->dev->caps.comp_pool && cq->vector && !reserve_vectors)
+                mlx4_release_eq(priv->mdev->dev, cq->vector);
         cq->buf_size = 0;
         cq->buf = NULL;
 }
diff --git a/drivers/net/mlx4/en_ethtool.c b/drivers/net/mlx4/en_ethtool.c
index 056152b3ff5..d54b7abf022 100644
--- a/drivers/net/mlx4/en_ethtool.c
+++ b/drivers/net/mlx4/en_ethtool.c
@@ -45,7 +45,7 @@ mlx4_en_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
 
-        sprintf(drvinfo->driver, DRV_NAME " (%s)", mdev->dev->board_id);
+        strncpy(drvinfo->driver, DRV_NAME, 32);
         strncpy(drvinfo->version, DRV_VERSION " (" DRV_RELDATE ")", 32);
         sprintf(drvinfo->fw_version, "%d.%d.%d",
                 (u16) (mdev->dev->caps.fw_ver >> 32),
@@ -131,8 +131,65 @@ static void mlx4_en_set_msglevel(struct net_device *dev, u32 val)
 static void mlx4_en_get_wol(struct net_device *netdev,
                             struct ethtool_wolinfo *wol)
 {
-        wol->supported = 0;
-        wol->wolopts = 0;
+        struct mlx4_en_priv *priv = netdev_priv(netdev);
+        int err = 0;
+        u64 config = 0;
+
+        if (!priv->mdev->dev->caps.wol) {
+                wol->supported = 0;
+                wol->wolopts = 0;
+                return;
+        }
+
+        err = mlx4_wol_read(priv->mdev->dev, &config, priv->port);
+        if (err) {
+                en_err(priv, "Failed to get WoL information\n");
+                return;
+        }
+
+        if (config & MLX4_EN_WOL_MAGIC)
+                wol->supported = WAKE_MAGIC;
+        else
+                wol->supported = 0;
+
+        if (config & MLX4_EN_WOL_ENABLED)
+                wol->wolopts = WAKE_MAGIC;
+        else
+                wol->wolopts = 0;
+}
+
+static int mlx4_en_set_wol(struct net_device *netdev,
+                            struct ethtool_wolinfo *wol)
+{
+        struct mlx4_en_priv *priv = netdev_priv(netdev);
+        u64 config = 0;
+        int err = 0;
+
+        if (!priv->mdev->dev->caps.wol)
+                return -EOPNOTSUPP;
+
+        if (wol->supported & ~WAKE_MAGIC)
+                return -EINVAL;
+
+        err = mlx4_wol_read(priv->mdev->dev, &config, priv->port);
+        if (err) {
+                en_err(priv, "Failed to get WoL info, unable to modify\n");
+                return err;
+        }
+
+        if (wol->wolopts & WAKE_MAGIC) {
+                config |= MLX4_EN_WOL_DO_MODIFY | MLX4_EN_WOL_ENABLED |
+                                MLX4_EN_WOL_MAGIC;
+        } else {
+                config &= ~(MLX4_EN_WOL_ENABLED | MLX4_EN_WOL_MAGIC);
+                config |= MLX4_EN_WOL_DO_MODIFY;
+        }
+
+        err = mlx4_wol_write(priv->mdev->dev, config, priv->port);
+        if (err)
+                en_err(priv, "Failed to set WoL information\n");
+
+        return err;
 }
 
 static int mlx4_en_get_sset_count(struct net_device *dev, int sset)
@@ -388,7 +445,7 @@ static int mlx4_en_set_ringparam(struct net_device *dev,
                 mlx4_en_stop_port(dev);
         }
 
-        mlx4_en_free_resources(priv);
+        mlx4_en_free_resources(priv, true);
 
         priv->prof->tx_ring_size = tx_size;
         priv->prof->rx_ring_size = rx_size;
@@ -442,6 +499,7 @@ const struct ethtool_ops mlx4_en_ethtool_ops = {
         .get_ethtool_stats = mlx4_en_get_ethtool_stats,
         .self_test = mlx4_en_self_test,
         .get_wol = mlx4_en_get_wol,
+        .set_wol = mlx4_en_set_wol,
         .get_msglevel = mlx4_en_get_msglevel,
         .set_msglevel = mlx4_en_set_msglevel,
         .get_coalesce = mlx4_en_get_coalesce,
diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c
index 1ff6ca6466e..9317b61a75b 100644
--- a/drivers/net/mlx4/en_main.c
+++ b/drivers/net/mlx4/en_main.c
@@ -241,16 +241,18 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
         mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH)
                 mdev->port_cnt++;
 
-        /* If we did not receive an explicit number of Rx rings, default to
-         * the number of completion vectors populated by the mlx4_core */
         mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) {
-                mlx4_info(mdev, "Using %d tx rings for port:%d\n",
-                          mdev->profile.prof[i].tx_ring_num, i);
-                mdev->profile.prof[i].rx_ring_num = min_t(int,
-                        roundup_pow_of_two(dev->caps.num_comp_vectors),
-                        MAX_RX_RINGS);
-                mlx4_info(mdev, "Defaulting to %d rx rings for port:%d\n",
-                          mdev->profile.prof[i].rx_ring_num, i);
+                if (!dev->caps.comp_pool) {
+                        mdev->profile.prof[i].rx_ring_num =
+                                rounddown_pow_of_two(max_t(int, MIN_RX_RINGS,
+                                                           min_t(int,
+                                                                 dev->caps.num_comp_vectors,
+                                                                 MAX_RX_RINGS)));
+                } else {
+                        mdev->profile.prof[i].rx_ring_num = rounddown_pow_of_two(
+                                min_t(int, dev->caps.comp_pool/
+                                      dev->caps.num_ports - 1 , MAX_MSIX_P_PORT - 1));
+                }
         }
 
         /* Create our own workqueue for reset/multicast tasks
@@ -294,7 +296,7 @@ static struct mlx4_interface mlx4_en_interface = {
         .remove         = mlx4_en_remove,
         .event          = mlx4_en_event,
         .get_dev        = mlx4_en_get_netdev,
-        .protocol       = MLX4_PROTOCOL_EN,
+        .protocol       = MLX4_PROT_ETH,
 };
 
 static int __init mlx4_en_init(void)
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c
index 897f576b8b1..4f158baa024 100644
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
@@ -156,9 +156,8 @@ static void mlx4_en_do_set_mac(struct work_struct *work)
         mutex_lock(&mdev->state_lock);
         if (priv->port_up) {
                 /* Remove old MAC and insert the new one */
-                mlx4_unregister_mac(mdev->dev, priv->port, priv->mac_index);
-                err = mlx4_register_mac(mdev->dev, priv->port,
-                                        priv->mac, &priv->mac_index);
+                err = mlx4_replace_mac(mdev->dev, priv->port,
+                                       priv->base_qpn, priv->mac, 0);
                 if (err)
                         en_err(priv, "Failed changing HW MAC address\n");
         } else
@@ -214,6 +213,7 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
         struct mlx4_en_dev *mdev = priv->mdev;
         struct net_device *dev = priv->dev;
         u64 mcast_addr = 0;
+        u8 mc_list[16] = {0};
         int err;
 
         mutex_lock(&mdev->state_lock);
@@ -239,8 +239,12 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                         priv->flags |= MLX4_EN_FLAG_PROMISC;
 
                         /* Enable promiscouos mode */
-                        err = mlx4_SET_PORT_qpn_calc(mdev->dev, priv->port,
-                                                     priv->base_qpn, 1);
+                        if (!mdev->dev->caps.vep_uc_steering)
+                                err = mlx4_SET_PORT_qpn_calc(mdev->dev, priv->port,
+                                                             priv->base_qpn, 1);
+                        else
+                                err = mlx4_unicast_promisc_add(mdev->dev, priv->base_qpn,
+                                                               priv->port);
                         if (err)
                                 en_err(priv, "Failed enabling "
                                              "promiscous mode\n");
@@ -252,10 +256,21 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                                 en_err(priv, "Failed disabling "
                                              "multicast filter\n");
 
-                        /* Disable port VLAN filter */
-                        err = mlx4_SET_VLAN_FLTR(mdev->dev, priv->port, NULL);
-                        if (err)
-                                en_err(priv, "Failed disabling VLAN filter\n");
+                        /* Add the default qp number as multicast promisc */
+                        if (!(priv->flags & MLX4_EN_FLAG_MC_PROMISC)) {
+                                err = mlx4_multicast_promisc_add(mdev->dev, priv->base_qpn,
+                                                                 priv->port);
+                                if (err)
+                                        en_err(priv, "Failed entering multicast promisc mode\n");
+                                priv->flags |= MLX4_EN_FLAG_MC_PROMISC;
+                        }
+
+                        if (priv->vlgrp) {
+                                /* Disable port VLAN filter */
+                                err = mlx4_SET_VLAN_FLTR(mdev->dev, priv->port, NULL);
+                                if (err)
+                                        en_err(priv, "Failed disabling VLAN filter\n");
+                        }
                 }
                 goto out;
         }
@@ -270,11 +285,24 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                 priv->flags &= ~MLX4_EN_FLAG_PROMISC;
 
                 /* Disable promiscouos mode */
-                err = mlx4_SET_PORT_qpn_calc(mdev->dev, priv->port,
-                                             priv->base_qpn, 0);
+                if (!mdev->dev->caps.vep_uc_steering)
+                        err = mlx4_SET_PORT_qpn_calc(mdev->dev, priv->port,
+                                                     priv->base_qpn, 0);
+                else
+                        err = mlx4_unicast_promisc_remove(mdev->dev, priv->base_qpn,
+                                                          priv->port);
                 if (err)
                         en_err(priv, "Failed disabling promiscous mode\n");
 
+                /* Disable Multicast promisc */
+                if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) {
+                        err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn,
+                                                            priv->port);
+                        if (err)
+                                en_err(priv, "Failed disabling multicast promiscous mode\n");
+                        priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
+                }
+
                 /* Enable port VLAN filter */
                 err = mlx4_SET_VLAN_FLTR(mdev->dev, priv->port, priv->vlgrp);
                 if (err)
@@ -287,14 +315,38 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                                           0, MLX4_MCAST_DISABLE);
                 if (err)
                         en_err(priv, "Failed disabling multicast filter\n");
+
+                /* Add the default qp number as multicast promisc */
+                if (!(priv->flags & MLX4_EN_FLAG_MC_PROMISC)) {
+                        err = mlx4_multicast_promisc_add(mdev->dev, priv->base_qpn,
+                                                         priv->port);
+                        if (err)
+                                en_err(priv, "Failed entering multicast promisc mode\n");
+                        priv->flags |= MLX4_EN_FLAG_MC_PROMISC;
+                }
         } else {
                 int i;
+                /* Disable Multicast promisc */
+                if (priv->flags & MLX4_EN_FLAG_MC_PROMISC) {
+                        err = mlx4_multicast_promisc_remove(mdev->dev, priv->base_qpn,
+                                                            priv->port);
+                        if (err)
+                                en_err(priv, "Failed disabling multicast promiscous mode\n");
+                        priv->flags &= ~MLX4_EN_FLAG_MC_PROMISC;
+                }
 
                 err = mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0,
                                           0, MLX4_MCAST_DISABLE);
                 if (err)
                         en_err(priv, "Failed disabling multicast filter\n");
 
+                /* Detach our qp from all the multicast addresses */
+                for (i = 0; i < priv->mc_addrs_cnt; i++) {
+                        memcpy(&mc_list[10], priv->mc_addrs + i * ETH_ALEN, ETH_ALEN);
+                        mc_list[5] = priv->port;
+                        mlx4_multicast_detach(mdev->dev, &priv->rss_map.indir_qp,
+                                              mc_list, MLX4_PROT_ETH);
+                }
                 /* Flush mcast filter and init it with broadcast address */
                 mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, ETH_BCAST,
                                     1, MLX4_MCAST_CONFIG);
@@ -307,6 +359,10 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                 for (i = 0; i < priv->mc_addrs_cnt; i++) {
                         mcast_addr =
                               mlx4_en_mac_to_u64(priv->mc_addrs + i * ETH_ALEN);
+                        memcpy(&mc_list[10], priv->mc_addrs + i * ETH_ALEN, ETH_ALEN);
+                        mc_list[5] = priv->port;
+                        mlx4_multicast_attach(mdev->dev, &priv->rss_map.indir_qp,
+                                              mc_list, 0, MLX4_PROT_ETH);
                         mlx4_SET_MCAST_FLTR(mdev->dev, priv->port,
                                             mcast_addr, 0, MLX4_MCAST_CONFIG);
                 }
@@ -314,8 +370,6 @@ static void mlx4_en_do_set_multicast(struct work_struct *work)
                                           0, MLX4_MCAST_ENABLE);
                 if (err)
                         en_err(priv, "Failed enabling multicast filter\n");
-
-                mlx4_en_clear_list(dev);
         }
 out:
         mutex_unlock(&mdev->state_lock);
@@ -417,7 +471,6 @@ static void mlx4_en_auto_moderation(struct mlx4_en_priv *priv)
         unsigned long avg_pkt_size;
         unsigned long rx_packets;
         unsigned long rx_bytes;
-        unsigned long rx_byte_diff;
         unsigned long tx_packets;
         unsigned long tx_pkt_diff;
         unsigned long rx_pkt_diff;
@@ -441,25 +494,20 @@ static void mlx4_en_auto_moderation(struct mlx4_en_priv *priv)
         rx_pkt_diff = ((unsigned long) (rx_packets -
                                         priv->last_moder_packets));
         packets = max(tx_pkt_diff, rx_pkt_diff);
-        rx_byte_diff = rx_bytes - priv->last_moder_bytes;
-        rx_byte_diff = rx_byte_diff ? rx_byte_diff : 1;
         rate = packets * HZ / period;
         avg_pkt_size = packets ? ((unsigned long) (rx_bytes -
                                  priv->last_moder_bytes)) / packets : 0;
 
         /* Apply auto-moderation only when packet rate exceeds a rate that
          * it matters */
-        if (rate > MLX4_EN_RX_RATE_THRESH) {
+        if (rate > MLX4_EN_RX_RATE_THRESH && avg_pkt_size > MLX4_EN_AVG_PKT_SMALL) {
                 /* If tx and rx packet rates are not balanced, assume that
                  * traffic is mainly BW bound and apply maximum moderation.
                  * Otherwise, moderate according to packet rate */
-                if (2 * tx_pkt_diff > 3 * rx_pkt_diff &&
-                    rx_pkt_diff / rx_byte_diff <
-                    MLX4_EN_SMALL_PKT_SIZE)
-                        moder_time = priv->rx_usecs_low;
-                else if (2 * rx_pkt_diff > 3 * tx_pkt_diff)
+                if (2 * tx_pkt_diff > 3 * rx_pkt_diff ||
+                    2 * rx_pkt_diff > 3 * tx_pkt_diff) {
                         moder_time = priv->rx_usecs_high;
-                else {
+                } else {
                         if (rate < priv->pkt_rate_low)
                                 moder_time = priv->rx_usecs_low;
                         else if (rate > priv->pkt_rate_high)
@@ -471,9 +519,7 @@ static void mlx4_en_auto_moderation(struct mlx4_en_priv *priv)
                                         priv->rx_usecs_low;
                 }
         } else {
-                /* When packet rate is low, use default moderation rather than
-                 * 0 to prevent interrupt storms if traffic suddenly increases */
-                moder_time = priv->rx_usecs;
+                moder_time = priv->rx_usecs_low;
         }
 
         en_dbg(INTR, priv, "tx rate:%lu rx_rate:%lu\n",
@@ -565,6 +611,8 @@ int mlx4_en_start_port(struct net_device *dev)
         int err = 0;
         int i;
         int j;
+        u8 mc_list[16] = {0};
+        char name[32];
 
         if (priv->port_up) {
                 en_dbg(DRV, priv, "start port called while port already up\n");
@@ -603,16 +651,35 @@ int mlx4_en_start_port(struct net_device *dev)
                 ++rx_index;
         }
 
+        /* Set port mac number */
+        en_dbg(DRV, priv, "Setting mac for port %d\n", priv->port);
+        err = mlx4_register_mac(mdev->dev, priv->port,
+                                priv->mac, &priv->base_qpn, 0);
+        if (err) {
+                en_err(priv, "Failed setting port mac\n");
+                goto cq_err;
+        }
+        mdev->mac_removed[priv->port] = 0;
+
         err = mlx4_en_config_rss_steer(priv);
         if (err) {
                 en_err(priv, "Failed configuring rss steering\n");
-                goto cq_err;
+                goto mac_err;
         }
 
+        if (mdev->dev->caps.comp_pool && !priv->tx_vector) {
+                sprintf(name , "%s-tx", priv->dev->name);
+                if (mlx4_assign_eq(mdev->dev , name, &priv->tx_vector)) {
+                        mlx4_warn(mdev, "Failed Assigning an EQ to "
+                                        "%s_tx ,Falling back to legacy "
+                                        "EQ's\n", priv->dev->name);
+                }
+        }
         /* Configure tx cq's and rings */
         for (i = 0; i < priv->tx_ring_num; i++) {
                 /* Configure cq */
                 cq = &priv->tx_cq[i];
+                cq->vector = priv->tx_vector;
                 err = mlx4_en_activate_cq(priv, cq);
                 if (err) {
                         en_err(priv, "Failed allocating Tx CQ\n");
@@ -659,24 +726,25 @@ int mlx4_en_start_port(struct net_device *dev)
                 en_err(priv, "Failed setting default qp numbers\n");
                 goto tx_err;
         }
-        /* Set port mac number */
-        en_dbg(DRV, priv, "Setting mac for port %d\n", priv->port);
-        err = mlx4_register_mac(mdev->dev, priv->port,
-                                priv->mac, &priv->mac_index);
-        if (err) {
-                en_err(priv, "Failed setting port mac\n");
-                goto tx_err;
-        }
-        mdev->mac_removed[priv->port] = 0;
 
         /* Init port */
         en_dbg(HW, priv, "Initializing port\n");
         err = mlx4_INIT_PORT(mdev->dev, priv->port);
         if (err) {
                 en_err(priv, "Failed Initializing port\n");
-                goto mac_err;
+                goto tx_err;
         }
 
+        /* Attach rx QP to bradcast address */
+        memset(&mc_list[10], 0xff, ETH_ALEN);
+        mc_list[5] = priv->port;
+        if (mlx4_multicast_attach(mdev->dev, &priv->rss_map.indir_qp, mc_list,
+                                  0, MLX4_PROT_ETH))
+                mlx4_warn(mdev, "Failed Attaching Broadcast\n");
+
+        /* Must redo promiscuous mode setup. */
+        priv->flags &= ~(MLX4_EN_FLAG_PROMISC | MLX4_EN_FLAG_MC_PROMISC);
+
         /* Schedule multicast task to populate multicast list */
         queue_work(mdev->workqueue, &priv->mcast_task);
 
@@ -684,8 +752,6 @@ int mlx4_en_start_port(struct net_device *dev)
         netif_tx_start_all_queues(dev);
         return 0;
 
-mac_err:
-        mlx4_unregister_mac(mdev->dev, priv->port, priv->mac_index);
 tx_err:
         while (tx_index--) {
                 mlx4_en_deactivate_tx_ring(priv, &priv->tx_ring[tx_index]);
@@ -693,6 +759,8 @@ tx_err:
         }
 
         mlx4_en_release_rss_steer(priv);
+mac_err:
+        mlx4_unregister_mac(mdev->dev, priv->port, priv->base_qpn);
 cq_err:
         while (rx_index--)
                 mlx4_en_deactivate_cq(priv, &priv->rx_cq[rx_index]);
@@ -708,6 +776,7 @@ void mlx4_en_stop_port(struct net_device *dev)
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
         int i;
+        u8 mc_list[16] = {0};
 
         if (!priv->port_up) {
                 en_dbg(DRV, priv, "stop port called while port already down\n");
@@ -722,8 +791,23 @@ void mlx4_en_stop_port(struct net_device *dev)
         /* Set port as not active */
         priv->port_up = false;
 
+        /* Detach All multicasts */
+        memset(&mc_list[10], 0xff, ETH_ALEN);
+        mc_list[5] = priv->port;
+        mlx4_multicast_detach(mdev->dev, &priv->rss_map.indir_qp, mc_list,
+                              MLX4_PROT_ETH);
+        for (i = 0; i < priv->mc_addrs_cnt; i++) {
+                memcpy(&mc_list[10], priv->mc_addrs + i * ETH_ALEN, ETH_ALEN);
+                mc_list[5] = priv->port;
+                mlx4_multicast_detach(mdev->dev, &priv->rss_map.indir_qp,
+                                      mc_list, MLX4_PROT_ETH);
+        }
+        mlx4_en_clear_list(dev);
+        /* Flush multicast filter */
+        mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0, 1, MLX4_MCAST_CONFIG);
+
         /* Unregister Mac address for the port */
-        mlx4_unregister_mac(mdev->dev, priv->port, priv->mac_index);
+        mlx4_unregister_mac(mdev->dev, priv->port, priv->base_qpn);
         mdev->mac_removed[priv->port] = 1;
 
         /* Free TX Rings */
@@ -801,7 +885,6 @@ static int mlx4_en_open(struct net_device *dev)
                 priv->rx_ring[i].packets = 0;
         }
 
-        mlx4_en_set_default_moderation(priv);
         err = mlx4_en_start_port(dev);
         if (err)
                 en_err(priv, "Failed starting port:%d\n", priv->port);
@@ -828,7 +911,7 @@ static int mlx4_en_close(struct net_device *dev)
         return 0;
 }
 
-void mlx4_en_free_resources(struct mlx4_en_priv *priv)
+void mlx4_en_free_resources(struct mlx4_en_priv *priv, bool reserve_vectors)
 {
         int i;
 
@@ -836,14 +919,14 @@ void mlx4_en_free_resources(struct mlx4_en_priv *priv)
                 if (priv->tx_ring[i].tx_info)
                         mlx4_en_destroy_tx_ring(priv, &priv->tx_ring[i]);
                 if (priv->tx_cq[i].buf)
-                        mlx4_en_destroy_cq(priv, &priv->tx_cq[i]);
+                        mlx4_en_destroy_cq(priv, &priv->tx_cq[i], reserve_vectors);
         }
 
         for (i = 0; i < priv->rx_ring_num; i++) {
                 if (priv->rx_ring[i].rx_info)
                         mlx4_en_destroy_rx_ring(priv, &priv->rx_ring[i]);
                 if (priv->rx_cq[i].buf)
-                        mlx4_en_destroy_cq(priv, &priv->rx_cq[i]);
+                        mlx4_en_destroy_cq(priv, &priv->rx_cq[i], reserve_vectors);
         }
 }
 
@@ -851,6 +934,13 @@ int mlx4_en_alloc_resources(struct mlx4_en_priv *priv)
 {
         struct mlx4_en_port_profile *prof = priv->prof;
         int i;
+        int base_tx_qpn, err;
+
+        err = mlx4_qp_reserve_range(priv->mdev->dev, priv->tx_ring_num, 256, &base_tx_qpn);
+        if (err) {
+                en_err(priv, "failed reserving range for TX rings\n");
+                return err;
+        }
 
         /* Create tx Rings */
         for (i = 0; i < priv->tx_ring_num; i++) {
@@ -858,7 +948,7 @@ int mlx4_en_alloc_resources(struct mlx4_en_priv *priv)
                                       prof->tx_ring_size, i, TX))
                         goto err;
 
-                if (mlx4_en_create_tx_ring(priv, &priv->tx_ring[i],
+                if (mlx4_en_create_tx_ring(priv, &priv->tx_ring[i], base_tx_qpn + i,
                                            prof->tx_ring_size, TXBB_SIZE))
                         goto err;
         }
@@ -878,6 +968,7 @@ int mlx4_en_alloc_resources(struct mlx4_en_priv *priv)
 
 err:
         en_err(priv, "Failed to allocate NIC resources\n");
+        mlx4_qp_release_range(priv->mdev->dev, base_tx_qpn, priv->tx_ring_num);
         return -ENOMEM;
 }
 
@@ -905,7 +996,7 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
         mdev->pndev[priv->port] = NULL;
         mutex_unlock(&mdev->state_lock);
 
-        mlx4_en_free_resources(priv);
+        mlx4_en_free_resources(priv, false);
         free_netdev(dev);
 }
 
@@ -932,7 +1023,6 @@ static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu)
                         en_dbg(DRV, priv, "Change MTU called with card down!?\n");
                 } else {
                         mlx4_en_stop_port(dev);
-                        mlx4_en_set_default_moderation(priv);
                         err = mlx4_en_start_port(dev);
                         if (err) {
                                 en_err(priv, "Failed restarting port:%d\n",
@@ -1079,7 +1169,25 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
         en_warn(priv, "Using %d TX rings\n", prof->tx_ring_num);
         en_warn(priv, "Using %d RX rings\n", prof->rx_ring_num);
 
+        /* Configure port */
+        err = mlx4_SET_PORT_general(mdev->dev, priv->port,
+                                    MLX4_EN_MIN_MTU,
+                                    0, 0, 0, 0);
+        if (err) {
+                en_err(priv, "Failed setting port general configurations "
+                       "for port %d, with error %d\n", priv->port, err);
+                goto out;
+        }
+
+        /* Init port */
+        en_warn(priv, "Initializing port\n");
+        err = mlx4_INIT_PORT(mdev->dev, priv->port);
+        if (err) {
+                en_err(priv, "Failed Initializing port\n");
+                goto out;
+        }
         priv->registered = 1;
+        mlx4_en_set_default_moderation(priv);
         queue_delayed_work(mdev->workqueue, &priv->stats_task, STATS_DELAY);
         return 0;
 
diff --git a/drivers/net/mlx4/en_port.c b/drivers/net/mlx4/en_port.c
index 7f5a3221e0c..f2a4f5dd313 100644
--- a/drivers/net/mlx4/en_port.c
+++ b/drivers/net/mlx4/en_port.c
@@ -119,6 +119,10 @@ int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
         struct mlx4_set_port_rqp_calc_context *context;
         int err;
         u32 in_mod;
+        u32 m_promisc = (dev->caps.vep_mc_steering) ? MCAST_DIRECT : MCAST_DEFAULT;
+
+        if (dev->caps.vep_mc_steering && dev->caps.vep_uc_steering)
+                return 0;
 
         mailbox = mlx4_alloc_cmd_mailbox(dev);
         if (IS_ERR(mailbox))
@@ -127,8 +131,11 @@ int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
         memset(context, 0, sizeof *context);
 
         context->base_qpn = cpu_to_be32(base_qpn);
-        context->promisc = cpu_to_be32(promisc << SET_PORT_PROMISC_EN_SHIFT | base_qpn);
-        context->mcast = cpu_to_be32(1 << SET_PORT_PROMISC_MODE_SHIFT | base_qpn);
+        context->n_mac = 0x7;
+        context->promisc = cpu_to_be32(promisc << SET_PORT_PROMISC_SHIFT |
+                                       base_qpn);
+        context->mcast = cpu_to_be32(m_promisc << SET_PORT_MC_PROMISC_SHIFT |
+                                     base_qpn);
         context->intra_no_vlan = 0;
         context->no_vlan = MLX4_NO_VLAN_IDX;
         context->intra_vlan_miss = 0;
@@ -206,7 +213,7 @@ int mlx4_en_DUMP_ETH_STATS(struct mlx4_en_dev *mdev, u8 port, u8 reset)
         }
         stats->tx_packets = 0;
         stats->tx_bytes = 0;
-        for (i = 0; i <= priv->tx_ring_num; i++) {
+        for (i = 0; i < priv->tx_ring_num; i++) {
                 stats->tx_packets += priv->tx_ring[i].packets;
                 stats->tx_bytes += priv->tx_ring[i].bytes;
         }
diff --git a/drivers/net/mlx4/en_port.h b/drivers/net/mlx4/en_port.h
index 092e814b198..e3d73e41c56 100644
--- a/drivers/net/mlx4/en_port.h
+++ b/drivers/net/mlx4/en_port.h
@@ -36,8 +36,8 @@
 
 
 #define SET_PORT_GEN_ALL_VALID  0x7
-#define SET_PORT_PROMISC_EN_SHIFT       31
-#define SET_PORT_PROMISC_MODE_SHIFT     30
+#define SET_PORT_PROMISC_SHIFT  31
+#define SET_PORT_MC_PROMISC_SHIFT       30
 
 enum {
         MLX4_CMD_SET_VLAN_FLTR  = 0x47,
@@ -45,6 +45,12 @@ enum {
         MLX4_CMD_DUMP_ETH_STATS = 0x49,
 };
 
+enum {
+        MCAST_DIRECT_ONLY       = 0,
+        MCAST_DIRECT            = 1,
+        MCAST_DEFAULT           = 2
+};
+
 struct mlx4_set_port_general_context {
         u8 reserved[3];
         u8 flags;
@@ -60,14 +66,17 @@ struct mlx4_set_port_general_context {
 
 struct mlx4_set_port_rqp_calc_context {
         __be32 base_qpn;
-        __be32 flags;
-        u8 reserved[3];
+        u8 rererved;
+        u8 n_mac;
+        u8 n_vlan;
+        u8 n_prio;
+        u8 reserved2[3];
         u8 mac_miss;
         u8 intra_no_vlan;
         u8 no_vlan;
         u8 intra_vlan_miss;
         u8 vlan_miss;
-        u8 reserved2[3];
+        u8 reserved3[3];
         u8 no_vlan_prio;
         __be32 promisc;
         __be32 mcast;
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c
index 570f2508fb3..05998ee297c 100644
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
@@ -845,16 +845,10 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
         }
 
         /* Configure RSS indirection qp */
-        err = mlx4_qp_reserve_range(mdev->dev, 1, 1, &priv->base_qpn);
-        if (err) {
-                en_err(priv, "Failed to reserve range for RSS "
-                             "indirection qp\n");
-                goto rss_err;
-        }
         err = mlx4_qp_alloc(mdev->dev, priv->base_qpn, &rss_map->indir_qp);
         if (err) {
                 en_err(priv, "Failed to allocate RSS indirection QP\n");
-                goto reserve_err;
+                goto rss_err;
         }
         rss_map->indir_qp.event = mlx4_en_sqp_event;
         mlx4_en_fill_qp_context(priv, 0, 0, 0, 1, priv->base_qpn,
@@ -881,8 +875,6 @@ indir_err:
                        MLX4_QP_STATE_RST, NULL, 0, 0, &rss_map->indir_qp);
         mlx4_qp_remove(mdev->dev, &rss_map->indir_qp);
         mlx4_qp_free(mdev->dev, &rss_map->indir_qp);
-reserve_err:
-        mlx4_qp_release_range(mdev->dev, priv->base_qpn, 1);
 rss_err:
         for (i = 0; i < good_qps; i++) {
                 mlx4_qp_modify(mdev->dev, NULL, rss_map->state[i],
@@ -904,7 +896,6 @@ void mlx4_en_release_rss_steer(struct mlx4_en_priv *priv)
                        MLX4_QP_STATE_RST, NULL, 0, 0, &rss_map->indir_qp);
         mlx4_qp_remove(mdev->dev, &rss_map->indir_qp);
         mlx4_qp_free(mdev->dev, &rss_map->indir_qp);
-        mlx4_qp_release_range(mdev->dev, priv->base_qpn, 1);
 
         for (i = 0; i < priv->rx_ring_num; i++) {
                 mlx4_qp_modify(mdev->dev, NULL, rss_map->state[i],
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c
index a680cd4a5ab..01feb8fd42a 100644
--- a/drivers/net/mlx4/en_tx.c
+++ b/drivers/net/mlx4/en_tx.c
@@ -44,6 +44,7 @@
 
 enum {
         MAX_INLINE = 104, /* 128 - 16 - 4 - 4 */
+        MAX_BF = 256,
 };
 
 static int inline_thold __read_mostly = MAX_INLINE;
@@ -52,7 +53,7 @@ module_param_named(inline_thold, inline_thold, int, 0444);
 MODULE_PARM_DESC(inline_thold, "threshold for using inline data");
 
 int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
-                           struct mlx4_en_tx_ring *ring, u32 size,
+                           struct mlx4_en_tx_ring *ring, int qpn, u32 size,
                            u16 stride)
 {
         struct mlx4_en_dev *mdev = priv->mdev;
@@ -103,23 +104,25 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
                "buf_size:%d dma:%llx\n", ring, ring->buf, ring->size,
                ring->buf_size, (unsigned long long) ring->wqres.buf.direct.map);
 
-        err = mlx4_qp_reserve_range(mdev->dev, 1, 1, &ring->qpn);
-        if (err) {
-                en_err(priv, "Failed reserving qp for tx ring.\n");
-                goto err_map;
-        }
-
+        ring->qpn = qpn;
         err = mlx4_qp_alloc(mdev->dev, ring->qpn, &ring->qp);
         if (err) {
                 en_err(priv, "Failed allocating qp %d\n", ring->qpn);
-                goto err_reserve;
+                goto err_map;
         }
         ring->qp.event = mlx4_en_sqp_event;
 
+        err = mlx4_bf_alloc(mdev->dev, &ring->bf);
+        if (err) {
+                en_dbg(DRV, priv, "working without blueflame (%d)", err);
+                ring->bf.uar = &mdev->priv_uar;
+                ring->bf.uar->map = mdev->uar_map;
+                ring->bf_enabled = false;
+        } else
+                ring->bf_enabled = true;
+
         return 0;
 
-err_reserve:
-        mlx4_qp_release_range(mdev->dev, ring->qpn, 1);
 err_map:
         mlx4_en_unmap_buffer(&ring->wqres.buf);
 err_hwq_res:
@@ -139,6 +142,8 @@ void mlx4_en_destroy_tx_ring(struct mlx4_en_priv *priv,
         struct mlx4_en_dev *mdev = priv->mdev;
         en_dbg(DRV, priv, "Destroying tx ring, qpn: %d\n", ring->qpn);
 
+        if (ring->bf_enabled)
+                mlx4_bf_free(mdev->dev, &ring->bf);
         mlx4_qp_remove(mdev->dev, &ring->qp);
         mlx4_qp_free(mdev->dev, &ring->qp);
         mlx4_qp_release_range(mdev->dev, ring->qpn, 1);
@@ -171,6 +176,8 @@ int mlx4_en_activate_tx_ring(struct mlx4_en_priv *priv,
 
         mlx4_en_fill_qp_context(priv, ring->size, ring->stride, 1, 0, ring->qpn,
                                 ring->cqn, &ring->context);
+        if (ring->bf_enabled)
+                ring->context.usr_page = cpu_to_be32(ring->bf.uar->index);
 
         err = mlx4_qp_to_ready(mdev->dev, &ring->wqres.mtt, &ring->context,
                                &ring->qp, &ring->qp_state);
@@ -591,6 +598,11 @@ u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb)
         return skb_tx_hash(dev, skb);
 }
 
+static void mlx4_bf_copy(unsigned long *dst, unsigned long *src, unsigned bytecnt)
+{
+        __iowrite64_copy(dst, src, bytecnt / 8);
+}
+
 netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
@@ -609,12 +621,13 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
         int desc_size;
         int real_size;
         dma_addr_t dma;
-        u32 index;
+        u32 index, bf_index;
         __be32 op_own;
         u16 vlan_tag = 0;
         int i;
         int lso_header_size;
         void *fragptr;
+        bool bounce = false;
 
         if (!priv->port_up)
                 goto tx_drop;
@@ -657,13 +670,16 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
 
         /* Packet is good - grab an index and transmit it */
         index = ring->prod & ring->size_mask;
+        bf_index = ring->prod;
 
         /* See if we have enough space for whole descriptor TXBB for setting
          * SW ownership on next descriptor; if not, use a bounce buffer. */
         if (likely(index + nr_txbb <= ring->size))
                 tx_desc = ring->buf + index * TXBB_SIZE;
-        else
+        else {
                 tx_desc = (struct mlx4_en_tx_desc *) ring->bounce_buf;
+                bounce = true;
+        }
 
         /* Save skb in tx_info ring */
         tx_info = &ring->tx_info[index];
@@ -768,21 +784,37 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
         ring->prod += nr_txbb;
 
         /* If we used a bounce buffer then copy descriptor back into place */
-        if (tx_desc == (struct mlx4_en_tx_desc *) ring->bounce_buf)
+        if (bounce)
                 tx_desc = mlx4_en_bounce_to_desc(priv, ring, index, desc_size);
 
         /* Run destructor before passing skb to HW */
         if (likely(!skb_shared(skb)))
                 skb_orphan(skb);
 
-        /* Ensure new descirptor hits memory
-         * before setting ownership of this descriptor to HW */
-        wmb();
-        tx_desc->ctrl.owner_opcode = op_own;
+        if (ring->bf_enabled && desc_size <= MAX_BF && !bounce && !vlan_tag) {
+                *(u32 *) (&tx_desc->ctrl.vlan_tag) |= ring->doorbell_qpn;
+                op_own |= htonl((bf_index & 0xffff) << 8);
+                /* Ensure new descirptor hits memory
+                * before setting ownership of this descriptor to HW */
+                wmb();
+                tx_desc->ctrl.owner_opcode = op_own;
 
-        /* Ring doorbell! */
-        wmb();
-        writel(ring->doorbell_qpn, mdev->uar_map + MLX4_SEND_DOORBELL);
+                wmb();
+
+                mlx4_bf_copy(ring->bf.reg + ring->bf.offset, (unsigned long *) &tx_desc->ctrl,
+                     desc_size);
+
+                wmb();
+
+                ring->bf.offset ^= ring->bf.buf_size;
+        } else {
+                /* Ensure new descirptor hits memory
+                * before setting ownership of this descriptor to HW */
+                wmb();
+                tx_desc->ctrl.owner_opcode = op_own;
+                wmb();
+                writel(ring->doorbell_qpn, ring->bf.uar->map + MLX4_SEND_DOORBELL);
+        }
 
         /* Poll CQ here */
         mlx4_en_xmit_poll(priv, tx_ind);
diff --git a/drivers/net/mlx4/eq.c b/drivers/net/mlx4/eq.c
index 552d0fce6f6..506cfd0372e 100644
--- a/drivers/net/mlx4/eq.c
+++ b/drivers/net/mlx4/eq.c
@@ -42,7 +42,7 @@
 #include "fw.h"
 
 enum {
-        MLX4_IRQNAME_SIZE       = 64
+        MLX4_IRQNAME_SIZE       = 32
 };
 
 enum {
@@ -317,8 +317,8 @@ static int mlx4_num_eq_uar(struct mlx4_dev *dev)
          * we need to map, take the difference of highest index and
          * the lowest index we'll use and add 1.
          */
-        return (dev->caps.num_comp_vectors + 1 + dev->caps.reserved_eqs) / 4 -
-                dev->caps.reserved_eqs / 4 + 1;
+        return (dev->caps.num_comp_vectors + 1 + dev->caps.reserved_eqs +
+                 dev->caps.comp_pool)/4 - dev->caps.reserved_eqs/4 + 1;
 }
 
 static void __iomem *mlx4_get_eq_uar(struct mlx4_dev *dev, struct mlx4_eq *eq)
@@ -496,16 +496,32 @@ static void mlx4_free_eq(struct mlx4_dev *dev,
 static void mlx4_free_irqs(struct mlx4_dev *dev)
 {
         struct mlx4_eq_table *eq_table = &mlx4_priv(dev)->eq_table;
-        int i;
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int     i, vec;
 
         if (eq_table->have_irq)
                 free_irq(dev->pdev->irq, dev);
+
         for (i = 0; i < dev->caps.num_comp_vectors + 1; ++i)
                 if (eq_table->eq[i].have_irq) {
                         free_irq(eq_table->eq[i].irq, eq_table->eq + i);
                         eq_table->eq[i].have_irq = 0;
                 }
 
+        for (i = 0; i < dev->caps.comp_pool; i++) {
+                /*
+                 * Freeing the assigned irq's
+                 * all bits should be 0, but we need to validate
+                 */
+                if (priv->msix_ctl.pool_bm & 1ULL << i) {
+                        /* NO need protecting*/
+                        vec = dev->caps.num_comp_vectors + 1 + i;
+                        free_irq(priv->eq_table.eq[vec].irq,
+                                 &priv->eq_table.eq[vec]);
+                }
+        }
+
+
         kfree(eq_table->irq_names);
 }
 
@@ -578,7 +594,8 @@ int mlx4_init_eq_table(struct mlx4_dev *dev)
                 (priv->eq_table.inta_pin < 32 ? 4 : 0);
 
         priv->eq_table.irq_names =
-                kmalloc(MLX4_IRQNAME_SIZE * (dev->caps.num_comp_vectors + 1),
+                kmalloc(MLX4_IRQNAME_SIZE * (dev->caps.num_comp_vectors + 1 +
+                                             dev->caps.comp_pool),
                         GFP_KERNEL);
         if (!priv->eq_table.irq_names) {
                 err = -ENOMEM;
@@ -601,6 +618,22 @@ int mlx4_init_eq_table(struct mlx4_dev *dev)
         if (err)
                 goto err_out_comp;
 
+        /*if additional completion vectors poolsize is 0 this loop will not run*/
+        for (i = dev->caps.num_comp_vectors + 1;
+              i < dev->caps.num_comp_vectors + dev->caps.comp_pool + 1; ++i) {
+
+                err = mlx4_create_eq(dev, dev->caps.num_cqs -
+                                          dev->caps.reserved_cqs +
+                                          MLX4_NUM_SPARE_EQE,
+                                     (dev->flags & MLX4_FLAG_MSI_X) ? i : 0,
+                                     &priv->eq_table.eq[i]);
+                if (err) {
+                        --i;
+                        goto err_out_unmap;
+                }
+        }
+
+
         if (dev->flags & MLX4_FLAG_MSI_X) {
                 const char *eq_name;
 
@@ -686,7 +719,7 @@ void mlx4_cleanup_eq_table(struct mlx4_dev *dev)
 
         mlx4_free_irqs(dev);
 
-        for (i = 0; i < dev->caps.num_comp_vectors + 1; ++i)
+        for (i = 0; i < dev->caps.num_comp_vectors + dev->caps.comp_pool + 1; ++i)
                 mlx4_free_eq(dev, &priv->eq_table.eq[i]);
 
         mlx4_unmap_clr_int(dev);
@@ -743,3 +776,65 @@ int mlx4_test_interrupts(struct mlx4_dev *dev)
         return err;
 }
 EXPORT_SYMBOL(mlx4_test_interrupts);
+
+int mlx4_assign_eq(struct mlx4_dev *dev, char* name, int * vector)
+{
+
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int vec = 0, err = 0, i;
+
+        spin_lock(&priv->msix_ctl.pool_lock);
+        for (i = 0; !vec && i < dev->caps.comp_pool; i++) {
+                if (~priv->msix_ctl.pool_bm & 1ULL << i) {
+                        priv->msix_ctl.pool_bm |= 1ULL << i;
+                        vec = dev->caps.num_comp_vectors + 1 + i;
+                        snprintf(priv->eq_table.irq_names +
+                                        vec * MLX4_IRQNAME_SIZE,
+                                        MLX4_IRQNAME_SIZE, "%s", name);
+                        err = request_irq(priv->eq_table.eq[vec].irq,
+                                          mlx4_msi_x_interrupt, 0,
+                                          &priv->eq_table.irq_names[vec<<5],
+                                          priv->eq_table.eq + vec);
+                        if (err) {
+                                /*zero out bit by fliping it*/
+                                priv->msix_ctl.pool_bm ^= 1 << i;
+                                vec = 0;
+                                continue;
+                                /*we dont want to break here*/
+                        }
+                        eq_set_ci(&priv->eq_table.eq[vec], 1);
+                }
+        }
+        spin_unlock(&priv->msix_ctl.pool_lock);
+
+        if (vec) {
+                *vector = vec;
+        } else {
+                *vector = 0;
+                err = (i == dev->caps.comp_pool) ? -ENOSPC : err;
+        }
+        return err;
+}
+EXPORT_SYMBOL(mlx4_assign_eq);
+
+void mlx4_release_eq(struct mlx4_dev *dev, int vec)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        /*bm index*/
+        int i = vec - dev->caps.num_comp_vectors - 1;
+
+        if (likely(i >= 0)) {
+                /*sanity check , making sure were not trying to free irq's
+                  Belonging to a legacy EQ*/
+                spin_lock(&priv->msix_ctl.pool_lock);
+                if (priv->msix_ctl.pool_bm & 1ULL << i) {
+                        free_irq(priv->eq_table.eq[vec].irq,
+                                 &priv->eq_table.eq[vec]);
+                        priv->msix_ctl.pool_bm &= ~(1ULL << i);
+                }
+                spin_unlock(&priv->msix_ctl.pool_lock);
+        }
+
+}
+EXPORT_SYMBOL(mlx4_release_eq);
+
diff --git a/drivers/net/mlx4/fw.c b/drivers/net/mlx4/fw.c
index 5de1db89783..67a209ba939 100644
--- a/drivers/net/mlx4/fw.c
+++ b/drivers/net/mlx4/fw.c
@@ -274,8 +274,11 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         dev_cap->stat_rate_support = stat_rate;
         MLX4_GET(field, outbox, QUERY_DEV_CAP_UDP_RSS_OFFSET);
         dev_cap->udp_rss = field & 0x1;
+        dev_cap->vep_uc_steering = field & 0x2;
+        dev_cap->vep_mc_steering = field & 0x4;
         MLX4_GET(field, outbox, QUERY_DEV_CAP_ETH_UC_LOOPBACK_OFFSET);
         dev_cap->loopback_support = field & 0x1;
+        dev_cap->wol = field & 0x40;
         MLX4_GET(dev_cap->flags, outbox, QUERY_DEV_CAP_FLAGS_OFFSET);
         MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_UAR_OFFSET);
         dev_cap->reserved_uars = field >> 4;
@@ -737,6 +740,7 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)
 #define  INIT_HCA_MC_BASE_OFFSET         (INIT_HCA_MCAST_OFFSET + 0x00)
 #define  INIT_HCA_LOG_MC_ENTRY_SZ_OFFSET (INIT_HCA_MCAST_OFFSET + 0x12)
 #define  INIT_HCA_LOG_MC_HASH_SZ_OFFSET  (INIT_HCA_MCAST_OFFSET + 0x16)
+#define  INIT_HCA_UC_STEERING_OFFSET     (INIT_HCA_MCAST_OFFSET + 0x18)
 #define  INIT_HCA_LOG_MC_TABLE_SZ_OFFSET (INIT_HCA_MCAST_OFFSET + 0x1b)
 #define INIT_HCA_TPT_OFFSET              0x0f0
 #define  INIT_HCA_DMPT_BASE_OFFSET       (INIT_HCA_TPT_OFFSET + 0x00)
@@ -797,6 +801,8 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param)
         MLX4_PUT(inbox, param->mc_base,         INIT_HCA_MC_BASE_OFFSET);
         MLX4_PUT(inbox, param->log_mc_entry_sz, INIT_HCA_LOG_MC_ENTRY_SZ_OFFSET);
         MLX4_PUT(inbox, param->log_mc_hash_sz,  INIT_HCA_LOG_MC_HASH_SZ_OFFSET);
+        if (dev->caps.vep_mc_steering)
+                MLX4_PUT(inbox, (u8) (1 << 3),  INIT_HCA_UC_STEERING_OFFSET);
         MLX4_PUT(inbox, param->log_mc_table_sz, INIT_HCA_LOG_MC_TABLE_SZ_OFFSET);
 
         /* TPT attributes */
@@ -908,3 +914,22 @@ int mlx4_NOP(struct mlx4_dev *dev)
         /* Input modifier of 0x1f means "finish as soon as possible." */
         return mlx4_cmd(dev, 0, 0x1f, 0, MLX4_CMD_NOP, 100);
 }
+
+#define MLX4_WOL_SETUP_MODE (5 << 28)
+int mlx4_wol_read(struct mlx4_dev *dev, u64 *config, int port)
+{
+        u32 in_mod = MLX4_WOL_SETUP_MODE | port << 8;
+
+        return mlx4_cmd_imm(dev, 0, config, in_mod, 0x3,
+                            MLX4_CMD_MOD_STAT_CFG, MLX4_CMD_TIME_CLASS_A);
+}
+EXPORT_SYMBOL_GPL(mlx4_wol_read);
+
+int mlx4_wol_write(struct mlx4_dev *dev, u64 config, int port)
+{
+        u32 in_mod = MLX4_WOL_SETUP_MODE | port << 8;
+
+        return mlx4_cmd(dev, config, in_mod, 0x1, MLX4_CMD_MOD_STAT_CFG,
+                                        MLX4_CMD_TIME_CLASS_A);
+}
+EXPORT_SYMBOL_GPL(mlx4_wol_write);
diff --git a/drivers/net/mlx4/fw.h b/drivers/net/mlx4/fw.h
index 65cc72eb899..88003ebc618 100644
--- a/drivers/net/mlx4/fw.h
+++ b/drivers/net/mlx4/fw.h
@@ -80,6 +80,9 @@ struct mlx4_dev_cap {
         u16 stat_rate_support;
         int udp_rss;
         int loopback_support;
+        int vep_uc_steering;
+        int vep_mc_steering;
+        int wol;
         u32 flags;
         int reserved_uars;
         int uar_size;
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 4ffdc18fcb8..62fa7eec5f0 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -39,6 +39,7 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
+#include <linux/io-mapping.h>
 
 #include <linux/mlx4/device.h>
 #include <linux/mlx4/doorbell.h>
@@ -227,6 +228,9 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         dev->caps.stat_rate_support  = dev_cap->stat_rate_support;
         dev->caps.udp_rss            = dev_cap->udp_rss;
         dev->caps.loopback_support   = dev_cap->loopback_support;
+        dev->caps.vep_uc_steering    = dev_cap->vep_uc_steering;
+        dev->caps.vep_mc_steering    = dev_cap->vep_mc_steering;
+        dev->caps.wol                = dev_cap->wol;
         dev->caps.max_gso_sz         = dev_cap->max_gso_sz;
 
         dev->caps.log_num_macs  = log_num_mac;
@@ -718,8 +722,31 @@ static void mlx4_free_icms(struct mlx4_dev *dev)
         mlx4_free_icm(dev, priv->fw.aux_icm, 0);
 }
 
+static int map_bf_area(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        resource_size_t bf_start;
+        resource_size_t bf_len;
+        int err = 0;
+
+        bf_start = pci_resource_start(dev->pdev, 2) + (dev->caps.num_uars << PAGE_SHIFT);
+        bf_len = pci_resource_len(dev->pdev, 2) - (dev->caps.num_uars << PAGE_SHIFT);
+        priv->bf_mapping = io_mapping_create_wc(bf_start, bf_len);
+        if (!priv->bf_mapping)
+                err = -ENOMEM;
+
+        return err;
+}
+
+static void unmap_bf_area(struct mlx4_dev *dev)
+{
+        if (mlx4_priv(dev)->bf_mapping)
+                io_mapping_free(mlx4_priv(dev)->bf_mapping);
+}
+
 static void mlx4_close_hca(struct mlx4_dev *dev)
 {
+        unmap_bf_area(dev);
         mlx4_CLOSE_HCA(dev, 0);
         mlx4_free_icms(dev);
         mlx4_UNMAP_FA(dev);
@@ -772,6 +799,9 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
                 goto err_stop_fw;
         }
 
+        if (map_bf_area(dev))
+                mlx4_dbg(dev, "Failed to map blue flame area\n");
+
         init_hca.log_uar_sz = ilog2(dev->caps.num_uars);
 
         err = mlx4_init_icm(dev, &dev_cap, &init_hca, icm_size);
@@ -802,6 +832,7 @@ err_free_icm:
         mlx4_free_icms(dev);
 
 err_stop_fw:
+        unmap_bf_area(dev);
         mlx4_UNMAP_FA(dev);
         mlx4_free_icm(dev, priv->fw.fw_icm, 0);
 
@@ -969,13 +1000,15 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct msix_entry *entries;
-        int nreq;
+        int nreq = min_t(int, dev->caps.num_ports *
+                         min_t(int, num_online_cpus() + 1, MAX_MSIX_P_PORT)
+                                + MSIX_LEGACY_SZ, MAX_MSIX);
         int err;
         int i;
 
         if (msi_x) {
                 nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs,
-                             num_possible_cpus() + 1);
+                             nreq);
                 entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);
                 if (!entries)
                         goto no_msi;
@@ -998,7 +1031,15 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
                         goto no_msi;
                 }
 
-                dev->caps.num_comp_vectors = nreq - 1;
+                if (nreq <
+                    MSIX_LEGACY_SZ + dev->caps.num_ports * MIN_MSIX_P_PORT) {
+                        /*Working in legacy mode , all EQ's shared*/
+                        dev->caps.comp_pool           = 0;
+                        dev->caps.num_comp_vectors = nreq - 1;
+                } else {
+                        dev->caps.comp_pool           = nreq - MSIX_LEGACY_SZ;
+                        dev->caps.num_comp_vectors = MSIX_LEGACY_SZ - 1;
+                }
                 for (i = 0; i < nreq; ++i)
                         priv->eq_table.eq[i].irq = entries[i].vector;
 
@@ -1010,6 +1051,7 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
 
 no_msi:
         dev->caps.num_comp_vectors = 1;
+        dev->caps.comp_pool        = 0;
 
         for (i = 0; i < 2; ++i)
                 priv->eq_table.eq[i].irq = dev->pdev->irq;
@@ -1049,6 +1091,59 @@ static void mlx4_cleanup_port_info(struct mlx4_port_info *info)
         device_remove_file(&info->dev->pdev->dev, &info->port_attr);
 }
 
+static int mlx4_init_steering(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int num_entries = dev->caps.num_ports;
+        int i, j;
+
+        priv->steer = kzalloc(sizeof(struct mlx4_steer) * num_entries, GFP_KERNEL);
+        if (!priv->steer)
+                return -ENOMEM;
+
+        for (i = 0; i < num_entries; i++) {
+                for (j = 0; j < MLX4_NUM_STEERS; j++) {
+                        INIT_LIST_HEAD(&priv->steer[i].promisc_qps[j]);
+                        INIT_LIST_HEAD(&priv->steer[i].steer_entries[j]);
+                }
+                INIT_LIST_HEAD(&priv->steer[i].high_prios);
+        }
+        return 0;
+}
+
+static void mlx4_clear_steering(struct mlx4_dev *dev)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_steer_index *entry, *tmp_entry;
+        struct mlx4_promisc_qp *pqp, *tmp_pqp;
+        int num_entries = dev->caps.num_ports;
+        int i, j;
+
+        for (i = 0; i < num_entries; i++) {
+                for (j = 0; j < MLX4_NUM_STEERS; j++) {
+                        list_for_each_entry_safe(pqp, tmp_pqp,
+                                                 &priv->steer[i].promisc_qps[j],
+                                                 list) {
+                                list_del(&pqp->list);
+                                kfree(pqp);
+                        }
+                        list_for_each_entry_safe(entry, tmp_entry,
+                                                 &priv->steer[i].steer_entries[j],
+                                                 list) {
+                                list_del(&entry->list);
+                                list_for_each_entry_safe(pqp, tmp_pqp,
+                                                         &entry->duplicates,
+                                                         list) {
+                                        list_del(&pqp->list);
+                                        kfree(pqp);
+                                }
+                                kfree(entry);
+                        }
+                }
+        }
+        kfree(priv->steer);
+}
+
 static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         struct mlx4_priv *priv;
@@ -1109,6 +1204,9 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 }
         }
 
+        /* Allow large DMA segments, up to the firmware limit of 1 GB */
+        dma_set_max_seg_size(&pdev->dev, 1024 * 1024 * 1024);
+
         priv = kzalloc(sizeof *priv, GFP_KERNEL);
         if (!priv) {
                 dev_err(&pdev->dev, "Device struct alloc failed, "
@@ -1127,6 +1225,11 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         INIT_LIST_HEAD(&priv->pgdir_list);
         mutex_init(&priv->pgdir_mutex);
 
+        pci_read_config_byte(pdev, PCI_REVISION_ID, &dev->rev_id);
+
+        INIT_LIST_HEAD(&priv->bf_list);
+        mutex_init(&priv->bf_mutex);
+
         /*
          * Now reset the HCA before we touch the PCI capabilities or
          * attempt a firmware command, since a boot ROM may have left
@@ -1151,8 +1254,15 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         if (err)
                 goto err_close;
 
+        priv->msix_ctl.pool_bm = 0;
+        spin_lock_init(&priv->msix_ctl.pool_lock);
+
         mlx4_enable_msi_x(dev);
 
+        err = mlx4_init_steering(dev);
+        if (err)
+                goto err_free_eq;
+
         err = mlx4_setup_hca(dev);
         if (err == -EBUSY && (dev->flags & MLX4_FLAG_MSI_X)) {
                 dev->flags &= ~MLX4_FLAG_MSI_X;
@@ -1161,7 +1271,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         if (err)
-                goto err_free_eq;
+                goto err_steer;
 
         for (port = 1; port <= dev->caps.num_ports; port++) {
                 err = mlx4_init_port_info(dev, port);
@@ -1194,6 +1304,9 @@ err_port:
         mlx4_cleanup_pd_table(dev);
         mlx4_cleanup_uar_table(dev);
 
+err_steer:
+        mlx4_clear_steering(dev);
+
 err_free_eq:
         mlx4_free_eq_table(dev);
 
@@ -1253,6 +1366,7 @@ static void mlx4_remove_one(struct pci_dev *pdev)
                 iounmap(priv->kar);
                 mlx4_uar_free(dev, &priv->driver_uar);
                 mlx4_cleanup_uar_table(dev);
+                mlx4_clear_steering(dev);
                 mlx4_free_eq_table(dev);
                 mlx4_close_hca(dev);
                 mlx4_cmd_cleanup(dev);
@@ -1286,6 +1400,21 @@ static DEFINE_PCI_DEVICE_TABLE(mlx4_pci_table) = {
         { PCI_VDEVICE(MELLANOX, 0x6764) }, /* MT26468 ConnectX EN 10GigE PCIe gen2*/
         { PCI_VDEVICE(MELLANOX, 0x6746) }, /* MT26438 ConnectX EN 40GigE PCIe gen2 5GT/s */
         { PCI_VDEVICE(MELLANOX, 0x676e) }, /* MT26478 ConnectX2 40GigE PCIe gen2 */
+        { PCI_VDEVICE(MELLANOX, 0x1002) }, /* MT25400 Family [ConnectX-2 Virtual Function] */
+        { PCI_VDEVICE(MELLANOX, 0x1003) }, /* MT27500 Family [ConnectX-3] */
+        { PCI_VDEVICE(MELLANOX, 0x1004) }, /* MT27500 Family [ConnectX-3 Virtual Function] */
+        { PCI_VDEVICE(MELLANOX, 0x1005) }, /* MT27510 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1006) }, /* MT27511 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1007) }, /* MT27520 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1008) }, /* MT27521 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1009) }, /* MT27530 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100a) }, /* MT27531 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100b) }, /* MT27540 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100c) }, /* MT27541 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100d) }, /* MT27550 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100e) }, /* MT27551 Family */
+        { PCI_VDEVICE(MELLANOX, 0x100f) }, /* MT27560 Family */
+        { PCI_VDEVICE(MELLANOX, 0x1010) }, /* MT27561 Family */
         { 0, }
 };
 
diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/mlx4/mcg.c
index 79cf42db2ea..e71372aa9cc 100644
--- a/drivers/net/mlx4/mcg.c
+++ b/drivers/net/mlx4/mcg.c
@@ -32,6 +32,7 @@
  */
 
 #include <linux/string.h>
+#include <linux/etherdevice.h>
 
 #include <linux/mlx4/cmd.h>
 
@@ -40,38 +41,40 @@
 #define MGM_QPN_MASK       0x00FFFFFF
 #define MGM_BLCK_LB_BIT    30
 
-struct mlx4_mgm {
-        __be32                  next_gid_index;
-        __be32                  members_count;
-        u32                     reserved[2];
-        u8                      gid[16];
-        __be32                  qp[MLX4_QP_PER_MGM];
-};
-
 static const u8 zero_gid[16];   /* automatically initialized to 0 */
 
-static int mlx4_READ_MCG(struct mlx4_dev *dev, int index,
-                         struct mlx4_cmd_mailbox *mailbox)
+static int mlx4_READ_ENTRY(struct mlx4_dev *dev, int index,
+                           struct mlx4_cmd_mailbox *mailbox)
 {
         return mlx4_cmd_box(dev, 0, mailbox->dma, index, 0, MLX4_CMD_READ_MCG,
                             MLX4_CMD_TIME_CLASS_A);
 }
 
-static int mlx4_WRITE_MCG(struct mlx4_dev *dev, int index,
-                          struct mlx4_cmd_mailbox *mailbox)
+static int mlx4_WRITE_ENTRY(struct mlx4_dev *dev, int index,
+                            struct mlx4_cmd_mailbox *mailbox)
 {
         return mlx4_cmd(dev, mailbox->dma, index, 0, MLX4_CMD_WRITE_MCG,
                         MLX4_CMD_TIME_CLASS_A);
 }
 
-static int mlx4_MGID_HASH(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
-                          u16 *hash)
+static int mlx4_WRITE_PROMISC(struct mlx4_dev *dev, u8 vep_num, u8 port, u8 steer,
+                              struct mlx4_cmd_mailbox *mailbox)
+{
+        u32 in_mod;
+
+        in_mod = (u32) vep_num << 24 | (u32) port << 16 | steer << 1;
+        return mlx4_cmd(dev, mailbox->dma, in_mod, 0x1,
+                        MLX4_CMD_WRITE_MCG, MLX4_CMD_TIME_CLASS_A);
+}
+
+static int mlx4_GID_HASH(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
+                         u16 *hash, u8 op_mod)
 {
         u64 imm;
         int err;
 
-        err = mlx4_cmd_imm(dev, mailbox->dma, &imm, 0, 0, MLX4_CMD_MGID_HASH,
-                           MLX4_CMD_TIME_CLASS_A);
+        err = mlx4_cmd_imm(dev, mailbox->dma, &imm, 0, op_mod,
+                           MLX4_CMD_MGID_HASH, MLX4_CMD_TIME_CLASS_A);
 
         if (!err)
                 *hash = imm;
@@ -79,6 +82,457 @@ static int mlx4_MGID_HASH(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox
         return err;
 }
 
+static struct mlx4_promisc_qp *get_promisc_qp(struct mlx4_dev *dev, u8 pf_num,
+                                              enum mlx4_steer_type steer,
+                                              u32 qpn)
+{
+        struct mlx4_steer *s_steer = &mlx4_priv(dev)->steer[pf_num];
+        struct mlx4_promisc_qp *pqp;
+
+        list_for_each_entry(pqp, &s_steer->promisc_qps[steer], list) {
+                if (pqp->qpn == qpn)
+                        return pqp;
+        }
+        /* not found */
+        return NULL;
+}
+
+/*
+ * Add new entry to steering data structure.
+ * All promisc QPs should be added as well
+ */
+static int new_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,
+                              enum mlx4_steer_type steer,
+                              unsigned int index, u32 qpn)
+{
+        struct mlx4_steer *s_steer;
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_mgm *mgm;
+        u32 members_count;
+        struct mlx4_steer_index *new_entry;
+        struct mlx4_promisc_qp *pqp;
+        struct mlx4_promisc_qp *dqp;
+        u32 prot;
+        int err;
+        u8 pf_num;
+
+        pf_num = (dev->caps.num_ports == 1) ? vep_num : (vep_num << 1) | (port - 1);
+        s_steer = &mlx4_priv(dev)->steer[pf_num];
+        new_entry = kzalloc(sizeof *new_entry, GFP_KERNEL);
+        if (!new_entry)
+                return -ENOMEM;
+
+        INIT_LIST_HEAD(&new_entry->duplicates);
+        new_entry->index = index;
+        list_add_tail(&new_entry->list, &s_steer->steer_entries[steer]);
+
+        /* If the given qpn is also a promisc qp,
+         * it should be inserted to duplicates list
+         */
+        pqp = get_promisc_qp(dev, pf_num, steer, qpn);
+        if (pqp) {
+                dqp = kmalloc(sizeof *dqp, GFP_KERNEL);
+                if (!dqp) {
+                        err = -ENOMEM;
+                        goto out_alloc;
+                }
+                dqp->qpn = qpn;
+                list_add_tail(&dqp->list, &new_entry->duplicates);
+        }
+
+        /* if no promisc qps for this vep, we are done */
+        if (list_empty(&s_steer->promisc_qps[steer]))
+                return 0;
+
+        /* now need to add all the promisc qps to the new
+         * steering entry, as they should also receive the packets
+         * destined to this address */
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox)) {
+                err = -ENOMEM;
+                goto out_alloc;
+        }
+        mgm = mailbox->buf;
+
+        err = mlx4_READ_ENTRY(dev, index, mailbox);
+        if (err)
+                goto out_mailbox;
+
+        members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
+        prot = be32_to_cpu(mgm->members_count) >> 30;
+        list_for_each_entry(pqp, &s_steer->promisc_qps[steer], list) {
+                /* don't add already existing qpn */
+                if (pqp->qpn == qpn)
+                        continue;
+                if (members_count == MLX4_QP_PER_MGM) {
+                        /* out of space */
+                        err = -ENOMEM;
+                        goto out_mailbox;
+                }
+
+                /* add the qpn */
+                mgm->qp[members_count++] = cpu_to_be32(pqp->qpn & MGM_QPN_MASK);
+        }
+        /* update the qps count and update the entry with all the promisc qps*/
+        mgm->members_count = cpu_to_be32(members_count | (prot << 30));
+        err = mlx4_WRITE_ENTRY(dev, index, mailbox);
+
+out_mailbox:
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        if (!err)
+                return 0;
+out_alloc:
+        if (dqp) {
+                list_del(&dqp->list);
+                kfree(&dqp);
+        }
+        list_del(&new_entry->list);
+        kfree(new_entry);
+        return err;
+}
+
+/* update the data structures with existing steering entry */
+static int existing_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,
+                                   enum mlx4_steer_type steer,
+                                   unsigned int index, u32 qpn)
+{
+        struct mlx4_steer *s_steer;
+        struct mlx4_steer_index *tmp_entry, *entry = NULL;
+        struct mlx4_promisc_qp *pqp;
+        struct mlx4_promisc_qp *dqp;
+        u8 pf_num;
+
+        pf_num = (dev->caps.num_ports == 1) ? vep_num : (vep_num << 1) | (port - 1);
+        s_steer = &mlx4_priv(dev)->steer[pf_num];
+
+        pqp = get_promisc_qp(dev, pf_num, steer, qpn);
+        if (!pqp)
+                return 0; /* nothing to do */
+
+        list_for_each_entry(tmp_entry, &s_steer->steer_entries[steer], list) {
+                if (tmp_entry->index == index) {
+                        entry = tmp_entry;
+                        break;
+                }
+        }
+        if (unlikely(!entry)) {
+                mlx4_warn(dev, "Steering entry at index %x is not registered\n", index);
+                return -EINVAL;
+        }
+
+        /* the given qpn is listed as a promisc qpn
+         * we need to add it as a duplicate to this entry
+         * for future refernce */
+        list_for_each_entry(dqp, &entry->duplicates, list) {
+                if (qpn == dqp->qpn)
+                        return 0; /* qp is already duplicated */
+        }
+
+        /* add the qp as a duplicate on this index */
+        dqp = kmalloc(sizeof *dqp, GFP_KERNEL);
+        if (!dqp)
+                return -ENOMEM;
+        dqp->qpn = qpn;
+        list_add_tail(&dqp->list, &entry->duplicates);
+
+        return 0;
+}
+
+/* Check whether a qpn is a duplicate on steering entry
+ * If so, it should not be removed from mgm */
+static bool check_duplicate_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,
+                                  enum mlx4_steer_type steer,
+                                  unsigned int index, u32 qpn)
+{
+        struct mlx4_steer *s_steer;
+        struct mlx4_steer_index *tmp_entry, *entry = NULL;
+        struct mlx4_promisc_qp *dqp, *tmp_dqp;
+        u8 pf_num;
+
+        pf_num = (dev->caps.num_ports == 1) ? vep_num : (vep_num << 1) | (port - 1);
+        s_steer = &mlx4_priv(dev)->steer[pf_num];
+
+        /* if qp is not promisc, it cannot be duplicated */
+        if (!get_promisc_qp(dev, pf_num, steer, qpn))
+                return false;
+
+        /* The qp is promisc qp so it is a duplicate on this index
+         * Find the index entry, and remove the duplicate */
+        list_for_each_entry(tmp_entry, &s_steer->steer_entries[steer], list) {
+                if (tmp_entry->index == index) {
+                        entry = tmp_entry;
+                        break;
+                }
+        }
+        if (unlikely(!entry)) {
+                mlx4_warn(dev, "Steering entry for index %x is not registered\n", index);
+                return false;
+        }
+        list_for_each_entry_safe(dqp, tmp_dqp, &entry->duplicates, list) {
+                if (dqp->qpn == qpn) {
+                        list_del(&dqp->list);
+                        kfree(dqp);
+                }
+        }
+        return true;
+}
+
+/* I a steering entry contains only promisc QPs, it can be removed. */
+static bool can_remove_steering_entry(struct mlx4_dev *dev, u8 vep_num, u8 port,
+                                      enum mlx4_steer_type steer,
+                                      unsigned int index, u32 tqpn)
+{
+        struct mlx4_steer *s_steer;
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_mgm *mgm;
+        struct mlx4_steer_index *entry = NULL, *tmp_entry;
+        u32 qpn;
+        u32 members_count;
+        bool ret = false;
+        int i;
+        u8 pf_num;
+
+        pf_num = (dev->caps.num_ports == 1) ? vep_num : (vep_num << 1) | (port - 1);
+        s_steer = &mlx4_priv(dev)->steer[pf_num];
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox))
+                return false;
+        mgm = mailbox->buf;
+
+        if (mlx4_READ_ENTRY(dev, index, mailbox))
+                goto out;
+        members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
+        for (i = 0;  i < members_count; i++) {
+                qpn = be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK;
+                if (!get_promisc_qp(dev, pf_num, steer, qpn) && qpn != tqpn) {
+                        /* the qp is not promisc, the entry can't be removed */
+                        goto out;
+                }
+        }
+         /* All the qps currently registered for this entry are promiscuous,
+          * Checking for duplicates */
+        ret = true;
+        list_for_each_entry_safe(entry, tmp_entry, &s_steer->steer_entries[steer], list) {
+                if (entry->index == index) {
+                        if (list_empty(&entry->duplicates)) {
+                                list_del(&entry->list);
+                                kfree(entry);
+                        } else {
+                                /* This entry contains duplicates so it shouldn't be removed */
+                                ret = false;
+                                goto out;
+                        }
+                }
+        }
+
+out:
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        return ret;
+}
+
+static int add_promisc_qp(struct mlx4_dev *dev, u8 vep_num, u8 port,
+                          enum mlx4_steer_type steer, u32 qpn)
+{
+        struct mlx4_steer *s_steer;
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_mgm *mgm;
+        struct mlx4_steer_index *entry;
+        struct mlx4_promisc_qp *pqp;
+        struct mlx4_promisc_qp *dqp;
+        u32 members_count;
+        u32 prot;
+        int i;
+        bool found;
+        int last_index;
+        int err;
+        u8 pf_num;
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        pf_num = (dev->caps.num_ports == 1) ? vep_num : (vep_num << 1) | (port - 1);
+        s_steer = &mlx4_priv(dev)->steer[pf_num];
+
+        mutex_lock(&priv->mcg_table.mutex);
+
+        if (get_promisc_qp(dev, pf_num, steer, qpn)) {
+                err = 0;  /* Noting to do, already exists */
+                goto out_mutex;
+        }
+
+        pqp = kmalloc(sizeof *pqp, GFP_KERNEL);
+        if (!pqp) {
+                err = -ENOMEM;
+                goto out_mutex;
+        }
+        pqp->qpn = qpn;
+
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox)) {
+                err = -ENOMEM;
+                goto out_alloc;
+        }
+        mgm = mailbox->buf;
+
+        /* the promisc qp needs to be added for each one of the steering
+         * entries, if it already exists, needs to be added as a duplicate
+         * for this entry */
+        list_for_each_entry(entry, &s_steer->steer_entries[steer], list) {
+                err = mlx4_READ_ENTRY(dev, entry->index, mailbox);
+                if (err)
+                        goto out_mailbox;
+
+                members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
+                prot = be32_to_cpu(mgm->members_count) >> 30;
+                found = false;
+                for (i = 0; i < members_count; i++) {
+                        if ((be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK) == qpn) {
+                                /* Entry already exists, add to duplicates */
+                                dqp = kmalloc(sizeof *dqp, GFP_KERNEL);
+                                if (!dqp)
+                                        goto out_mailbox;
+                                dqp->qpn = qpn;
+                                list_add_tail(&dqp->list, &entry->duplicates);
+                                found = true;
+                        }
+                }
+                if (!found) {
+                        /* Need to add the qpn to mgm */
+                        if (members_count == MLX4_QP_PER_MGM) {
+                                /* entry is full */
+                                err = -ENOMEM;
+                                goto out_mailbox;
+                        }
+                        mgm->qp[members_count++] = cpu_to_be32(qpn & MGM_QPN_MASK);
+                        mgm->members_count = cpu_to_be32(members_count | (prot << 30));
+                        err = mlx4_WRITE_ENTRY(dev, entry->index, mailbox);
+                        if (err)
+                                goto out_mailbox;
+                }
+                last_index = entry->index;
+        }
+
+        /* add the new qpn to list of promisc qps */
+        list_add_tail(&pqp->list, &s_steer->promisc_qps[steer]);
+        /* now need to add all the promisc qps to default entry */
+        memset(mgm, 0, sizeof *mgm);
+        members_count = 0;
+        list_for_each_entry(dqp, &s_steer->promisc_qps[steer], list)
+                mgm->qp[members_count++] = cpu_to_be32(dqp->qpn & MGM_QPN_MASK);
+        mgm->members_count = cpu_to_be32(members_count | MLX4_PROT_ETH << 30);
+
+        err = mlx4_WRITE_PROMISC(dev, vep_num, port, steer, mailbox);
+        if (err)
+                goto out_list;
+
+        mlx4_free_cmd_mailbox(dev, mailbox);
+        mutex_unlock(&priv->mcg_table.mutex);
+        return 0;
+
+out_list:
+        list_del(&pqp->list);
+out_mailbox:
+        mlx4_free_cmd_mailbox(dev, mailbox);
+out_alloc:
+        kfree(pqp);
+out_mutex:
+        mutex_unlock(&priv->mcg_table.mutex);
+        return err;
+}
+
+static int remove_promisc_qp(struct mlx4_dev *dev, u8 vep_num, u8 port,
+                             enum mlx4_steer_type steer, u32 qpn)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_steer *s_steer;
+        struct mlx4_cmd_mailbox *mailbox;
+        struct mlx4_mgm *mgm;
+        struct mlx4_steer_index *entry;
+        struct mlx4_promisc_qp *pqp;
+        struct mlx4_promisc_qp *dqp;
+        u32 members_count;
+        bool found;
+        bool back_to_list = false;
+        int loc, i;
+        int err;
+        u8 pf_num;
+
+        pf_num = (dev->caps.num_ports == 1) ? vep_num : (vep_num << 1) | (port - 1);
+        s_steer = &mlx4_priv(dev)->steer[pf_num];
+        mutex_lock(&priv->mcg_table.mutex);
+
+        pqp = get_promisc_qp(dev, pf_num, steer, qpn);
+        if (unlikely(!pqp)) {
+                mlx4_warn(dev, "QP %x is not promiscuous QP\n", qpn);
+                /* nothing to do */
+                err = 0;
+                goto out_mutex;
+        }
+
+        /*remove from list of promisc qps */
+        list_del(&pqp->list);
+        kfree(pqp);
+
+        /* set the default entry not to include the removed one */
+        mailbox = mlx4_alloc_cmd_mailbox(dev);
+        if (IS_ERR(mailbox)) {
+                err = -ENOMEM;
+                back_to_list = true;
+                goto out_list;
+        }
+        mgm = mailbox->buf;
+        members_count = 0;
+        list_for_each_entry(dqp, &s_steer->promisc_qps[steer], list)
+                mgm->qp[members_count++] = cpu_to_be32(dqp->qpn & MGM_QPN_MASK);
+        mgm->members_count = cpu_to_be32(members_count | MLX4_PROT_ETH << 30);
+
+        err = mlx4_WRITE_PROMISC(dev, vep_num, port, steer, mailbox);
+        if (err)
+                goto out_mailbox;
+
+        /* remove the qp from all the steering entries*/
+        list_for_each_entry(entry, &s_steer->steer_entries[steer], list) {
+                found = false;
+                list_for_each_entry(dqp, &entry->duplicates, list) {
+                        if (dqp->qpn == qpn) {
+                                found = true;
+                                break;
+                        }
+                }
+                if (found) {
+                        /* a duplicate, no need to change the mgm,
+                         * only update the duplicates list */
+                        list_del(&dqp->list);
+                        kfree(dqp);
+                } else {
+                        err = mlx4_READ_ENTRY(dev, entry->index, mailbox);
+                                if (err)
+                                        goto out_mailbox;
+                        members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
+                        for (loc = -1, i = 0; i < members_count; ++i)
+                                if ((be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK) == qpn)
+                                        loc = i;
+
+                        mgm->members_count = cpu_to_be32(--members_count |
+                                                         (MLX4_PROT_ETH << 30));
+                        mgm->qp[loc] = mgm->qp[i - 1];
+                        mgm->qp[i - 1] = 0;
+
+                        err = mlx4_WRITE_ENTRY(dev, entry->index, mailbox);
+                                if (err)
+                                        goto out_mailbox;
+                }
+
+        }
+
+out_mailbox:
+        mlx4_free_cmd_mailbox(dev, mailbox);
+out_list:
+        if (back_to_list)
+                list_add_tail(&pqp->list, &s_steer->promisc_qps[steer]);
+out_mutex:
+        mutex_unlock(&priv->mcg_table.mutex);
+        return err;
+}
+
 /*
  * Caller must hold MCG table semaphore.  gid and mgm parameters must
  * be properly aligned for command interface.
@@ -94,15 +548,17 @@ static int mlx4_MGID_HASH(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox
  * If no AMGM exists for given gid, *index = -1, *prev = index of last
  * entry in hash chain and *mgm holds end of hash chain.
  */
-static int find_mgm(struct mlx4_dev *dev,
-                    u8 *gid, enum mlx4_protocol protocol,
-                    struct mlx4_cmd_mailbox *mgm_mailbox,
-                    u16 *hash, int *prev, int *index)
+static int find_entry(struct mlx4_dev *dev, u8 port,
+                      u8 *gid, enum mlx4_protocol prot,
+                      enum mlx4_steer_type steer,
+                      struct mlx4_cmd_mailbox *mgm_mailbox,
+                      u16 *hash, int *prev, int *index)
 {
         struct mlx4_cmd_mailbox *mailbox;
         struct mlx4_mgm *mgm = mgm_mailbox->buf;
         u8 *mgid;
         int err;
+        u8 op_mod = (prot == MLX4_PROT_ETH) ? !!(dev->caps.vep_mc_steering) : 0;
 
         mailbox = mlx4_alloc_cmd_mailbox(dev);
         if (IS_ERR(mailbox))
@@ -111,7 +567,7 @@ static int find_mgm(struct mlx4_dev *dev,
 
         memcpy(mgid, gid, 16);
 
-        err = mlx4_MGID_HASH(dev, mailbox, hash);
+        err = mlx4_GID_HASH(dev, mailbox, hash, op_mod);
         mlx4_free_cmd_mailbox(dev, mailbox);
         if (err)
                 return err;
@@ -123,11 +579,11 @@ static int find_mgm(struct mlx4_dev *dev,
         *prev  = -1;
 
         do {
-                err = mlx4_READ_MCG(dev, *index, mgm_mailbox);
+                err = mlx4_READ_ENTRY(dev, *index, mgm_mailbox);
                 if (err)
                         return err;
 
-                if (!memcmp(mgm->gid, zero_gid, 16)) {
+                if (!(be32_to_cpu(mgm->members_count) & 0xffffff)) {
                         if (*index != *hash) {
                                 mlx4_err(dev, "Found zero MGID in AMGM.\n");
                                 err = -EINVAL;
@@ -136,7 +592,7 @@ static int find_mgm(struct mlx4_dev *dev,
                 }
 
                 if (!memcmp(mgm->gid, gid, 16) &&
-                    be32_to_cpu(mgm->members_count) >> 30 == protocol)
+                    be32_to_cpu(mgm->members_count) >> 30 == prot)
                         return err;
 
                 *prev = *index;
@@ -147,8 +603,9 @@ static int find_mgm(struct mlx4_dev *dev,
         return err;
 }
 
-int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
-                          int block_mcast_loopback, enum mlx4_protocol protocol)
+int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
+                          int block_mcast_loopback, enum mlx4_protocol prot,
+                          enum mlx4_steer_type steer)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_cmd_mailbox *mailbox;
@@ -159,6 +616,8 @@ int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
         int link = 0;
         int i;
         int err;
+        u8 port = gid[5];
+        u8 new_entry = 0;
 
         mailbox = mlx4_alloc_cmd_mailbox(dev);
         if (IS_ERR(mailbox))
@@ -166,14 +625,16 @@ int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
         mgm = mailbox->buf;
 
         mutex_lock(&priv->mcg_table.mutex);
-
-        err = find_mgm(dev, gid, protocol, mailbox, &hash, &prev, &index);
+        err = find_entry(dev, port, gid, prot, steer,
+                         mailbox, &hash, &prev, &index);
         if (err)
                 goto out;
 
         if (index != -1) {
-                if (!memcmp(mgm->gid, zero_gid, 16))
+                if (!(be32_to_cpu(mgm->members_count) & 0xffffff)) {
+                        new_entry = 1;
                         memcpy(mgm->gid, gid, 16);
+                }
         } else {
                 link = 1;
 
@@ -209,26 +670,34 @@ int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
         else
                 mgm->qp[members_count++] = cpu_to_be32(qp->qpn & MGM_QPN_MASK);
 
-        mgm->members_count = cpu_to_be32(members_count | (u32) protocol << 30);
+        mgm->members_count = cpu_to_be32(members_count | (u32) prot << 30);
 
-        err = mlx4_WRITE_MCG(dev, index, mailbox);
+        err = mlx4_WRITE_ENTRY(dev, index, mailbox);
         if (err)
                 goto out;
 
         if (!link)
                 goto out;
 
-        err = mlx4_READ_MCG(dev, prev, mailbox);
+        err = mlx4_READ_ENTRY(dev, prev, mailbox);
         if (err)
                 goto out;
 
         mgm->next_gid_index = cpu_to_be32(index << 6);
 
-        err = mlx4_WRITE_MCG(dev, prev, mailbox);
+        err = mlx4_WRITE_ENTRY(dev, prev, mailbox);
         if (err)
                 goto out;
 
 out:
+        if (prot == MLX4_PROT_ETH) {
+                /* manage the steering entry for promisc mode */
+                if (new_entry)
+                        new_steering_entry(dev, 0, port, steer, index, qp->qpn);
+                else
+                        existing_steering_entry(dev, 0, port, steer,
+                                                index, qp->qpn);
+        }
         if (err && link && index != -1) {
                 if (index < dev->caps.num_mgms)
                         mlx4_warn(dev, "Got AMGM index %d < %d",
@@ -242,10 +711,9 @@ out:
         mlx4_free_cmd_mailbox(dev, mailbox);
         return err;
 }
-EXPORT_SYMBOL_GPL(mlx4_multicast_attach);
 
-int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
-                          enum mlx4_protocol protocol)
+int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
+                          enum mlx4_protocol prot, enum mlx4_steer_type steer)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         struct mlx4_cmd_mailbox *mailbox;
@@ -255,6 +723,8 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
         int prev, index;
         int i, loc;
         int err;
+        u8 port = gid[5];
+        bool removed_entry = false;
 
         mailbox = mlx4_alloc_cmd_mailbox(dev);
         if (IS_ERR(mailbox))
@@ -263,7 +733,8 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
 
         mutex_lock(&priv->mcg_table.mutex);
 
-        err = find_mgm(dev, gid, protocol, mailbox, &hash, &prev, &index);
+        err = find_entry(dev, port, gid, prot, steer,
+                         mailbox, &hash, &prev, &index);
         if (err)
                 goto out;
 
@@ -273,6 +744,11 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
                 goto out;
         }
 
+        /* if this pq is also a promisc qp, it shouldn't be removed */
+        if (prot == MLX4_PROT_ETH &&
+            check_duplicate_entry(dev, 0, port, steer, index, qp->qpn))
+                goto out;
+
         members_count = be32_to_cpu(mgm->members_count) & 0xffffff;
         for (loc = -1, i = 0; i < members_count; ++i)
                 if ((be32_to_cpu(mgm->qp[i]) & MGM_QPN_MASK) == qp->qpn)
@@ -285,26 +761,31 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
         }
 
 
-        mgm->members_count = cpu_to_be32(--members_count | (u32) protocol << 30);
+        mgm->members_count = cpu_to_be32(--members_count | (u32) prot << 30);
         mgm->qp[loc]       = mgm->qp[i - 1];
         mgm->qp[i - 1]     = 0;
 
-        if (i != 1) {
-                err = mlx4_WRITE_MCG(dev, index, mailbox);
+        if (prot == MLX4_PROT_ETH)
+                removed_entry = can_remove_steering_entry(dev, 0, port, steer, index, qp->qpn);
+        if (i != 1 && (prot != MLX4_PROT_ETH || !removed_entry)) {
+                err = mlx4_WRITE_ENTRY(dev, index, mailbox);
                 goto out;
         }
 
+        /* We are going to delete the entry, members count should be 0 */
+        mgm->members_count = cpu_to_be32((u32) prot << 30);
+
         if (prev == -1) {
                 /* Remove entry from MGM */
                 int amgm_index = be32_to_cpu(mgm->next_gid_index) >> 6;
                 if (amgm_index) {
-                        err = mlx4_READ_MCG(dev, amgm_index, mailbox);
+                        err = mlx4_READ_ENTRY(dev, amgm_index, mailbox);
                         if (err)
                                 goto out;
                 } else
                         memset(mgm->gid, 0, 16);
 
-                err = mlx4_WRITE_MCG(dev, index, mailbox);
+                err = mlx4_WRITE_ENTRY(dev, index, mailbox);
                 if (err)
                         goto out;
 
@@ -319,13 +800,13 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
         } else {
                 /* Remove entry from AMGM */
                 int cur_next_index = be32_to_cpu(mgm->next_gid_index) >> 6;
-                err = mlx4_READ_MCG(dev, prev, mailbox);
+                err = mlx4_READ_ENTRY(dev, prev, mailbox);
                 if (err)
                         goto out;
 
                 mgm->next_gid_index = cpu_to_be32(cur_next_index << 6);
 
-                err = mlx4_WRITE_MCG(dev, prev, mailbox);
+                err = mlx4_WRITE_ENTRY(dev, prev, mailbox);
                 if (err)
                         goto out;
 
@@ -343,8 +824,85 @@ out:
         mlx4_free_cmd_mailbox(dev, mailbox);
         return err;
 }
+
+
+int mlx4_multicast_attach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
+                          int block_mcast_loopback, enum mlx4_protocol prot)
+{
+        enum mlx4_steer_type steer;
+
+        steer = (is_valid_ether_addr(&gid[10])) ? MLX4_UC_STEER : MLX4_MC_STEER;
+
+        if (prot == MLX4_PROT_ETH && !dev->caps.vep_mc_steering)
+                return 0;
+
+        if (prot == MLX4_PROT_ETH)
+                gid[7] |= (steer << 1);
+
+        return mlx4_qp_attach_common(dev, qp, gid,
+                                     block_mcast_loopback, prot,
+                                     steer);
+}
+EXPORT_SYMBOL_GPL(mlx4_multicast_attach);
+
+int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
+                          enum mlx4_protocol prot)
+{
+        enum mlx4_steer_type steer;
+
+        steer = (is_valid_ether_addr(&gid[10])) ? MLX4_UC_STEER : MLX4_MC_STEER;
+
+        if (prot == MLX4_PROT_ETH && !dev->caps.vep_mc_steering)
+                return 0;
+
+        if (prot == MLX4_PROT_ETH) {
+                gid[7] |= (steer << 1);
+        }
+
+        return mlx4_qp_detach_common(dev, qp, gid, prot, steer);
+}
 EXPORT_SYMBOL_GPL(mlx4_multicast_detach);
 
+
+int mlx4_multicast_promisc_add(struct mlx4_dev *dev, u32 qpn, u8 port)
+{
+        if (!dev->caps.vep_mc_steering)
+                return 0;
+
+
+        return add_promisc_qp(dev, 0, port, MLX4_MC_STEER, qpn);
+}
+EXPORT_SYMBOL_GPL(mlx4_multicast_promisc_add);
+
+int mlx4_multicast_promisc_remove(struct mlx4_dev *dev, u32 qpn, u8 port)
+{
+        if (!dev->caps.vep_mc_steering)
+                return 0;
+
+
+        return remove_promisc_qp(dev, 0, port, MLX4_MC_STEER, qpn);
+}
+EXPORT_SYMBOL_GPL(mlx4_multicast_promisc_remove);
+
+int mlx4_unicast_promisc_add(struct mlx4_dev *dev, u32 qpn, u8 port)
+{
+        if (!dev->caps.vep_mc_steering)
+                return 0;
+
+
+        return add_promisc_qp(dev, 0, port, MLX4_UC_STEER, qpn);
+}
+EXPORT_SYMBOL_GPL(mlx4_unicast_promisc_add);
+
+int mlx4_unicast_promisc_remove(struct mlx4_dev *dev, u32 qpn, u8 port)
+{
+        if (!dev->caps.vep_mc_steering)
+                return 0;
+
+        return remove_promisc_qp(dev, 0, port, MLX4_UC_STEER, qpn);
+}
+EXPORT_SYMBOL_GPL(mlx4_unicast_promisc_remove);
+
 int mlx4_init_mcg_table(struct mlx4_dev *dev)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h
index 0da5bb7285b..c1e0e5f1bcd 100644
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
@@ -105,6 +105,7 @@ struct mlx4_bitmap {
         u32                     max;
         u32                     reserved_top;
         u32                     mask;
+        u32                     avail;
         spinlock_t              lock;
         unsigned long          *table;
 };
@@ -162,6 +163,27 @@ struct mlx4_fw {
         u8                      catas_bar;
 };
 
+#define MGM_QPN_MASK       0x00FFFFFF
+#define MGM_BLCK_LB_BIT    30
+
+struct mlx4_promisc_qp {
+        struct list_head list;
+        u32 qpn;
+};
+
+struct mlx4_steer_index {
+        struct list_head list;
+        unsigned int index;
+        struct list_head duplicates;
+};
+
+struct mlx4_mgm {
+        __be32                  next_gid_index;
+        __be32                  members_count;
+        u32                     reserved[2];
+        u8                      gid[16];
+        __be32                  qp[MLX4_QP_PER_MGM];
+};
 struct mlx4_cmd {
         struct pci_pool        *pool;
         void __iomem           *hcr;
@@ -265,6 +287,10 @@ struct mlx4_vlan_table {
         int                     max;
 };
 
+struct mlx4_mac_entry {
+        u64 mac;
+};
+
 struct mlx4_port_info {
         struct mlx4_dev        *dev;
         int                     port;
@@ -272,7 +298,9 @@ struct mlx4_port_info {
         struct device_attribute port_attr;
         enum mlx4_port_type     tmp_type;
         struct mlx4_mac_table   mac_table;
+        struct radix_tree_root  mac_tree;
         struct mlx4_vlan_table  vlan_table;
+        int                     base_qpn;
 };
 
 struct mlx4_sense {
@@ -282,6 +310,17 @@ struct mlx4_sense {
         struct delayed_work     sense_poll;
 };
 
+struct mlx4_msix_ctl {
+        u64             pool_bm;
+        spinlock_t      pool_lock;
+};
+
+struct mlx4_steer {
+        struct list_head promisc_qps[MLX4_NUM_STEERS];
+        struct list_head steer_entries[MLX4_NUM_STEERS];
+        struct list_head high_prios;
+};
+
 struct mlx4_priv {
         struct mlx4_dev         dev;
 
@@ -313,6 +352,11 @@ struct mlx4_priv {
         struct mlx4_port_info   port[MLX4_MAX_PORTS + 1];
         struct mlx4_sense       sense;
         struct mutex            port_mutex;
+        struct mlx4_msix_ctl    msix_ctl;
+        struct mlx4_steer       *steer;
+        struct list_head        bf_list;
+        struct mutex            bf_mutex;
+        struct io_mapping       *bf_mapping;
 };
 
 static inline struct mlx4_priv *mlx4_priv(struct mlx4_dev *dev)
@@ -328,6 +372,7 @@ u32 mlx4_bitmap_alloc(struct mlx4_bitmap *bitmap);
 void mlx4_bitmap_free(struct mlx4_bitmap *bitmap, u32 obj);
 u32 mlx4_bitmap_alloc_range(struct mlx4_bitmap *bitmap, int cnt, int align);
 void mlx4_bitmap_free_range(struct mlx4_bitmap *bitmap, u32 obj, int cnt);
+u32 mlx4_bitmap_avail(struct mlx4_bitmap *bitmap);
 int mlx4_bitmap_init(struct mlx4_bitmap *bitmap, u32 num, u32 mask,
                      u32 reserved_bot, u32 resetrved_top);
 void mlx4_bitmap_cleanup(struct mlx4_bitmap *bitmap);
@@ -403,4 +448,9 @@ void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table);
 int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port);
 int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps);
 
+int mlx4_qp_detach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
+                          enum mlx4_protocol prot, enum mlx4_steer_type steer);
+int mlx4_qp_attach_common(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16],
+                          int block_mcast_loopback, enum mlx4_protocol prot,
+                          enum mlx4_steer_type steer);
 #endif /* MLX4_H */
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h
index dfed6a07c2d..e30f6099c0d 100644
--- a/drivers/net/mlx4/mlx4_en.h
+++ b/drivers/net/mlx4/mlx4_en.h
@@ -49,8 +49,8 @@
 #include "en_port.h"
 
 #define DRV_NAME        "mlx4_en"
-#define DRV_VERSION     "1.5.1.6"
-#define DRV_RELDATE     "August 2010"
+#define DRV_VERSION     "1.5.4.1"
+#define DRV_RELDATE     "March 2011"
 
 #define MLX4_EN_MSG_LEVEL       (NETIF_MSG_LINK | NETIF_MSG_IFDOWN)
 
@@ -62,6 +62,7 @@
 #define MLX4_EN_PAGE_SHIFT      12
 #define MLX4_EN_PAGE_SIZE       (1 << MLX4_EN_PAGE_SHIFT)
 #define MAX_RX_RINGS            16
+#define MIN_RX_RINGS            4
 #define TXBB_SIZE               64
 #define HEADROOM                (2048 / TXBB_SIZE + 1)
 #define STAMP_STRIDE            64
@@ -124,6 +125,7 @@ enum {
 #define MLX4_EN_RX_SIZE_THRESH          1024
 #define MLX4_EN_RX_RATE_THRESH          (1000000 / MLX4_EN_RX_COAL_TIME_HIGH)
 #define MLX4_EN_SAMPLE_INTERVAL         0
+#define MLX4_EN_AVG_PKT_SMALL           256
 
 #define MLX4_EN_AUTO_CONF       0xffff
 
@@ -214,6 +216,9 @@ struct mlx4_en_tx_desc {
 
 #define MLX4_EN_USE_SRQ         0x01000000
 
+#define MLX4_EN_CX3_LOW_ID      0x1000
+#define MLX4_EN_CX3_HIGH_ID     0x1005
+
 struct mlx4_en_rx_alloc {
         struct page *page;
         u16 offset;
@@ -243,6 +248,8 @@ struct mlx4_en_tx_ring {
         unsigned long bytes;
         unsigned long packets;
         spinlock_t comp_lock;
+        struct mlx4_bf bf;
+        bool bf_enabled;
 };
 
 struct mlx4_en_rx_desc {
@@ -453,6 +460,7 @@ struct mlx4_en_priv {
         struct mlx4_en_rss_map rss_map;
         u32 flags;
 #define MLX4_EN_FLAG_PROMISC    0x1
+#define MLX4_EN_FLAG_MC_PROMISC 0x2
         u32 tx_ring_num;
         u32 rx_ring_num;
         u32 rx_skb_size;
@@ -461,6 +469,7 @@ struct mlx4_en_priv {
         u16 log_rx_info;
 
         struct mlx4_en_tx_ring tx_ring[MAX_TX_RINGS];
+        int tx_vector;
         struct mlx4_en_rx_ring rx_ring[MAX_RX_RINGS];
         struct mlx4_en_cq tx_cq[MAX_TX_RINGS];
         struct mlx4_en_cq rx_cq[MAX_RX_RINGS];
@@ -476,6 +485,13 @@ struct mlx4_en_priv {
         int mc_addrs_cnt;
         struct mlx4_en_stat_out_mbox hw_stats;
         int vids[128];
+        bool wol;
+};
+
+enum mlx4_en_wol {
+        MLX4_EN_WOL_MAGIC = (1ULL << 61),
+        MLX4_EN_WOL_ENABLED = (1ULL << 62),
+        MLX4_EN_WOL_DO_MODIFY = (1ULL << 63),
 };
 
 
@@ -486,12 +502,13 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
 int mlx4_en_start_port(struct net_device *dev);
 void mlx4_en_stop_port(struct net_device *dev);
 
-void mlx4_en_free_resources(struct mlx4_en_priv *priv);
+void mlx4_en_free_resources(struct mlx4_en_priv *priv, bool reserve_vectors);
 int mlx4_en_alloc_resources(struct mlx4_en_priv *priv);
 
 int mlx4_en_create_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,
                       int entries, int ring, enum cq_type mode);
-void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
+void mlx4_en_destroy_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,
+                        bool reserve_vectors);
 int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
 void mlx4_en_deactivate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
 int mlx4_en_set_cq_moder(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq);
@@ -503,7 +520,7 @@ u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb);
 netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev);
 
 int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, struct mlx4_en_tx_ring *ring,
-                           u32 size, u16 stride);
+                           int qpn, u32 size, u16 stride);
 void mlx4_en_destroy_tx_ring(struct mlx4_en_priv *priv, struct mlx4_en_tx_ring *ring);
 int mlx4_en_activate_tx_ring(struct mlx4_en_priv *priv,
                              struct mlx4_en_tx_ring *ring,
diff --git a/drivers/net/mlx4/pd.c b/drivers/net/mlx4/pd.c
index c4988d6bd5b..1286b886dce 100644
--- a/drivers/net/mlx4/pd.c
+++ b/drivers/net/mlx4/pd.c
@@ -32,12 +32,17 @@
  */
 
 #include <linux/errno.h>
+#include <linux/io-mapping.h>
 
 #include <asm/page.h>
 
 #include "mlx4.h"
 #include "icm.h"
 
+enum {
+        MLX4_NUM_RESERVED_UARS = 8
+};
+
 int mlx4_pd_alloc(struct mlx4_dev *dev, u32 *pdn)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
@@ -77,6 +82,7 @@ int mlx4_uar_alloc(struct mlx4_dev *dev, struct mlx4_uar *uar)
                 return -ENOMEM;
 
         uar->pfn = (pci_resource_start(dev->pdev, 2) >> PAGE_SHIFT) + uar->index;
+        uar->map = NULL;
 
         return 0;
 }
@@ -88,6 +94,102 @@ void mlx4_uar_free(struct mlx4_dev *dev, struct mlx4_uar *uar)
 }
 EXPORT_SYMBOL_GPL(mlx4_uar_free);
 
+int mlx4_bf_alloc(struct mlx4_dev *dev, struct mlx4_bf *bf)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        struct mlx4_uar *uar;
+        int err = 0;
+        int idx;
+
+        if (!priv->bf_mapping)
+                return -ENOMEM;
+
+        mutex_lock(&priv->bf_mutex);
+        if (!list_empty(&priv->bf_list))
+                uar = list_entry(priv->bf_list.next, struct mlx4_uar, bf_list);
+        else {
+                if (mlx4_bitmap_avail(&priv->uar_table.bitmap) < MLX4_NUM_RESERVED_UARS) {
+                        err = -ENOMEM;
+                        goto out;
+                }
+                uar = kmalloc(sizeof *uar, GFP_KERNEL);
+                if (!uar) {
+                        err = -ENOMEM;
+                        goto out;
+                }
+                err = mlx4_uar_alloc(dev, uar);
+                if (err)
+                        goto free_kmalloc;
+
+                uar->map = ioremap(uar->pfn << PAGE_SHIFT, PAGE_SIZE);
+                if (!uar->map) {
+                        err = -ENOMEM;
+                        goto free_uar;
+                }
+
+                uar->bf_map = io_mapping_map_wc(priv->bf_mapping, uar->index << PAGE_SHIFT);
+                if (!uar->bf_map) {
+                        err = -ENOMEM;
+                        goto unamp_uar;
+                }
+                uar->free_bf_bmap = 0;
+                list_add(&uar->bf_list, &priv->bf_list);
+        }
+
+        bf->uar = uar;
+        idx = ffz(uar->free_bf_bmap);
+        uar->free_bf_bmap |= 1 << idx;
+        bf->uar = uar;
+        bf->offset = 0;
+        bf->buf_size = dev->caps.bf_reg_size / 2;
+        bf->reg = uar->bf_map + idx * dev->caps.bf_reg_size;
+        if (uar->free_bf_bmap == (1 << dev->caps.bf_regs_per_page) - 1)
+                list_del_init(&uar->bf_list);
+
+        goto out;
+
+unamp_uar:
+        bf->uar = NULL;
+        iounmap(uar->map);
+
+free_uar:
+        mlx4_uar_free(dev, uar);
+
+free_kmalloc:
+        kfree(uar);
+
+out:
+        mutex_unlock(&priv->bf_mutex);
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_bf_alloc);
+
+void mlx4_bf_free(struct mlx4_dev *dev, struct mlx4_bf *bf)
+{
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int idx;
+
+        if (!bf->uar || !bf->uar->bf_map)
+                return;
+
+        mutex_lock(&priv->bf_mutex);
+        idx = (bf->reg - bf->uar->bf_map) / dev->caps.bf_reg_size;
+        bf->uar->free_bf_bmap &= ~(1 << idx);
+        if (!bf->uar->free_bf_bmap) {
+                if (!list_empty(&bf->uar->bf_list))
+                        list_del(&bf->uar->bf_list);
+
+                io_mapping_unmap(bf->uar->bf_map);
+                iounmap(bf->uar->map);
+                mlx4_uar_free(dev, bf->uar);
+                kfree(bf->uar);
+        } else if (list_empty(&bf->uar->bf_list))
+                list_add(&bf->uar->bf_list, &priv->bf_list);
+
+        mutex_unlock(&priv->bf_mutex);
+}
+EXPORT_SYMBOL_GPL(mlx4_bf_free);
+
 int mlx4_init_uar_table(struct mlx4_dev *dev)
 {
         if (dev->caps.num_uars <= 128) {
diff --git a/drivers/net/mlx4/port.c b/drivers/net/mlx4/port.c
index 451339559bd..eca7d8596f8 100644
--- a/drivers/net/mlx4/port.c
+++ b/drivers/net/mlx4/port.c
@@ -90,12 +90,79 @@ static int mlx4_set_port_mac_table(struct mlx4_dev *dev, u8 port,
         return err;
 }
 
-int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *index)
+static int mlx4_uc_steer_add(struct mlx4_dev *dev, u8 port,
+                             u64 mac, int *qpn, u8 reserve)
 {
-        struct mlx4_mac_table *table = &mlx4_priv(dev)->port[port].mac_table;
+        struct mlx4_qp qp;
+        u8 gid[16] = {0};
+        int err;
+
+        if (reserve) {
+                err = mlx4_qp_reserve_range(dev, 1, 1, qpn);
+                if (err) {
+                        mlx4_err(dev, "Failed to reserve qp for mac registration\n");
+                        return err;
+                }
+        }
+        qp.qpn = *qpn;
+
+        mac &= 0xffffffffffffULL;
+        mac = cpu_to_be64(mac << 16);
+        memcpy(&gid[10], &mac, ETH_ALEN);
+        gid[5] = port;
+        gid[7] = MLX4_UC_STEER << 1;
+
+        err = mlx4_qp_attach_common(dev, &qp, gid, 0,
+                                    MLX4_PROT_ETH, MLX4_UC_STEER);
+        if (err && reserve)
+                mlx4_qp_release_range(dev, *qpn, 1);
+
+        return err;
+}
+
+static void mlx4_uc_steer_release(struct mlx4_dev *dev, u8 port,
+                                  u64 mac, int qpn, u8 free)
+{
+        struct mlx4_qp qp;
+        u8 gid[16] = {0};
+
+        qp.qpn = qpn;
+        mac &= 0xffffffffffffULL;
+        mac = cpu_to_be64(mac << 16);
+        memcpy(&gid[10], &mac, ETH_ALEN);
+        gid[5] = port;
+        gid[7] = MLX4_UC_STEER << 1;
+
+        mlx4_qp_detach_common(dev, &qp, gid, MLX4_PROT_ETH, MLX4_UC_STEER);
+        if (free)
+                mlx4_qp_release_range(dev, qpn, 1);
+}
+
+int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn, u8 wrap)
+{
+        struct mlx4_port_info *info = &mlx4_priv(dev)->port[port];
+        struct mlx4_mac_table *table = &info->mac_table;
+        struct mlx4_mac_entry *entry;
         int i, err = 0;
         int free = -1;
 
+        if (dev->caps.vep_uc_steering) {
+                err = mlx4_uc_steer_add(dev, port, mac, qpn, 1);
+                if (!err) {
+                        entry = kmalloc(sizeof *entry, GFP_KERNEL);
+                        if (!entry) {
+                                mlx4_uc_steer_release(dev, port, mac, *qpn, 1);
+                                return -ENOMEM;
+                        }
+                        entry->mac = mac;
+                        err = radix_tree_insert(&info->mac_tree, *qpn, entry);
+                        if (err) {
+                                mlx4_uc_steer_release(dev, port, mac, *qpn, 1);
+                                return err;
+                        }
+                } else
+                        return err;
+        }
         mlx4_dbg(dev, "Registering MAC: 0x%llx\n", (unsigned long long) mac);
         mutex_lock(&table->mutex);
         for (i = 0; i < MLX4_MAX_MAC_NUM - 1; i++) {
@@ -106,7 +173,6 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *index)
 
                 if (mac == (MLX4_MAC_MASK & be64_to_cpu(table->entries[i]))) {
                         /* MAC already registered, increase refernce count */
-                        *index = i;
                         ++table->refs[i];
                         goto out;
                 }
@@ -137,7 +203,8 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *index)
                 goto out;
         }
 
-        *index = free;
+        if (!dev->caps.vep_uc_steering)
+                *qpn = info->base_qpn + free;
         ++table->total;
 out:
         mutex_unlock(&table->mutex);
@@ -145,20 +212,52 @@ out:
 }
 EXPORT_SYMBOL_GPL(mlx4_register_mac);
 
-void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, int index)
+static int validate_index(struct mlx4_dev *dev,
+                          struct mlx4_mac_table *table, int index)
 {
-        struct mlx4_mac_table *table = &mlx4_priv(dev)->port[port].mac_table;
+        int err = 0;
 
-        mutex_lock(&table->mutex);
-        if (!table->refs[index]) {
-                mlx4_warn(dev, "No MAC entry for index %d\n", index);
-                goto out;
+        if (index < 0 || index >= table->max || !table->entries[index]) {
+                mlx4_warn(dev, "No valid Mac entry for the given index\n");
+                err = -EINVAL;
         }
-        if (--table->refs[index]) {
-                mlx4_warn(dev, "Have more references for index %d,"
-                          "no need to modify MAC table\n", index);
-                goto out;
+        return err;
+}
+
+static int find_index(struct mlx4_dev *dev,
+                      struct mlx4_mac_table *table, u64 mac)
+{
+        int i;
+        for (i = 0; i < MLX4_MAX_MAC_NUM; i++) {
+                if (mac == (MLX4_MAC_MASK & be64_to_cpu(table->entries[i])))
+                        return i;
         }
+        /* Mac not found */
+        return -EINVAL;
+}
+
+void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, int qpn)
+{
+        struct mlx4_port_info *info = &mlx4_priv(dev)->port[port];
+        struct mlx4_mac_table *table = &info->mac_table;
+        int index = qpn - info->base_qpn;
+        struct mlx4_mac_entry *entry;
+
+        if (dev->caps.vep_uc_steering) {
+                entry = radix_tree_lookup(&info->mac_tree, qpn);
+                if (entry) {
+                        mlx4_uc_steer_release(dev, port, entry->mac, qpn, 1);
+                        radix_tree_delete(&info->mac_tree, qpn);
+                        index = find_index(dev, table, entry->mac);
+                        kfree(entry);
+                }
+        }
+
+        mutex_lock(&table->mutex);
+
+        if (validate_index(dev, table, index))
+                goto out;
+
         table->entries[index] = 0;
         mlx4_set_port_mac_table(dev, port, table->entries);
         --table->total;
@@ -167,6 +266,44 @@ out:
 }
 EXPORT_SYMBOL_GPL(mlx4_unregister_mac);
 
+int mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac, u8 wrap)
+{
+        struct mlx4_port_info *info = &mlx4_priv(dev)->port[port];
+        struct mlx4_mac_table *table = &info->mac_table;
+        int index = qpn - info->base_qpn;
+        struct mlx4_mac_entry *entry;
+        int err;
+
+        if (dev->caps.vep_uc_steering) {
+                entry = radix_tree_lookup(&info->mac_tree, qpn);
+                if (!entry)
+                        return -EINVAL;
+                index = find_index(dev, table, entry->mac);
+                mlx4_uc_steer_release(dev, port, entry->mac, qpn, 0);
+                entry->mac = new_mac;
+                err = mlx4_uc_steer_add(dev, port, entry->mac, &qpn, 0);
+                if (err || index < 0)
+                        return err;
+        }
+
+        mutex_lock(&table->mutex);
+
+        err = validate_index(dev, table, index);
+        if (err)
+                goto out;
+
+        table->entries[index] = cpu_to_be64(new_mac | MLX4_MAC_VALID);
+
+        err = mlx4_set_port_mac_table(dev, port, table->entries);
+        if (unlikely(err)) {
+                mlx4_err(dev, "Failed adding MAC: 0x%llx\n", (unsigned long long) new_mac);
+                table->entries[index] = 0;
+        }
+out:
+        mutex_unlock(&table->mutex);
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_replace_mac);
 static int mlx4_set_port_vlan_table(struct mlx4_dev *dev, u8 port,
                                     __be32 *entries)
 {
diff --git a/drivers/net/mlx4/profile.c b/drivers/net/mlx4/profile.c
index e749f82865f..b967647d0c7 100644
--- a/drivers/net/mlx4/profile.c
+++ b/drivers/net/mlx4/profile.c
@@ -107,9 +107,7 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,
         profile[MLX4_RES_AUXC].num    = request->num_qp;
         profile[MLX4_RES_SRQ].num     = request->num_srq;
         profile[MLX4_RES_CQ].num      = request->num_cq;
-        profile[MLX4_RES_EQ].num      = min_t(unsigned, dev_cap->max_eqs,
-                                              dev_cap->reserved_eqs +
-                                              num_possible_cpus() + 1);
+        profile[MLX4_RES_EQ].num      = min_t(unsigned, dev_cap->max_eqs, MAX_MSIX);
         profile[MLX4_RES_DMPT].num    = request->num_mpt;
         profile[MLX4_RES_CMPT].num    = MLX4_NUM_CMPTS;
         profile[MLX4_RES_MTT].num     = request->num_mtt;
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 02076e16542..34425b94452 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -35,6 +35,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
 #include <linux/in.h>
@@ -627,9 +629,8 @@ err:
                 if ((cmd_sts & (RX_FIRST_DESC | RX_LAST_DESC)) !=
                         (RX_FIRST_DESC | RX_LAST_DESC)) {
                         if (net_ratelimit())
-                                dev_printk(KERN_ERR, &mp->dev->dev,
-                                           "received packet spanning "
-                                           "multiple descriptors\n");
+                                netdev_err(mp->dev,
+                                           "received packet spanning multiple descriptors\n");
                 }
 
                 if (cmd_sts & ERROR_SUMMARY)
@@ -868,15 +869,14 @@ static netdev_tx_t mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (has_tiny_unaligned_frags(skb) && __skb_linearize(skb)) {
                 txq->tx_dropped++;
-                dev_printk(KERN_DEBUG, &dev->dev,
-                           "failed to linearize skb with tiny "
-                           "unaligned fragment\n");
+                netdev_printk(KERN_DEBUG, dev,
+                              "failed to linearize skb with tiny unaligned fragment\n");
                 return NETDEV_TX_BUSY;
         }
 
         if (txq->tx_ring_size - txq->tx_desc_count < MAX_SKB_FRAGS + 1) {
                 if (net_ratelimit())
-                        dev_printk(KERN_ERR, &dev->dev, "tx queue full?!\n");
+                        netdev_err(dev, "tx queue full?!\n");
                 kfree_skb(skb);
                 return NETDEV_TX_OK;
         }
@@ -959,7 +959,7 @@ static int txq_reclaim(struct tx_queue *txq, int budget, int force)
                         skb = __skb_dequeue(&txq->tx_skb);
 
                 if (cmd_sts & ERROR_SUMMARY) {
-                        dev_printk(KERN_INFO, &mp->dev->dev, "tx error\n");
+                        netdev_info(mp->dev, "tx error\n");
                         mp->dev->stats.tx_errors++;
                 }
 
@@ -1122,20 +1122,20 @@ static int smi_bus_read(struct mii_bus *bus, int addr, int reg)
         int ret;
 
         if (smi_wait_ready(msp)) {
-                printk(KERN_WARNING "mv643xx_eth: SMI bus busy timeout\n");
+                pr_warn("SMI bus busy timeout\n");
                 return -ETIMEDOUT;
         }
 
         writel(SMI_OPCODE_READ | (reg << 21) | (addr << 16), smi_reg);
 
         if (smi_wait_ready(msp)) {
-                printk(KERN_WARNING "mv643xx_eth: SMI bus busy timeout\n");
+                pr_warn("SMI bus busy timeout\n");
                 return -ETIMEDOUT;
         }
 
         ret = readl(smi_reg);
         if (!(ret & SMI_READ_VALID)) {
-                printk(KERN_WARNING "mv643xx_eth: SMI bus read not valid\n");
+                pr_warn("SMI bus read not valid\n");
                 return -ENODEV;
         }
 
@@ -1148,7 +1148,7 @@ static int smi_bus_write(struct mii_bus *bus, int addr, int reg, u16 val)
         void __iomem *smi_reg = msp->base + SMI_REG;
 
         if (smi_wait_ready(msp)) {
-                printk(KERN_WARNING "mv643xx_eth: SMI bus busy timeout\n");
+                pr_warn("SMI bus busy timeout\n");
                 return -ETIMEDOUT;
         }
 
@@ -1156,7 +1156,7 @@ static int smi_bus_write(struct mii_bus *bus, int addr, int reg, u16 val)
                 (addr << 16) | (val & 0xffff), smi_reg);
 
         if (smi_wait_ready(msp)) {
-                printk(KERN_WARNING "mv643xx_eth: SMI bus busy timeout\n");
+                pr_warn("SMI bus busy timeout\n");
                 return -ETIMEDOUT;
         }
 
@@ -1566,9 +1566,8 @@ mv643xx_eth_set_ringparam(struct net_device *dev, struct ethtool_ringparam *er)
         if (netif_running(dev)) {
                 mv643xx_eth_stop(dev);
                 if (mv643xx_eth_open(dev)) {
-                        dev_printk(KERN_ERR, &dev->dev,
-                                   "fatal error on re-opening device after "
-                                   "ring param change\n");
+                        netdev_err(dev,
+                                   "fatal error on re-opening device after ring param change\n");
                         return -ENOMEM;
                 }
         }
@@ -1874,7 +1873,7 @@ static int rxq_init(struct mv643xx_eth_private *mp, int index)
         }
 
         if (rxq->rx_desc_area == NULL) {
-                dev_printk(KERN_ERR, &mp->dev->dev,
+                netdev_err(mp->dev,
                            "can't allocate rx ring (%d bytes)\n", size);
                 goto out;
         }
@@ -1884,8 +1883,7 @@ static int rxq_init(struct mv643xx_eth_private *mp, int index)
         rxq->rx_skb = kmalloc(rxq->rx_ring_size * sizeof(*rxq->rx_skb),
                                                                 GFP_KERNEL);
         if (rxq->rx_skb == NULL) {
-                dev_printk(KERN_ERR, &mp->dev->dev,
-                           "can't allocate rx skb ring\n");
+                netdev_err(mp->dev, "can't allocate rx skb ring\n");
                 goto out_free;
         }
 
@@ -1944,8 +1942,7 @@ static void rxq_deinit(struct rx_queue *rxq)
         }
 
         if (rxq->rx_desc_count) {
-                dev_printk(KERN_ERR, &mp->dev->dev,
-                           "error freeing rx ring -- %d skbs stuck\n",
+                netdev_err(mp->dev, "error freeing rx ring -- %d skbs stuck\n",
                            rxq->rx_desc_count);
         }
 
@@ -1987,7 +1984,7 @@ static int txq_init(struct mv643xx_eth_private *mp, int index)
         }
 
         if (txq->tx_desc_area == NULL) {
-                dev_printk(KERN_ERR, &mp->dev->dev,
+                netdev_err(mp->dev,
                            "can't allocate tx ring (%d bytes)\n", size);
                 return -ENOMEM;
         }
@@ -2093,7 +2090,7 @@ static void handle_link_event(struct mv643xx_eth_private *mp)
                 if (netif_carrier_ok(dev)) {
                         int i;
 
-                        printk(KERN_INFO "%s: link down\n", dev->name);
+                        netdev_info(dev, "link down\n");
 
                         netif_carrier_off(dev);
 
@@ -2124,10 +2121,8 @@ static void handle_link_event(struct mv643xx_eth_private *mp)
         duplex = (port_status & FULL_DUPLEX) ? 1 : 0;
         fc = (port_status & FLOW_CONTROL_ENABLED) ? 1 : 0;
 
-        printk(KERN_INFO "%s: link up, %d Mb/s, %s duplex, "
-                         "flow control %sabled\n", dev->name,
-                         speed, duplex ? "full" : "half",
-                         fc ? "en" : "dis");
+        netdev_info(dev, "link up, %d Mb/s, %s duplex, flow control %sabled\n",
+                    speed, duplex ? "full" : "half", fc ? "en" : "dis");
 
         if (!netif_carrier_ok(dev))
                 netif_carrier_on(dev);
@@ -2337,7 +2332,7 @@ static int mv643xx_eth_open(struct net_device *dev)
         err = request_irq(dev->irq, mv643xx_eth_irq,
                           IRQF_SHARED, dev->name, dev);
         if (err) {
-                dev_printk(KERN_ERR, &dev->dev, "can't assign irq\n");
+                netdev_err(dev, "can't assign irq\n");
                 return -EAGAIN;
         }
 
@@ -2483,9 +2478,8 @@ static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
          */
         mv643xx_eth_stop(dev);
         if (mv643xx_eth_open(dev)) {
-                dev_printk(KERN_ERR, &dev->dev,
-                           "fatal error on re-opening device after "
-                           "MTU change\n");
+                netdev_err(dev,
+                           "fatal error on re-opening device after MTU change\n");
         }
 
         return 0;
@@ -2508,7 +2502,7 @@ static void mv643xx_eth_tx_timeout(struct net_device *dev)
 {
         struct mv643xx_eth_private *mp = netdev_priv(dev);
 
-        dev_printk(KERN_INFO, &dev->dev, "tx timeout\n");
+        netdev_info(dev, "tx timeout\n");
 
         schedule_work(&mp->tx_timeout_task);
 }
@@ -2603,8 +2597,8 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
         int ret;
 
         if (!mv643xx_eth_version_printed++)
-                printk(KERN_NOTICE "MV-643xx 10/100/1000 ethernet "
-                        "driver version %s\n", mv643xx_eth_driver_version);
+                pr_notice("MV-643xx 10/100/1000 ethernet driver version %s\n",
+                          mv643xx_eth_driver_version);
 
         ret = -EINVAL;
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -2871,14 +2865,12 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
 
         pd = pdev->dev.platform_data;
         if (pd == NULL) {
-                dev_printk(KERN_ERR, &pdev->dev,
-                           "no mv643xx_eth_platform_data\n");
+                dev_err(&pdev->dev, "no mv643xx_eth_platform_data\n");
                 return -ENODEV;
         }
 
         if (pd->shared == NULL) {
-                dev_printk(KERN_ERR, &pdev->dev,
-                           "no mv643xx_eth_platform_data->shared\n");
+                dev_err(&pdev->dev, "no mv643xx_eth_platform_data->shared\n");
                 return -ENODEV;
         }
 
@@ -2957,11 +2949,11 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
         if (err)
                 goto out;
 
-        dev_printk(KERN_NOTICE, &dev->dev, "port %d with MAC address %pM\n",
-                   mp->port_num, dev->dev_addr);
+        netdev_notice(dev, "port %d with MAC address %pM\n",
+                      mp->port_num, dev->dev_addr);
 
         if (mp->tx_desc_sram_size > 0)
-                dev_printk(KERN_NOTICE, &dev->dev, "configured with sram\n");
+                netdev_notice(dev, "configured with sram\n");
 
         return 0;
 
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index ea5cfe2c3a0..673dc600c89 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -253,7 +253,7 @@ struct myri10ge_priv {
         unsigned long serial_number;
         int vendor_specific_offset;
         int fw_multicast_support;
-        unsigned long features;
+        u32 features;
         u32 max_tso6;
         u32 read_dma;
         u32 write_dma;
@@ -1312,17 +1312,26 @@ myri10ge_unmap_rx_page(struct pci_dev *pdev,
                                  * page into an skb */
 
 static inline int
-myri10ge_rx_done(struct myri10ge_slice_state *ss, struct myri10ge_rx_buf *rx,
-                 int bytes, int len, __wsum csum)
+myri10ge_rx_done(struct myri10ge_slice_state *ss, int len, __wsum csum,
+                 int lro_enabled)
 {
         struct myri10ge_priv *mgp = ss->mgp;
         struct sk_buff *skb;
         struct skb_frag_struct rx_frags[MYRI10GE_MAX_FRAGS_PER_FRAME];
-        int i, idx, hlen, remainder;
+        struct myri10ge_rx_buf *rx;
+        int i, idx, hlen, remainder, bytes;
         struct pci_dev *pdev = mgp->pdev;
         struct net_device *dev = mgp->dev;
         u8 *va;
 
+        if (len <= mgp->small_bytes) {
+                rx = &ss->rx_small;
+                bytes = mgp->small_bytes;
+        } else {
+                rx = &ss->rx_big;
+                bytes = mgp->big_bytes;
+        }
+
         len += MXGEFW_PAD;
         idx = rx->cnt & rx->mask;
         va = page_address(rx->info[idx].page) + rx->info[idx].page_offset;
@@ -1341,7 +1350,7 @@ myri10ge_rx_done(struct myri10ge_slice_state *ss, struct myri10ge_rx_buf *rx,
                 remainder -= MYRI10GE_ALLOC_SIZE;
         }
 
-        if (dev->features & NETIF_F_LRO) {
+        if (lro_enabled) {
                 rx_frags[0].page_offset += MXGEFW_PAD;
                 rx_frags[0].size -= MXGEFW_PAD;
                 len -= MXGEFW_PAD;
@@ -1463,7 +1472,7 @@ myri10ge_clean_rx_done(struct myri10ge_slice_state *ss, int budget)
 {
         struct myri10ge_rx_done *rx_done = &ss->rx_done;
         struct myri10ge_priv *mgp = ss->mgp;
-        struct net_device *netdev = mgp->dev;
+
         unsigned long rx_bytes = 0;
         unsigned long rx_packets = 0;
         unsigned long rx_ok;
@@ -1474,18 +1483,18 @@ myri10ge_clean_rx_done(struct myri10ge_slice_state *ss, int budget)
         u16 length;
         __wsum checksum;
 
+        /*
+         * Prevent compiler from generating more than one ->features memory
+         * access to avoid theoretical race condition with functions that
+         * change NETIF_F_LRO flag at runtime.
+         */
+        bool lro_enabled = ACCESS_ONCE(mgp->dev->features) & NETIF_F_LRO;
+
         while (rx_done->entry[idx].length != 0 && work_done < budget) {
                 length = ntohs(rx_done->entry[idx].length);
                 rx_done->entry[idx].length = 0;
                 checksum = csum_unfold(rx_done->entry[idx].checksum);
-                if (length <= mgp->small_bytes)
-                        rx_ok = myri10ge_rx_done(ss, &ss->rx_small,
-                                                 mgp->small_bytes,
-                                                 length, checksum);
-                else
-                        rx_ok = myri10ge_rx_done(ss, &ss->rx_big,
-                                                 mgp->big_bytes,
-                                                 length, checksum);
+                rx_ok = myri10ge_rx_done(ss, length, checksum, lro_enabled);
                 rx_packets += rx_ok;
                 rx_bytes += rx_ok * (unsigned long)length;
                 cnt++;
@@ -1497,7 +1506,7 @@ myri10ge_clean_rx_done(struct myri10ge_slice_state *ss, int budget)
         ss->stats.rx_packets += rx_packets;
         ss->stats.rx_bytes += rx_bytes;
 
-        if (netdev->features & NETIF_F_LRO)
+        if (lro_enabled)
                 lro_flush_all(&rx_done->lro_mgr);
 
         /* restock receive rings if needed */
@@ -1776,7 +1785,7 @@ static int myri10ge_set_rx_csum(struct net_device *netdev, u32 csum_enabled)
 static int myri10ge_set_tso(struct net_device *netdev, u32 tso_enabled)
 {
         struct myri10ge_priv *mgp = netdev_priv(netdev);
-        unsigned long flags = mgp->features & (NETIF_F_TSO6 | NETIF_F_TSO);
+        u32 flags = mgp->features & (NETIF_F_TSO6 | NETIF_F_TSO);
 
         if (tso_enabled)
                 netdev->features |= flags;
@@ -3645,6 +3654,7 @@ static void myri10ge_free_slices(struct myri10ge_priv *mgp)
                         dma_free_coherent(&pdev->dev, bytes,
                                           ss->fw_stats, ss->fw_stats_bus);
                         ss->fw_stats = NULL;
+                        netif_napi_del(&ss->napi);
                 }
         }
         kfree(mgp->ss);
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 4846e131a04..a761076b69c 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -926,7 +926,7 @@ static const struct net_device_ops myri_ops = {
         .ndo_validate_addr      = eth_validate_addr,
 };
 
-static int __devinit myri_sbus_probe(struct platform_device *op, const struct of_device_id *match)
+static int __devinit myri_sbus_probe(struct platform_device *op)
 {
         struct device_node *dp = op->dev.of_node;
         static unsigned version_printed;
@@ -1160,7 +1160,7 @@ static const struct of_device_id myri_sbus_match[] = {
 
 MODULE_DEVICE_TABLE(of, myri_sbus_match);
 
-static struct of_platform_driver myri_sbus_driver = {
+static struct platform_driver myri_sbus_driver = {
         .driver = {
                 .name = "myri",
                 .owner = THIS_MODULE,
@@ -1172,12 +1172,12 @@ static struct of_platform_driver myri_sbus_driver = {
 
 static int __init myri_sbus_init(void)
 {
-        return of_register_platform_driver(&myri_sbus_driver);
+        return platform_driver_register(&myri_sbus_driver);
 }
 
 static void __exit myri_sbus_exit(void)
 {
-        of_unregister_platform_driver(&myri_sbus_driver);
+        platform_driver_unregister(&myri_sbus_driver);
 }
 
 module_init(myri_sbus_init);
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index a11380544e6..d7299f1a494 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -739,7 +739,8 @@ struct netxen_recv_context {
 #define NX_CDRP_CMD_READ_PEXQ_PARAMETERS        0x0000001c
 #define NX_CDRP_CMD_GET_LIC_CAPABILITIES        0x0000001d
 #define NX_CDRP_CMD_READ_MAX_LRO_PER_BOARD      0x0000001e
-#define NX_CDRP_CMD_MAX                         0x0000001f
+#define NX_CDRP_CMD_CONFIG_GBE_PORT             0x0000001f
+#define NX_CDRP_CMD_MAX                         0x00000020
 
 #define NX_RCODE_SUCCESS                0
 #define NX_RCODE_NO_HOST_MEM            1
@@ -1054,6 +1055,7 @@ typedef struct {
 #define NX_FW_CAPABILITY_BDG                    (1 << 8)
 #define NX_FW_CAPABILITY_FVLANTX                (1 << 9)
 #define NX_FW_CAPABILITY_HW_LRO                 (1 << 10)
+#define NX_FW_CAPABILITY_GBE_LINK_CFG           (1 << 11)
 
 /* module types */
 #define LINKEVENT_MODULE_NOT_PRESENT                    1
@@ -1349,6 +1351,8 @@ void netxen_advert_link_change(struct netxen_adapter *adapter, int linkup);
 void netxen_pci_camqm_read_2M(struct netxen_adapter *, u64, u64 *);
 void netxen_pci_camqm_write_2M(struct netxen_adapter *, u64, u64);
 
+int nx_fw_cmd_set_gbe_port(struct netxen_adapter *adapter,
+                                u32 speed, u32 duplex, u32 autoneg);
 int nx_fw_cmd_set_mtu(struct netxen_adapter *adapter, int mtu);
 int netxen_nic_change_mtu(struct net_device *netdev, int new_mtu);
 int netxen_config_hw_lro(struct netxen_adapter *adapter, int enable);
diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/netxen/netxen_nic_ctx.c
index f7d06cbc70a..f16966afa64 100644
--- a/drivers/net/netxen/netxen_nic_ctx.c
+++ b/drivers/net/netxen/netxen_nic_ctx.c
@@ -112,6 +112,21 @@ nx_fw_cmd_set_mtu(struct netxen_adapter *adapter, int mtu)
         return 0;
 }
 
+int
+nx_fw_cmd_set_gbe_port(struct netxen_adapter *adapter,
+                        u32 speed, u32 duplex, u32 autoneg)
+{
+
+        return netxen_issue_cmd(adapter,
+                                adapter->ahw.pci_func,
+                                NXHAL_VERSION,
+                                speed,
+                                duplex,
+                                autoneg,
+                                NX_CDRP_CMD_CONFIG_GBE_PORT);
+
+}
+
 static int
 nx_fw_cmd_create_rx_ctx(struct netxen_adapter *adapter)
 {
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index 587498e140b..3bdcc803ec6 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -214,7 +214,6 @@ skip:
                         check_sfp_module = netif_running(dev) &&
                                 adapter->has_link_events;
                 } else {
-                        ecmd->autoneg = AUTONEG_ENABLE;
                         ecmd->supported |= (SUPPORTED_TP |SUPPORTED_Autoneg);
                         ecmd->advertising |=
                                 (ADVERTISED_TP | ADVERTISED_Autoneg);
@@ -252,53 +251,24 @@ static int
 netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
         struct netxen_adapter *adapter = netdev_priv(dev);
-        __u32 status;
+        int ret;
 
-        /* read which mode */
-        if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
-                /* autonegotiation */
-                if (adapter->phy_write &&
-                    adapter->phy_write(adapter,
-                                       NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
-                                       ecmd->autoneg) != 0)
-                        return -EIO;
-                else
-                        adapter->link_autoneg = ecmd->autoneg;
+        if (adapter->ahw.port_type != NETXEN_NIC_GBE)
+                return -EOPNOTSUPP;
 
-                if (adapter->phy_read &&
-                    adapter->phy_read(adapter,
-                                      NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
-                                      &status) != 0)
-                        return -EIO;
+        if (!(adapter->capabilities & NX_FW_CAPABILITY_GBE_LINK_CFG))
+                return -EOPNOTSUPP;
 
-                /* speed */
-                switch (ecmd->speed) {
-                case SPEED_10:
-                        netxen_set_phy_speed(status, 0);
-                        break;
-                case SPEED_100:
-                        netxen_set_phy_speed(status, 1);
-                        break;
-                case SPEED_1000:
-                        netxen_set_phy_speed(status, 2);
-                        break;
-                }
-                /* set duplex mode */
-                if (ecmd->duplex == DUPLEX_HALF)
-                        netxen_clear_phy_duplex(status);
-                if (ecmd->duplex == DUPLEX_FULL)
-                        netxen_set_phy_duplex(status);
-                if (adapter->phy_write &&
-                    adapter->phy_write(adapter,
-                                       NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
-                                       *((int *)&status)) != 0)
-                        return -EIO;
-                else {
-                        adapter->link_speed = ecmd->speed;
-                        adapter->link_duplex = ecmd->duplex;
-                }
-        } else
+        ret = nx_fw_cmd_set_gbe_port(adapter, ecmd->speed, ecmd->duplex,
+                                     ecmd->autoneg);
+        if (ret == NX_RCODE_NOT_SUPPORTED)
                 return -EOPNOTSUPP;
+        else if (ret)
+                return -EIO;
+
+        adapter->link_speed = ecmd->speed;
+        adapter->link_duplex = ecmd->duplex;
+        adapter->link_autoneg = ecmd->autoneg;
 
         if (!netif_running(dev))
                 return 0;
@@ -901,7 +871,7 @@ static int netxen_nic_set_flags(struct net_device *netdev, u32 data)
         struct netxen_adapter *adapter = netdev_priv(netdev);
         int hw_lro;
 
-        if (data & ~ETH_FLAG_LRO)
+        if (ethtool_invalid_flags(netdev, data, ETH_FLAG_LRO))
                 return -EINVAL;
 
         if (!(adapter->capabilities & NX_FW_CAPABILITY_HW_LRO))
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 33fac32e0d9..83348dc4b18 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1032,6 +1032,9 @@ __netxen_nic_down(struct netxen_adapter *adapter, struct net_device *netdev)
         netif_carrier_off(netdev);
         netif_tx_disable(netdev);
 
+        if (adapter->capabilities & NX_FW_CAPABILITY_LINK_NOTIFICATION)
+                netxen_linkevent_request(adapter, 0);
+
         if (adapter->stop_port)
                 adapter->stop_port(adapter);
 
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 2541321bad8..32678b6c6b3 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -4489,6 +4489,9 @@ static int niu_alloc_channels(struct niu *np)
 {
         struct niu_parent *parent = np->parent;
         int first_rx_channel, first_tx_channel;
+        int num_rx_rings, num_tx_rings;
+        struct rx_ring_info *rx_rings;
+        struct tx_ring_info *tx_rings;
         int i, port, err;
 
         port = np->port;
@@ -4498,18 +4501,21 @@ static int niu_alloc_channels(struct niu *np)
                 first_tx_channel += parent->txchan_per_port[i];
         }
 
-        np->num_rx_rings = parent->rxchan_per_port[port];
-        np->num_tx_rings = parent->txchan_per_port[port];
+        num_rx_rings = parent->rxchan_per_port[port];
+        num_tx_rings = parent->txchan_per_port[port];
 
-        netif_set_real_num_rx_queues(np->dev, np->num_rx_rings);
-        netif_set_real_num_tx_queues(np->dev, np->num_tx_rings);
-
-        np->rx_rings = kcalloc(np->num_rx_rings, sizeof(struct rx_ring_info),
-                               GFP_KERNEL);
+        rx_rings = kcalloc(num_rx_rings, sizeof(struct rx_ring_info),
+                           GFP_KERNEL);
         err = -ENOMEM;
-        if (!np->rx_rings)
+        if (!rx_rings)
                 goto out_err;
 
+        np->num_rx_rings = num_rx_rings;
+        smp_wmb();
+        np->rx_rings = rx_rings;
+
+        netif_set_real_num_rx_queues(np->dev, num_rx_rings);
+
         for (i = 0; i < np->num_rx_rings; i++) {
                 struct rx_ring_info *rp = &np->rx_rings[i];
 
@@ -4538,12 +4544,18 @@ static int niu_alloc_channels(struct niu *np)
                         return err;
         }
 
-        np->tx_rings = kcalloc(np->num_tx_rings, sizeof(struct tx_ring_info),
-                               GFP_KERNEL);
+        tx_rings = kcalloc(num_tx_rings, sizeof(struct tx_ring_info),
+                           GFP_KERNEL);
         err = -ENOMEM;
-        if (!np->tx_rings)
+        if (!tx_rings)
                 goto out_err;
 
+        np->num_tx_rings = num_tx_rings;
+        smp_wmb();
+        np->tx_rings = tx_rings;
+
+        netif_set_real_num_tx_queues(np->dev, num_tx_rings);
+
         for (i = 0; i < np->num_tx_rings; i++) {
                 struct tx_ring_info *rp = &np->tx_rings[i];
 
@@ -6246,11 +6258,17 @@ static void niu_sync_mac_stats(struct niu *np)
 static void niu_get_rx_stats(struct niu *np)
 {
         unsigned long pkts, dropped, errors, bytes;
+        struct rx_ring_info *rx_rings;
         int i;
 
         pkts = dropped = errors = bytes = 0;
+
+        rx_rings = ACCESS_ONCE(np->rx_rings);
+        if (!rx_rings)
+                goto no_rings;
+
         for (i = 0; i < np->num_rx_rings; i++) {
-                struct rx_ring_info *rp = &np->rx_rings[i];
+                struct rx_ring_info *rp = &rx_rings[i];
 
                 niu_sync_rx_discard_stats(np, rp, 0);
 
@@ -6259,6 +6277,8 @@ static void niu_get_rx_stats(struct niu *np)
                 dropped += rp->rx_dropped;
                 errors += rp->rx_errors;
         }
+
+no_rings:
         np->dev->stats.rx_packets = pkts;
         np->dev->stats.rx_bytes = bytes;
         np->dev->stats.rx_dropped = dropped;
@@ -6268,16 +6288,24 @@ static void niu_get_rx_stats(struct niu *np)
 static void niu_get_tx_stats(struct niu *np)
 {
         unsigned long pkts, errors, bytes;
+        struct tx_ring_info *tx_rings;
         int i;
 
         pkts = errors = bytes = 0;
+
+        tx_rings = ACCESS_ONCE(np->tx_rings);
+        if (!tx_rings)
+                goto no_rings;
+
         for (i = 0; i < np->num_tx_rings; i++) {
-                struct tx_ring_info *rp = &np->tx_rings[i];
+                struct tx_ring_info *rp = &tx_rings[i];
 
                 pkts += rp->tx_packets;
                 bytes += rp->tx_bytes;
                 errors += rp->tx_errors;
         }
+
+no_rings:
         np->dev->stats.tx_packets = pkts;
         np->dev->stats.tx_bytes = bytes;
         np->dev->stats.tx_errors = errors;
@@ -6287,9 +6315,10 @@ static struct net_device_stats *niu_get_stats(struct net_device *dev)
 {
         struct niu *np = netdev_priv(dev);
 
-        niu_get_rx_stats(np);
-        niu_get_tx_stats(np);
-
+        if (netif_running(dev)) {
+                niu_get_rx_stats(np);
+                niu_get_tx_stats(np);
+        }
         return &dev->stats;
 }
 
@@ -9472,7 +9501,7 @@ static struct niu_parent * __devinit niu_new_parent(struct niu *np,
         struct niu_parent *p;
         int i;
 
-        plat_dev = platform_device_register_simple("niu", niu_parent_index,
+        plat_dev = platform_device_register_simple("niu-board", niu_parent_index,
                                                    NULL, 0);
         if (IS_ERR(plat_dev))
                 return NULL;
@@ -10033,8 +10062,7 @@ static const struct niu_ops niu_phys_ops = {
         .unmap_single   = niu_phys_unmap_single,
 };
 
-static int __devinit niu_of_probe(struct platform_device *op,
-                                  const struct of_device_id *match)
+static int __devinit niu_of_probe(struct platform_device *op)
 {
         union niu_parent_id parent_id;
         struct net_device *dev;
@@ -10194,7 +10222,7 @@ static const struct of_device_id niu_match[] = {
 };
 MODULE_DEVICE_TABLE(of, niu_match);
 
-static struct of_platform_driver niu_of_driver = {
+static struct platform_driver niu_of_driver = {
         .driver = {
                 .name = "niu",
                 .owner = THIS_MODULE,
@@ -10215,14 +10243,14 @@ static int __init niu_init(void)
         niu_debug = netif_msg_init(debug, NIU_MSG_DEFAULT);
 
 #ifdef CONFIG_SPARC64
-        err = of_register_platform_driver(&niu_of_driver);
+        err = platform_driver_register(&niu_of_driver);
 #endif
 
         if (!err) {
                 err = pci_register_driver(&niu_pci_driver);
 #ifdef CONFIG_SPARC64
                 if (err)
-                        of_unregister_platform_driver(&niu_of_driver);
+                        platform_driver_unregister(&niu_of_driver);
 #endif
         }
 
@@ -10233,7 +10261,7 @@ static void __exit niu_exit(void)
 {
         pci_unregister_driver(&niu_pci_driver);
 #ifdef CONFIG_SPARC64
-        of_unregister_platform_driver(&niu_of_driver);
+        platform_driver_unregister(&niu_of_driver);
 #endif
 }
 
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 84134c766f3..a41b2cf4d91 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1988,12 +1988,11 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev,
         }
 
         ndev = alloc_etherdev(sizeof(struct ns83820));
-        dev = PRIV(ndev);
-
         err = -ENOMEM;
-        if (!dev)
+        if (!ndev)
                 goto out;
 
+        dev = PRIV(ndev);
         dev->ndev = ndev;
 
         spin_lock_init(&dev->rx_info.lock);
diff --git a/drivers/net/pch_gbe/pch_gbe.h b/drivers/net/pch_gbe/pch_gbe.h
index a0c26a99520..e1e33c80fb2 100644
--- a/drivers/net/pch_gbe/pch_gbe.h
+++ b/drivers/net/pch_gbe/pch_gbe.h
@@ -73,7 +73,7 @@ struct pch_gbe_regs {
         struct pch_gbe_regs_mac_adr mac_adr[16];
         u32 ADDR_MASK;
         u32 MIIM;
-        u32 reserve2;
+        u32 MAC_ADDR_LOAD;
         u32 RGMII_ST;
         u32 RGMII_CTRL;
         u32 reserve3[3];
diff --git a/drivers/net/pch_gbe/pch_gbe_main.c b/drivers/net/pch_gbe/pch_gbe_main.c
index d7355306a73..50986840c99 100644
--- a/drivers/net/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/pch_gbe/pch_gbe_main.c
@@ -29,6 +29,7 @@ const char pch_driver_version[] = DRV_VERSION;
 #define PCH_GBE_SHORT_PKT               64
 #define DSC_INIT16                      0xC000
 #define PCH_GBE_DMA_ALIGN               0
+#define PCH_GBE_DMA_PADDING             2
 #define PCH_GBE_WATCHDOG_PERIOD         (1 * HZ)        /* watchdog time */
 #define PCH_GBE_COPYBREAK_DEFAULT       256
 #define PCH_GBE_PCI_BAR                 1
@@ -88,6 +89,12 @@ static unsigned int copybreak __read_mostly = PCH_GBE_COPYBREAK_DEFAULT;
 static int pch_gbe_mdio_read(struct net_device *netdev, int addr, int reg);
 static void pch_gbe_mdio_write(struct net_device *netdev, int addr, int reg,
                                int data);
+
+inline void pch_gbe_mac_load_mac_addr(struct pch_gbe_hw *hw)
+{
+        iowrite32(0x01, &hw->reg->MAC_ADDR_LOAD);
+}
+
 /**
  * pch_gbe_mac_read_mac_addr - Read MAC address
  * @hw:             Pointer to the HW structure
@@ -519,7 +526,9 @@ static void pch_gbe_reset_task(struct work_struct *work)
         struct pch_gbe_adapter *adapter;
         adapter = container_of(work, struct pch_gbe_adapter, reset_task);
 
+        rtnl_lock();
         pch_gbe_reinit_locked(adapter);
+        rtnl_unlock();
 }
 
 /**
@@ -528,14 +537,8 @@ static void pch_gbe_reset_task(struct work_struct *work)
  */
 void pch_gbe_reinit_locked(struct pch_gbe_adapter *adapter)
 {
-        struct net_device *netdev = adapter->netdev;
-
-        rtnl_lock();
-        if (netif_running(netdev)) {
-                pch_gbe_down(adapter);
-                pch_gbe_up(adapter);
-        }
-        rtnl_unlock();
+        pch_gbe_down(adapter);
+        pch_gbe_up(adapter);
 }
 
 /**
@@ -1369,16 +1372,13 @@ pch_gbe_clean_rx(struct pch_gbe_adapter *adapter,
         struct pch_gbe_buffer *buffer_info;
         struct pch_gbe_rx_desc *rx_desc;
         u32 length;
-        unsigned char tmp_packet[ETH_HLEN];
         unsigned int i;
         unsigned int cleaned_count = 0;
         bool cleaned = false;
-        struct sk_buff *skb;
+        struct sk_buff *skb, *new_skb;
         u8 dma_status;
         u16 gbec_status;
         u32 tcp_ip_status;
-        u8 skb_copy_flag = 0;
-        u8 skb_padding_flag = 0;
 
         i = rx_ring->next_to_clean;
 
@@ -1422,55 +1422,70 @@ pch_gbe_clean_rx(struct pch_gbe_adapter *adapter,
                         pr_err("Receive CRC Error\n");
                 } else {
                         /* get receive length */
-                        /* length convert[-3], padding[-2] */
-                        length = (rx_desc->rx_words_eob) - 3 - 2;
+                        /* length convert[-3] */
+                        length = (rx_desc->rx_words_eob) - 3;
 
                         /* Decide the data conversion method */
                         if (!adapter->rx_csum) {
                                 /* [Header:14][payload] */
-                                skb_padding_flag = 0;
-                                skb_copy_flag = 1;
+                                if (NET_IP_ALIGN) {
+                                        /* Because alignment differs,
+                                         * the new_skb is newly allocated,
+                                         * and data is copied to new_skb.*/
+                                        new_skb = netdev_alloc_skb(netdev,
+                                                         length + NET_IP_ALIGN);
+                                        if (!new_skb) {
+                                                /* dorrop error */
+                                                pr_err("New skb allocation "
+                                                        "Error\n");
+                                                goto dorrop;
+                                        }
+                                        skb_reserve(new_skb, NET_IP_ALIGN);
+                                        memcpy(new_skb->data, skb->data,
+                                               length);
+                                        skb = new_skb;
+                                } else {
+                                        /* DMA buffer is used as SKB as it is.*/
+                                        buffer_info->skb = NULL;
+                                }
                         } else {
                                 /* [Header:14][padding:2][payload] */
-                                skb_padding_flag = 1;
-                                if (length < copybreak)
-                                        skb_copy_flag = 1;
-                                else
-                                        skb_copy_flag = 0;
-                        }
-
-                        /* Data conversion */
-                        if (skb_copy_flag) {    /* recycle  skb */
-                                struct sk_buff *new_skb;
-                                new_skb =
-                                    netdev_alloc_skb(netdev,
-                                                     length + NET_IP_ALIGN);
-                                if (new_skb) {
-                                        if (!skb_padding_flag) {
-                                                skb_reserve(new_skb,
-                                                                NET_IP_ALIGN);
+                                /* The length includes padding length */
+                                length = length - PCH_GBE_DMA_PADDING;
+                                if ((length < copybreak) ||
+                                    (NET_IP_ALIGN != PCH_GBE_DMA_PADDING)) {
+                                        /* Because alignment differs,
+                                         * the new_skb is newly allocated,
+                                         * and data is copied to new_skb.
+                                         * Padding data is deleted
+                                         * at the time of a copy.*/
+                                        new_skb = netdev_alloc_skb(netdev,
+                                                         length + NET_IP_ALIGN);
+                                        if (!new_skb) {
+                                                /* dorrop error */
+                                                pr_err("New skb allocation "
+                                                        "Error\n");
+                                                goto dorrop;
                                         }
+                                        skb_reserve(new_skb, NET_IP_ALIGN);
                                         memcpy(new_skb->data, skb->data,
-                                                length);
-                                        /* save the skb
-                                         * in buffer_info as good */
+                                               ETH_HLEN);
+                                        memcpy(&new_skb->data[ETH_HLEN],
+                                               &skb->data[ETH_HLEN +
+                                               PCH_GBE_DMA_PADDING],
+                                               length - ETH_HLEN);
                                         skb = new_skb;
-                                } else if (!skb_padding_flag) {
-                                        /* dorrop error */
-                                        pr_err("New skb allocation Error\n");
-                                        goto dorrop;
+                                } else {
+                                        /* Padding data is deleted
+                                         * by moving header data.*/
+                                        memmove(&skb->data[PCH_GBE_DMA_PADDING],
+                                                &skb->data[0], ETH_HLEN);
+                                        skb_reserve(skb, NET_IP_ALIGN);
+                                        buffer_info->skb = NULL;
                                 }
-                        } else {
-                                buffer_info->skb = NULL;
-                        }
-                        if (skb_padding_flag) {
-                                memcpy(&tmp_packet[0], &skb->data[0], ETH_HLEN);
-                                memcpy(&skb->data[NET_IP_ALIGN], &tmp_packet[0],
-                                        ETH_HLEN);
-                                skb_reserve(skb, NET_IP_ALIGN);
-
                         }
-
+                        /* The length includes FCS length */
+                        length = length - ETH_FCS_LEN;
                         /* update status of driver */
                         adapter->stats.rx_bytes += length;
                         adapter->stats.rx_packets++;
@@ -2247,7 +2262,7 @@ static void pch_gbe_remove(struct pci_dev *pdev)
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct pch_gbe_adapter *adapter = netdev_priv(netdev);
 
-        flush_scheduled_work();
+        cancel_work_sync(&adapter->reset_task);
         unregister_netdev(netdev);
 
         pch_gbe_hal_phy_hw_reset(&adapter->hw);
@@ -2322,6 +2337,7 @@ static int pch_gbe_probe(struct pci_dev *pdev,
         netdev->features = NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_GRO;
         pch_gbe_set_ethtool_ops(netdev);
 
+        pch_gbe_mac_load_mac_addr(&adapter->hw);
         pch_gbe_mac_reset_hw(&adapter->hw);
 
         /* setup the private structure */
@@ -2425,12 +2441,12 @@ static struct pci_error_handlers pch_gbe_err_handler = {
         .resume = pch_gbe_io_resume
 };
 
-static struct pci_driver pch_gbe_pcidev = {
+static struct pci_driver pch_gbe_driver = {
         .name = KBUILD_MODNAME,
         .id_table = pch_gbe_pcidev_id,
         .probe = pch_gbe_probe,
         .remove = pch_gbe_remove,
-#ifdef CONFIG_PM_OPS
+#ifdef CONFIG_PM
         .driver.pm = &pch_gbe_pm_ops,
 #endif
         .shutdown = pch_gbe_shutdown,
@@ -2442,7 +2458,7 @@ static int __init pch_gbe_init_module(void)
 {
         int ret;
 
-        ret = pci_register_driver(&pch_gbe_pcidev);
+        ret = pci_register_driver(&pch_gbe_driver);
         if (copybreak != PCH_GBE_COPYBREAK_DEFAULT) {
                 if (copybreak == 0) {
                         pr_info("copybreak disabled\n");
@@ -2456,7 +2472,7 @@ static int __init pch_gbe_init_module(void)
 
 static void __exit pch_gbe_exit_module(void)
 {
-        pci_unregister_driver(&pch_gbe_pcidev);
+        pci_unregister_driver(&pch_gbe_driver);
 }
 
 module_init(pch_gbe_init_module);
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 1f42f6ac855..d3cb7720586 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1488,12 +1488,10 @@ static void ei_rx_overrun(struct net_device *dev)
     
         /* 
          * Wait a full Tx time (1.2ms) + some guard time, NS says 1.6ms total.
-         * Early datasheets said to poll the reset bit, but now they say that
-         * it "is not a reliable indicator and subsequently should be ignored."
-         * We wait at least 10ms.
+         * We wait at least 2ms.
          */
 
-        mdelay(10);
+        mdelay(2);
 
         /*
          * Reset RBCR[01] back to zero as per magic incantation.
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 9226cda4d05..530ab5a10bd 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -691,6 +691,7 @@ static struct pcmcia_device_id fmvj18x_ids[] = {
         PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0e0a),
         PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x0e01),
         PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x0a05),
+        PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x0b05),
         PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x1101),
         PCMCIA_DEVICE_NULL,
 };
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 35fda5ac812..392a6c4b72e 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -77,7 +77,6 @@ config NATIONAL_PHY
           Currently supports the DP83865 PHY.
 
 config STE10XP
-        depends on PHYLIB
         tristate "Driver for STMicroelectronics STe10Xp PHYs"
         ---help---
           This is the driver for the STe100p and STe101p PHYs.
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index f62c7b717bc..47c8339a035 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -188,8 +188,7 @@ static int __devexit mdio_gpio_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF_GPIO
 
-static int __devinit mdio_ofgpio_probe(struct platform_device *ofdev,
-                                        const struct of_device_id *match)
+static int __devinit mdio_ofgpio_probe(struct platform_device *ofdev)
 {
         struct mdio_gpio_platform_data *pdata;
         struct mii_bus *new_bus;
@@ -240,7 +239,7 @@ static struct of_device_id mdio_ofgpio_match[] = {
 };
 MODULE_DEVICE_TABLE(of, mdio_ofgpio_match);
 
-static struct of_platform_driver mdio_ofgpio_driver = {
+static struct platform_driver mdio_ofgpio_driver = {
         .driver = {
                 .name = "mdio-gpio",
                 .owner = THIS_MODULE,
@@ -252,12 +251,12 @@ static struct of_platform_driver mdio_ofgpio_driver = {
 
 static inline int __init mdio_ofgpio_init(void)
 {
-        return of_register_platform_driver(&mdio_ofgpio_driver);
+        return platform_driver_register(&mdio_ofgpio_driver);
 }
 
 static inline void __exit mdio_ofgpio_exit(void)
 {
-        of_unregister_platform_driver(&mdio_ofgpio_driver);
+        platform_driver_unregister(&mdio_ofgpio_driver);
 }
 #else
 static inline int __init mdio_ofgpio_init(void) { return 0; }
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 0fd1678bc5a..590f902deb6 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -19,13 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/phy.h>
-
-#define PHY_ID_KSZ9021                  0x00221611
-#define PHY_ID_KS8737                   0x00221720
-#define PHY_ID_KS8041                   0x00221510
-#define PHY_ID_KS8051                   0x00221550
-/* both for ks8001 Rev. A/B, and for ks8721 Rev 3. */
-#define PHY_ID_KS8001                   0x0022161A
+#include <linux/micrel_phy.h>
 
 /* general Interrupt control/status reg in vendor specific block. */
 #define MII_KSZPHY_INTCS                        0x1B
@@ -46,6 +40,7 @@
 #define KSZPHY_CTRL_INT_ACTIVE_HIGH             (1 << 9)
 #define KSZ9021_CTRL_INT_ACTIVE_HIGH            (1 << 14)
 #define KS8737_CTRL_INT_ACTIVE_HIGH             (1 << 14)
+#define KSZ8051_RMII_50MHZ_CLK                  (1 << 7)
 
 static int kszphy_ack_interrupt(struct phy_device *phydev)
 {
@@ -106,6 +101,19 @@ static int kszphy_config_init(struct phy_device *phydev)
         return 0;
 }
 
+static int ks8051_config_init(struct phy_device *phydev)
+{
+        int regval;
+
+        if (phydev->dev_flags & MICREL_PHY_50MHZ_CLK) {
+                regval = phy_read(phydev, MII_KSZPHY_CTRL);
+                regval |= KSZ8051_RMII_50MHZ_CLK;
+                phy_write(phydev, MII_KSZPHY_CTRL, regval);
+        }
+
+        return 0;
+}
+
 static struct phy_driver ks8737_driver = {
         .phy_id         = PHY_ID_KS8737,
         .phy_id_mask    = 0x00fffff0,
@@ -142,7 +150,7 @@ static struct phy_driver ks8051_driver = {
         .features       = (PHY_BASIC_FEATURES | SUPPORTED_Pause
                                 | SUPPORTED_Asym_Pause),
         .flags          = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
-        .config_init    = kszphy_config_init,
+        .config_init    = ks8051_config_init,
         .config_aneg    = genphy_config_aneg,
         .read_status    = genphy_read_status,
         .ack_interrupt  = kszphy_ack_interrupt,
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index a8445c72fc1..f7670330f98 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -319,7 +319,8 @@ int phy_mii_ioctl(struct phy_device *phydev,
                 /* fall through */
 
         case SIOCGMIIREG:
-                mii_data->val_out = phy_read(phydev, mii_data->reg_num);
+                mii_data->val_out = mdiobus_read(phydev->bus, mii_data->phy_id,
+                                                 mii_data->reg_num);
                 break;
 
         case SIOCSMIIREG:
@@ -350,8 +351,9 @@ int phy_mii_ioctl(struct phy_device *phydev,
                         }
                 }
 
-                phy_write(phydev, mii_data->reg_num, val);
-                
+                mdiobus_write(phydev->bus, mii_data->phy_id,
+                              mii_data->reg_num, val);
+
                 if (mii_data->reg_num == MII_BMCR &&
                     val & BMCR_RESET &&
                     phydev->drv->config_init) {
diff --git a/drivers/net/ppp_deflate.c b/drivers/net/ppp_deflate.c
index 43583309a65..31e9407a073 100644
--- a/drivers/net/ppp_deflate.c
+++ b/drivers/net/ppp_deflate.c
@@ -129,7 +129,7 @@ static void *z_comp_alloc(unsigned char *options, int opt_len)
 
         state->strm.next_in   = NULL;
         state->w_size         = w_size;
-        state->strm.workspace = vmalloc(zlib_deflate_workspacesize());
+        state->strm.workspace = vmalloc(zlib_deflate_workspacesize(-w_size, 8));
         if (state->strm.workspace == NULL)
                 goto out_free;
 
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index c7a6c446697..9f6d670748d 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -592,8 +592,8 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         ppp_release(NULL, file);
                         err = 0;
                 } else
-                        printk(KERN_DEBUG "PPPIOCDETACH file->f_count=%ld\n",
-                               atomic_long_read(&file->f_count));
+                        pr_warn("PPPIOCDETACH file->f_count=%ld\n",
+                                atomic_long_read(&file->f_count));
                 mutex_unlock(&ppp_mutex);
                 return err;
         }
@@ -630,7 +630,7 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
         if (pf->kind != INTERFACE) {
                 /* can't happen */
-                printk(KERN_ERR "PPP: not interface or channel??\n");
+                pr_err("PPP: not interface or channel??\n");
                 return -EINVAL;
         }
 
@@ -704,7 +704,8 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 }
                 vj = slhc_init(val2+1, val+1);
                 if (!vj) {
-                        printk(KERN_ERR "PPP: no memory (VJ compressor)\n");
+                        netdev_err(ppp->dev,
+                                   "PPP: no memory (VJ compressor)\n");
                         err = -ENOMEM;
                         break;
                 }
@@ -898,17 +899,17 @@ static int __init ppp_init(void)
 {
         int err;
 
-        printk(KERN_INFO "PPP generic driver version " PPP_VERSION "\n");
+        pr_info("PPP generic driver version " PPP_VERSION "\n");
 
         err = register_pernet_device(&ppp_net_ops);
         if (err) {
-                printk(KERN_ERR "failed to register PPP pernet device (%d)\n", err);
+                pr_err("failed to register PPP pernet device (%d)\n", err);
                 goto out;
         }
 
         err = register_chrdev(PPP_MAJOR, "ppp", &ppp_device_fops);
         if (err) {
-                printk(KERN_ERR "failed to register PPP device (%d)\n", err);
+                pr_err("failed to register PPP device (%d)\n", err);
                 goto out_net;
         }
 
@@ -1078,7 +1079,7 @@ pad_compress_skb(struct ppp *ppp, struct sk_buff *skb)
         new_skb = alloc_skb(new_skb_size, GFP_ATOMIC);
         if (!new_skb) {
                 if (net_ratelimit())
-                        printk(KERN_ERR "PPP: no memory (comp pkt)\n");
+                        netdev_err(ppp->dev, "PPP: no memory (comp pkt)\n");
                 return NULL;
         }
         if (ppp->dev->hard_header_len > PPP_HDRLEN)
@@ -1108,7 +1109,7 @@ pad_compress_skb(struct ppp *ppp, struct sk_buff *skb)
                  * the same number.
                  */
                 if (net_ratelimit())
-                        printk(KERN_ERR "ppp: compressor dropped pkt\n");
+                        netdev_err(ppp->dev, "ppp: compressor dropped pkt\n");
                 kfree_skb(skb);
                 kfree_skb(new_skb);
                 new_skb = NULL;
@@ -1138,7 +1139,9 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
                 if (ppp->pass_filter &&
                     sk_run_filter(skb, ppp->pass_filter) == 0) {
                         if (ppp->debug & 1)
-                                printk(KERN_DEBUG "PPP: outbound frame not passed\n");
+                                netdev_printk(KERN_DEBUG, ppp->dev,
+                                              "PPP: outbound frame "
+                                              "not passed\n");
                         kfree_skb(skb);
                         return;
                 }
@@ -1164,7 +1167,7 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
                 new_skb = alloc_skb(skb->len + ppp->dev->hard_header_len - 2,
                                     GFP_ATOMIC);
                 if (!new_skb) {
-                        printk(KERN_ERR "PPP: no memory (VJ comp pkt)\n");
+                        netdev_err(ppp->dev, "PPP: no memory (VJ comp pkt)\n");
                         goto drop;
                 }
                 skb_reserve(new_skb, ppp->dev->hard_header_len - 2);
@@ -1202,7 +1205,9 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
             proto != PPP_LCP && proto != PPP_CCP) {
                 if (!(ppp->flags & SC_CCP_UP) && (ppp->flags & SC_MUST_COMP)) {
                         if (net_ratelimit())
-                                printk(KERN_ERR "ppp: compression required but down - pkt dropped.\n");
+                                netdev_err(ppp->dev,
+                                           "ppp: compression required but "
+                                           "down - pkt dropped.\n");
                         goto drop;
                 }
                 skb = pad_compress_skb(ppp, skb);
@@ -1505,7 +1510,7 @@ static int ppp_mp_explode(struct ppp *ppp, struct sk_buff *skb)
  noskb:
         spin_unlock_bh(&pch->downl);
         if (ppp->debug & 1)
-                printk(KERN_ERR "PPP: no memory (fragment)\n");
+                netdev_err(ppp->dev, "PPP: no memory (fragment)\n");
         ++ppp->dev->stats.tx_errors;
         ++ppp->nxseq;
         return 1;       /* abandon the frame */
@@ -1686,7 +1691,8 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                         /* copy to a new sk_buff with more tailroom */
                         ns = dev_alloc_skb(skb->len + 128);
                         if (!ns) {
-                                printk(KERN_ERR"PPP: no memory (VJ decomp)\n");
+                                netdev_err(ppp->dev, "PPP: no memory "
+                                           "(VJ decomp)\n");
                                 goto err;
                         }
                         skb_reserve(ns, 2);
@@ -1699,7 +1705,8 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
 
                 len = slhc_uncompress(ppp->vj, skb->data + 2, skb->len - 2);
                 if (len <= 0) {
-                        printk(KERN_DEBUG "PPP: VJ decompression error\n");
+                        netdev_printk(KERN_DEBUG, ppp->dev,
+                                      "PPP: VJ decompression error\n");
                         goto err;
                 }
                 len += 2;
@@ -1721,7 +1728,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                         goto err;
 
                 if (slhc_remember(ppp->vj, skb->data + 2, skb->len - 2) <= 0) {
-                        printk(KERN_ERR "PPP: VJ uncompressed error\n");
+                        netdev_err(ppp->dev, "PPP: VJ uncompressed error\n");
                         goto err;
                 }
                 proto = PPP_IP;
@@ -1762,8 +1769,9 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
                         if (ppp->pass_filter &&
                             sk_run_filter(skb, ppp->pass_filter) == 0) {
                                 if (ppp->debug & 1)
-                                        printk(KERN_DEBUG "PPP: inbound frame "
-                                               "not passed\n");
+                                        netdev_printk(KERN_DEBUG, ppp->dev,
+                                                      "PPP: inbound frame "
+                                                      "not passed\n");
                                 kfree_skb(skb);
                                 return;
                         }
@@ -1821,7 +1829,8 @@ ppp_decompress_frame(struct ppp *ppp, struct sk_buff *skb)
 
                 ns = dev_alloc_skb(obuff_size);
                 if (!ns) {
-                        printk(KERN_ERR "ppp_decompress_frame: no memory\n");
+                        netdev_err(ppp->dev, "ppp_decompress_frame: "
+                                   "no memory\n");
                         goto err;
                 }
                 /* the decompressor still expects the A/C bytes in the hdr */
@@ -1989,7 +1998,7 @@ ppp_mp_reconstruct(struct ppp *ppp)
         u32 seq = ppp->nextseq;
         u32 minseq = ppp->minseq;
         struct sk_buff_head *list = &ppp->mrq;
-        struct sk_buff *p, *next;
+        struct sk_buff *p, *tmp;
         struct sk_buff *head, *tail;
         struct sk_buff *skb = NULL;
         int lost = 0, len = 0;
@@ -1998,13 +2007,15 @@ ppp_mp_reconstruct(struct ppp *ppp)
                 return NULL;
         head = list->next;
         tail = NULL;
-        for (p = head; p != (struct sk_buff *) list; p = next) {
-                next = p->next;
+        skb_queue_walk_safe(list, p, tmp) {
+        again:
                 if (seq_before(PPP_MP_CB(p)->sequence, seq)) {
                         /* this can't happen, anyway ignore the skb */
-                        printk(KERN_ERR "ppp_mp_reconstruct bad seq %u < %u\n",
-                               PPP_MP_CB(p)->sequence, seq);
-                        head = next;
+                        netdev_err(ppp->dev, "ppp_mp_reconstruct bad "
+                                   "seq %u < %u\n",
+                                   PPP_MP_CB(p)->sequence, seq);
+                        __skb_unlink(p, list);
+                        kfree_skb(p);
                         continue;
                 }
                 if (PPP_MP_CB(p)->sequence != seq) {
@@ -2016,8 +2027,7 @@ ppp_mp_reconstruct(struct ppp *ppp)
                         lost = 1;
                         seq = seq_before(minseq, PPP_MP_CB(p)->sequence)?
                                 minseq + 1: PPP_MP_CB(p)->sequence;
-                        next = p;
-                        continue;
+                        goto again;
                 }
 
                 /*
@@ -2042,17 +2052,9 @@ ppp_mp_reconstruct(struct ppp *ppp)
                     (PPP_MP_CB(head)->BEbits & B)) {
                         if (len > ppp->mrru + 2) {
                                 ++ppp->dev->stats.rx_length_errors;
-                                printk(KERN_DEBUG "PPP: reconstructed packet"
-                                       " is too long (%d)\n", len);
-                        } else if (p == head) {
-                                /* fragment is complete packet - reuse skb */
-                                tail = p;
-                                skb = skb_get(p);
-                                break;
-                        } else if ((skb = dev_alloc_skb(len)) == NULL) {
-                                ++ppp->dev->stats.rx_missed_errors;
-                                printk(KERN_DEBUG "PPP: no memory for "
-                                       "reconstructed packet");
+                                netdev_printk(KERN_DEBUG, ppp->dev,
+                                              "PPP: reconstructed packet"
+                                              " is too long (%d)\n", len);
                         } else {
                                 tail = p;
                                 break;
@@ -2065,9 +2067,17 @@ ppp_mp_reconstruct(struct ppp *ppp)
                  * and we haven't found a complete valid packet yet,
                  * we can discard up to and including this fragment.
                  */
-                if (PPP_MP_CB(p)->BEbits & E)
-                        head = next;
+                if (PPP_MP_CB(p)->BEbits & E) {
+                        struct sk_buff *tmp2;
 
+                        skb_queue_reverse_walk_from_safe(list, p, tmp2) {
+                                __skb_unlink(p, list);
+                                kfree_skb(p);
+                        }
+                        head = skb_peek(list);
+                        if (!head)
+                                break;
+                }
                 ++seq;
         }
 
@@ -2077,26 +2087,37 @@ ppp_mp_reconstruct(struct ppp *ppp)
                    signal a receive error. */
                 if (PPP_MP_CB(head)->sequence != ppp->nextseq) {
                         if (ppp->debug & 1)
-                                printk(KERN_DEBUG "  missed pkts %u..%u\n",
-                                       ppp->nextseq,
-                                       PPP_MP_CB(head)->sequence-1);
+                                netdev_printk(KERN_DEBUG, ppp->dev,
+                                              "  missed pkts %u..%u\n",
+                                              ppp->nextseq,
+                                              PPP_MP_CB(head)->sequence-1);
                         ++ppp->dev->stats.rx_dropped;
                         ppp_receive_error(ppp);
                 }
 
-                if (head != tail)
-                        /* copy to a single skb */
-                        for (p = head; p != tail->next; p = p->next)
-                                skb_copy_bits(p, 0, skb_put(skb, p->len), p->len);
-                ppp->nextseq = PPP_MP_CB(tail)->sequence + 1;
-                head = tail->next;
-        }
+                skb = head;
+                if (head != tail) {
+                        struct sk_buff **fragpp = &skb_shinfo(skb)->frag_list;
+                        p = skb_queue_next(list, head);
+                        __skb_unlink(skb, list);
+                        skb_queue_walk_from_safe(list, p, tmp) {
+                                __skb_unlink(p, list);
+                                *fragpp = p;
+                                p->next = NULL;
+                                fragpp = &p->next;
+
+                                skb->len += p->len;
+                                skb->data_len += p->len;
+                                skb->truesize += p->len;
+
+                                if (p == tail)
+                                        break;
+                        }
+                } else {
+                        __skb_unlink(skb, list);
+                }
 
-        /* Discard all the skbuffs that we have copied the data out of
-           or that we can't use. */
-        while ((p = list->next) != head) {
-                __skb_unlink(p, list);
-                kfree_skb(p);
+                ppp->nextseq = PPP_MP_CB(tail)->sequence + 1;
         }
 
         return skb;
@@ -2617,8 +2638,8 @@ ppp_create_interface(struct net *net, int unit, int *retp)
         ret = register_netdev(dev);
         if (ret != 0) {
                 unit_put(&pn->units_idr, unit);
-                printk(KERN_ERR "PPP: couldn't register device %s (%d)\n",
-                       dev->name, ret);
+                netdev_err(ppp->dev, "PPP: couldn't register device %s (%d)\n",
+                           dev->name, ret);
                 goto out2;
         }
 
@@ -2690,9 +2711,9 @@ static void ppp_destroy_interface(struct ppp *ppp)
 
         if (!ppp->file.dead || ppp->n_channels) {
                 /* "can't happen" */
-                printk(KERN_ERR "ppp: destroying ppp struct %p but dead=%d "
-                       "n_channels=%d !\n", ppp, ppp->file.dead,
-                       ppp->n_channels);
+                netdev_err(ppp->dev, "ppp: destroying ppp struct %p "
+                           "but dead=%d n_channels=%d !\n",
+                           ppp, ppp->file.dead, ppp->n_channels);
                 return;
         }
 
@@ -2834,8 +2855,7 @@ static void ppp_destroy_channel(struct channel *pch)
 
         if (!pch->file.dead) {
                 /* "can't happen" */
-                printk(KERN_ERR "ppp: destroying undead channel %p !\n",
-                       pch);
+                pr_err("ppp: destroying undead channel %p !\n", pch);
                 return;
         }
         skb_queue_purge(&pch->file.xq);
@@ -2847,7 +2867,7 @@ static void __exit ppp_cleanup(void)
 {
         /* should never happen */
         if (atomic_read(&ppp_unit_count) || atomic_read(&channel_count))
-                printk(KERN_ERR "PPP: removing module but units remain!\n");
+                pr_err("PPP: removing module but units remain!\n");
         unregister_chrdev(PPP_MAJOR, "ppp");
         device_destroy(ppp_class, MKDEV(PPP_MAJOR, 0));
         class_destroy(ppp_class);
@@ -2865,7 +2885,7 @@ static int __unit_alloc(struct idr *p, void *ptr, int n)
 
 again:
         if (!idr_pre_get(p, GFP_KERNEL)) {
-                printk(KERN_ERR "PPP: No free memory for idr\n");
+                pr_err("PPP: No free memory for idr\n");
                 return -ENOMEM;
         }
 
diff --git a/drivers/net/pptp.c b/drivers/net/pptp.c
index 164cfad6ce7..51dfcf8023c 100644
--- a/drivers/net/pptp.c
+++ b/drivers/net/pptp.c
@@ -175,7 +175,6 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
         struct pptp_opt *opt = &po->proto.pptp;
         struct pptp_gre_header *hdr;
         unsigned int header_len = sizeof(*hdr);
-        int err = 0;
         int islcp;
         int len;
         unsigned char *data;
@@ -190,18 +189,14 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
         if (sk_pppox(po)->sk_state & PPPOX_DEAD)
                 goto tx_error;
 
-        {
-                struct flowi fl = { .oif = 0,
-                        .nl_u = {
-                                .ip4_u = {
-                                        .daddr = opt->dst_addr.sin_addr.s_addr,
-                                        .saddr = opt->src_addr.sin_addr.s_addr,
-                                        .tos = RT_TOS(0) } },
-                        .proto = IPPROTO_GRE };
-                err = ip_route_output_key(&init_net, &rt, &fl);
-                if (err)
-                        goto tx_error;
-        }
+        rt = ip_route_output_ports(&init_net, NULL,
+                                   opt->dst_addr.sin_addr.s_addr,
+                                   opt->src_addr.sin_addr.s_addr,
+                                   0, 0, IPPROTO_GRE,
+                                   RT_TOS(0), 0);
+        if (IS_ERR(rt))
+                goto tx_error;
+
         tdev = rt->dst.dev;
 
         max_headroom = LL_RESERVED_SPACE(tdev) + sizeof(*iph) + sizeof(*hdr) + 2;
@@ -468,21 +463,17 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr,
         po->chan.private = sk;
         po->chan.ops = &pptp_chan_ops;
 
-        {
-                struct flowi fl = {
-                        .nl_u = {
-                                .ip4_u = {
-                                        .daddr = opt->dst_addr.sin_addr.s_addr,
-                                        .saddr = opt->src_addr.sin_addr.s_addr,
-                                        .tos = RT_CONN_FLAGS(sk) } },
-                        .proto = IPPROTO_GRE };
-                security_sk_classify_flow(sk, &fl);
-                if (ip_route_output_key(&init_net, &rt, &fl)) {
-                        error = -EHOSTUNREACH;
-                        goto end;
-                }
-                sk_setup_caps(sk, &rt->dst);
+        rt = ip_route_output_ports(&init_net, sk,
+                                   opt->dst_addr.sin_addr.s_addr,
+                                   opt->src_addr.sin_addr.s_addr,
+                                   0, 0,
+                                   IPPROTO_GRE, RT_CONN_FLAGS(sk), 0);
+        if (IS_ERR(rt)) {
+                error = -EHOSTUNREACH;
+                goto end;
         }
+        sk_setup_caps(sk, &rt->dst);
+
         po->chan.mtu = dst_mtu(&rt->dst);
         if (!po->chan.mtu)
                 po->chan.mtu = PPP_MTU;
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 1a3584edd79..348b4f1367c 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -379,7 +379,7 @@ static void fm93c56a_select(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
                         qdev->mem_map_registers;
-        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
+        __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
 
         qdev->eeprom_cmd_data = AUBURN_EEPROM_CS_1;
         ql_write_nvram_reg(qdev, spir, ISP_NVRAM_MASK | qdev->eeprom_cmd_data);
@@ -398,7 +398,7 @@ static void fm93c56a_cmd(struct ql3_adapter *qdev, u32 cmd, u32 eepromAddr)
         u32 previousBit;
         struct ql3xxx_port_registers __iomem *port_regs =
                         qdev->mem_map_registers;
-        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
+        __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
 
         /* Clock in a zero, then do the start bit */
         ql_write_nvram_reg(qdev, spir,
@@ -467,7 +467,7 @@ static void fm93c56a_deselect(struct ql3_adapter *qdev)
 {
         struct ql3xxx_port_registers __iomem *port_regs =
                         qdev->mem_map_registers;
-        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
+        __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
 
         qdev->eeprom_cmd_data = AUBURN_EEPROM_CS_0;
         ql_write_nvram_reg(qdev, spir, ISP_NVRAM_MASK | qdev->eeprom_cmd_data);
@@ -483,7 +483,7 @@ static void fm93c56a_datain(struct ql3_adapter *qdev, unsigned short *value)
         u32 dataBit;
         struct ql3xxx_port_registers __iomem *port_regs =
                         qdev->mem_map_registers;
-        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
+        __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
 
         /* Read the data bits */
         /* The first bit is a dummy.  Clock right over it. */
@@ -2460,7 +2460,7 @@ map_error:
  * The 3032 supports sglists by using the 3 addr/len pairs (ALP)
  * in the IOCB plus a chain of outbound address lists (OAL) that
  * each contain 5 ALPs.  The last ALP of the IOCB (3rd) or OAL (5th)
- * will used to point to an OAL when more ALP entries are required.
+ * will be used to point to an OAL when more ALP entries are required.
  * The IOCB is always the top of the chain followed by one or more
  * OALs (when necessary).
  */
@@ -3011,7 +3011,7 @@ static int ql_adapter_initialize(struct ql3_adapter *qdev)
         u32 value;
         struct ql3xxx_port_registers __iomem *port_regs =
                 qdev->mem_map_registers;
-        u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
+        __iomem u32 *spir = &port_regs->CommonRegs.serialPortInterfaceReg;
         struct ql3xxx_host_memory_registers __iomem *hmem_regs =
                 (void __iomem *)port_regs;
         u32 delay = 10;
diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h
index 44e316fd67b..dc44564ef6f 100644
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/qlcnic/qlcnic.h
@@ -867,7 +867,6 @@ struct qlcnic_nic_intr_coalesce {
 #define LINKEVENT_LINKSPEED_MBPS        0
 #define LINKEVENT_LINKSPEED_ENCODED     1
 
-#define AUTO_FW_RESET_ENABLED   0x01
 /* firmware response header:
  *      63:58 - message type
  *      57:56 - owner
@@ -1133,14 +1132,10 @@ struct qlcnic_eswitch {
 #define MAX_BW                  100     /* % of link speed */
 #define MAX_VLAN_ID             4095
 #define MIN_VLAN_ID             2
-#define MAX_TX_QUEUES           1
-#define MAX_RX_QUEUES           4
 #define DEFAULT_MAC_LEARN       1
 
 #define IS_VALID_VLAN(vlan)     (vlan >= MIN_VLAN_ID && vlan < MAX_VLAN_ID)
 #define IS_VALID_BW(bw)         (bw <= MAX_BW)
-#define IS_VALID_TX_QUEUES(que) (que > 0 && que <= MAX_TX_QUEUES)
-#define IS_VALID_RX_QUEUES(que) (que > 0 && que <= MAX_RX_QUEUES)
 
 struct qlcnic_pci_func_cfg {
         u16     func_type;
diff --git a/drivers/net/qlcnic/qlcnic_ethtool.c b/drivers/net/qlcnic/qlcnic_ethtool.c
index 4c14510e2a8..45b2755d6cb 100644
--- a/drivers/net/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/qlcnic/qlcnic_ethtool.c
@@ -1003,7 +1003,7 @@ static int qlcnic_set_flags(struct net_device *netdev, u32 data)
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         int hw_lro;
 
-        if (data & ~ETH_FLAG_LRO)
+        if (ethtool_invalid_flags(netdev, data, ETH_FLAG_LRO))
                 return -EINVAL;
 
         if (!(adapter->capabilities & QLCNIC_FW_CAPABILITY_HW_LRO))
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 37c04b4fade..cd88c7e1bfa 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -42,7 +42,7 @@ static int use_msi_x = 1;
 module_param(use_msi_x, int, 0444);
 MODULE_PARM_DESC(use_msi_x, "MSI-X interrupt (0=disabled, 1=enabled");
 
-static int auto_fw_reset = AUTO_FW_RESET_ENABLED;
+static int auto_fw_reset = 1;
 module_param(auto_fw_reset, int, 0644);
 MODULE_PARM_DESC(auto_fw_reset, "Auto firmware reset (0=disabled, 1=enabled");
 
@@ -2959,8 +2959,7 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
                 if (adapter->need_fw_reset)
                         goto detach;
 
-                if (adapter->reset_context &&
-                    auto_fw_reset == AUTO_FW_RESET_ENABLED) {
+                if (adapter->reset_context && auto_fw_reset) {
                         qlcnic_reset_hw_context(adapter);
                         adapter->netdev->trans_start = jiffies;
                 }
@@ -2973,7 +2972,7 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
 
         qlcnic_dev_request_reset(adapter);
 
-        if ((auto_fw_reset == AUTO_FW_RESET_ENABLED))
+        if (auto_fw_reset)
                 clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state);
 
         dev_info(&netdev->dev, "firmware hang detected\n");
@@ -2982,7 +2981,7 @@ detach:
         adapter->dev_state = (state == QLCNIC_DEV_NEED_QUISCENT) ? state :
                 QLCNIC_DEV_NEED_RESET;
 
-        if ((auto_fw_reset == AUTO_FW_RESET_ENABLED) &&
+        if (auto_fw_reset &&
                 !test_and_set_bit(__QLCNIC_RESETTING, &adapter->state)) {
 
                 qlcnic_schedule_work(adapter, qlcnic_detach_work, 0);
@@ -3654,10 +3653,8 @@ validate_npar_config(struct qlcnic_adapter *adapter,
                 if (adapter->npars[pci_func].type != QLCNIC_TYPE_NIC)
                         return QL_STATUS_INVALID_PARAM;
 
-                if (!IS_VALID_BW(np_cfg[i].min_bw)
-                                || !IS_VALID_BW(np_cfg[i].max_bw)
-                                || !IS_VALID_RX_QUEUES(np_cfg[i].max_rx_queues)
-                                || !IS_VALID_TX_QUEUES(np_cfg[i].max_tx_queues))
+                if (!IS_VALID_BW(np_cfg[i].min_bw) ||
+                    !IS_VALID_BW(np_cfg[i].max_bw))
                         return QL_STATUS_INVALID_PARAM;
         }
         return 0;
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 27e6f6d43ca..e3ebd90ae65 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -49,8 +49,8 @@
 #include <asm/processor.h>
 
 #define DRV_NAME        "r6040"
-#define DRV_VERSION     "0.26"
-#define DRV_RELDATE     "30May2010"
+#define DRV_VERSION     "0.27"
+#define DRV_RELDATE     "23Feb2011"
 
 /* PHY CHIP Address */
 #define PHY1_ADDR       1       /* For MAC1 */
@@ -69,6 +69,8 @@
 
 /* MAC registers */
 #define MCR0            0x00    /* Control register 0 */
+#define  MCR0_PROMISC   0x0020  /* Promiscuous mode */
+#define  MCR0_HASH_EN   0x0100  /* Enable multicast hash table function */
 #define MCR1            0x04    /* Control register 1 */
 #define  MAC_RST        0x0001  /* Reset the MAC */
 #define MBCR            0x08    /* Bus control */
@@ -851,77 +853,92 @@ static void r6040_multicast_list(struct net_device *dev)
 {
         struct r6040_private *lp = netdev_priv(dev);
         void __iomem *ioaddr = lp->base;
-        u16 *adrp;
-        u16 reg;
         unsigned long flags;
         struct netdev_hw_addr *ha;
         int i;
+        u16 *adrp;
+        u16 hash_table[4] = { 0 };
+
+        spin_lock_irqsave(&lp->lock, flags);
 
-        /* MAC Address */
+        /* Keep our MAC Address */
         adrp = (u16 *)dev->dev_addr;
         iowrite16(adrp[0], ioaddr + MID_0L);
         iowrite16(adrp[1], ioaddr + MID_0M);
         iowrite16(adrp[2], ioaddr + MID_0H);
 
-        /* Promiscous Mode */
-        spin_lock_irqsave(&lp->lock, flags);
-
         /* Clear AMCP & PROM bits */
-        reg = ioread16(ioaddr) & ~0x0120;
-        if (dev->flags & IFF_PROMISC) {
-                reg |= 0x0020;
-                lp->mcr0 |= 0x0020;
-        }
-        /* Too many multicast addresses
-         * accept all traffic */
-        else if ((netdev_mc_count(dev) > MCAST_MAX) ||
-                 (dev->flags & IFF_ALLMULTI))
-                reg |= 0x0020;
+        lp->mcr0 = ioread16(ioaddr + MCR0) & ~(MCR0_PROMISC | MCR0_HASH_EN);
 
-        iowrite16(reg, ioaddr);
-        spin_unlock_irqrestore(&lp->lock, flags);
+        /* Promiscuous mode */
+        if (dev->flags & IFF_PROMISC)
+                lp->mcr0 |= MCR0_PROMISC;
 
-        /* Build the hash table */
-        if (netdev_mc_count(dev) > MCAST_MAX) {
-                u16 hash_table[4];
-                u32 crc;
+        /* Enable multicast hash table function to
+         * receive all multicast packets. */
+        else if (dev->flags & IFF_ALLMULTI) {
+                lp->mcr0 |= MCR0_HASH_EN;
 
-                for (i = 0; i < 4; i++)
-                        hash_table[i] = 0;
+                for (i = 0; i < MCAST_MAX ; i++) {
+                        iowrite16(0, ioaddr + MID_1L + 8 * i);
+                        iowrite16(0, ioaddr + MID_1M + 8 * i);
+                        iowrite16(0, ioaddr + MID_1H + 8 * i);
+                }
 
+                for (i = 0; i < 4; i++)
+                        hash_table[i] = 0xffff;
+        }
+        /* Use internal multicast address registers if the number of
+         * multicast addresses is not greater than MCAST_MAX. */
+        else if (netdev_mc_count(dev) <= MCAST_MAX) {
+                i = 0;
                 netdev_for_each_mc_addr(ha, dev) {
-                        char *addrs = ha->addr;
+                        u16 *adrp = (u16 *) ha->addr;
+                        iowrite16(adrp[0], ioaddr + MID_1L + 8 * i);
+                        iowrite16(adrp[1], ioaddr + MID_1M + 8 * i);
+                        iowrite16(adrp[2], ioaddr + MID_1H + 8 * i);
+                        i++;
+                }
+                while (i < MCAST_MAX) {
+                        iowrite16(0, ioaddr + MID_1L + 8 * i);
+                        iowrite16(0, ioaddr + MID_1M + 8 * i);
+                        iowrite16(0, ioaddr + MID_1H + 8 * i);
+                        i++;
+                }
+        }
+        /* Otherwise, Enable multicast hash table function. */
+        else {
+                u32 crc;
 
-                        if (!(*addrs & 1))
-                                continue;
+                lp->mcr0 |= MCR0_HASH_EN;
+
+                for (i = 0; i < MCAST_MAX ; i++) {
+                        iowrite16(0, ioaddr + MID_1L + 8 * i);
+                        iowrite16(0, ioaddr + MID_1M + 8 * i);
+                        iowrite16(0, ioaddr + MID_1H + 8 * i);
+                }
 
-                        crc = ether_crc_le(6, addrs);
+                /* Build multicast hash table */
+                netdev_for_each_mc_addr(ha, dev) {
+                        u8 *addrs = ha->addr;
+
+                        crc = ether_crc(ETH_ALEN, addrs);
                         crc >>= 26;
-                        hash_table[crc >> 4] |= 1 << (15 - (crc & 0xf));
+                        hash_table[crc >> 4] |= 1 << (crc & 0xf);
                 }
-                /* Fill the MAC hash tables with their values */
+        }
+
+        iowrite16(lp->mcr0, ioaddr + MCR0);
+
+        /* Fill the MAC hash tables with their values */
+        if (lp->mcr0 && MCR0_HASH_EN) {
                 iowrite16(hash_table[0], ioaddr + MAR0);
                 iowrite16(hash_table[1], ioaddr + MAR1);
                 iowrite16(hash_table[2], ioaddr + MAR2);
                 iowrite16(hash_table[3], ioaddr + MAR3);
         }
-        /* Multicast Address 1~4 case */
-        i = 0;
-        netdev_for_each_mc_addr(ha, dev) {
-                if (i >= MCAST_MAX)
-                        break;
-                adrp = (u16 *) ha->addr;
-                iowrite16(adrp[0], ioaddr + MID_1L + 8 * i);
-                iowrite16(adrp[1], ioaddr + MID_1M + 8 * i);
-                iowrite16(adrp[2], ioaddr + MID_1H + 8 * i);
-                i++;
-        }
-        while (i < MCAST_MAX) {
-                iowrite16(0xffff, ioaddr + MID_1L + 8 * i);
-                iowrite16(0xffff, ioaddr + MID_1M + 8 * i);
-                iowrite16(0xffff, ioaddr + MID_1H + 8 * i);
-                i++;
-        }
+
+        spin_unlock_irqrestore(&lp->lock, flags);
 }
 
 static void netdev_get_drvinfo(struct net_device *dev,
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index bde7d61f193..493b0de3848 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -25,6 +25,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/pm_runtime.h>
 #include <linux/firmware.h>
+#include <linux/pci-aspm.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -36,6 +37,7 @@
 
 #define FIRMWARE_8168D_1        "rtl_nic/rtl8168d-1.fw"
 #define FIRMWARE_8168D_2        "rtl_nic/rtl8168d-2.fw"
+#define FIRMWARE_8105E_1        "rtl_nic/rtl8105e-1.fw"
 
 #ifdef RTL8169_DEBUG
 #define assert(expr) \
@@ -123,6 +125,8 @@ enum mac_version {
         RTL_GIGA_MAC_VER_26 = 0x1a, // 8168D
         RTL_GIGA_MAC_VER_27 = 0x1b, // 8168DP
         RTL_GIGA_MAC_VER_28 = 0x1c, // 8168DP
+        RTL_GIGA_MAC_VER_29 = 0x1d, // 8105E
+        RTL_GIGA_MAC_VER_30 = 0x1e, // 8105E
 };
 
 #define _R(NAME,MAC,MASK) \
@@ -160,7 +164,9 @@ static const struct {
         _R("RTL8168d/8111d",    RTL_GIGA_MAC_VER_25, 0xff7e1880), // PCI-E
         _R("RTL8168d/8111d",    RTL_GIGA_MAC_VER_26, 0xff7e1880), // PCI-E
         _R("RTL8168dp/8111dp",  RTL_GIGA_MAC_VER_27, 0xff7e1880), // PCI-E
-        _R("RTL8168dp/8111dp",  RTL_GIGA_MAC_VER_28, 0xff7e1880)  // PCI-E
+        _R("RTL8168dp/8111dp",  RTL_GIGA_MAC_VER_28, 0xff7e1880), // PCI-E
+        _R("RTL8105e",          RTL_GIGA_MAC_VER_29, 0xff7e1880), // PCI-E
+        _R("RTL8105e",          RTL_GIGA_MAC_VER_30, 0xff7e1880)  // PCI-E
 };
 #undef _R
 
@@ -267,9 +273,15 @@ enum rtl8168_8101_registers {
 #define EPHYAR_REG_MASK                 0x1f
 #define EPHYAR_REG_SHIFT                16
 #define EPHYAR_DATA_MASK                0xffff
+        DLLPR                   = 0xd0,
+#define PM_SWITCH                       (1 << 6)
         DBG_REG                 = 0xd1,
 #define FIX_NAK_1                       (1 << 4)
 #define FIX_NAK_2                       (1 << 3)
+        TWSI                    = 0xd2,
+        MCU                     = 0xd3,
+#define EN_NDP                          (1 << 3)
+#define EN_OOB_RESET                    (1 << 2)
         EFUSEAR                 = 0xdc,
 #define EFUSEAR_FLAG                    0x80000000
 #define EFUSEAR_WRITE_CMD               0x80000000
@@ -526,9 +538,6 @@ struct rtl8169_private {
         u16 napi_event;
         u16 intr_mask;
         int phy_1000_ctrl_reg;
-#ifdef CONFIG_R8169_VLAN
-        struct vlan_group *vlgrp;
-#endif
 
         struct mdio_ops {
                 void (*write)(void __iomem *, int, int);
@@ -540,7 +549,7 @@ struct rtl8169_private {
                 void (*up)(struct rtl8169_private *);
         } pll_power_ops;
 
-        int (*set_speed)(struct net_device *, u8 autoneg, u16 speed, u8 duplex);
+        int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
         int (*get_settings)(struct net_device *, struct ethtool_cmd *);
         void (*phy_reset_enable)(struct rtl8169_private *tp);
         void (*hw_start)(struct net_device *);
@@ -568,6 +577,7 @@ MODULE_LICENSE("GPL");
 MODULE_VERSION(RTL8169_VERSION);
 MODULE_FIRMWARE(FIRMWARE_8168D_1);
 MODULE_FIRMWARE(FIRMWARE_8168D_2);
+MODULE_FIRMWARE(FIRMWARE_8105E_1);
 
 static int rtl8169_open(struct net_device *dev);
 static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
@@ -617,8 +627,9 @@ static void ocp_write(struct rtl8169_private *tp, u8 mask, u16 reg, u32 data)
         }
 }
 
-static void rtl8168_oob_notify(void __iomem *ioaddr, u8 cmd)
+static void rtl8168_oob_notify(struct rtl8169_private *tp, u8 cmd)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         int i;
 
         RTL_W8(ERIDR, cmd);
@@ -630,7 +641,7 @@ static void rtl8168_oob_notify(void __iomem *ioaddr, u8 cmd)
                         break;
         }
 
-        ocp_write(ioaddr, 0x1, 0x30, 0x00000001);
+        ocp_write(tp, 0x1, 0x30, 0x00000001);
 }
 
 #define OOB_CMD_RESET           0x00
@@ -973,7 +984,8 @@ static void __rtl8169_check_link_status(struct net_device *dev,
                 if (pm)
                         pm_request_resume(&tp->pci_dev->dev);
                 netif_carrier_on(dev);
-                netif_info(tp, ifup, dev, "link up\n");
+                if (net_ratelimit())
+                        netif_info(tp, ifup, dev, "link up\n");
         } else {
                 netif_carrier_off(dev);
                 netif_info(tp, ifdown, dev, "link down\n");
@@ -1095,7 +1107,7 @@ static int rtl8169_get_regs_len(struct net_device *dev)
 }
 
 static int rtl8169_set_speed_tbi(struct net_device *dev,
-                                 u8 autoneg, u16 speed, u8 duplex)
+                                 u8 autoneg, u16 speed, u8 duplex, u32 ignored)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
         void __iomem *ioaddr = tp->mmio_addr;
@@ -1118,17 +1130,30 @@ static int rtl8169_set_speed_tbi(struct net_device *dev,
 }
 
 static int rtl8169_set_speed_xmii(struct net_device *dev,
-                                  u8 autoneg, u16 speed, u8 duplex)
+                                  u8 autoneg, u16 speed, u8 duplex, u32 adv)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
         int giga_ctrl, bmcr;
+        int rc = -EINVAL;
+
+        rtl_writephy(tp, 0x1f, 0x0000);
 
         if (autoneg == AUTONEG_ENABLE) {
                 int auto_nego;
 
                 auto_nego = rtl_readphy(tp, MII_ADVERTISE);
-                auto_nego |= (ADVERTISE_10HALF | ADVERTISE_10FULL |
-                              ADVERTISE_100HALF | ADVERTISE_100FULL);
+                auto_nego &= ~(ADVERTISE_10HALF | ADVERTISE_10FULL |
+                                ADVERTISE_100HALF | ADVERTISE_100FULL);
+
+                if (adv & ADVERTISED_10baseT_Half)
+                        auto_nego |= ADVERTISE_10HALF;
+                if (adv & ADVERTISED_10baseT_Full)
+                        auto_nego |= ADVERTISE_10FULL;
+                if (adv & ADVERTISED_100baseT_Half)
+                        auto_nego |= ADVERTISE_100HALF;
+                if (adv & ADVERTISED_100baseT_Full)
+                        auto_nego |= ADVERTISE_100FULL;
+
                 auto_nego |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM;
 
                 giga_ctrl = rtl_readphy(tp, MII_CTRL1000);
@@ -1142,27 +1167,22 @@ static int rtl8169_set_speed_xmii(struct net_device *dev,
                     (tp->mac_version != RTL_GIGA_MAC_VER_13) &&
                     (tp->mac_version != RTL_GIGA_MAC_VER_14) &&
                     (tp->mac_version != RTL_GIGA_MAC_VER_15) &&
-                    (tp->mac_version != RTL_GIGA_MAC_VER_16)) {
-                        giga_ctrl |= ADVERTISE_1000FULL | ADVERTISE_1000HALF;
-                } else {
+                    (tp->mac_version != RTL_GIGA_MAC_VER_16) &&
+                    (tp->mac_version != RTL_GIGA_MAC_VER_29) &&
+                    (tp->mac_version != RTL_GIGA_MAC_VER_30)) {
+                        if (adv & ADVERTISED_1000baseT_Half)
+                                giga_ctrl |= ADVERTISE_1000HALF;
+                        if (adv & ADVERTISED_1000baseT_Full)
+                                giga_ctrl |= ADVERTISE_1000FULL;
+                } else if (adv & (ADVERTISED_1000baseT_Half |
+                                  ADVERTISED_1000baseT_Full)) {
                         netif_info(tp, link, dev,
                                    "PHY does not support 1000Mbps\n");
+                        goto out;
                 }
 
                 bmcr = BMCR_ANENABLE | BMCR_ANRESTART;
 
-                if ((tp->mac_version == RTL_GIGA_MAC_VER_11) ||
-                    (tp->mac_version == RTL_GIGA_MAC_VER_12) ||
-                    (tp->mac_version >= RTL_GIGA_MAC_VER_17)) {
-                        /*
-                         * Wake up the PHY.
-                         * Vendor specific (0x1f) and reserved (0x0e) MII
-                         * registers.
-                         */
-                        rtl_writephy(tp, 0x1f, 0x0000);
-                        rtl_writephy(tp, 0x0e, 0x0000);
-                }
-
                 rtl_writephy(tp, MII_ADVERTISE, auto_nego);
                 rtl_writephy(tp, MII_CTRL1000, giga_ctrl);
         } else {
@@ -1173,12 +1193,10 @@ static int rtl8169_set_speed_xmii(struct net_device *dev,
                 else if (speed == SPEED_100)
                         bmcr = BMCR_SPEED100;
                 else
-                        return -EINVAL;
+                        goto out;
 
                 if (duplex == DUPLEX_FULL)
                         bmcr |= BMCR_FULLDPLX;
-
-                rtl_writephy(tp, 0x1f, 0x0000);
         }
 
         tp->phy_1000_ctrl_reg = giga_ctrl;
@@ -1196,16 +1214,18 @@ static int rtl8169_set_speed_xmii(struct net_device *dev,
                 }
         }
 
-        return 0;
+        rc = 0;
+out:
+        return rc;
 }
 
 static int rtl8169_set_speed(struct net_device *dev,
-                             u8 autoneg, u16 speed, u8 duplex)
+                             u8 autoneg, u16 speed, u8 duplex, u32 advertising)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
         int ret;
 
-        ret = tp->set_speed(dev, autoneg, speed, duplex);
+        ret = tp->set_speed(dev, autoneg, speed, duplex, advertising);
 
         if (netif_running(dev) && (tp->phy_1000_ctrl_reg & ADVERTISE_1000FULL))
                 mod_timer(&tp->timer, jiffies + RTL8169_PHY_TIMEOUT);
@@ -1220,7 +1240,8 @@ static int rtl8169_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
         int ret;
 
         spin_lock_irqsave(&tp->lock, flags);
-        ret = rtl8169_set_speed(dev, cmd->autoneg, cmd->speed, cmd->duplex);
+        ret = rtl8169_set_speed(dev,
+                cmd->autoneg, cmd->speed, cmd->duplex, cmd->advertising);
         spin_unlock_irqrestore(&tp->lock, flags);
 
         return ret;
@@ -1254,8 +1275,6 @@ static int rtl8169_set_rx_csum(struct net_device *dev, u32 data)
         return 0;
 }
 
-#ifdef CONFIG_R8169_VLAN
-
 static inline u32 rtl8169_tx_vlan_tag(struct rtl8169_private *tp,
                                       struct sk_buff *skb)
 {
@@ -1263,64 +1282,37 @@ static inline u32 rtl8169_tx_vlan_tag(struct rtl8169_private *tp,
                 TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00;
 }
 
-static void rtl8169_vlan_rx_register(struct net_device *dev,
-                                     struct vlan_group *grp)
+#define NETIF_F_HW_VLAN_TX_RX   (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX)
+
+static void rtl8169_vlan_mode(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
         void __iomem *ioaddr = tp->mmio_addr;
         unsigned long flags;
 
         spin_lock_irqsave(&tp->lock, flags);
-        tp->vlgrp = grp;
-        /*
-         * Do not disable RxVlan on 8110SCd.
-         */
-        if (tp->vlgrp || (tp->mac_version == RTL_GIGA_MAC_VER_05))
+        if (dev->features & NETIF_F_HW_VLAN_RX)
                 tp->cp_cmd |= RxVlan;
         else
                 tp->cp_cmd &= ~RxVlan;
         RTL_W16(CPlusCmd, tp->cp_cmd);
+        /* PCI commit */
         RTL_R16(CPlusCmd);
         spin_unlock_irqrestore(&tp->lock, flags);
+
+        dev->vlan_features = dev->features &~ NETIF_F_HW_VLAN_TX_RX;
 }
 
-static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc,
-                               struct sk_buff *skb, int polling)
+static void rtl8169_rx_vlan_tag(struct RxDesc *desc, struct sk_buff *skb)
 {
         u32 opts2 = le32_to_cpu(desc->opts2);
-        struct vlan_group *vlgrp = tp->vlgrp;
-        int ret;
 
-        if (vlgrp && (opts2 & RxVlanTag)) {
-                u16 vtag = swab16(opts2 & 0xffff);
+        if (opts2 & RxVlanTag)
+                __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff));
 
-                if (likely(polling))
-                        vlan_gro_receive(&tp->napi, vlgrp, vtag, skb);
-                else
-                        __vlan_hwaccel_rx(skb, vlgrp, vtag, polling);
-                ret = 0;
-        } else
-                ret = -1;
         desc->opts2 = 0;
-        return ret;
-}
-
-#else /* !CONFIG_R8169_VLAN */
-
-static inline u32 rtl8169_tx_vlan_tag(struct rtl8169_private *tp,
-                                      struct sk_buff *skb)
-{
-        return 0;
-}
-
-static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc,
-                               struct sk_buff *skb, int polling)
-{
-        return -1;
 }
 
-#endif
-
 static int rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
@@ -1491,6 +1483,28 @@ static void rtl8169_get_strings(struct net_device *dev, u32 stringset, u8 *data)
         }
 }
 
+static int rtl8169_set_flags(struct net_device *dev, u32 data)
+{
+        struct rtl8169_private *tp = netdev_priv(dev);
+        unsigned long old_feat = dev->features;
+        int rc;
+
+        if ((tp->mac_version == RTL_GIGA_MAC_VER_05) &&
+            !(data & ETH_FLAG_RXVLAN)) {
+                netif_info(tp, drv, dev, "8110SCd requires hardware Rx VLAN\n");
+                return -EINVAL;
+        }
+
+        rc = ethtool_op_set_flags(dev, data, ETH_FLAG_TXVLAN | ETH_FLAG_RXVLAN);
+        if (rc)
+                return rc;
+
+        if ((old_feat ^ dev->features) & NETIF_F_HW_VLAN_RX)
+                rtl8169_vlan_mode(dev);
+
+        return 0;
+}
+
 static const struct ethtool_ops rtl8169_ethtool_ops = {
         .get_drvinfo            = rtl8169_get_drvinfo,
         .get_regs_len           = rtl8169_get_regs_len,
@@ -1510,6 +1524,8 @@ static const struct ethtool_ops rtl8169_ethtool_ops = {
         .get_strings            = rtl8169_get_strings,
         .get_sset_count         = rtl8169_get_sset_count,
         .get_ethtool_stats      = rtl8169_get_ethtool_stats,
+        .set_flags              = rtl8169_set_flags,
+        .get_flags              = ethtool_op_get_flags,
 };
 
 static void rtl8169_get_mac_version(struct rtl8169_private *tp,
@@ -1558,6 +1574,9 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
                 { 0x7c800000, 0x30000000,       RTL_GIGA_MAC_VER_11 },
 
                 /* 8101 family. */
+                { 0x7cf00000, 0x40a00000,       RTL_GIGA_MAC_VER_30 },
+                { 0x7cf00000, 0x40900000,       RTL_GIGA_MAC_VER_29 },
+                { 0x7c800000, 0x40800000,       RTL_GIGA_MAC_VER_30 },
                 { 0x7cf00000, 0x34a00000,       RTL_GIGA_MAC_VER_09 },
                 { 0x7cf00000, 0x24a00000,       RTL_GIGA_MAC_VER_09 },
                 { 0x7cf00000, 0x34900000,       RTL_GIGA_MAC_VER_08 },
@@ -2434,6 +2453,33 @@ static void rtl8102e_hw_phy_config(struct rtl8169_private *tp)
         rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));
 }
 
+static void rtl8105e_hw_phy_config(struct rtl8169_private *tp)
+{
+        static const struct phy_reg phy_reg_init[] = {
+                { 0x1f, 0x0005 },
+                { 0x1a, 0x0000 },
+                { 0x1f, 0x0000 },
+
+                { 0x1f, 0x0004 },
+                { 0x1c, 0x0000 },
+                { 0x1f, 0x0000 },
+
+                { 0x1f, 0x0001 },
+                { 0x15, 0x7701 },
+                { 0x1f, 0x0000 }
+        };
+
+        /* Disable ALDPS before ram code */
+        rtl_writephy(tp, 0x1f, 0x0000);
+        rtl_writephy(tp, 0x18, 0x0310);
+        msleep(100);
+
+        if (rtl_apply_firmware(tp, FIRMWARE_8105E_1) < 0)
+                netif_warn(tp, probe, tp->dev, "unable to apply firmware patch\n");
+
+        rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));
+}
+
 static void rtl_hw_phy_config(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
@@ -2501,6 +2547,10 @@ static void rtl_hw_phy_config(struct net_device *dev)
         case RTL_GIGA_MAC_VER_28:
                 rtl8168d_4_hw_phy_config(tp);
                 break;
+        case RTL_GIGA_MAC_VER_29:
+        case RTL_GIGA_MAC_VER_30:
+                rtl8105e_hw_phy_config(tp);
+                break;
 
         default:
                 break;
@@ -2632,11 +2682,12 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
 
         rtl8169_phy_reset(dev, tp);
 
-        /*
-         * rtl8169_set_speed_xmii takes good care of the Fast Ethernet
-         * only 8101. Don't panic.
-         */
-        rtl8169_set_speed(dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL);
+        rtl8169_set_speed(dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL,
+                ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
+                ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
+                (tp->mii.supports_gmii ?
+                        ADVERTISED_1000baseT_Half |
+                        ADVERTISED_1000baseT_Full : 0));
 
         if (RTL_R8(PHYstatus) & TBI_Enable)
                 netif_info(tp, link, dev, "TBI auto-negotiating\n");
@@ -2792,9 +2843,6 @@ static const struct net_device_ops rtl8169_netdev_ops = {
         .ndo_set_mac_address    = rtl_set_mac_address,
         .ndo_do_ioctl           = rtl8169_ioctl,
         .ndo_set_multicast_list = rtl_set_rx_mode,
-#ifdef CONFIG_R8169_VLAN
-        .ndo_vlan_rx_register   = rtl8169_vlan_rx_register,
-#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = rtl8169_netpoll,
 #endif
@@ -2867,8 +2915,11 @@ static void r8168_pll_power_down(struct rtl8169_private *tp)
 {
         void __iomem *ioaddr = tp->mmio_addr;
 
-        if (tp->mac_version == RTL_GIGA_MAC_VER_27)
+        if (((tp->mac_version == RTL_GIGA_MAC_VER_27) ||
+             (tp->mac_version == RTL_GIGA_MAC_VER_28)) &&
+            (ocp_read(tp, 0x0f, 0x0010) & 0x00008000)) {
                 return;
+        }
 
         if (((tp->mac_version == RTL_GIGA_MAC_VER_23) ||
              (tp->mac_version == RTL_GIGA_MAC_VER_24)) &&
@@ -2890,6 +2941,8 @@ static void r8168_pll_power_down(struct rtl8169_private *tp)
         switch (tp->mac_version) {
         case RTL_GIGA_MAC_VER_25:
         case RTL_GIGA_MAC_VER_26:
+        case RTL_GIGA_MAC_VER_27:
+        case RTL_GIGA_MAC_VER_28:
                 RTL_W8(PMCH, RTL_R8(PMCH) & ~0x80);
                 break;
         }
@@ -2899,12 +2952,17 @@ static void r8168_pll_power_up(struct rtl8169_private *tp)
 {
         void __iomem *ioaddr = tp->mmio_addr;
 
-        if (tp->mac_version == RTL_GIGA_MAC_VER_27)
+        if (((tp->mac_version == RTL_GIGA_MAC_VER_27) ||
+             (tp->mac_version == RTL_GIGA_MAC_VER_28)) &&
+            (ocp_read(tp, 0x0f, 0x0010) & 0x00008000)) {
                 return;
+        }
 
         switch (tp->mac_version) {
         case RTL_GIGA_MAC_VER_25:
         case RTL_GIGA_MAC_VER_26:
+        case RTL_GIGA_MAC_VER_27:
+        case RTL_GIGA_MAC_VER_28:
                 RTL_W8(PMCH, RTL_R8(PMCH) | 0x80);
                 break;
         }
@@ -2939,6 +2997,8 @@ static void __devinit rtl_init_pll_power_ops(struct rtl8169_private *tp)
         case RTL_GIGA_MAC_VER_09:
         case RTL_GIGA_MAC_VER_10:
         case RTL_GIGA_MAC_VER_16:
+        case RTL_GIGA_MAC_VER_29:
+        case RTL_GIGA_MAC_VER_30:
                 ops->down       = r810x_pll_power_down;
                 ops->up         = r810x_pll_power_up;
                 break;
@@ -3008,6 +3068,11 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         mii->reg_num_mask = 0x1f;
         mii->supports_gmii = !!(cfg->features & RTL_FEATURE_GMII);
 
+        /* disable ASPM completely as that cause random device stop working
+         * problems as well as full system hangs for some PCIe devices users */
+        pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
+                                     PCIE_LINK_STATE_CLKPM);
+
         /* enable device (incl. PCI PM wakeup and hotplug setup) */
         rc = pci_enable_device(pdev);
         if (rc < 0) {
@@ -3041,7 +3106,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_out_mwi_2;
         }
 
-        tp->cp_cmd = PCIMulRW | RxChkSum;
+        tp->cp_cmd = RxChkSum;
 
         if ((sizeof(dma_addr_t) > 4) &&
             !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) && use_dac) {
@@ -3086,6 +3151,13 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         /* Identify chip attached to board */
         rtl8169_get_mac_version(tp, ioaddr);
 
+        /*
+         * Pretend we are using VLANs; This bypasses a nasty bug where
+         * Interrupts stop flowing on high load on 8110SCd controllers.
+         */
+        if (tp->mac_version == RTL_GIGA_MAC_VER_05)
+                tp->cp_cmd |= RxVlan;
+
         rtl_init_mdio_ops(tp);
         rtl_init_pll_power_ops(tp);
 
@@ -3154,10 +3226,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         netif_napi_add(dev, &tp->napi, rtl8169_poll, R8169_NAPI_WEIGHT);
 
-#ifdef CONFIG_R8169_VLAN
-        dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-#endif
-        dev->features |= NETIF_F_GRO;
+        dev->features |= NETIF_F_HW_VLAN_TX_RX | NETIF_F_GRO;
 
         tp->intr_mask = 0xffff;
         tp->hw_start = cfg->hw_start;
@@ -3189,6 +3258,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (pci_dev_run_wake(pdev))
                 pm_runtime_put_noidle(&pdev->dev);
 
+        netif_carrier_off(dev);
+
 out:
         return rc;
 
@@ -3273,12 +3344,7 @@ static int rtl8169_open(struct net_device *dev)
 
         rtl8169_init_phy(dev, tp);
 
-        /*
-         * Pretend we are using VLANs; This bypasses a nasty bug where
-         * Interrupts stop flowing on high load on 8110SCd controllers.
-         */
-        if (tp->mac_version == RTL_GIGA_MAC_VER_05)
-                RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) | RxVlan);
+        rtl8169_vlan_mode(dev);
 
         rtl_pll_power_up(tp);
 
@@ -3315,7 +3381,8 @@ static void rtl8169_hw_reset(struct rtl8169_private *tp)
         /* Disable interrupts */
         rtl8169_irq_mask_and_ack(ioaddr);
 
-        if (tp->mac_version == RTL_GIGA_MAC_VER_28) {
+        if (tp->mac_version == RTL_GIGA_MAC_VER_27 ||
+            tp->mac_version == RTL_GIGA_MAC_VER_28) {
                 while (RTL_R8(TxPoll) & NPQ)
                         udelay(20);
 
@@ -3757,7 +3824,8 @@ static void rtl_hw_start_8168(struct net_device *dev)
         RTL_W16(IntrMitigate, 0x5151);
 
         /* Work around for RxFIFO overflow. */
-        if (tp->mac_version == RTL_GIGA_MAC_VER_11) {
+        if (tp->mac_version == RTL_GIGA_MAC_VER_11 ||
+            tp->mac_version == RTL_GIGA_MAC_VER_22) {
                 tp->intr_event |= RxFIFOOver | PCSTimeout;
                 tp->intr_event &= ~RxOverflow;
         }
@@ -3843,8 +3911,7 @@ static void rtl_hw_start_8168(struct net_device *dev)
         Cxpl_dbg_sel | \
         ASF | \
         PktCntrDisable | \
-        PCIDAC | \
-        PCIMulRW)
+        Mac_dbgo_sel)
 
 static void rtl_hw_start_8102e_1(void __iomem *ioaddr, struct pci_dev *pdev)
 {
@@ -3874,8 +3941,6 @@ static void rtl_hw_start_8102e_1(void __iomem *ioaddr, struct pci_dev *pdev)
         if ((cfg1 & LEDS0) && (cfg1 & LEDS1))
                 RTL_W8(Config1, cfg1 & ~LEDS0);
 
-        RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R810X_CPCMD_QUIRK_MASK);
-
         rtl_ephy_init(ioaddr, e_info_8102e_1, ARRAY_SIZE(e_info_8102e_1));
 }
 
@@ -3887,8 +3952,6 @@ static void rtl_hw_start_8102e_2(void __iomem *ioaddr, struct pci_dev *pdev)
 
         RTL_W8(Config1, MEMMAP | IOMAP | VPD | PMEnable);
         RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
-
-        RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R810X_CPCMD_QUIRK_MASK);
 }
 
 static void rtl_hw_start_8102e_3(void __iomem *ioaddr, struct pci_dev *pdev)
@@ -3898,6 +3961,37 @@ static void rtl_hw_start_8102e_3(void __iomem *ioaddr, struct pci_dev *pdev)
         rtl_ephy_write(ioaddr, 0x03, 0xc2f9);
 }
 
+static void rtl_hw_start_8105e_1(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+        static const struct ephy_info e_info_8105e_1[] = {
+                { 0x07, 0, 0x4000 },
+                { 0x19, 0, 0x0200 },
+                { 0x19, 0, 0x0020 },
+                { 0x1e, 0, 0x2000 },
+                { 0x03, 0, 0x0001 },
+                { 0x19, 0, 0x0100 },
+                { 0x19, 0, 0x0004 },
+                { 0x0a, 0, 0x0020 }
+        };
+
+        /* Force LAN exit from ASPM if Rx/Tx are not idel */
+        RTL_W32(FuncEvent, RTL_R32(FuncEvent) | 0x002800);
+
+        /* disable Early Tally Counter */
+        RTL_W32(FuncEvent, RTL_R32(FuncEvent) & ~0x010000);
+
+        RTL_W8(MCU, RTL_R8(MCU) | EN_NDP | EN_OOB_RESET);
+        RTL_W8(DLLPR, RTL_R8(DLLPR) | PM_SWITCH);
+
+        rtl_ephy_init(ioaddr, e_info_8105e_1, ARRAY_SIZE(e_info_8105e_1));
+}
+
+static void rtl_hw_start_8105e_2(void __iomem *ioaddr, struct pci_dev *pdev)
+{
+        rtl_hw_start_8105e_1(ioaddr, pdev);
+        rtl_ephy_write(ioaddr, 0x1e, rtl_ephy_read(ioaddr, 0x1e) | 0x8000);
+}
+
 static void rtl_hw_start_8101(struct net_device *dev)
 {
         struct rtl8169_private *tp = netdev_priv(dev);
@@ -3914,6 +4008,8 @@ static void rtl_hw_start_8101(struct net_device *dev)
                 }
         }
 
+        RTL_W8(Cfg9346, Cfg9346_Unlock);
+
         switch (tp->mac_version) {
         case RTL_GIGA_MAC_VER_07:
                 rtl_hw_start_8102e_1(ioaddr, pdev);
@@ -3926,16 +4022,22 @@ static void rtl_hw_start_8101(struct net_device *dev)
         case RTL_GIGA_MAC_VER_09:
                 rtl_hw_start_8102e_2(ioaddr, pdev);
                 break;
+
+        case RTL_GIGA_MAC_VER_29:
+                rtl_hw_start_8105e_1(ioaddr, pdev);
+                break;
+        case RTL_GIGA_MAC_VER_30:
+                rtl_hw_start_8105e_2(ioaddr, pdev);
+                break;
         }
 
-        RTL_W8(Cfg9346, Cfg9346_Unlock);
+        RTL_W8(Cfg9346, Cfg9346_Lock);
 
         RTL_W8(MaxTxPacketSize, TxPacketMax);
 
         rtl_set_rx_max_size(ioaddr, rx_buf_sz);
 
-        tp->cp_cmd |= rtl_rw_cpluscmd(ioaddr) | PCIMulRW;
-
+        tp->cp_cmd &= ~R810X_CPCMD_QUIRK_MASK;
         RTL_W16(CPlusCmd, tp->cp_cmd);
 
         RTL_W16(IntrMitigate, 0x0000);
@@ -3945,14 +4047,10 @@ static void rtl_hw_start_8101(struct net_device *dev)
         RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
         rtl_set_rx_tx_config_registers(tp);
 
-        RTL_W8(Cfg9346, Cfg9346_Lock);
-
         RTL_R8(IntrMask);
 
         rtl_set_rx_mode(dev);
 
-        RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
-
         RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xf000);
 
         RTL_W16(IntrMask, tp->intr_event);
@@ -4589,12 +4687,12 @@ static int rtl8169_rx_interrupt(struct net_device *dev,
                         skb_put(skb, pkt_size);
                         skb->protocol = eth_type_trans(skb, dev);
 
-                        if (rtl8169_rx_vlan_skb(tp, desc, skb, polling) < 0) {
-                                if (likely(polling))
-                                        napi_gro_receive(&tp->napi, skb);
-                                else
-                                        netif_rx(skb);
-                        }
+                        rtl8169_rx_vlan_tag(desc, skb);
+
+                        if (likely(polling))
+                                napi_gro_receive(&tp->napi, skb);
+                        else
+                                netif_rx(skb);
 
                         dev->stats.rx_bytes += pkt_size;
                         dev->stats.rx_packets++;
@@ -4639,12 +4737,33 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
                         break;
                 }
 
-                /* Work around for rx fifo overflow */
-                if (unlikely(status & RxFIFOOver) &&
-                (tp->mac_version == RTL_GIGA_MAC_VER_11)) {
-                        netif_stop_queue(dev);
-                        rtl8169_tx_timeout(dev);
-                        break;
+                if (unlikely(status & RxFIFOOver)) {
+                        switch (tp->mac_version) {
+                        /* Work around for rx fifo overflow */
+                        case RTL_GIGA_MAC_VER_11:
+                        case RTL_GIGA_MAC_VER_22:
+                        case RTL_GIGA_MAC_VER_26:
+                                netif_stop_queue(dev);
+                                rtl8169_tx_timeout(dev);
+                                goto done;
+                        /* Testers needed. */
+                        case RTL_GIGA_MAC_VER_17:
+                        case RTL_GIGA_MAC_VER_19:
+                        case RTL_GIGA_MAC_VER_20:
+                        case RTL_GIGA_MAC_VER_21:
+                        case RTL_GIGA_MAC_VER_23:
+                        case RTL_GIGA_MAC_VER_24:
+                        case RTL_GIGA_MAC_VER_27:
+                        case RTL_GIGA_MAC_VER_28:
+                        /* Experimental science. Pktgen proof. */
+                        case RTL_GIGA_MAC_VER_12:
+                        case RTL_GIGA_MAC_VER_25:
+                                if (status == RxFIFOOver)
+                                        goto done;
+                                break;
+                        default:
+                                break;
+                        }
                 }
 
                 if (unlikely(status & SYSErr)) {
@@ -4680,7 +4799,7 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
                         (status & RxFIFOOver) ? (status | RxOverflow) : status);
                 status = RTL_R16(IntrStatus);
         }
-
+done:
         return IRQ_RETVAL(handled);
 }
 
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index 44150f2f7bf..26afbaae23f 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -382,7 +382,7 @@ static void rionet_remove(struct rio_dev *rdev)
         struct rionet_peer *peer, *tmp;
 
         free_pages((unsigned long)rionet_active, rdev->net->hport->sys_size ?
-                                        __ilog2(sizeof(void *)) + 4 : 0);
+                                        __fls(sizeof(void *)) + 4 : 0);
         unregister_netdev(ndev);
         free_netdev(ndev);
 
@@ -450,7 +450,7 @@ static int rionet_setup_netdev(struct rio_mport *mport)
         }
 
         rionet_active = (struct rio_dev **)__get_free_pages(GFP_KERNEL,
-                        mport->sys_size ? __ilog2(sizeof(void *)) + 4 : 0);
+                        mport->sys_size ? __fls(sizeof(void *)) + 4 : 0);
         if (!rionet_active) {
                 rc = -ENOMEM;
                 goto out;
@@ -571,5 +571,5 @@ static void __exit rionet_exit(void)
         rio_unregister_driver(&rionet_driver);
 }
 
-module_init(rionet_init);
+late_initcall(rionet_init);
 module_exit(rionet_exit);
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 39c17cecb8b..356e74d20b8 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -6726,7 +6726,7 @@ static int s2io_ethtool_set_flags(struct net_device *dev, u32 data)
         int rc = 0;
         int changed = 0;
 
-        if (data & ~ETH_FLAG_LRO)
+        if (ethtool_invalid_flags(dev, data, ETH_FLAG_LRO))
                 return -EINVAL;
 
         if (data & ETH_FLAG_LRO) {
@@ -7556,7 +7556,7 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
                          */
                         skb->ip_summed = CHECKSUM_UNNECESSARY;
                         if (ring_data->lro) {
-                                u32 tcp_len;
+                                u32 tcp_len = 0;
                                 u8 *tcp;
                                 int ret = 0;
 
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 002bac74384..d890679e4c4 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2005-2009 Solarflare Communications Inc.
+ * Copyright 2005-2011 Solarflare Communications 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
@@ -21,6 +21,7 @@
 #include <linux/ethtool.h>
 #include <linux/topology.h>
 #include <linux/gfp.h>
+#include <linux/cpu_rmap.h>
 #include "net_driver.h"
 #include "efx.h"
 #include "nic.h"
@@ -307,6 +308,8 @@ static int efx_poll(struct napi_struct *napi, int budget)
                         channel->irq_mod_score = 0;
                 }
 
+                efx_filter_rfs_expire(channel);
+
                 /* There is no race here; although napi_disable() will
                  * only wait for napi_complete(), this isn't a problem
                  * since efx_channel_processed() will have no effect if
@@ -673,7 +676,7 @@ static void efx_fini_channels(struct efx_nic *efx)
 
                 efx_for_each_channel_rx_queue(rx_queue, channel)
                         efx_fini_rx_queue(rx_queue);
-                efx_for_each_channel_tx_queue(tx_queue, channel)
+                efx_for_each_possible_channel_tx_queue(tx_queue, channel)
                         efx_fini_tx_queue(tx_queue);
                 efx_fini_eventq(channel);
         }
@@ -689,7 +692,7 @@ static void efx_remove_channel(struct efx_channel *channel)
 
         efx_for_each_channel_rx_queue(rx_queue, channel)
                 efx_remove_rx_queue(rx_queue);
-        efx_for_each_channel_tx_queue(tx_queue, channel)
+        efx_for_each_possible_channel_tx_queue(tx_queue, channel)
                 efx_remove_tx_queue(tx_queue);
         efx_remove_eventq(channel);
 }
@@ -1051,6 +1054,7 @@ static int efx_init_io(struct efx_nic *efx)
 {
         struct pci_dev *pci_dev = efx->pci_dev;
         dma_addr_t dma_mask = efx->type->max_dma_mask;
+        bool use_wc;
         int rc;
 
         netif_dbg(efx, probe, efx->net_dev, "initialising I/O\n");
@@ -1101,8 +1105,21 @@ static int efx_init_io(struct efx_nic *efx)
                 rc = -EIO;
                 goto fail3;
         }
-        efx->membase = ioremap_nocache(efx->membase_phys,
-                                       efx->type->mem_map_size);
+
+        /* bug22643: If SR-IOV is enabled then tx push over a write combined
+         * mapping is unsafe. We need to disable write combining in this case.
+         * MSI is unsupported when SR-IOV is enabled, and the firmware will
+         * have removed the MSI capability. So write combining is safe if
+         * there is an MSI capability.
+         */
+        use_wc = (!EFX_WORKAROUND_22643(efx) ||
+                  pci_find_capability(pci_dev, PCI_CAP_ID_MSI));
+        if (use_wc)
+                efx->membase = ioremap_wc(efx->membase_phys,
+                                          efx->type->mem_map_size);
+        else
+                efx->membase = ioremap_nocache(efx->membase_phys,
+                                               efx->type->mem_map_size);
         if (!efx->membase) {
                 netif_err(efx, probe, efx->net_dev,
                           "could not map memory BAR at %llx+%x\n",
@@ -1175,10 +1192,32 @@ static int efx_wanted_channels(void)
         return count;
 }
 
+static int
+efx_init_rx_cpu_rmap(struct efx_nic *efx, struct msix_entry *xentries)
+{
+#ifdef CONFIG_RFS_ACCEL
+        int i, rc;
+
+        efx->net_dev->rx_cpu_rmap = alloc_irq_cpu_rmap(efx->n_rx_channels);
+        if (!efx->net_dev->rx_cpu_rmap)
+                return -ENOMEM;
+        for (i = 0; i < efx->n_rx_channels; i++) {
+                rc = irq_cpu_rmap_add(efx->net_dev->rx_cpu_rmap,
+                                      xentries[i].vector);
+                if (rc) {
+                        free_irq_cpu_rmap(efx->net_dev->rx_cpu_rmap);
+                        efx->net_dev->rx_cpu_rmap = NULL;
+                        return rc;
+                }
+        }
+#endif
+        return 0;
+}
+
 /* Probe the number and type of interrupts we are able to obtain, and
  * the resulting numbers of channels and RX queues.
  */
-static void efx_probe_interrupts(struct efx_nic *efx)
+static int efx_probe_interrupts(struct efx_nic *efx)
 {
         int max_channels =
                 min_t(int, efx->type->phys_addr_channels, EFX_MAX_CHANNELS);
@@ -1220,6 +1259,11 @@ static void efx_probe_interrupts(struct efx_nic *efx)
                                 efx->n_tx_channels = efx->n_channels;
                                 efx->n_rx_channels = efx->n_channels;
                         }
+                        rc = efx_init_rx_cpu_rmap(efx, xentries);
+                        if (rc) {
+                                pci_disable_msix(efx->pci_dev);
+                                return rc;
+                        }
                         for (i = 0; i < n_channels; i++)
                                 efx_get_channel(efx, i)->irq =
                                         xentries[i].vector;
@@ -1253,6 +1297,8 @@ static void efx_probe_interrupts(struct efx_nic *efx)
                 efx->n_tx_channels = 1;
                 efx->legacy_irq = efx->pci_dev->irq;
         }
+
+        return 0;
 }
 
 static void efx_remove_interrupts(struct efx_nic *efx)
@@ -1271,21 +1317,8 @@ static void efx_remove_interrupts(struct efx_nic *efx)
 
 static void efx_set_channels(struct efx_nic *efx)
 {
-        struct efx_channel *channel;
-        struct efx_tx_queue *tx_queue;
-
         efx->tx_channel_offset =
                 separate_tx_channels ? efx->n_channels - efx->n_tx_channels : 0;
-
-        /* Channel pointers were set in efx_init_struct() but we now
-         * need to clear them for TX queues in any RX-only channels. */
-        efx_for_each_channel(channel, efx) {
-                if (channel->channel - efx->tx_channel_offset >=
-                    efx->n_tx_channels) {
-                        efx_for_each_channel_tx_queue(tx_queue, channel)
-                                tx_queue->channel = NULL;
-                }
-        }
 }
 
 static int efx_probe_nic(struct efx_nic *efx)
@@ -1302,7 +1335,9 @@ static int efx_probe_nic(struct efx_nic *efx)
 
         /* Determine the number of channels and queues by trying to hook
          * in MSI-X interrupts. */
-        efx_probe_interrupts(efx);
+        rc = efx_probe_interrupts(efx);
+        if (rc)
+                goto fail;
 
         if (efx->n_channels > 1)
                 get_random_bytes(&efx->rx_hash_key, sizeof(efx->rx_hash_key));
@@ -1317,6 +1352,10 @@ static int efx_probe_nic(struct efx_nic *efx)
         efx_init_irq_moderation(efx, tx_irq_mod_usec, rx_irq_mod_usec, true);
 
         return 0;
+
+fail:
+        efx->type->remove(efx);
+        return rc;
 }
 
 static void efx_remove_nic(struct efx_nic *efx)
@@ -1531,9 +1570,9 @@ void efx_init_irq_moderation(struct efx_nic *efx, int tx_usecs, int rx_usecs,
         efx->irq_rx_adaptive = rx_adaptive;
         efx->irq_rx_moderation = rx_ticks;
         efx_for_each_channel(channel, efx) {
-                if (efx_channel_get_rx_queue(channel))
+                if (efx_channel_has_rx_queue(channel))
                         channel->irq_moderation = rx_ticks;
-                else if (efx_channel_get_tx_queue(channel, 0))
+                else if (efx_channel_has_tx_queues(channel))
                         channel->irq_moderation = tx_ticks;
         }
 }
@@ -1849,6 +1888,10 @@ static const struct net_device_ops efx_netdev_ops = {
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller = efx_netpoll,
 #endif
+        .ndo_setup_tc           = efx_setup_tc,
+#ifdef CONFIG_RFS_ACCEL
+        .ndo_rx_flow_steer      = efx_filter_rfs,
+#endif
 };
 
 static void efx_update_name(struct efx_nic *efx)
@@ -1910,10 +1953,8 @@ static int efx_register_netdev(struct efx_nic *efx)
 
         efx_for_each_channel(channel, efx) {
                 struct efx_tx_queue *tx_queue;
-                efx_for_each_channel_tx_queue(tx_queue, channel) {
-                        tx_queue->core_txq = netdev_get_tx_queue(
-                                efx->net_dev, tx_queue->queue / EFX_TXQ_TYPES);
-                }
+                efx_for_each_channel_tx_queue(tx_queue, channel)
+                        efx_init_tx_queue_core_txq(tx_queue);
         }
 
         /* Always start with carrier off; PHY events will detect the link */
@@ -2288,6 +2329,10 @@ static void efx_fini_struct(struct efx_nic *efx)
  */
 static void efx_pci_remove_main(struct efx_nic *efx)
 {
+#ifdef CONFIG_RFS_ACCEL
+        free_irq_cpu_rmap(efx->net_dev->rx_cpu_rmap);
+        efx->net_dev->rx_cpu_rmap = NULL;
+#endif
         efx_nic_fini_interrupt(efx);
         efx_fini_channels(efx);
         efx_fini_port(efx);
@@ -2401,7 +2446,8 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
         int i, rc;
 
         /* Allocate and initialise a struct net_device and struct efx_nic */
-        net_dev = alloc_etherdev_mq(sizeof(*efx), EFX_MAX_CORE_TX_QUEUES);
+        net_dev = alloc_etherdev_mqs(sizeof(*efx), EFX_MAX_CORE_TX_QUEUES,
+                                     EFX_MAX_RX_QUEUES);
         if (!net_dev)
                 return -ENOMEM;
         net_dev->features |= (type->offload_features | NETIF_F_SG |
diff --git a/drivers/net/sfc/efx.h b/drivers/net/sfc/efx.h
index d43a7e5212b..3d83a1f74fe 100644
--- a/drivers/net/sfc/efx.h
+++ b/drivers/net/sfc/efx.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2010 Solarflare Communications 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
@@ -29,6 +29,7 @@
 extern int efx_probe_tx_queue(struct efx_tx_queue *tx_queue);
 extern void efx_remove_tx_queue(struct efx_tx_queue *tx_queue);
 extern void efx_init_tx_queue(struct efx_tx_queue *tx_queue);
+extern void efx_init_tx_queue_core_txq(struct efx_tx_queue *tx_queue);
 extern void efx_fini_tx_queue(struct efx_tx_queue *tx_queue);
 extern void efx_release_tx_buffers(struct efx_tx_queue *tx_queue);
 extern netdev_tx_t
@@ -36,6 +37,7 @@ efx_hard_start_xmit(struct sk_buff *skb, struct net_device *net_dev);
 extern netdev_tx_t
 efx_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb);
 extern void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index);
+extern int efx_setup_tc(struct net_device *net_dev, u8 num_tc);
 
 /* RX */
 extern int efx_probe_rx_queue(struct efx_rx_queue *rx_queue);
@@ -74,6 +76,21 @@ extern int efx_filter_remove_filter(struct efx_nic *efx,
                                     struct efx_filter_spec *spec);
 extern void efx_filter_clear_rx(struct efx_nic *efx,
                                 enum efx_filter_priority priority);
+#ifdef CONFIG_RFS_ACCEL
+extern int efx_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,
+                          u16 rxq_index, u32 flow_id);
+extern bool __efx_filter_rfs_expire(struct efx_nic *efx, unsigned quota);
+static inline void efx_filter_rfs_expire(struct efx_channel *channel)
+{
+        if (channel->rfs_filters_added >= 60 &&
+            __efx_filter_rfs_expire(channel->efx, 100))
+                channel->rfs_filters_added -= 60;
+}
+#define efx_filter_rfs_enabled() 1
+#else
+static inline void efx_filter_rfs_expire(struct efx_channel *channel) {}
+#define efx_filter_rfs_enabled() 0
+#endif
 
 /* Channels */
 extern void efx_process_channel_now(struct efx_channel *channel);
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index 0e8bb19ed60..807178ef65a 100644
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2010 Solarflare Communications 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
@@ -28,7 +28,8 @@ struct efx_ethtool_stat {
         enum {
                 EFX_ETHTOOL_STAT_SOURCE_mac_stats,
                 EFX_ETHTOOL_STAT_SOURCE_nic,
-                EFX_ETHTOOL_STAT_SOURCE_channel
+                EFX_ETHTOOL_STAT_SOURCE_channel,
+                EFX_ETHTOOL_STAT_SOURCE_tx_queue
         } source;
         unsigned offset;
         u64(*get_stat) (void *field); /* Reader function */
@@ -86,6 +87,10 @@ static u64 efx_get_atomic_stat(void *field)
         EFX_ETHTOOL_STAT(field, channel, n_##field,             \
                          unsigned int, efx_get_uint_stat)
 
+#define EFX_ETHTOOL_UINT_TXQ_STAT(field)                        \
+        EFX_ETHTOOL_STAT(tx_##field, tx_queue, field,           \
+                         unsigned int, efx_get_uint_stat)
+
 static struct efx_ethtool_stat efx_ethtool_stats[] = {
         EFX_ETHTOOL_U64_MAC_STAT(tx_bytes),
         EFX_ETHTOOL_U64_MAC_STAT(tx_good_bytes),
@@ -116,6 +121,10 @@ static struct efx_ethtool_stat efx_ethtool_stats[] = {
         EFX_ETHTOOL_ULONG_MAC_STAT(tx_non_tcpudp),
         EFX_ETHTOOL_ULONG_MAC_STAT(tx_mac_src_error),
         EFX_ETHTOOL_ULONG_MAC_STAT(tx_ip_src_error),
+        EFX_ETHTOOL_UINT_TXQ_STAT(tso_bursts),
+        EFX_ETHTOOL_UINT_TXQ_STAT(tso_long_headers),
+        EFX_ETHTOOL_UINT_TXQ_STAT(tso_packets),
+        EFX_ETHTOOL_UINT_TXQ_STAT(pushes),
         EFX_ETHTOOL_U64_MAC_STAT(rx_bytes),
         EFX_ETHTOOL_U64_MAC_STAT(rx_good_bytes),
         EFX_ETHTOOL_U64_MAC_STAT(rx_bad_bytes),
@@ -237,8 +246,8 @@ static void efx_ethtool_get_drvinfo(struct net_device *net_dev,
         strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
         strlcpy(info->version, EFX_DRIVER_VERSION, sizeof(info->version));
         if (efx_nic_rev(efx) >= EFX_REV_SIENA_A0)
-                siena_print_fwver(efx, info->fw_version,
-                                  sizeof(info->fw_version));
+                efx_mcdi_print_fwver(efx, info->fw_version,
+                                     sizeof(info->fw_version));
         strlcpy(info->bus_info, pci_name(efx->pci_dev), sizeof(info->bus_info));
 }
 
@@ -470,6 +479,7 @@ static void efx_ethtool_get_stats(struct net_device *net_dev,
         struct efx_mac_stats *mac_stats = &efx->mac_stats;
         struct efx_ethtool_stat *stat;
         struct efx_channel *channel;
+        struct efx_tx_queue *tx_queue;
         struct rtnl_link_stats64 temp;
         int i;
 
@@ -495,6 +505,15 @@ static void efx_ethtool_get_stats(struct net_device *net_dev,
                                 data[i] += stat->get_stat((void *)channel +
                                                           stat->offset);
                         break;
+                case EFX_ETHTOOL_STAT_SOURCE_tx_queue:
+                        data[i] = 0;
+                        efx_for_each_channel(channel, efx) {
+                                efx_for_each_channel_tx_queue(tx_queue, channel)
+                                        data[i] +=
+                                                stat->get_stat((void *)tx_queue
+                                                               + stat->offset);
+                        }
+                        break;
                 }
         }
 }
@@ -502,7 +521,7 @@ static void efx_ethtool_get_stats(struct net_device *net_dev,
 static int efx_ethtool_set_tso(struct net_device *net_dev, u32 enable)
 {
         struct efx_nic *efx __attribute__ ((unused)) = netdev_priv(net_dev);
-        unsigned long features;
+        u32 features;
 
         features = NETIF_F_TSO;
         if (efx->type->offload_features & NETIF_F_V6_CSUM)
@@ -519,7 +538,7 @@ static int efx_ethtool_set_tso(struct net_device *net_dev, u32 enable)
 static int efx_ethtool_set_tx_csum(struct net_device *net_dev, u32 enable)
 {
         struct efx_nic *efx = netdev_priv(net_dev);
-        unsigned long features = efx->type->offload_features & NETIF_F_ALL_CSUM;
+        u32 features = efx->type->offload_features & NETIF_F_ALL_CSUM;
 
         if (enable)
                 net_dev->features |= features;
@@ -569,9 +588,14 @@ static void efx_ethtool_self_test(struct net_device *net_dev,
                                   struct ethtool_test *test, u64 *data)
 {
         struct efx_nic *efx = netdev_priv(net_dev);
-        struct efx_self_tests efx_tests;
+        struct efx_self_tests *efx_tests;
         int already_up;
-        int rc;
+        int rc = -ENOMEM;
+
+        efx_tests = kzalloc(sizeof(*efx_tests), GFP_KERNEL);
+        if (!efx_tests)
+                goto fail;
+
 
         ASSERT_RTNL();
         if (efx->state != STATE_RUNNING) {
@@ -589,13 +613,11 @@ static void efx_ethtool_self_test(struct net_device *net_dev,
                 if (rc) {
                         netif_err(efx, drv, efx->net_dev,
                                   "failed opening device.\n");
-                        goto fail2;
+                        goto fail1;
                 }
         }
 
-        memset(&efx_tests, 0, sizeof(efx_tests));
-
-        rc = efx_selftest(efx, &efx_tests, test->flags);
+        rc = efx_selftest(efx, efx_tests, test->flags);
 
         if (!already_up)
                 dev_close(efx->net_dev);
@@ -604,10 +626,11 @@ static void efx_ethtool_self_test(struct net_device *net_dev,
                    rc == 0 ? "passed" : "failed",
                    (test->flags & ETH_TEST_FL_OFFLINE) ? "off" : "on");
 
- fail2:
- fail1:
+fail1:
         /* Fill ethtool results structures */
-        efx_ethtool_fill_self_tests(efx, &efx_tests, NULL, data);
+        efx_ethtool_fill_self_tests(efx, efx_tests, NULL, data);
+        kfree(efx_tests);
+fail:
         if (rc)
                 test->flags |= ETH_TEST_FL_FAILED;
 }
@@ -631,7 +654,7 @@ static int efx_ethtool_get_coalesce(struct net_device *net_dev,
         /* Find lowest IRQ moderation across all used TX queues */
         coalesce->tx_coalesce_usecs_irq = ~((u32) 0);
         efx_for_each_channel(channel, efx) {
-                if (!efx_channel_get_tx_queue(channel, 0))
+                if (!efx_channel_has_tx_queues(channel))
                         continue;
                 if (channel->irq_moderation < coalesce->tx_coalesce_usecs_irq) {
                         if (channel->channel < efx->n_rx_channels)
@@ -676,8 +699,8 @@ static int efx_ethtool_set_coalesce(struct net_device *net_dev,
 
         /* If the channel is shared only allow RX parameters to be set */
         efx_for_each_channel(channel, efx) {
-                if (efx_channel_get_rx_queue(channel) &&
-                    efx_channel_get_tx_queue(channel, 0) &&
+                if (efx_channel_has_rx_queue(channel) &&
+                    efx_channel_has_tx_queues(channel) &&
                     tx_usecs) {
                         netif_err(efx, drv, efx->net_dev, "Channel is shared. "
                                   "Only RX coalescing may be set\n");
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 61ddd2c6e75..734fcfb52e8 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2010 Solarflare Communications 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
@@ -1478,36 +1478,26 @@ static void falcon_init_rx_cfg(struct efx_nic *efx)
         /* RX control FIFO thresholds (32 entries) */
         const unsigned ctrl_xon_thr = 20;
         const unsigned ctrl_xoff_thr = 25;
-        /* RX data FIFO thresholds (256-byte units; size varies) */
-        int data_xon_thr = efx_nic_rx_xon_thresh >> 8;
-        int data_xoff_thr = efx_nic_rx_xoff_thresh >> 8;
         efx_oword_t reg;
 
         efx_reado(efx, &reg, FR_AZ_RX_CFG);
         if (efx_nic_rev(efx) <= EFX_REV_FALCON_A1) {
                 /* Data FIFO size is 5.5K */
-                if (data_xon_thr < 0)
-                        data_xon_thr = 512 >> 8;
-                if (data_xoff_thr < 0)
-                        data_xoff_thr = 2048 >> 8;
                 EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_DESC_PUSH_EN, 0);
                 EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_USR_BUF_SIZE,
                                     huge_buf_size);
-                EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XON_MAC_TH, data_xon_thr);
-                EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XOFF_MAC_TH, data_xoff_thr);
+                EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XON_MAC_TH, 512 >> 8);
+                EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XOFF_MAC_TH, 2048 >> 8);
                 EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XON_TX_TH, ctrl_xon_thr);
                 EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XOFF_TX_TH, ctrl_xoff_thr);
         } else {
                 /* Data FIFO size is 80K; register fields moved */
-                if (data_xon_thr < 0)
-                        data_xon_thr = 27648 >> 8; /* ~3*max MTU */
-                if (data_xoff_thr < 0)
-                        data_xoff_thr = 54272 >> 8; /* ~80Kb - 3*max MTU */
                 EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_DESC_PUSH_EN, 0);
                 EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_USR_BUF_SIZE,
                                     huge_buf_size);
-                EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XON_MAC_TH, data_xon_thr);
-                EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XOFF_MAC_TH, data_xoff_thr);
+                /* Send XON and XOFF at ~3 * max MTU away from empty/full */
+                EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XON_MAC_TH, 27648 >> 8);
+                EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XOFF_MAC_TH, 54272 >> 8);
                 EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XON_TX_TH, ctrl_xon_thr);
                 EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XOFF_TX_TH, ctrl_xoff_thr);
                 EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_INGR_EN, 1);
diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/sfc/falcon_boards.c
index 2dd16f0b3ce..b9cc846811d 100644
--- a/drivers/net/sfc/falcon_boards.c
+++ b/drivers/net/sfc/falcon_boards.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2007-2009 Solarflare Communications Inc.
+ * Copyright 2007-2010 Solarflare Communications 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
diff --git a/drivers/net/sfc/falcon_xmac.c b/drivers/net/sfc/falcon_xmac.c
index b49e8439464..2c9ee5db3bf 100644
--- a/drivers/net/sfc/falcon_xmac.c
+++ b/drivers/net/sfc/falcon_xmac.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2010 Solarflare Communications 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
diff --git a/drivers/net/sfc/filter.c b/drivers/net/sfc/filter.c
index d4722c41c4c..95a980fd63d 100644
--- a/drivers/net/sfc/filter.c
+++ b/drivers/net/sfc/filter.c
@@ -8,6 +8,7 @@
  */
 
 #include <linux/in.h>
+#include <net/ip.h>
 #include "efx.h"
 #include "filter.h"
 #include "io.h"
@@ -27,6 +28,10 @@
  */
 #define FILTER_CTL_SRCH_MAX 200
 
+/* Don't try very hard to find space for performance hints, as this is
+ * counter-productive. */
+#define FILTER_CTL_SRCH_HINT_MAX 5
+
 enum efx_filter_table_id {
         EFX_FILTER_TABLE_RX_IP = 0,
         EFX_FILTER_TABLE_RX_MAC,
@@ -47,6 +52,10 @@ struct efx_filter_table {
 struct efx_filter_state {
         spinlock_t      lock;
         struct efx_filter_table table[EFX_FILTER_TABLE_COUNT];
+#ifdef CONFIG_RFS_ACCEL
+        u32             *rps_flow_id;
+        unsigned        rps_expire_index;
+#endif
 };
 
 /* The filter hash function is LFSR polynomial x^16 + x^3 + 1 of a 32-bit
@@ -325,15 +334,16 @@ static int efx_filter_search(struct efx_filter_table *table,
                              struct efx_filter_spec *spec, u32 key,
                              bool for_insert, int *depth_required)
 {
-        unsigned hash, incr, filter_idx, depth;
+        unsigned hash, incr, filter_idx, depth, depth_max;
         struct efx_filter_spec *cmp;
 
         hash = efx_filter_hash(key);
         incr = efx_filter_increment(key);
+        depth_max = (spec->priority <= EFX_FILTER_PRI_HINT ?
+                     FILTER_CTL_SRCH_HINT_MAX : FILTER_CTL_SRCH_MAX);
 
         for (depth = 1, filter_idx = hash & (table->size - 1);
-             depth <= FILTER_CTL_SRCH_MAX &&
-                     test_bit(filter_idx, table->used_bitmap);
+             depth <= depth_max && test_bit(filter_idx, table->used_bitmap);
              ++depth) {
                 cmp = &table->spec[filter_idx];
                 if (efx_filter_equal(spec, cmp))
@@ -342,7 +352,7 @@ static int efx_filter_search(struct efx_filter_table *table,
         }
         if (!for_insert)
                 return -ENOENT;
-        if (depth > FILTER_CTL_SRCH_MAX)
+        if (depth > depth_max)
                 return -EBUSY;
 found:
         *depth_required = depth;
@@ -562,6 +572,13 @@ int efx_probe_filters(struct efx_nic *efx)
         spin_lock_init(&state->lock);
 
         if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0) {
+#ifdef CONFIG_RFS_ACCEL
+                state->rps_flow_id = kcalloc(FR_BZ_RX_FILTER_TBL0_ROWS,
+                                             sizeof(*state->rps_flow_id),
+                                             GFP_KERNEL);
+                if (!state->rps_flow_id)
+                        goto fail;
+#endif
                 table = &state->table[EFX_FILTER_TABLE_RX_IP];
                 table->id = EFX_FILTER_TABLE_RX_IP;
                 table->offset = FR_BZ_RX_FILTER_TBL0;
@@ -607,5 +624,97 @@ void efx_remove_filters(struct efx_nic *efx)
                 kfree(state->table[table_id].used_bitmap);
                 vfree(state->table[table_id].spec);
         }
+#ifdef CONFIG_RFS_ACCEL
+        kfree(state->rps_flow_id);
+#endif
         kfree(state);
 }
+
+#ifdef CONFIG_RFS_ACCEL
+
+int efx_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,
+                   u16 rxq_index, u32 flow_id)
+{
+        struct efx_nic *efx = netdev_priv(net_dev);
+        struct efx_channel *channel;
+        struct efx_filter_state *state = efx->filter_state;
+        struct efx_filter_spec spec;
+        const struct iphdr *ip;
+        const __be16 *ports;
+        int nhoff;
+        int rc;
+
+        nhoff = skb_network_offset(skb);
+
+        if (skb->protocol != htons(ETH_P_IP))
+                return -EPROTONOSUPPORT;
+
+        /* RFS must validate the IP header length before calling us */
+        EFX_BUG_ON_PARANOID(!pskb_may_pull(skb, nhoff + sizeof(*ip)));
+        ip = (const struct iphdr *)(skb->data + nhoff);
+        if (ip->frag_off & htons(IP_MF | IP_OFFSET))
+                return -EPROTONOSUPPORT;
+        EFX_BUG_ON_PARANOID(!pskb_may_pull(skb, nhoff + 4 * ip->ihl + 4));
+        ports = (const __be16 *)(skb->data + nhoff + 4 * ip->ihl);
+
+        efx_filter_init_rx(&spec, EFX_FILTER_PRI_HINT, 0, rxq_index);
+        rc = efx_filter_set_ipv4_full(&spec, ip->protocol,
+                                      ip->daddr, ports[1], ip->saddr, ports[0]);
+        if (rc)
+                return rc;
+
+        rc = efx_filter_insert_filter(efx, &spec, true);
+        if (rc < 0)
+                return rc;
+
+        /* Remember this so we can check whether to expire the filter later */
+        state->rps_flow_id[rc] = flow_id;
+        channel = efx_get_channel(efx, skb_get_rx_queue(skb));
+        ++channel->rfs_filters_added;
+
+        netif_info(efx, rx_status, efx->net_dev,
+                   "steering %s %pI4:%u:%pI4:%u to queue %u [flow %u filter %d]\n",
+                   (ip->protocol == IPPROTO_TCP) ? "TCP" : "UDP",
+                   &ip->saddr, ntohs(ports[0]), &ip->daddr, ntohs(ports[1]),
+                   rxq_index, flow_id, rc);
+
+        return rc;
+}
+
+bool __efx_filter_rfs_expire(struct efx_nic *efx, unsigned quota)
+{
+        struct efx_filter_state *state = efx->filter_state;
+        struct efx_filter_table *table = &state->table[EFX_FILTER_TABLE_RX_IP];
+        unsigned mask = table->size - 1;
+        unsigned index;
+        unsigned stop;
+
+        if (!spin_trylock_bh(&state->lock))
+                return false;
+
+        index = state->rps_expire_index;
+        stop = (index + quota) & mask;
+
+        while (index != stop) {
+                if (test_bit(index, table->used_bitmap) &&
+                    table->spec[index].priority == EFX_FILTER_PRI_HINT &&
+                    rps_may_expire_flow(efx->net_dev,
+                                        table->spec[index].dmaq_id,
+                                        state->rps_flow_id[index], index)) {
+                        netif_info(efx, rx_status, efx->net_dev,
+                                   "expiring filter %d [flow %u]\n",
+                                   index, state->rps_flow_id[index]);
+                        efx_filter_table_clear_entry(efx, table, index);
+                }
+                index = (index + 1) & mask;
+        }
+
+        state->rps_expire_index = stop;
+        if (table->used == 0)
+                efx_filter_table_reset_search_depth(table);
+
+        spin_unlock_bh(&state->lock);
+        return true;
+}
+
+#endif /* CONFIG_RFS_ACCEL */
diff --git a/drivers/net/sfc/io.h b/drivers/net/sfc/io.h
index 6da4ae20a03..d9d8c2ef107 100644
--- a/drivers/net/sfc/io.h
+++ b/drivers/net/sfc/io.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2010 Solarflare Communications 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
@@ -48,9 +48,9 @@
  *   replacing the low 96 bits with zero does not affect functionality.
  * - If the host writes to the last dword address of such a register
  *   (i.e. the high 32 bits) the underlying register will always be
- *   written.  If the collector does not hold values for the low 96
- *   bits of the register, they will be written as zero.  Writing to
- *   the last qword does not have this effect and must not be done.
+ *   written.  If the collector and the current write together do not
+ *   provide values for all 128 bits of the register, the low 96 bits
+ *   will be written as zero.
  * - If the host writes to the address of any other part of such a
  *   register while the collector already holds values for some other
  *   register, the write is discarded and the collector maintains its
@@ -103,6 +103,7 @@ static inline void efx_writeo(struct efx_nic *efx, efx_oword_t *value,
         _efx_writed(efx, value->u32[2], reg + 8);
         _efx_writed(efx, value->u32[3], reg + 12);
 #endif
+        wmb();
         mmiowb();
         spin_unlock_irqrestore(&efx->biu_lock, flags);
 }
@@ -125,6 +126,7 @@ static inline void efx_sram_writeq(struct efx_nic *efx, void __iomem *membase,
         __raw_writel((__force u32)value->u32[0], membase + addr);
         __raw_writel((__force u32)value->u32[1], membase + addr + 4);
 #endif
+        wmb();
         mmiowb();
         spin_unlock_irqrestore(&efx->biu_lock, flags);
 }
@@ -139,6 +141,7 @@ static inline void efx_writed(struct efx_nic *efx, efx_dword_t *value,
 
         /* No lock required */
         _efx_writed(efx, value->u32[0], reg);
+        wmb();
 }
 
 /* Read a 128-bit CSR, locking as appropriate. */
@@ -237,12 +240,14 @@ static inline void _efx_writeo_page(struct efx_nic *efx, efx_oword_t *value,
 
 #ifdef EFX_USE_QWORD_IO
         _efx_writeq(efx, value->u64[0], reg + 0);
+        _efx_writeq(efx, value->u64[1], reg + 8);
 #else
         _efx_writed(efx, value->u32[0], reg + 0);
         _efx_writed(efx, value->u32[1], reg + 4);
-#endif
         _efx_writed(efx, value->u32[2], reg + 8);
         _efx_writed(efx, value->u32[3], reg + 12);
+#endif
+        wmb();
 }
 #define efx_writeo_page(efx, value, reg, page)                          \
         _efx_writeo_page(efx, value,                                    \
diff --git a/drivers/net/sfc/mcdi.c b/drivers/net/sfc/mcdi.c
index b716e827b29..5e118f0d247 100644
--- a/drivers/net/sfc/mcdi.c
+++ b/drivers/net/sfc/mcdi.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2008-2009 Solarflare Communications Inc.
+ * Copyright 2008-2011 Solarflare Communications 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
@@ -94,14 +94,15 @@ static void efx_mcdi_copyin(struct efx_nic *efx, unsigned cmd,
 
         efx_writed(efx, &hdr, pdu);
 
-        for (i = 0; i < inlen; i += 4)
+        for (i = 0; i < inlen; i += 4) {
                 _efx_writed(efx, *((__le32 *)(inbuf + i)), pdu + 4 + i);
-
-        /* Ensure the payload is written out before the header */
-        wmb();
+                /* use wmb() within loop to inhibit write combining */
+                wmb();
+        }
 
         /* ring the doorbell with a distinctive value */
         _efx_writed(efx, (__force __le32) 0x45789abc, doorbell);
+        wmb();
 }
 
 static void efx_mcdi_copyout(struct efx_nic *efx, u8 *outbuf, size_t outlen)
@@ -602,7 +603,7 @@ void efx_mcdi_process_event(struct efx_channel *channel,
  **************************************************************************
  */
 
-int efx_mcdi_fwver(struct efx_nic *efx, u64 *version, u32 *build)
+void efx_mcdi_print_fwver(struct efx_nic *efx, char *buf, size_t len)
 {
         u8 outbuf[ALIGN(MC_CMD_GET_VERSION_V1_OUT_LEN, 4)];
         size_t outlength;
@@ -616,29 +617,20 @@ int efx_mcdi_fwver(struct efx_nic *efx, u64 *version, u32 *build)
         if (rc)
                 goto fail;
 
-        if (outlength == MC_CMD_GET_VERSION_V0_OUT_LEN) {
-                *version = 0;
-                *build = MCDI_DWORD(outbuf, GET_VERSION_OUT_FIRMWARE);
-                return 0;
-        }
-
         if (outlength < MC_CMD_GET_VERSION_V1_OUT_LEN) {
                 rc = -EIO;
                 goto fail;
         }
 
         ver_words = (__le16 *)MCDI_PTR(outbuf, GET_VERSION_OUT_VERSION);
-        *version = (((u64)le16_to_cpu(ver_words[0]) << 48) |
-                    ((u64)le16_to_cpu(ver_words[1]) << 32) |
-                    ((u64)le16_to_cpu(ver_words[2]) << 16) |
-                    le16_to_cpu(ver_words[3]));
-        *build = MCDI_DWORD(outbuf, GET_VERSION_OUT_FIRMWARE);
-
-        return 0;
+        snprintf(buf, len, "%u.%u.%u.%u",
+                 le16_to_cpu(ver_words[0]), le16_to_cpu(ver_words[1]),
+                 le16_to_cpu(ver_words[2]), le16_to_cpu(ver_words[3]));
+        return;
 
 fail:
         netif_err(efx, probe, efx->net_dev, "%s: failed rc=%d\n", __func__, rc);
-        return rc;
+        buf[0] = 0;
 }
 
 int efx_mcdi_drv_attach(struct efx_nic *efx, bool driver_operating,
diff --git a/drivers/net/sfc/mcdi.h b/drivers/net/sfc/mcdi.h
index c792f1d65e4..aced2a7856f 100644
--- a/drivers/net/sfc/mcdi.h
+++ b/drivers/net/sfc/mcdi.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2008-2009 Solarflare Communications Inc.
+ * Copyright 2008-2010 Solarflare Communications 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
@@ -93,7 +93,7 @@ extern void efx_mcdi_process_event(struct efx_channel *channel,
 #define MCDI_EVENT_FIELD(_ev, _field)                   \
         EFX_QWORD_FIELD(_ev, MCDI_EVENT_ ## _field)
 
-extern int efx_mcdi_fwver(struct efx_nic *efx, u64 *version, u32 *build);
+extern void efx_mcdi_print_fwver(struct efx_nic *efx, char *buf, size_t len);
 extern int efx_mcdi_drv_attach(struct efx_nic *efx, bool driver_operating,
                                bool *was_attached_out);
 extern int efx_mcdi_get_board_cfg(struct efx_nic *efx, u8 *mac_address,
diff --git a/drivers/net/sfc/mcdi_mac.c b/drivers/net/sfc/mcdi_mac.c
index f88f4bf986f..33f7294edb4 100644
--- a/drivers/net/sfc/mcdi_mac.c
+++ b/drivers/net/sfc/mcdi_mac.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2009 Solarflare Communications Inc.
+ * Copyright 2009-2010 Solarflare Communications 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
diff --git a/drivers/net/sfc/mcdi_pcol.h b/drivers/net/sfc/mcdi_pcol.h
index 90359e64400..b86a15f221a 100644
--- a/drivers/net/sfc/mcdi_pcol.h
+++ b/drivers/net/sfc/mcdi_pcol.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2009 Solarflare Communications Inc.
+ * Copyright 2009-2011 Solarflare Communications 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
diff --git a/drivers/net/sfc/mcdi_phy.c b/drivers/net/sfc/mcdi_phy.c
index 0e97eed663c..ec3f740f546 100644
--- a/drivers/net/sfc/mcdi_phy.c
+++ b/drivers/net/sfc/mcdi_phy.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2009 Solarflare Communications Inc.
+ * Copyright 2009-2010 Solarflare Communications 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
diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c
index 56b0266b441..19e68c26d10 100644
--- a/drivers/net/sfc/mdio_10g.c
+++ b/drivers/net/sfc/mdio_10g.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2011 Solarflare Communications 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
@@ -51,13 +51,10 @@ int efx_mdio_reset_mmd(struct efx_nic *port, int mmd,
         return spins ? spins : -ETIMEDOUT;
 }
 
-static int efx_mdio_check_mmd(struct efx_nic *efx, int mmd, int fault_fatal)
+static int efx_mdio_check_mmd(struct efx_nic *efx, int mmd)
 {
         int status;
 
-        if (LOOPBACK_INTERNAL(efx))
-                return 0;
-
         if (mmd != MDIO_MMD_AN) {
                 /* Read MMD STATUS2 to check it is responding. */
                 status = efx_mdio_read(efx, mmd, MDIO_STAT2);
@@ -68,20 +65,6 @@ static int efx_mdio_check_mmd(struct efx_nic *efx, int mmd, int fault_fatal)
                 }
         }
 
-        /* Read MMD STATUS 1 to check for fault. */
-        status = efx_mdio_read(efx, mmd, MDIO_STAT1);
-        if (status & MDIO_STAT1_FAULT) {
-                if (fault_fatal) {
-                        netif_err(efx, hw, efx->net_dev,
-                                  "PHY MMD %d reporting fatal"
-                                  " fault: status %x\n", mmd, status);
-                        return -EIO;
-                } else {
-                        netif_dbg(efx, hw, efx->net_dev,
-                                  "PHY MMD %d reporting status"
-                                  " %x (expected)\n", mmd, status);
-                }
-        }
         return 0;
 }
 
@@ -130,8 +113,7 @@ int efx_mdio_wait_reset_mmds(struct efx_nic *efx, unsigned int mmd_mask)
         return rc;
 }
 
-int efx_mdio_check_mmds(struct efx_nic *efx,
-                        unsigned int mmd_mask, unsigned int fatal_mask)
+int efx_mdio_check_mmds(struct efx_nic *efx, unsigned int mmd_mask)
 {
         int mmd = 0, probe_mmd, devs1, devs2;
         u32 devices;
@@ -161,13 +143,9 @@ int efx_mdio_check_mmds(struct efx_nic *efx,
 
         /* Check all required MMDs are responding and happy. */
         while (mmd_mask) {
-                if (mmd_mask & 1) {
-                        int fault_fatal = fatal_mask & 1;
-                        if (efx_mdio_check_mmd(efx, mmd, fault_fatal))
-                                return -EIO;
-                }
+                if ((mmd_mask & 1) && efx_mdio_check_mmd(efx, mmd))
+                        return -EIO;
                 mmd_mask = mmd_mask >> 1;
-                fatal_mask = fatal_mask >> 1;
                 mmd++;
         }
 
@@ -337,7 +315,7 @@ int efx_mdio_test_alive(struct efx_nic *efx)
                           "no MDIO PHY present with ID %d\n", efx->mdio.prtad);
                 rc = -EINVAL;
         } else {
-                rc = efx_mdio_check_mmds(efx, efx->mdio.mmds, 0);
+                rc = efx_mdio_check_mmds(efx, efx->mdio.mmds);
         }
 
         mutex_unlock(&efx->mac_lock);
diff --git a/drivers/net/sfc/mdio_10g.h b/drivers/net/sfc/mdio_10g.h
index 75791d3d496..df0703940c8 100644
--- a/drivers/net/sfc/mdio_10g.h
+++ b/drivers/net/sfc/mdio_10g.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2011 Solarflare Communications 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
@@ -68,8 +68,7 @@ extern int efx_mdio_reset_mmd(struct efx_nic *efx, int mmd,
                               int spins, int spintime);
 
 /* As efx_mdio_check_mmd but for multiple MMDs */
-int efx_mdio_check_mmds(struct efx_nic *efx,
-                        unsigned int mmd_mask, unsigned int fatal_mask);
+int efx_mdio_check_mmds(struct efx_nic *efx, unsigned int mmd_mask);
 
 /* Check the link status of specified mmds in bit mask */
 extern bool efx_mdio_links_ok(struct efx_nic *efx, unsigned int mmd_mask);
diff --git a/drivers/net/sfc/mtd.c b/drivers/net/sfc/mtd.c
index d38627448c2..e646bfce2d8 100644
--- a/drivers/net/sfc/mtd.c
+++ b/drivers/net/sfc/mtd.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2010 Solarflare Communications 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
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 28df8665256..215d5c51bfa 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2005-2009 Solarflare Communications Inc.
+ * Copyright 2005-2011 Solarflare Communications 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
@@ -41,7 +41,7 @@
  *
  **************************************************************************/
 
-#define EFX_DRIVER_VERSION      "3.0"
+#define EFX_DRIVER_VERSION      "3.1"
 
 #ifdef EFX_ENABLE_DEBUG
 #define EFX_BUG_ON_PARANOID(x) BUG_ON(x)
@@ -63,10 +63,12 @@
 /* Checksum generation is a per-queue option in hardware, so each
  * queue visible to the networking core is backed by two hardware TX
  * queues. */
-#define EFX_MAX_CORE_TX_QUEUES  EFX_MAX_CHANNELS
-#define EFX_TXQ_TYPE_OFFLOAD    1
-#define EFX_TXQ_TYPES           2
-#define EFX_MAX_TX_QUEUES       (EFX_TXQ_TYPES * EFX_MAX_CORE_TX_QUEUES)
+#define EFX_MAX_TX_TC           2
+#define EFX_MAX_CORE_TX_QUEUES  (EFX_MAX_TX_TC * EFX_MAX_CHANNELS)
+#define EFX_TXQ_TYPE_OFFLOAD    1       /* flag */
+#define EFX_TXQ_TYPE_HIGHPRI    2       /* flag */
+#define EFX_TXQ_TYPES           4
+#define EFX_MAX_TX_QUEUES       (EFX_TXQ_TYPES * EFX_MAX_CHANNELS)
 
 /**
  * struct efx_special_buffer - An Efx special buffer
@@ -140,6 +142,7 @@ struct efx_tx_buffer {
  * @buffer: The software buffer ring
  * @txd: The hardware descriptor ring
  * @ptr_mask: The size of the ring minus 1.
+ * @initialised: Has hardware queue been initialised?
  * @flushed: Used when handling queue flushing
  * @read_count: Current read pointer.
  *      This is the number of buffers that have been removed from both rings.
@@ -182,6 +185,7 @@ struct efx_tx_queue {
         struct efx_tx_buffer *buffer;
         struct efx_special_buffer txd;
         unsigned int ptr_mask;
+        bool initialised;
         enum efx_flush_state flushed;
 
         /* Members used mainly on the completion path */
@@ -210,15 +214,17 @@ struct efx_tx_queue {
  *      If both this and page are %NULL, the buffer slot is currently free.
  * @page: The associated page buffer, if any.
  *      If both this and skb are %NULL, the buffer slot is currently free.
- * @data: Pointer to ethernet header
  * @len: Buffer length, in bytes.
+ * @is_page: Indicates if @page is valid. If false, @skb is valid.
  */
 struct efx_rx_buffer {
         dma_addr_t dma_addr;
-        struct sk_buff *skb;
-        struct page *page;
-        char *data;
+        union {
+                struct sk_buff *skb;
+                struct page *page;
+        } u;
         unsigned int len;
+        bool is_page;
 };
 
 /**
@@ -358,6 +364,9 @@ struct efx_channel {
 
         unsigned int irq_count;
         unsigned int irq_mod_score;
+#ifdef CONFIG_RFS_ACCEL
+        unsigned int rfs_filters_added;
+#endif
 
         int rx_alloc_level;
         int rx_alloc_push_pages;
@@ -377,7 +386,7 @@ struct efx_channel {
         bool rx_pkt_csummed;
 
         struct efx_rx_queue rx_queue;
-        struct efx_tx_queue tx_queue[2];
+        struct efx_tx_queue tx_queue[EFX_TXQ_TYPES];
 };
 
 enum efx_led_mode {
@@ -906,7 +915,7 @@ struct efx_nic_type {
         unsigned int phys_addr_channels;
         unsigned int tx_dc_base;
         unsigned int rx_dc_base;
-        unsigned long offload_features;
+        u32 offload_features;
         u32 reset_world_flags;
 };
 
@@ -938,18 +947,40 @@ efx_get_tx_queue(struct efx_nic *efx, unsigned index, unsigned type)
         return &efx->channel[efx->tx_channel_offset + index]->tx_queue[type];
 }
 
+static inline bool efx_channel_has_tx_queues(struct efx_channel *channel)
+{
+        return channel->channel - channel->efx->tx_channel_offset <
+                channel->efx->n_tx_channels;
+}
+
 static inline struct efx_tx_queue *
 efx_channel_get_tx_queue(struct efx_channel *channel, unsigned type)
 {
-        struct efx_tx_queue *tx_queue = channel->tx_queue;
-        EFX_BUG_ON_PARANOID(type >= EFX_TXQ_TYPES);
-        return tx_queue->channel ? tx_queue + type : NULL;
+        EFX_BUG_ON_PARANOID(!efx_channel_has_tx_queues(channel) ||
+                            type >= EFX_TXQ_TYPES);
+        return &channel->tx_queue[type];
+}
+
+static inline bool efx_tx_queue_used(struct efx_tx_queue *tx_queue)
+{
+        return !(tx_queue->efx->net_dev->num_tc < 2 &&
+                 tx_queue->queue & EFX_TXQ_TYPE_HIGHPRI);
 }
 
 /* Iterate over all TX queues belonging to a channel */
 #define efx_for_each_channel_tx_queue(_tx_queue, _channel)              \
-        for (_tx_queue = efx_channel_get_tx_queue(channel, 0);          \
-             _tx_queue && _tx_queue < (_channel)->tx_queue + EFX_TXQ_TYPES; \
+        if (!efx_channel_has_tx_queues(_channel))                       \
+                ;                                                       \
+        else                                                            \
+                for (_tx_queue = (_channel)->tx_queue;                  \
+                     _tx_queue < (_channel)->tx_queue + EFX_TXQ_TYPES && \
+                             efx_tx_queue_used(_tx_queue);              \
+                     _tx_queue++)
+
+/* Iterate over all possible TX queues belonging to a channel */
+#define efx_for_each_possible_channel_tx_queue(_tx_queue, _channel)     \
+        for (_tx_queue = (_channel)->tx_queue;                          \
+             _tx_queue < (_channel)->tx_queue + EFX_TXQ_TYPES;          \
              _tx_queue++)
 
 static inline struct efx_rx_queue *
@@ -959,18 +990,26 @@ efx_get_rx_queue(struct efx_nic *efx, unsigned index)
         return &efx->channel[index]->rx_queue;
 }
 
+static inline bool efx_channel_has_rx_queue(struct efx_channel *channel)
+{
+        return channel->channel < channel->efx->n_rx_channels;
+}
+
 static inline struct efx_rx_queue *
 efx_channel_get_rx_queue(struct efx_channel *channel)
 {
-        return channel->channel < channel->efx->n_rx_channels ?
-                &channel->rx_queue : NULL;
+        EFX_BUG_ON_PARANOID(!efx_channel_has_rx_queue(channel));
+        return &channel->rx_queue;
 }
 
 /* Iterate over all RX queues belonging to a channel */
 #define efx_for_each_channel_rx_queue(_rx_queue, _channel)              \
-        for (_rx_queue = efx_channel_get_rx_queue(channel);             \
-             _rx_queue;                                                 \
-             _rx_queue = NULL)
+        if (!efx_channel_has_rx_queue(_channel))                        \
+                ;                                                       \
+        else                                                            \
+                for (_rx_queue = &(_channel)->rx_queue;                 \
+                     _rx_queue;                                         \
+                     _rx_queue = NULL)
 
 static inline struct efx_channel *
 efx_rx_queue_channel(struct efx_rx_queue *rx_queue)
diff --git a/drivers/net/sfc/nic.c b/drivers/net/sfc/nic.c
index da386599ab6..e8396614daf 100644
--- a/drivers/net/sfc/nic.c
+++ b/drivers/net/sfc/nic.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2011 Solarflare Communications 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
@@ -41,26 +41,6 @@
 #define RX_DC_ENTRIES 64
 #define RX_DC_ENTRIES_ORDER 3
 
-/* RX FIFO XOFF watermark
- *
- * When the amount of the RX FIFO increases used increases past this
- * watermark send XOFF. Only used if RX flow control is enabled (ethtool -A)
- * This also has an effect on RX/TX arbitration
- */
-int efx_nic_rx_xoff_thresh = -1;
-module_param_named(rx_xoff_thresh_bytes, efx_nic_rx_xoff_thresh, int, 0644);
-MODULE_PARM_DESC(rx_xoff_thresh_bytes, "RX fifo XOFF threshold");
-
-/* RX FIFO XON watermark
- *
- * When the amount of the RX FIFO used decreases below this
- * watermark send XON. Only used if TX flow control is enabled (ethtool -A)
- * This also has an effect on RX/TX arbitration
- */
-int efx_nic_rx_xon_thresh = -1;
-module_param_named(rx_xon_thresh_bytes, efx_nic_rx_xon_thresh, int, 0644);
-MODULE_PARM_DESC(rx_xon_thresh_bytes, "RX fifo XON threshold");
-
 /* If EFX_MAX_INT_ERRORS internal errors occur within
  * EFX_INT_ERROR_EXPIRE seconds, we consider the NIC broken and
  * disable it.
@@ -445,8 +425,8 @@ int efx_nic_probe_tx(struct efx_tx_queue *tx_queue)
 
 void efx_nic_init_tx(struct efx_tx_queue *tx_queue)
 {
-        efx_oword_t tx_desc_ptr;
         struct efx_nic *efx = tx_queue->efx;
+        efx_oword_t reg;
 
         tx_queue->flushed = FLUSH_NONE;
 
@@ -454,7 +434,7 @@ void efx_nic_init_tx(struct efx_tx_queue *tx_queue)
         efx_init_special_buffer(efx, &tx_queue->txd);
 
         /* Push TX descriptor ring to card */
-        EFX_POPULATE_OWORD_10(tx_desc_ptr,
+        EFX_POPULATE_OWORD_10(reg,
                               FRF_AZ_TX_DESCQ_EN, 1,
                               FRF_AZ_TX_ISCSI_DDIG_EN, 0,
                               FRF_AZ_TX_ISCSI_HDIG_EN, 0,
@@ -470,17 +450,15 @@ void efx_nic_init_tx(struct efx_tx_queue *tx_queue)
 
         if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0) {
                 int csum = tx_queue->queue & EFX_TXQ_TYPE_OFFLOAD;
-                EFX_SET_OWORD_FIELD(tx_desc_ptr, FRF_BZ_TX_IP_CHKSM_DIS, !csum);
-                EFX_SET_OWORD_FIELD(tx_desc_ptr, FRF_BZ_TX_TCP_CHKSM_DIS,
+                EFX_SET_OWORD_FIELD(reg, FRF_BZ_TX_IP_CHKSM_DIS, !csum);
+                EFX_SET_OWORD_FIELD(reg, FRF_BZ_TX_TCP_CHKSM_DIS,
                                     !csum);
         }
 
-        efx_writeo_table(efx, &tx_desc_ptr, efx->type->txd_ptr_tbl_base,
+        efx_writeo_table(efx, &reg, efx->type->txd_ptr_tbl_base,
                          tx_queue->queue);
 
         if (efx_nic_rev(efx) < EFX_REV_FALCON_B0) {
-                efx_oword_t reg;
-
                 /* Only 128 bits in this register */
                 BUILD_BUG_ON(EFX_MAX_TX_QUEUES > 128);
 
@@ -491,6 +469,16 @@ void efx_nic_init_tx(struct efx_tx_queue *tx_queue)
                         set_bit_le(tx_queue->queue, (void *)&reg);
                 efx_writeo(efx, &reg, FR_AA_TX_CHKSM_CFG);
         }
+
+        if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0) {
+                EFX_POPULATE_OWORD_1(reg,
+                                     FRF_BZ_TX_PACE,
+                                     (tx_queue->queue & EFX_TXQ_TYPE_HIGHPRI) ?
+                                     FFE_BZ_TX_PACE_OFF :
+                                     FFE_BZ_TX_PACE_RESERVED);
+                efx_writeo_table(efx, &reg, FR_BZ_TX_PACE_TBL,
+                                 tx_queue->queue);
+        }
 }
 
 static void efx_flush_tx_queue(struct efx_tx_queue *tx_queue)
@@ -1238,8 +1226,10 @@ int efx_nic_flush_queues(struct efx_nic *efx)
 
         /* Flush all tx queues in parallel */
         efx_for_each_channel(channel, efx) {
-                efx_for_each_channel_tx_queue(tx_queue, channel)
-                        efx_flush_tx_queue(tx_queue);
+                efx_for_each_possible_channel_tx_queue(tx_queue, channel) {
+                        if (tx_queue->initialised)
+                                efx_flush_tx_queue(tx_queue);
+                }
         }
 
         /* The hardware supports four concurrent rx flushes, each of which may
@@ -1262,8 +1252,9 @@ int efx_nic_flush_queues(struct efx_nic *efx)
                                         ++rx_pending;
                                 }
                         }
-                        efx_for_each_channel_tx_queue(tx_queue, channel) {
-                                if (tx_queue->flushed != FLUSH_DONE)
+                        efx_for_each_possible_channel_tx_queue(tx_queue, channel) {
+                                if (tx_queue->initialised &&
+                                    tx_queue->flushed != FLUSH_DONE)
                                         ++tx_pending;
                         }
                 }
@@ -1278,8 +1269,9 @@ int efx_nic_flush_queues(struct efx_nic *efx)
         /* Mark the queues as all flushed. We're going to return failure
          * leading to a reset, or fake up success anyway */
         efx_for_each_channel(channel, efx) {
-                efx_for_each_channel_tx_queue(tx_queue, channel) {
-                        if (tx_queue->flushed != FLUSH_DONE)
+                efx_for_each_possible_channel_tx_queue(tx_queue, channel) {
+                        if (tx_queue->initialised &&
+                            tx_queue->flushed != FLUSH_DONE)
                                 netif_err(efx, hw, efx->net_dev,
                                           "tx queue %d flush command timed out\n",
                                           tx_queue->queue);
@@ -1682,6 +1674,19 @@ void efx_nic_init_common(struct efx_nic *efx)
         if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0)
                 EFX_SET_OWORD_FIELD(temp, FRF_BZ_TX_FLUSH_MIN_LEN_EN, 1);
         efx_writeo(efx, &temp, FR_AZ_TX_RESERVED);
+
+        if (efx_nic_rev(efx) >= EFX_REV_FALCON_B0) {
+                EFX_POPULATE_OWORD_4(temp,
+                                     /* Default values */
+                                     FRF_BZ_TX_PACE_SB_NOT_AF, 0x15,
+                                     FRF_BZ_TX_PACE_SB_AF, 0xb,
+                                     FRF_BZ_TX_PACE_FB_BASE, 0,
+                                     /* Allow large pace values in the
+                                      * fast bin. */
+                                     FRF_BZ_TX_PACE_BIN_TH,
+                                     FFE_BZ_TX_PACE_RESERVED);
+                efx_writeo(efx, &temp, FR_BZ_TX_PACE);
+        }
 }
 
 /* Register dump */
diff --git a/drivers/net/sfc/nic.h b/drivers/net/sfc/nic.h
index eb0586925b5..d9de1b647d4 100644
--- a/drivers/net/sfc/nic.h
+++ b/drivers/net/sfc/nic.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2011 Solarflare Communications 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
@@ -142,20 +142,14 @@ static inline struct falcon_board *falcon_board(struct efx_nic *efx)
 
 /**
  * struct siena_nic_data - Siena NIC state
- * @fw_version: Management controller firmware version
- * @fw_build: Firmware build number
  * @mcdi: Management-Controller-to-Driver Interface
  * @wol_filter_id: Wake-on-LAN packet filter id
  */
 struct siena_nic_data {
-        u64 fw_version;
-        u32 fw_build;
         struct efx_mcdi_iface mcdi;
         int wol_filter_id;
 };
 
-extern void siena_print_fwver(struct efx_nic *efx, char *buf, size_t len);
-
 extern struct efx_nic_type falcon_a1_nic_type;
 extern struct efx_nic_type falcon_b0_nic_type;
 extern struct efx_nic_type siena_a0_nic_type;
@@ -194,7 +188,6 @@ extern void efx_nic_eventq_read_ack(struct efx_channel *channel);
 /* MAC/PHY */
 extern void falcon_drain_tx_fifo(struct efx_nic *efx);
 extern void falcon_reconfigure_mac_wrapper(struct efx_nic *efx);
-extern int efx_nic_rx_xoff_thresh, efx_nic_rx_xon_thresh;
 
 /* Interrupts and test events */
 extern int efx_nic_init_interrupt(struct efx_nic *efx);
diff --git a/drivers/net/sfc/phy.h b/drivers/net/sfc/phy.h
index 1dab609757f..b3b79472421 100644
--- a/drivers/net/sfc/phy.h
+++ b/drivers/net/sfc/phy.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2007-2009 Solarflare Communications Inc.
+ * Copyright 2007-2010 Solarflare Communications 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
diff --git a/drivers/net/sfc/qt202x_phy.c b/drivers/net/sfc/qt202x_phy.c
index ea3ae008931..55f90924247 100644
--- a/drivers/net/sfc/qt202x_phy.c
+++ b/drivers/net/sfc/qt202x_phy.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2010 Solarflare Communications 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
diff --git a/drivers/net/sfc/regs.h b/drivers/net/sfc/regs.h
index 96430ed81c3..cc2c86b76a7 100644
--- a/drivers/net/sfc/regs.h
+++ b/drivers/net/sfc/regs.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2010 Solarflare Communications 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
@@ -2907,6 +2907,12 @@
 #define FRF_CZ_TMFT_SRC_MAC_HI_LBN 44
 #define FRF_CZ_TMFT_SRC_MAC_HI_WIDTH 16
 
+/* TX_PACE_TBL */
+/* Values >20 are documented as reserved, but will result in a queue going
+ * into the fast bin with a pace value of zero. */
+#define FFE_BZ_TX_PACE_OFF 0
+#define FFE_BZ_TX_PACE_RESERVED 21
+
 /* DRIVER_EV */
 /* Sub-fields of an RX flush completion event */
 #define FSF_AZ_DRIVER_EV_RX_FLUSH_FAIL_LBN 12
diff --git a/drivers/net/sfc/rx.c b/drivers/net/sfc/rx.c
index 3925fd62117..c0fdb59030f 100644
--- a/drivers/net/sfc/rx.c
+++ b/drivers/net/sfc/rx.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2005-2009 Solarflare Communications Inc.
+ * Copyright 2005-2011 Solarflare Communications 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
@@ -89,24 +89,37 @@ static unsigned int rx_refill_limit = 95;
  */
 #define EFX_RXD_HEAD_ROOM 2
 
-static inline unsigned int efx_rx_buf_offset(struct efx_rx_buffer *buf)
+/* Offset of ethernet header within page */
+static inline unsigned int efx_rx_buf_offset(struct efx_nic *efx,
+                                             struct efx_rx_buffer *buf)
 {
         /* Offset is always within one page, so we don't need to consider
          * the page order.
          */
-        return (__force unsigned long) buf->data & (PAGE_SIZE - 1);
+        return (((__force unsigned long) buf->dma_addr & (PAGE_SIZE - 1)) +
+                efx->type->rx_buffer_hash_size);
 }
 static inline unsigned int efx_rx_buf_size(struct efx_nic *efx)
 {
         return PAGE_SIZE << efx->rx_buffer_order;
 }
 
-static inline u32 efx_rx_buf_hash(struct efx_rx_buffer *buf)
+static u8 *efx_rx_buf_eh(struct efx_nic *efx, struct efx_rx_buffer *buf)
 {
+        if (buf->is_page)
+                return page_address(buf->u.page) + efx_rx_buf_offset(efx, buf);
+        else
+                return ((u8 *)buf->u.skb->data +
+                        efx->type->rx_buffer_hash_size);
+}
+
+static inline u32 efx_rx_buf_hash(const u8 *eh)
+{
+        /* The ethernet header is always directly after any hash. */
 #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) || NET_IP_ALIGN % 4 == 0
-        return __le32_to_cpup((const __le32 *)(buf->data - 4));
+        return __le32_to_cpup((const __le32 *)(eh - 4));
 #else
-        const u8 *data = (const u8 *)(buf->data - 4);
+        const u8 *data = eh - 4;
         return ((u32)data[0]       |
                 (u32)data[1] << 8  |
                 (u32)data[2] << 16 |
@@ -129,6 +142,7 @@ static int efx_init_rx_buffers_skb(struct efx_rx_queue *rx_queue)
         struct efx_nic *efx = rx_queue->efx;
         struct net_device *net_dev = efx->net_dev;
         struct efx_rx_buffer *rx_buf;
+        struct sk_buff *skb;
         int skb_len = efx->rx_buffer_len;
         unsigned index, count;
 
@@ -136,24 +150,23 @@ static int efx_init_rx_buffers_skb(struct efx_rx_queue *rx_queue)
                 index = rx_queue->added_count & rx_queue->ptr_mask;
                 rx_buf = efx_rx_buffer(rx_queue, index);
 
-                rx_buf->skb = netdev_alloc_skb(net_dev, skb_len);
-                if (unlikely(!rx_buf->skb))
+                rx_buf->u.skb = skb = netdev_alloc_skb(net_dev, skb_len);
+                if (unlikely(!skb))
                         return -ENOMEM;
-                rx_buf->page = NULL;
 
                 /* Adjust the SKB for padding and checksum */
-                skb_reserve(rx_buf->skb, NET_IP_ALIGN);
+                skb_reserve(skb, NET_IP_ALIGN);
                 rx_buf->len = skb_len - NET_IP_ALIGN;
-                rx_buf->data = (char *)rx_buf->skb->data;
-                rx_buf->skb->ip_summed = CHECKSUM_UNNECESSARY;
+                rx_buf->is_page = false;
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
 
                 rx_buf->dma_addr = pci_map_single(efx->pci_dev,
-                                                  rx_buf->data, rx_buf->len,
+                                                  skb->data, rx_buf->len,
                                                   PCI_DMA_FROMDEVICE);
                 if (unlikely(pci_dma_mapping_error(efx->pci_dev,
                                                    rx_buf->dma_addr))) {
-                        dev_kfree_skb_any(rx_buf->skb);
-                        rx_buf->skb = NULL;
+                        dev_kfree_skb_any(skb);
+                        rx_buf->u.skb = NULL;
                         return -EIO;
                 }
 
@@ -211,10 +224,9 @@ static int efx_init_rx_buffers_page(struct efx_rx_queue *rx_queue)
                 index = rx_queue->added_count & rx_queue->ptr_mask;
                 rx_buf = efx_rx_buffer(rx_queue, index);
                 rx_buf->dma_addr = dma_addr + EFX_PAGE_IP_ALIGN;
-                rx_buf->skb = NULL;
-                rx_buf->page = page;
-                rx_buf->data = page_addr + EFX_PAGE_IP_ALIGN;
+                rx_buf->u.page = page;
                 rx_buf->len = efx->rx_buffer_len - EFX_PAGE_IP_ALIGN;
+                rx_buf->is_page = true;
                 ++rx_queue->added_count;
                 ++rx_queue->alloc_page_count;
                 ++state->refcnt;
@@ -235,19 +247,17 @@ static int efx_init_rx_buffers_page(struct efx_rx_queue *rx_queue)
 static void efx_unmap_rx_buffer(struct efx_nic *efx,
                                 struct efx_rx_buffer *rx_buf)
 {
-        if (rx_buf->page) {
+        if (rx_buf->is_page && rx_buf->u.page) {
                 struct efx_rx_page_state *state;
 
-                EFX_BUG_ON_PARANOID(rx_buf->skb);
-
-                state = page_address(rx_buf->page);
+                state = page_address(rx_buf->u.page);
                 if (--state->refcnt == 0) {
                         pci_unmap_page(efx->pci_dev,
                                        state->dma_addr,
                                        efx_rx_buf_size(efx),
                                        PCI_DMA_FROMDEVICE);
                 }
-        } else if (likely(rx_buf->skb)) {
+        } else if (!rx_buf->is_page && rx_buf->u.skb) {
                 pci_unmap_single(efx->pci_dev, rx_buf->dma_addr,
                                  rx_buf->len, PCI_DMA_FROMDEVICE);
         }
@@ -256,12 +266,12 @@ static void efx_unmap_rx_buffer(struct efx_nic *efx,
 static void efx_free_rx_buffer(struct efx_nic *efx,
                                struct efx_rx_buffer *rx_buf)
 {
-        if (rx_buf->page) {
-                __free_pages(rx_buf->page, efx->rx_buffer_order);
-                rx_buf->page = NULL;
-        } else if (likely(rx_buf->skb)) {
-                dev_kfree_skb_any(rx_buf->skb);
-                rx_buf->skb = NULL;
+        if (rx_buf->is_page && rx_buf->u.page) {
+                __free_pages(rx_buf->u.page, efx->rx_buffer_order);
+                rx_buf->u.page = NULL;
+        } else if (!rx_buf->is_page && rx_buf->u.skb) {
+                dev_kfree_skb_any(rx_buf->u.skb);
+                rx_buf->u.skb = NULL;
         }
 }
 
@@ -277,7 +287,7 @@ static void efx_fini_rx_buffer(struct efx_rx_queue *rx_queue,
 static void efx_resurrect_rx_buffer(struct efx_rx_queue *rx_queue,
                                     struct efx_rx_buffer *rx_buf)
 {
-        struct efx_rx_page_state *state = page_address(rx_buf->page);
+        struct efx_rx_page_state *state = page_address(rx_buf->u.page);
         struct efx_rx_buffer *new_buf;
         unsigned fill_level, index;
 
@@ -292,16 +302,14 @@ static void efx_resurrect_rx_buffer(struct efx_rx_queue *rx_queue,
         }
 
         ++state->refcnt;
-        get_page(rx_buf->page);
+        get_page(rx_buf->u.page);
 
         index = rx_queue->added_count & rx_queue->ptr_mask;
         new_buf = efx_rx_buffer(rx_queue, index);
         new_buf->dma_addr = rx_buf->dma_addr ^ (PAGE_SIZE >> 1);
-        new_buf->skb = NULL;
-        new_buf->page = rx_buf->page;
-        new_buf->data = (void *)
-                ((__force unsigned long)rx_buf->data ^ (PAGE_SIZE >> 1));
+        new_buf->u.page = rx_buf->u.page;
         new_buf->len = rx_buf->len;
+        new_buf->is_page = true;
         ++rx_queue->added_count;
 }
 
@@ -315,16 +323,15 @@ static void efx_recycle_rx_buffer(struct efx_channel *channel,
         struct efx_rx_buffer *new_buf;
         unsigned index;
 
-        if (rx_buf->page != NULL && efx->rx_buffer_len <= EFX_RX_HALF_PAGE &&
-            page_count(rx_buf->page) == 1)
+        if (rx_buf->is_page && efx->rx_buffer_len <= EFX_RX_HALF_PAGE &&
+            page_count(rx_buf->u.page) == 1)
                 efx_resurrect_rx_buffer(rx_queue, rx_buf);
 
         index = rx_queue->added_count & rx_queue->ptr_mask;
         new_buf = efx_rx_buffer(rx_queue, index);
 
         memcpy(new_buf, rx_buf, sizeof(*new_buf));
-        rx_buf->page = NULL;
-        rx_buf->skb = NULL;
+        rx_buf->u.page = NULL;
         ++rx_queue->added_count;
 }
 
@@ -428,7 +435,7 @@ static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,
                  * data at the end of the skb will be trashed. So
                  * we have no choice but to leak the fragment.
                  */
-                *leak_packet = (rx_buf->skb != NULL);
+                *leak_packet = !rx_buf->is_page;
                 efx_schedule_reset(efx, RESET_TYPE_RX_RECOVERY);
         } else {
                 if (net_ratelimit())
@@ -448,19 +455,18 @@ static void efx_rx_packet__check_len(struct efx_rx_queue *rx_queue,
  */
 static void efx_rx_packet_gro(struct efx_channel *channel,
                               struct efx_rx_buffer *rx_buf,
-                              bool checksummed)
+                              const u8 *eh, bool checksummed)
 {
         struct napi_struct *napi = &channel->napi_str;
         gro_result_t gro_result;
 
         /* Pass the skb/page into the GRO engine */
-        if (rx_buf->page) {
+        if (rx_buf->is_page) {
                 struct efx_nic *efx = channel->efx;
-                struct page *page = rx_buf->page;
+                struct page *page = rx_buf->u.page;
                 struct sk_buff *skb;
 
-                EFX_BUG_ON_PARANOID(rx_buf->skb);
-                rx_buf->page = NULL;
+                rx_buf->u.page = NULL;
 
                 skb = napi_get_frags(napi);
                 if (!skb) {
@@ -469,11 +475,11 @@ static void efx_rx_packet_gro(struct efx_channel *channel,
                 }
 
                 if (efx->net_dev->features & NETIF_F_RXHASH)
-                        skb->rxhash = efx_rx_buf_hash(rx_buf);
+                        skb->rxhash = efx_rx_buf_hash(eh);
 
                 skb_shinfo(skb)->frags[0].page = page;
                 skb_shinfo(skb)->frags[0].page_offset =
-                        efx_rx_buf_offset(rx_buf);
+                        efx_rx_buf_offset(efx, rx_buf);
                 skb_shinfo(skb)->frags[0].size = rx_buf->len;
                 skb_shinfo(skb)->nr_frags = 1;
 
@@ -487,11 +493,10 @@ static void efx_rx_packet_gro(struct efx_channel *channel,
 
                 gro_result = napi_gro_frags(napi);
         } else {
-                struct sk_buff *skb = rx_buf->skb;
+                struct sk_buff *skb = rx_buf->u.skb;
 
-                EFX_BUG_ON_PARANOID(!skb);
                 EFX_BUG_ON_PARANOID(!checksummed);
-                rx_buf->skb = NULL;
+                rx_buf->u.skb = NULL;
 
                 gro_result = napi_gro_receive(napi, skb);
         }
@@ -513,9 +518,6 @@ void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
         bool leak_packet = false;
 
         rx_buf = efx_rx_buffer(rx_queue, index);
-        EFX_BUG_ON_PARANOID(!rx_buf->data);
-        EFX_BUG_ON_PARANOID(rx_buf->skb && rx_buf->page);
-        EFX_BUG_ON_PARANOID(!(rx_buf->skb || rx_buf->page));
 
         /* This allows the refill path to post another buffer.
          * EFX_RXD_HEAD_ROOM ensures that the slot we are using
@@ -554,12 +556,12 @@ void efx_rx_packet(struct efx_rx_queue *rx_queue, unsigned int index,
         /* Prefetch nice and early so data will (hopefully) be in cache by
          * the time we look at it.
          */
-        prefetch(rx_buf->data);
+        prefetch(efx_rx_buf_eh(efx, rx_buf));
 
         /* Pipeline receives so that we give time for packet headers to be
          * prefetched into cache.
          */
-        rx_buf->len = len;
+        rx_buf->len = len - efx->type->rx_buffer_hash_size;
 out:
         if (channel->rx_pkt)
                 __efx_rx_packet(channel,
@@ -574,45 +576,43 @@ void __efx_rx_packet(struct efx_channel *channel,
 {
         struct efx_nic *efx = channel->efx;
         struct sk_buff *skb;
-
-        rx_buf->data += efx->type->rx_buffer_hash_size;
-        rx_buf->len -= efx->type->rx_buffer_hash_size;
+        u8 *eh = efx_rx_buf_eh(efx, rx_buf);
 
         /* If we're in loopback test, then pass the packet directly to the
          * loopback layer, and free the rx_buf here
          */
         if (unlikely(efx->loopback_selftest)) {
-                efx_loopback_rx_packet(efx, rx_buf->data, rx_buf->len);
+                efx_loopback_rx_packet(efx, eh, rx_buf->len);
                 efx_free_rx_buffer(efx, rx_buf);
                 return;
         }
 
-        if (rx_buf->skb) {
-                prefetch(skb_shinfo(rx_buf->skb));
+        if (!rx_buf->is_page) {
+                skb = rx_buf->u.skb;
 
-                skb_reserve(rx_buf->skb, efx->type->rx_buffer_hash_size);
-                skb_put(rx_buf->skb, rx_buf->len);
+                prefetch(skb_shinfo(skb));
+
+                skb_reserve(skb, efx->type->rx_buffer_hash_size);
+                skb_put(skb, rx_buf->len);
 
                 if (efx->net_dev->features & NETIF_F_RXHASH)
-                        rx_buf->skb->rxhash = efx_rx_buf_hash(rx_buf);
+                        skb->rxhash = efx_rx_buf_hash(eh);
 
                 /* Move past the ethernet header. rx_buf->data still points
                  * at the ethernet header */
-                rx_buf->skb->protocol = eth_type_trans(rx_buf->skb,
-                                                       efx->net_dev);
+                skb->protocol = eth_type_trans(skb, efx->net_dev);
 
-                skb_record_rx_queue(rx_buf->skb, channel->channel);
+                skb_record_rx_queue(skb, channel->channel);
         }
 
-        if (likely(checksummed || rx_buf->page)) {
-                efx_rx_packet_gro(channel, rx_buf, checksummed);
+        if (likely(checksummed || rx_buf->is_page)) {
+                efx_rx_packet_gro(channel, rx_buf, eh, checksummed);
                 return;
         }
 
         /* We now own the SKB */
-        skb = rx_buf->skb;
-        rx_buf->skb = NULL;
-        EFX_BUG_ON_PARANOID(!skb);
+        skb = rx_buf->u.skb;
+        rx_buf->u.skb = NULL;
 
         /* Set the SKB flags */
         skb_checksum_none_assert(skb);
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index 0ebfb99f129..a0f49b348d6 100644
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2010 Solarflare Communications 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
@@ -644,7 +644,7 @@ static int efx_test_loopbacks(struct efx_nic *efx, struct efx_self_tests *tests,
                         goto out;
                 }
 
-                /* Test both types of TX queue */
+                /* Test all enabled types of TX queue */
                 efx_for_each_channel_tx_queue(tx_queue, channel) {
                         state->offload_csum = (tx_queue->queue &
                                                EFX_TXQ_TYPE_OFFLOAD);
diff --git a/drivers/net/sfc/selftest.h b/drivers/net/sfc/selftest.h
index aed495a4dad..dba5456e70f 100644
--- a/drivers/net/sfc/selftest.h
+++ b/drivers/net/sfc/selftest.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006-2008 Solarflare Communications Inc.
+ * Copyright 2006-2010 Solarflare Communications 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
diff --git a/drivers/net/sfc/siena.c b/drivers/net/sfc/siena.c
index bf845617644..e4dd8986b1f 100644
--- a/drivers/net/sfc/siena.c
+++ b/drivers/net/sfc/siena.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2010 Solarflare Communications 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
@@ -227,13 +227,6 @@ static int siena_probe_nic(struct efx_nic *efx)
         if (rc)
                 goto fail1;
 
-        rc = efx_mcdi_fwver(efx, &nic_data->fw_version, &nic_data->fw_build);
-        if (rc) {
-                netif_err(efx, probe, efx->net_dev,
-                          "Failed to read MCPU firmware version - rc %d\n", rc);
-                goto fail1; /* MCPU absent? */
-        }
-
         /* Let the BMC know that the driver is now in charge of link and
          * filter settings. We must do this before we reset the NIC */
         rc = efx_mcdi_drv_attach(efx, true, &already_attached);
@@ -348,11 +341,6 @@ static int siena_init_nic(struct efx_nic *efx)
                FRF_CZ_RX_RSS_IPV6_TKEY_HI_WIDTH / 8);
         efx_writeo(efx, &temp, FR_CZ_RX_RSS_IPV6_REG3);
 
-        if (efx_nic_rx_xoff_thresh >= 0 || efx_nic_rx_xon_thresh >= 0)
-                /* No MCDI operation has been defined to set thresholds */
-                netif_err(efx, hw, efx->net_dev,
-                          "ignoring RX flow control thresholds\n");
-
         /* Enable event logging */
         rc = efx_mcdi_log_ctrl(efx, true, false, 0);
         if (rc)
@@ -514,16 +502,6 @@ static void siena_stop_nic_stats(struct efx_nic *efx)
         efx_mcdi_mac_stats(efx, efx->stats_buffer.dma_addr, 0, 0, 0);
 }
 
-void siena_print_fwver(struct efx_nic *efx, char *buf, size_t len)
-{
-        struct siena_nic_data *nic_data = efx->nic_data;
-        snprintf(buf, len, "%u.%u.%u.%u",
-                 (unsigned int)(nic_data->fw_version >> 48),
-                 (unsigned int)(nic_data->fw_version >> 32 & 0xffff),
-                 (unsigned int)(nic_data->fw_version >> 16 & 0xffff),
-                 (unsigned int)(nic_data->fw_version & 0xffff));
-}
-
 /**************************************************************************
  *
  * Wake on LAN
diff --git a/drivers/net/sfc/spi.h b/drivers/net/sfc/spi.h
index 879b7f6bde3..71f2e3ebe1c 100644
--- a/drivers/net/sfc/spi.h
+++ b/drivers/net/sfc/spi.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005 Fen Systems Ltd.
- * Copyright 2006 Solarflare Communications Inc.
+ * Copyright 2006-2010 Solarflare Communications 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
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c
index f102912eba9..efdceb35aaa 100644
--- a/drivers/net/sfc/tenxpress.c
+++ b/drivers/net/sfc/tenxpress.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2007-2009 Solarflare Communications Inc.
+ * Copyright 2007-2011 Solarflare Communications 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
@@ -196,7 +196,7 @@ static int tenxpress_phy_init(struct efx_nic *efx)
                 if (rc < 0)
                         return rc;
 
-                rc = efx_mdio_check_mmds(efx, TENXPRESS_REQUIRED_DEVS, 0);
+                rc = efx_mdio_check_mmds(efx, TENXPRESS_REQUIRED_DEVS);
                 if (rc < 0)
                         return rc;
         }
diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c
index 2f5e9da657b..13980190821 100644
--- a/drivers/net/sfc/tx.c
+++ b/drivers/net/sfc/tx.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
  * Copyright 2005-2006 Fen Systems Ltd.
- * Copyright 2005-2009 Solarflare Communications Inc.
+ * Copyright 2005-2010 Solarflare Communications 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
@@ -336,17 +336,91 @@ netdev_tx_t efx_hard_start_xmit(struct sk_buff *skb,
 {
         struct efx_nic *efx = netdev_priv(net_dev);
         struct efx_tx_queue *tx_queue;
+        unsigned index, type;
 
         if (unlikely(efx->port_inhibited))
                 return NETDEV_TX_BUSY;
 
-        tx_queue = efx_get_tx_queue(efx, skb_get_queue_mapping(skb),
-                                    skb->ip_summed == CHECKSUM_PARTIAL ?
-                                    EFX_TXQ_TYPE_OFFLOAD : 0);
+        index = skb_get_queue_mapping(skb);
+        type = skb->ip_summed == CHECKSUM_PARTIAL ? EFX_TXQ_TYPE_OFFLOAD : 0;
+        if (index >= efx->n_tx_channels) {
+                index -= efx->n_tx_channels;
+                type |= EFX_TXQ_TYPE_HIGHPRI;
+        }
+        tx_queue = efx_get_tx_queue(efx, index, type);
 
         return efx_enqueue_skb(tx_queue, skb);
 }
 
+void efx_init_tx_queue_core_txq(struct efx_tx_queue *tx_queue)
+{
+        struct efx_nic *efx = tx_queue->efx;
+
+        /* Must be inverse of queue lookup in efx_hard_start_xmit() */
+        tx_queue->core_txq =
+                netdev_get_tx_queue(efx->net_dev,
+                                    tx_queue->queue / EFX_TXQ_TYPES +
+                                    ((tx_queue->queue & EFX_TXQ_TYPE_HIGHPRI) ?
+                                     efx->n_tx_channels : 0));
+}
+
+int efx_setup_tc(struct net_device *net_dev, u8 num_tc)
+{
+        struct efx_nic *efx = netdev_priv(net_dev);
+        struct efx_channel *channel;
+        struct efx_tx_queue *tx_queue;
+        unsigned tc;
+        int rc;
+
+        if (efx_nic_rev(efx) < EFX_REV_FALCON_B0 || num_tc > EFX_MAX_TX_TC)
+                return -EINVAL;
+
+        if (num_tc == net_dev->num_tc)
+                return 0;
+
+        for (tc = 0; tc < num_tc; tc++) {
+                net_dev->tc_to_txq[tc].offset = tc * efx->n_tx_channels;
+                net_dev->tc_to_txq[tc].count = efx->n_tx_channels;
+        }
+
+        if (num_tc > net_dev->num_tc) {
+                /* Initialise high-priority queues as necessary */
+                efx_for_each_channel(channel, efx) {
+                        efx_for_each_possible_channel_tx_queue(tx_queue,
+                                                               channel) {
+                                if (!(tx_queue->queue & EFX_TXQ_TYPE_HIGHPRI))
+                                        continue;
+                                if (!tx_queue->buffer) {
+                                        rc = efx_probe_tx_queue(tx_queue);
+                                        if (rc)
+                                                return rc;
+                                }
+                                if (!tx_queue->initialised)
+                                        efx_init_tx_queue(tx_queue);
+                                efx_init_tx_queue_core_txq(tx_queue);
+                        }
+                }
+        } else {
+                /* Reduce number of classes before number of queues */
+                net_dev->num_tc = num_tc;
+        }
+
+        rc = netif_set_real_num_tx_queues(net_dev,
+                                          max_t(int, num_tc, 1) *
+                                          efx->n_tx_channels);
+        if (rc)
+                return rc;
+
+        /* Do not destroy high-priority queues when they become
+         * unused.  We would have to flush them first, and it is
+         * fairly difficult to flush a subset of TX queues.  Leave
+         * it to efx_fini_channels().
+         */
+
+        net_dev->num_tc = num_tc;
+        return 0;
+}
+
 void efx_xmit_done(struct efx_tx_queue *tx_queue, unsigned int index)
 {
         unsigned fill_level;
@@ -430,6 +504,8 @@ void efx_init_tx_queue(struct efx_tx_queue *tx_queue)
 
         /* Set up TX descriptor ring */
         efx_nic_init_tx(tx_queue);
+
+        tx_queue->initialised = true;
 }
 
 void efx_release_tx_buffers(struct efx_tx_queue *tx_queue)
@@ -452,9 +528,14 @@ void efx_release_tx_buffers(struct efx_tx_queue *tx_queue)
 
 void efx_fini_tx_queue(struct efx_tx_queue *tx_queue)
 {
+        if (!tx_queue->initialised)
+                return;
+
         netif_dbg(tx_queue->efx, drv, tx_queue->efx->net_dev,
                   "shutting down TX queue %d\n", tx_queue->queue);
 
+        tx_queue->initialised = false;
+
         /* Flush TX queue, remove descriptor ring */
         efx_nic_fini_tx(tx_queue);
 
@@ -466,6 +547,9 @@ void efx_fini_tx_queue(struct efx_tx_queue *tx_queue)
 
 void efx_remove_tx_queue(struct efx_tx_queue *tx_queue)
 {
+        if (!tx_queue->buffer)
+                return;
+
         netif_dbg(tx_queue->efx, drv, tx_queue->efx->net_dev,
                   "destroying TX queue %d\n", tx_queue->queue);
         efx_nic_remove_tx(tx_queue);
diff --git a/drivers/net/sfc/txc43128_phy.c b/drivers/net/sfc/txc43128_phy.c
index 351794a7921..d9886addcc9 100644
--- a/drivers/net/sfc/txc43128_phy.c
+++ b/drivers/net/sfc/txc43128_phy.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2006-2010 Solarflare Communications Inc.
+ * Copyright 2006-2011 Solarflare Communications 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
@@ -193,7 +193,7 @@ static int txc_reset_phy(struct efx_nic *efx)
                 goto fail;
 
         /* Check that all the MMDs we expect are present and responding. */
-        rc = efx_mdio_check_mmds(efx, TXC_REQUIRED_DEVS, 0);
+        rc = efx_mdio_check_mmds(efx, TXC_REQUIRED_DEVS);
         if (rc < 0)
                 goto fail;
 
diff --git a/drivers/net/sfc/workarounds.h b/drivers/net/sfc/workarounds.h
index e0d63083c3a..99ff11400ce 100644
--- a/drivers/net/sfc/workarounds.h
+++ b/drivers/net/sfc/workarounds.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2006-2009 Solarflare Communications Inc.
+ * Copyright 2006-2010 Solarflare Communications 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
@@ -38,6 +38,8 @@
 #define EFX_WORKAROUND_15783 EFX_WORKAROUND_ALWAYS
 /* Legacy interrupt storm when interrupt fifo fills */
 #define EFX_WORKAROUND_17213 EFX_WORKAROUND_SIENA
+/* Write combining and sriov=enabled are incompatible */
+#define EFX_WORKAROUND_22643 EFX_WORKAROUND_SIENA
 
 /* Spurious parity errors in TSORT buffers */
 #define EFX_WORKAROUND_5129 EFX_WORKAROUND_FALCON_A
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 819c1750e2a..e9e7a530552 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -32,35 +32,40 @@
 #include <linux/io.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
+#include <linux/ethtool.h>
 #include <asm/cacheflush.h>
 
 #include "sh_eth.h"
 
+#define SH_ETH_DEF_MSG_ENABLE \
+                (NETIF_MSG_LINK | \
+                NETIF_MSG_TIMER | \
+                NETIF_MSG_RX_ERR| \
+                NETIF_MSG_TX_ERR)
+
 /* There is CPU dependent code */
 #if defined(CONFIG_CPU_SUBTYPE_SH7724)
 #define SH_ETH_RESET_DEFAULT    1
 static void sh_eth_set_duplex(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        u32 ioaddr = ndev->base_addr;
 
         if (mdp->duplex) /* Full */
-                writel(readl(ioaddr + ECMR) | ECMR_DM, ioaddr + ECMR);
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_DM, ECMR);
         else            /* Half */
-                writel(readl(ioaddr + ECMR) & ~ECMR_DM, ioaddr + ECMR);
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR);
 }
 
 static void sh_eth_set_rate(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        u32 ioaddr = ndev->base_addr;
 
         switch (mdp->speed) {
         case 10: /* 10BASE */
-                writel(readl(ioaddr + ECMR) & ~ECMR_RTM, ioaddr + ECMR);
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_RTM, ECMR);
                 break;
         case 100:/* 100BASE */
-                writel(readl(ioaddr + ECMR) | ECMR_RTM, ioaddr + ECMR);
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_RTM, ECMR);
                 break;
         default:
                 break;
@@ -89,29 +94,28 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
         .rpadir_value   = 0x00020000, /* NET_IP_ALIGN assumed to be 2 */
 };
 #elif defined(CONFIG_CPU_SUBTYPE_SH7757)
-#define SH_ETH_RESET_DEFAULT    1
+#define SH_ETH_HAS_BOTH_MODULES 1
+#define SH_ETH_HAS_TSU  1
 static void sh_eth_set_duplex(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        u32 ioaddr = ndev->base_addr;
 
         if (mdp->duplex) /* Full */
-                writel(readl(ioaddr + ECMR) | ECMR_DM, ioaddr + ECMR);
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_DM, ECMR);
         else            /* Half */
-                writel(readl(ioaddr + ECMR) & ~ECMR_DM, ioaddr + ECMR);
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR);
 }
 
 static void sh_eth_set_rate(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        u32 ioaddr = ndev->base_addr;
 
         switch (mdp->speed) {
         case 10: /* 10BASE */
-                writel(0, ioaddr + RTRATE);
+                sh_eth_write(ndev, 0, RTRATE);
                 break;
         case 100:/* 100BASE */
-                writel(1, ioaddr + RTRATE);
+                sh_eth_write(ndev, 1, RTRATE);
                 break;
         default:
                 break;
@@ -138,24 +142,154 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
         .no_ade         = 1,
 };
 
+#define SH_GIGA_ETH_BASE        0xfee00000
+#define GIGA_MALR(port)         (SH_GIGA_ETH_BASE + 0x800 * (port) + 0x05c8)
+#define GIGA_MAHR(port)         (SH_GIGA_ETH_BASE + 0x800 * (port) + 0x05c0)
+static void sh_eth_chip_reset_giga(struct net_device *ndev)
+{
+        int i;
+        unsigned long mahr[2], malr[2];
+
+        /* save MAHR and MALR */
+        for (i = 0; i < 2; i++) {
+                malr[i] = readl(GIGA_MALR(i));
+                mahr[i] = readl(GIGA_MAHR(i));
+        }
+
+        /* reset device */
+        writel(ARSTR_ARSTR, SH_GIGA_ETH_BASE + 0x1800);
+        mdelay(1);
+
+        /* restore MAHR and MALR */
+        for (i = 0; i < 2; i++) {
+                writel(malr[i], GIGA_MALR(i));
+                writel(mahr[i], GIGA_MAHR(i));
+        }
+}
+
+static int sh_eth_is_gether(struct sh_eth_private *mdp);
+static void sh_eth_reset(struct net_device *ndev)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        int cnt = 100;
+
+        if (sh_eth_is_gether(mdp)) {
+                sh_eth_write(ndev, 0x03, EDSR);
+                sh_eth_write(ndev, sh_eth_read(ndev, EDMR) | EDMR_SRST_GETHER,
+                                EDMR);
+                while (cnt > 0) {
+                        if (!(sh_eth_read(ndev, EDMR) & 0x3))
+                                break;
+                        mdelay(1);
+                        cnt--;
+                }
+                if (cnt < 0)
+                        printk(KERN_ERR "Device reset fail\n");
+
+                /* Table Init */
+                sh_eth_write(ndev, 0x0, TDLAR);
+                sh_eth_write(ndev, 0x0, TDFAR);
+                sh_eth_write(ndev, 0x0, TDFXR);
+                sh_eth_write(ndev, 0x0, TDFFR);
+                sh_eth_write(ndev, 0x0, RDLAR);
+                sh_eth_write(ndev, 0x0, RDFAR);
+                sh_eth_write(ndev, 0x0, RDFXR);
+                sh_eth_write(ndev, 0x0, RDFFR);
+        } else {
+                sh_eth_write(ndev, sh_eth_read(ndev, EDMR) | EDMR_SRST_ETHER,
+                                EDMR);
+                mdelay(3);
+                sh_eth_write(ndev, sh_eth_read(ndev, EDMR) & ~EDMR_SRST_ETHER,
+                                EDMR);
+        }
+}
+
+static void sh_eth_set_duplex_giga(struct net_device *ndev)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+
+        if (mdp->duplex) /* Full */
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_DM, ECMR);
+        else            /* Half */
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR);
+}
+
+static void sh_eth_set_rate_giga(struct net_device *ndev)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+
+        switch (mdp->speed) {
+        case 10: /* 10BASE */
+                sh_eth_write(ndev, 0x00000000, GECMR);
+                break;
+        case 100:/* 100BASE */
+                sh_eth_write(ndev, 0x00000010, GECMR);
+                break;
+        case 1000: /* 1000BASE */
+                sh_eth_write(ndev, 0x00000020, GECMR);
+                break;
+        default:
+                break;
+        }
+}
+
+/* SH7757(GETHERC) */
+static struct sh_eth_cpu_data sh_eth_my_cpu_data_giga = {
+        .chip_reset     = sh_eth_chip_reset_giga,
+        .set_duplex     = sh_eth_set_duplex_giga,
+        .set_rate       = sh_eth_set_rate_giga,
+
+        .ecsr_value     = ECSR_ICD | ECSR_MPD,
+        .ecsipr_value   = ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP,
+        .eesipr_value   = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
+
+        .tx_check       = EESR_TC1 | EESR_FTC,
+        .eesr_err_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT | \
+                          EESR_RDE | EESR_RFRMER | EESR_TFE | EESR_TDE | \
+                          EESR_ECI,
+        .tx_error_check = EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_TDE | \
+                          EESR_TFE,
+        .fdr_value      = 0x0000072f,
+        .rmcr_value     = 0x00000001,
+
+        .apr            = 1,
+        .mpr            = 1,
+        .tpauser        = 1,
+        .bculr          = 1,
+        .hw_swap        = 1,
+        .rpadir         = 1,
+        .rpadir_value   = 2 << 16,
+        .no_trimd       = 1,
+        .no_ade         = 1,
+};
+
+static struct sh_eth_cpu_data *sh_eth_get_cpu_data(struct sh_eth_private *mdp)
+{
+        if (sh_eth_is_gether(mdp))
+                return &sh_eth_my_cpu_data_giga;
+        else
+                return &sh_eth_my_cpu_data;
+}
+
 #elif defined(CONFIG_CPU_SUBTYPE_SH7763)
 #define SH_ETH_HAS_TSU  1
 static void sh_eth_chip_reset(struct net_device *ndev)
 {
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+
         /* reset device */
-        writel(ARSTR_ARSTR, ARSTR);
+        sh_eth_tsu_write(mdp, ARSTR_ARSTR, ARSTR);
         mdelay(1);
 }
 
 static void sh_eth_reset(struct net_device *ndev)
 {
-        u32 ioaddr = ndev->base_addr;
         int cnt = 100;
 
-        writel(EDSR_ENALL, ioaddr + EDSR);
-        writel(readl(ioaddr + EDMR) | EDMR_SRST, ioaddr + EDMR);
+        sh_eth_write(ndev, EDSR_ENALL, EDSR);
+        sh_eth_write(ndev, sh_eth_read(ndev, EDMR) | EDMR_SRST_GETHER, EDMR);
         while (cnt > 0) {
-                if (!(readl(ioaddr + EDMR) & 0x3))
+                if (!(sh_eth_read(ndev, EDMR) & 0x3))
                         break;
                 mdelay(1);
                 cnt--;
@@ -164,41 +298,39 @@ static void sh_eth_reset(struct net_device *ndev)
                 printk(KERN_ERR "Device reset fail\n");
 
         /* Table Init */
-        writel(0x0, ioaddr + TDLAR);
-        writel(0x0, ioaddr + TDFAR);
-        writel(0x0, ioaddr + TDFXR);
-        writel(0x0, ioaddr + TDFFR);
-        writel(0x0, ioaddr + RDLAR);
-        writel(0x0, ioaddr + RDFAR);
-        writel(0x0, ioaddr + RDFXR);
-        writel(0x0, ioaddr + RDFFR);
+        sh_eth_write(ndev, 0x0, TDLAR);
+        sh_eth_write(ndev, 0x0, TDFAR);
+        sh_eth_write(ndev, 0x0, TDFXR);
+        sh_eth_write(ndev, 0x0, TDFFR);
+        sh_eth_write(ndev, 0x0, RDLAR);
+        sh_eth_write(ndev, 0x0, RDFAR);
+        sh_eth_write(ndev, 0x0, RDFXR);
+        sh_eth_write(ndev, 0x0, RDFFR);
 }
 
 static void sh_eth_set_duplex(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        u32 ioaddr = ndev->base_addr;
 
         if (mdp->duplex) /* Full */
-                writel(readl(ioaddr + ECMR) | ECMR_DM, ioaddr + ECMR);
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) | ECMR_DM, ECMR);
         else            /* Half */
-                writel(readl(ioaddr + ECMR) & ~ECMR_DM, ioaddr + ECMR);
+                sh_eth_write(ndev, sh_eth_read(ndev, ECMR) & ~ECMR_DM, ECMR);
 }
 
 static void sh_eth_set_rate(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        u32 ioaddr = ndev->base_addr;
 
         switch (mdp->speed) {
         case 10: /* 10BASE */
-                writel(GECMR_10, ioaddr + GECMR);
+                sh_eth_write(ndev, GECMR_10, GECMR);
                 break;
         case 100:/* 100BASE */
-                writel(GECMR_100, ioaddr + GECMR);
+                sh_eth_write(ndev, GECMR_100, GECMR);
                 break;
         case 1000: /* 1000BASE */
-                writel(GECMR_1000, ioaddr + GECMR);
+                sh_eth_write(ndev, GECMR_1000, GECMR);
                 break;
         default:
                 break;
@@ -229,6 +361,7 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
         .hw_swap        = 1,
         .no_trimd       = 1,
         .no_ade         = 1,
+        .tsu            = 1,
 };
 
 #elif defined(CONFIG_CPU_SUBTYPE_SH7619)
@@ -246,6 +379,7 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
 #define SH_ETH_HAS_TSU  1
 static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
         .eesipr_value   = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
+        .tsu            = 1,
 };
 #endif
 
@@ -281,11 +415,9 @@ static void sh_eth_set_default_cpu_data(struct sh_eth_cpu_data *cd)
 /* Chip Reset */
 static void sh_eth_reset(struct net_device *ndev)
 {
-        u32 ioaddr = ndev->base_addr;
-
-        writel(readl(ioaddr + EDMR) | EDMR_SRST, ioaddr + EDMR);
+        sh_eth_write(ndev, sh_eth_read(ndev, EDMR) | EDMR_SRST_ETHER, EDMR);
         mdelay(3);
-        writel(readl(ioaddr + EDMR) & ~EDMR_SRST, ioaddr + EDMR);
+        sh_eth_write(ndev, sh_eth_read(ndev, EDMR) & ~EDMR_SRST_ETHER, EDMR);
 }
 #endif
 
@@ -334,13 +466,11 @@ static inline __u32 edmac_to_cpu(struct sh_eth_private *mdp, u32 x)
  */
 static void update_mac_address(struct net_device *ndev)
 {
-        u32 ioaddr = ndev->base_addr;
-
-        writel((ndev->dev_addr[0] << 24) | (ndev->dev_addr[1] << 16) |
-                  (ndev->dev_addr[2] << 8) | (ndev->dev_addr[3]),
-                  ioaddr + MAHR);
-        writel((ndev->dev_addr[4] << 8) | (ndev->dev_addr[5]),
-                  ioaddr + MALR);
+        sh_eth_write(ndev,
+                (ndev->dev_addr[0] << 24) | (ndev->dev_addr[1] << 16) |
+                (ndev->dev_addr[2] << 8) | (ndev->dev_addr[3]), MAHR);
+        sh_eth_write(ndev,
+                (ndev->dev_addr[4] << 8) | (ndev->dev_addr[5]), MALR);
 }
 
 /*
@@ -353,21 +483,36 @@ static void update_mac_address(struct net_device *ndev)
  */
 static void read_mac_address(struct net_device *ndev, unsigned char *mac)
 {
-        u32 ioaddr = ndev->base_addr;
-
         if (mac[0] || mac[1] || mac[2] || mac[3] || mac[4] || mac[5]) {
                 memcpy(ndev->dev_addr, mac, 6);
         } else {
-                ndev->dev_addr[0] = (readl(ioaddr + MAHR) >> 24);
-                ndev->dev_addr[1] = (readl(ioaddr + MAHR) >> 16) & 0xFF;
-                ndev->dev_addr[2] = (readl(ioaddr + MAHR) >> 8) & 0xFF;
-                ndev->dev_addr[3] = (readl(ioaddr + MAHR) & 0xFF);
-                ndev->dev_addr[4] = (readl(ioaddr + MALR) >> 8) & 0xFF;
-                ndev->dev_addr[5] = (readl(ioaddr + MALR) & 0xFF);
+                ndev->dev_addr[0] = (sh_eth_read(ndev, MAHR) >> 24);
+                ndev->dev_addr[1] = (sh_eth_read(ndev, MAHR) >> 16) & 0xFF;
+                ndev->dev_addr[2] = (sh_eth_read(ndev, MAHR) >> 8) & 0xFF;
+                ndev->dev_addr[3] = (sh_eth_read(ndev, MAHR) & 0xFF);
+                ndev->dev_addr[4] = (sh_eth_read(ndev, MALR) >> 8) & 0xFF;
+                ndev->dev_addr[5] = (sh_eth_read(ndev, MALR) & 0xFF);
         }
 }
 
+static int sh_eth_is_gether(struct sh_eth_private *mdp)
+{
+        if (mdp->reg_offset == sh_eth_offset_gigabit)
+                return 1;
+        else
+                return 0;
+}
+
+static unsigned long sh_eth_get_edtrr_trns(struct sh_eth_private *mdp)
+{
+        if (sh_eth_is_gether(mdp))
+                return EDTRR_TRNS_GETHER;
+        else
+                return EDTRR_TRNS_ETHER;
+}
+
 struct bb_info {
+        void (*set_gate)(unsigned long addr);
         struct mdiobb_ctrl ctrl;
         u32 addr;
         u32 mmd_msk;/* MMD */
@@ -398,6 +543,10 @@ static int bb_read(u32 addr, u32 msk)
 static void sh_mmd_ctrl(struct mdiobb_ctrl *ctrl, int bit)
 {
         struct bb_info *bitbang = container_of(ctrl, struct bb_info, ctrl);
+
+        if (bitbang->set_gate)
+                bitbang->set_gate(bitbang->addr);
+
         if (bit)
                 bb_set(bitbang->addr, bitbang->mmd_msk);
         else
@@ -409,6 +558,9 @@ static void sh_set_mdio(struct mdiobb_ctrl *ctrl, int bit)
 {
         struct bb_info *bitbang = container_of(ctrl, struct bb_info, ctrl);
 
+        if (bitbang->set_gate)
+                bitbang->set_gate(bitbang->addr);
+
         if (bit)
                 bb_set(bitbang->addr, bitbang->mdo_msk);
         else
@@ -419,6 +571,10 @@ static void sh_set_mdio(struct mdiobb_ctrl *ctrl, int bit)
 static int sh_get_mdio(struct mdiobb_ctrl *ctrl)
 {
         struct bb_info *bitbang = container_of(ctrl, struct bb_info, ctrl);
+
+        if (bitbang->set_gate)
+                bitbang->set_gate(bitbang->addr);
+
         return bb_read(bitbang->addr, bitbang->mdi_msk);
 }
 
@@ -427,6 +583,9 @@ static void sh_mdc_ctrl(struct mdiobb_ctrl *ctrl, int bit)
 {
         struct bb_info *bitbang = container_of(ctrl, struct bb_info, ctrl);
 
+        if (bitbang->set_gate)
+                bitbang->set_gate(bitbang->addr);
+
         if (bit)
                 bb_set(bitbang->addr, bitbang->mdc_msk);
         else
@@ -470,7 +629,6 @@ static void sh_eth_ring_free(struct net_device *ndev)
 /* format skb and descriptor buffer */
 static void sh_eth_ring_format(struct net_device *ndev)
 {
-        u32 ioaddr = ndev->base_addr;
         struct sh_eth_private *mdp = netdev_priv(ndev);
         int i;
         struct sk_buff *skb;
@@ -506,10 +664,9 @@ static void sh_eth_ring_format(struct net_device *ndev)
                 rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);
                 /* Rx descriptor address set */
                 if (i == 0) {
-                        writel(mdp->rx_desc_dma, ioaddr + RDLAR);
-#if defined(CONFIG_CPU_SUBTYPE_SH7763)
-                        writel(mdp->rx_desc_dma, ioaddr + RDFAR);
-#endif
+                        sh_eth_write(ndev, mdp->rx_desc_dma, RDLAR);
+                        if (sh_eth_is_gether(mdp))
+                                sh_eth_write(ndev, mdp->rx_desc_dma, RDFAR);
                 }
         }
 
@@ -528,10 +685,9 @@ static void sh_eth_ring_format(struct net_device *ndev)
                 txdesc->buffer_length = 0;
                 if (i == 0) {
                         /* Tx descriptor address set */
-                        writel(mdp->tx_desc_dma, ioaddr + TDLAR);
-#if defined(CONFIG_CPU_SUBTYPE_SH7763)
-                        writel(mdp->tx_desc_dma, ioaddr + TDFAR);
-#endif
+                        sh_eth_write(ndev, mdp->tx_desc_dma, TDLAR);
+                        if (sh_eth_is_gether(mdp))
+                                sh_eth_write(ndev, mdp->tx_desc_dma, TDFAR);
                 }
         }
 
@@ -613,7 +769,6 @@ static int sh_eth_dev_init(struct net_device *ndev)
 {
         int ret = 0;
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        u32 ioaddr = ndev->base_addr;
         u_int32_t rx_int_var, tx_int_var;
         u32 val;
 
@@ -623,71 +778,71 @@ static int sh_eth_dev_init(struct net_device *ndev)
         /* Descriptor format */
         sh_eth_ring_format(ndev);
         if (mdp->cd->rpadir)
-                writel(mdp->cd->rpadir_value, ioaddr + RPADIR);
+                sh_eth_write(ndev, mdp->cd->rpadir_value, RPADIR);
 
         /* all sh_eth int mask */
-        writel(0, ioaddr + EESIPR);
+        sh_eth_write(ndev, 0, EESIPR);
 
 #if defined(__LITTLE_ENDIAN__)
         if (mdp->cd->hw_swap)
-                writel(EDMR_EL, ioaddr + EDMR);
+                sh_eth_write(ndev, EDMR_EL, EDMR);
         else
 #endif
-                writel(0, ioaddr + EDMR);
+                sh_eth_write(ndev, 0, EDMR);
 
         /* FIFO size set */
-        writel(mdp->cd->fdr_value, ioaddr + FDR);
-        writel(0, ioaddr + TFTR);
+        sh_eth_write(ndev, mdp->cd->fdr_value, FDR);
+        sh_eth_write(ndev, 0, TFTR);
 
         /* Frame recv control */
-        writel(mdp->cd->rmcr_value, ioaddr + RMCR);
+        sh_eth_write(ndev, mdp->cd->rmcr_value, RMCR);
 
         rx_int_var = mdp->rx_int_var = DESC_I_RINT8 | DESC_I_RINT5;
         tx_int_var = mdp->tx_int_var = DESC_I_TINT2;
-        writel(rx_int_var | tx_int_var, ioaddr + TRSCER);
+        sh_eth_write(ndev, rx_int_var | tx_int_var, TRSCER);
 
         if (mdp->cd->bculr)
-                writel(0x800, ioaddr + BCULR);  /* Burst sycle set */
+                sh_eth_write(ndev, 0x800, BCULR);       /* Burst sycle set */
 
-        writel(mdp->cd->fcftr_value, ioaddr + FCFTR);
+        sh_eth_write(ndev, mdp->cd->fcftr_value, FCFTR);
 
         if (!mdp->cd->no_trimd)
-                writel(0, ioaddr + TRIMD);
+                sh_eth_write(ndev, 0, TRIMD);
 
         /* Recv frame limit set register */
-        writel(RFLR_VALUE, ioaddr + RFLR);
+        sh_eth_write(ndev, RFLR_VALUE, RFLR);
 
-        writel(readl(ioaddr + EESR), ioaddr + EESR);
-        writel(mdp->cd->eesipr_value, ioaddr + EESIPR);
+        sh_eth_write(ndev, sh_eth_read(ndev, EESR), EESR);
+        sh_eth_write(ndev, mdp->cd->eesipr_value, EESIPR);
 
         /* PAUSE Prohibition */
-        val = (readl(ioaddr + ECMR) & ECMR_DM) |
+        val = (sh_eth_read(ndev, ECMR) & ECMR_DM) |
                 ECMR_ZPF | (mdp->duplex ? ECMR_DM : 0) | ECMR_TE | ECMR_RE;
 
-        writel(val, ioaddr + ECMR);
+        sh_eth_write(ndev, val, ECMR);
 
         if (mdp->cd->set_rate)
                 mdp->cd->set_rate(ndev);
 
         /* E-MAC Status Register clear */
-        writel(mdp->cd->ecsr_value, ioaddr + ECSR);
+        sh_eth_write(ndev, mdp->cd->ecsr_value, ECSR);
 
         /* E-MAC Interrupt Enable register */
-        writel(mdp->cd->ecsipr_value, ioaddr + ECSIPR);
+        sh_eth_write(ndev, mdp->cd->ecsipr_value, ECSIPR);
 
         /* Set MAC address */
         update_mac_address(ndev);
 
         /* mask reset */
         if (mdp->cd->apr)
-                writel(APR_AP, ioaddr + APR);
+                sh_eth_write(ndev, APR_AP, APR);
         if (mdp->cd->mpr)
-                writel(MPR_MP, ioaddr + MPR);
+                sh_eth_write(ndev, MPR_MP, MPR);
         if (mdp->cd->tpauser)
-                writel(TPAUSER_UNLIMITED, ioaddr + TPAUSER);
+                sh_eth_write(ndev, TPAUSER_UNLIMITED, TPAUSER);
 
         /* Setting the Rx mode will start the Rx process. */
-        writel(EDRRR_R, ioaddr + EDRRR);
+        sh_eth_write(ndev, EDRRR_R, EDRRR);
 
         netif_start_queue(ndev);
 
@@ -811,24 +966,37 @@ static int sh_eth_rx(struct net_device *ndev)
 
         /* Restart Rx engine if stopped. */
         /* If we don't need to check status, don't. -KDU */
-        if (!(readl(ndev->base_addr + EDRRR) & EDRRR_R))
-                writel(EDRRR_R, ndev->base_addr + EDRRR);
+        if (!(sh_eth_read(ndev, EDRRR) & EDRRR_R))
+                sh_eth_write(ndev, EDRRR_R, EDRRR);
 
         return 0;
 }
 
+static void sh_eth_rcv_snd_disable(struct net_device *ndev)
+{
+        /* disable tx and rx */
+        sh_eth_write(ndev, sh_eth_read(ndev, ECMR) &
+                ~(ECMR_RE | ECMR_TE), ECMR);
+}
+
+static void sh_eth_rcv_snd_enable(struct net_device *ndev)
+{
+        /* enable tx and rx */
+        sh_eth_write(ndev, sh_eth_read(ndev, ECMR) |
+                (ECMR_RE | ECMR_TE), ECMR);
+}
+
 /* error control function */
 static void sh_eth_error(struct net_device *ndev, int intr_status)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        u32 ioaddr = ndev->base_addr;
         u32 felic_stat;
         u32 link_stat;
         u32 mask;
 
         if (intr_status & EESR_ECI) {
-                felic_stat = readl(ioaddr + ECSR);
-                writel(felic_stat, ioaddr + ECSR);      /* clear int */
+                felic_stat = sh_eth_read(ndev, ECSR);
+                sh_eth_write(ndev, felic_stat, ECSR);   /* clear int */
                 if (felic_stat & ECSR_ICD)
                         mdp->stats.tx_carrier_errors++;
                 if (felic_stat & ECSR_LCHNG) {
@@ -839,26 +1007,23 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                                 else
                                         link_stat = PHY_ST_LINK;
                         } else {
-                                link_stat = (readl(ioaddr + PSR));
+                                link_stat = (sh_eth_read(ndev, PSR));
                                 if (mdp->ether_link_active_low)
                                         link_stat = ~link_stat;
                         }
-                        if (!(link_stat & PHY_ST_LINK)) {
-                                /* Link Down : disable tx and rx */
-                                writel(readl(ioaddr + ECMR) &
-                                          ~(ECMR_RE | ECMR_TE), ioaddr + ECMR);
-                        } else {
+                        if (!(link_stat & PHY_ST_LINK))
+                                sh_eth_rcv_snd_disable(ndev);
+                        else {
                                 /* Link Up */
-                                writel(readl(ioaddr + EESIPR) &
-                                          ~DMAC_M_ECI, ioaddr + EESIPR);
+                                sh_eth_write(ndev, sh_eth_read(ndev, EESIPR) &
+                                          ~DMAC_M_ECI, EESIPR);
                                 /*clear int */
-                                writel(readl(ioaddr + ECSR),
-                                          ioaddr + ECSR);
-                                writel(readl(ioaddr + EESIPR) |
-                                          DMAC_M_ECI, ioaddr + EESIPR);
+                                sh_eth_write(ndev, sh_eth_read(ndev, ECSR),
+                                          ECSR);
+                                sh_eth_write(ndev, sh_eth_read(ndev, EESIPR) |
+                                          DMAC_M_ECI, EESIPR);
                                 /* enable tx and rx */
-                                writel(readl(ioaddr + ECMR) |
-                                          (ECMR_RE | ECMR_TE), ioaddr + ECMR);
+                                sh_eth_rcv_snd_enable(ndev);
                         }
                 }
         }
@@ -867,6 +1032,8 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                 /* Write buck end. unused write back interrupt */
                 if (intr_status & EESR_TABT)    /* Transmit Abort int */
                         mdp->stats.tx_aborted_errors++;
+                        if (netif_msg_tx_err(mdp))
+                                dev_err(&ndev->dev, "Transmit Abort\n");
         }
 
         if (intr_status & EESR_RABT) {
@@ -874,28 +1041,47 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                 if (intr_status & EESR_RFRMER) {
                         /* Receive Frame Overflow int */
                         mdp->stats.rx_frame_errors++;
-                        dev_err(&ndev->dev, "Receive Frame Overflow\n");
+                        if (netif_msg_rx_err(mdp))
+                                dev_err(&ndev->dev, "Receive Abort\n");
                 }
         }
 
-        if (!mdp->cd->no_ade) {
-                if (intr_status & EESR_ADE && intr_status & EESR_TDE &&
-                    intr_status & EESR_TFE)
-                        mdp->stats.tx_fifo_errors++;
+        if (intr_status & EESR_TDE) {
+                /* Transmit Descriptor Empty int */
+                mdp->stats.tx_fifo_errors++;
+                if (netif_msg_tx_err(mdp))
+                        dev_err(&ndev->dev, "Transmit Descriptor Empty\n");
+        }
+
+        if (intr_status & EESR_TFE) {
+                /* FIFO under flow */
+                mdp->stats.tx_fifo_errors++;
+                if (netif_msg_tx_err(mdp))
+                        dev_err(&ndev->dev, "Transmit FIFO Under flow\n");
         }
 
         if (intr_status & EESR_RDE) {
                 /* Receive Descriptor Empty int */
                 mdp->stats.rx_over_errors++;
 
-                if (readl(ioaddr + EDRRR) ^ EDRRR_R)
-                        writel(EDRRR_R, ioaddr + EDRRR);
-                dev_err(&ndev->dev, "Receive Descriptor Empty\n");
+                if (sh_eth_read(ndev, EDRRR) ^ EDRRR_R)
+                        sh_eth_write(ndev, EDRRR_R, EDRRR);
+                if (netif_msg_rx_err(mdp))
+                        dev_err(&ndev->dev, "Receive Descriptor Empty\n");
         }
+
         if (intr_status & EESR_RFE) {
                 /* Receive FIFO Overflow int */
                 mdp->stats.rx_fifo_errors++;
-                dev_err(&ndev->dev, "Receive FIFO Overflow\n");
+                if (netif_msg_rx_err(mdp))
+                        dev_err(&ndev->dev, "Receive FIFO Overflow\n");
+        }
+
+        if (!mdp->cd->no_ade && (intr_status & EESR_ADE)) {
+                /* Address Error */
+                mdp->stats.tx_fifo_errors++;
+                if (netif_msg_tx_err(mdp))
+                        dev_err(&ndev->dev, "Address Error\n");
         }
 
         mask = EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE;
@@ -903,7 +1089,7 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                 mask &= ~EESR_ADE;
         if (intr_status & mask) {
                 /* Tx error */
-                u32 edtrr = readl(ndev->base_addr + EDTRR);
+                u32 edtrr = sh_eth_read(ndev, EDTRR);
                 /* dmesg */
                 dev_err(&ndev->dev, "TX error. status=%8.8x cur_tx=%8.8x ",
                                 intr_status, mdp->cur_tx);
@@ -913,9 +1099,9 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
                 sh_eth_txfree(ndev);
 
                 /* SH7712 BUG */
-                if (edtrr ^ EDTRR_TRNS) {
+                if (edtrr ^ sh_eth_get_edtrr_trns(mdp)) {
                         /* tx dma start */
-                        writel(EDTRR_TRNS, ndev->base_addr + EDTRR);
+                        sh_eth_write(ndev, sh_eth_get_edtrr_trns(mdp), EDTRR);
                 }
                 /* wakeup */
                 netif_wake_queue(ndev);
@@ -928,18 +1114,17 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev)
         struct sh_eth_private *mdp = netdev_priv(ndev);
         struct sh_eth_cpu_data *cd = mdp->cd;
         irqreturn_t ret = IRQ_NONE;
-        u32 ioaddr, intr_status = 0;
+        u32 intr_status = 0;
 
-        ioaddr = ndev->base_addr;
         spin_lock(&mdp->lock);
 
         /* Get interrpt stat */
-        intr_status = readl(ioaddr + EESR);
+        intr_status = sh_eth_read(ndev, EESR);
         /* Clear interrupt */
         if (intr_status & (EESR_FRC | EESR_RMAF | EESR_RRF |
                         EESR_RTLF | EESR_RTSF | EESR_PRE | EESR_CERF |
                         cd->tx_check | cd->eesr_err_check)) {
-                writel(intr_status, ioaddr + EESR);
+                sh_eth_write(ndev, intr_status, EESR);
                 ret = IRQ_HANDLED;
         } else
                 goto other_irq;
@@ -982,7 +1167,6 @@ static void sh_eth_adjust_link(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
         struct phy_device *phydev = mdp->phydev;
-        u32 ioaddr = ndev->base_addr;
         int new_state = 0;
 
         if (phydev->link != PHY_DOWN) {
@@ -1000,8 +1184,8 @@ static void sh_eth_adjust_link(struct net_device *ndev)
                                 mdp->cd->set_rate(ndev);
                 }
                 if (mdp->link == PHY_DOWN) {
-                        writel((readl(ioaddr + ECMR) & ~ECMR_TXF)
-                                        | ECMR_DM, ioaddr + ECMR);
+                        sh_eth_write(ndev, (sh_eth_read(ndev, ECMR) & ~ECMR_TXF)
+                                        | ECMR_DM, ECMR);
                         new_state = 1;
                         mdp->link = phydev->link;
                 }
@@ -1012,7 +1196,7 @@ static void sh_eth_adjust_link(struct net_device *ndev)
                 mdp->duplex = -1;
         }
 
-        if (new_state)
+        if (new_state && netif_msg_link(mdp))
                 phy_print_status(phydev);
 }
 
@@ -1032,7 +1216,7 @@ static int sh_eth_phy_init(struct net_device *ndev)
 
         /* Try connect to PHY */
         phydev = phy_connect(ndev, phy_id, sh_eth_adjust_link,
-                                0, PHY_INTERFACE_MODE_MII);
+                                0, mdp->phy_interface);
         if (IS_ERR(phydev)) {
                 dev_err(&ndev->dev, "phy_connect failed\n");
                 return PTR_ERR(phydev);
@@ -1063,6 +1247,131 @@ static int sh_eth_phy_start(struct net_device *ndev)
         return 0;
 }
 
+static int sh_eth_get_settings(struct net_device *ndev,
+                        struct ethtool_cmd *ecmd)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&mdp->lock, flags);
+        ret = phy_ethtool_gset(mdp->phydev, ecmd);
+        spin_unlock_irqrestore(&mdp->lock, flags);
+
+        return ret;
+}
+
+static int sh_eth_set_settings(struct net_device *ndev,
+                struct ethtool_cmd *ecmd)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&mdp->lock, flags);
+
+        /* disable tx and rx */
+        sh_eth_rcv_snd_disable(ndev);
+
+        ret = phy_ethtool_sset(mdp->phydev, ecmd);
+        if (ret)
+                goto error_exit;
+
+        if (ecmd->duplex == DUPLEX_FULL)
+                mdp->duplex = 1;
+        else
+                mdp->duplex = 0;
+
+        if (mdp->cd->set_duplex)
+                mdp->cd->set_duplex(ndev);
+
+error_exit:
+        mdelay(1);
+
+        /* enable tx and rx */
+        sh_eth_rcv_snd_enable(ndev);
+
+        spin_unlock_irqrestore(&mdp->lock, flags);
+
+        return ret;
+}
+
+static int sh_eth_nway_reset(struct net_device *ndev)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&mdp->lock, flags);
+        ret = phy_start_aneg(mdp->phydev);
+        spin_unlock_irqrestore(&mdp->lock, flags);
+
+        return ret;
+}
+
+static u32 sh_eth_get_msglevel(struct net_device *ndev)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        return mdp->msg_enable;
+}
+
+static void sh_eth_set_msglevel(struct net_device *ndev, u32 value)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        mdp->msg_enable = value;
+}
+
+static const char sh_eth_gstrings_stats[][ETH_GSTRING_LEN] = {
+        "rx_current", "tx_current",
+        "rx_dirty", "tx_dirty",
+};
+#define SH_ETH_STATS_LEN  ARRAY_SIZE(sh_eth_gstrings_stats)
+
+static int sh_eth_get_sset_count(struct net_device *netdev, int sset)
+{
+        switch (sset) {
+        case ETH_SS_STATS:
+                return SH_ETH_STATS_LEN;
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+
+static void sh_eth_get_ethtool_stats(struct net_device *ndev,
+                        struct ethtool_stats *stats, u64 *data)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+        int i = 0;
+
+        /* device-specific stats */
+        data[i++] = mdp->cur_rx;
+        data[i++] = mdp->cur_tx;
+        data[i++] = mdp->dirty_rx;
+        data[i++] = mdp->dirty_tx;
+}
+
+static void sh_eth_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
+{
+        switch (stringset) {
+        case ETH_SS_STATS:
+                memcpy(data, *sh_eth_gstrings_stats,
+                                        sizeof(sh_eth_gstrings_stats));
+                break;
+        }
+}
+
+static struct ethtool_ops sh_eth_ethtool_ops = {
+        .get_settings   = sh_eth_get_settings,
+        .set_settings   = sh_eth_set_settings,
+        .nway_reset             = sh_eth_nway_reset,
+        .get_msglevel   = sh_eth_get_msglevel,
+        .set_msglevel   = sh_eth_set_msglevel,
+        .get_link               = ethtool_op_get_link,
+        .get_strings    = sh_eth_get_strings,
+        .get_ethtool_stats  = sh_eth_get_ethtool_stats,
+        .get_sset_count     = sh_eth_get_sset_count,
+};
+
 /* network device open function */
 static int sh_eth_open(struct net_device *ndev)
 {
@@ -1073,8 +1382,8 @@ static int sh_eth_open(struct net_device *ndev)
 
         ret = request_irq(ndev->irq, sh_eth_interrupt,
 #if defined(CONFIG_CPU_SUBTYPE_SH7763) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7764) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7757)
+        defined(CONFIG_CPU_SUBTYPE_SH7764) || \
+        defined(CONFIG_CPU_SUBTYPE_SH7757)
                                 IRQF_SHARED,
 #else
                                 0,
@@ -1117,15 +1426,14 @@ out_free_irq:
 static void sh_eth_tx_timeout(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        u32 ioaddr = ndev->base_addr;
         struct sh_eth_rxdesc *rxdesc;
         int i;
 
         netif_stop_queue(ndev);
 
-        /* worning message out. */
-        printk(KERN_WARNING "%s: transmit timed out, status %8.8x,"
-               " resetting...\n", ndev->name, (int)readl(ioaddr + EESR));
+        if (netif_msg_timer(mdp))
+                dev_err(&ndev->dev, "%s: transmit timed out, status %8.8x,"
+               " resetting...\n", ndev->name, (int)sh_eth_read(ndev, EESR));
 
         /* tx_errors count up */
         mdp->stats.tx_errors++;
@@ -1167,6 +1475,8 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
         spin_lock_irqsave(&mdp->lock, flags);
         if ((mdp->cur_tx - mdp->dirty_tx) >= (TX_RING_SIZE - 4)) {
                 if (!sh_eth_txfree(ndev)) {
+                        if (netif_msg_tx_queued(mdp))
+                                dev_warn(&ndev->dev, "TxFD exhausted.\n");
                         netif_stop_queue(ndev);
                         spin_unlock_irqrestore(&mdp->lock, flags);
                         return NETDEV_TX_BUSY;
@@ -1196,8 +1506,8 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 
         mdp->cur_tx++;
 
-        if (!(readl(ndev->base_addr + EDTRR) & EDTRR_TRNS))
-                writel(EDTRR_TRNS, ndev->base_addr + EDTRR);
+        if (!(sh_eth_read(ndev, EDTRR) & sh_eth_get_edtrr_trns(mdp)))
+                sh_eth_write(ndev, sh_eth_get_edtrr_trns(mdp), EDTRR);
 
         return NETDEV_TX_OK;
 }
@@ -1206,17 +1516,16 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 static int sh_eth_close(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        u32 ioaddr = ndev->base_addr;
         int ringsize;
 
         netif_stop_queue(ndev);
 
         /* Disable interrupts by clearing the interrupt mask. */
-        writel(0x0000, ioaddr + EESIPR);
+        sh_eth_write(ndev, 0x0000, EESIPR);
 
         /* Stop the chip's Tx and Rx processes. */
-        writel(0, ioaddr + EDTRR);
-        writel(0, ioaddr + EDRRR);
+        sh_eth_write(ndev, 0, EDTRR);
+        sh_eth_write(ndev, 0, EDRRR);
 
         /* PHY Disconnect */
         if (mdp->phydev) {
@@ -1247,25 +1556,24 @@ static int sh_eth_close(struct net_device *ndev)
 static struct net_device_stats *sh_eth_get_stats(struct net_device *ndev)
 {
         struct sh_eth_private *mdp = netdev_priv(ndev);
-        u32 ioaddr = ndev->base_addr;
 
         pm_runtime_get_sync(&mdp->pdev->dev);
 
-        mdp->stats.tx_dropped += readl(ioaddr + TROCR);
-        writel(0, ioaddr + TROCR);      /* (write clear) */
-        mdp->stats.collisions += readl(ioaddr + CDCR);
-        writel(0, ioaddr + CDCR);       /* (write clear) */
-        mdp->stats.tx_carrier_errors += readl(ioaddr + LCCR);
-        writel(0, ioaddr + LCCR);       /* (write clear) */
-#if defined(CONFIG_CPU_SUBTYPE_SH7763)
-        mdp->stats.tx_carrier_errors += readl(ioaddr + CERCR);/* CERCR */
-        writel(0, ioaddr + CERCR);      /* (write clear) */
-        mdp->stats.tx_carrier_errors += readl(ioaddr + CEECR);/* CEECR */
-        writel(0, ioaddr + CEECR);      /* (write clear) */
-#else
-        mdp->stats.tx_carrier_errors += readl(ioaddr + CNDCR);
-        writel(0, ioaddr + CNDCR);      /* (write clear) */
-#endif
+        mdp->stats.tx_dropped += sh_eth_read(ndev, TROCR);
+        sh_eth_write(ndev, 0, TROCR);   /* (write clear) */
+        mdp->stats.collisions += sh_eth_read(ndev, CDCR);
+        sh_eth_write(ndev, 0, CDCR);    /* (write clear) */
+        mdp->stats.tx_carrier_errors += sh_eth_read(ndev, LCCR);
+        sh_eth_write(ndev, 0, LCCR);    /* (write clear) */
+        if (sh_eth_is_gether(mdp)) {
+                mdp->stats.tx_carrier_errors += sh_eth_read(ndev, CERCR);
+                sh_eth_write(ndev, 0, CERCR);   /* (write clear) */
+                mdp->stats.tx_carrier_errors += sh_eth_read(ndev, CEECR);
+                sh_eth_write(ndev, 0, CEECR);   /* (write clear) */
+        } else {
+                mdp->stats.tx_carrier_errors += sh_eth_read(ndev, CNDCR);
+                sh_eth_write(ndev, 0, CNDCR);   /* (write clear) */
+        }
         pm_runtime_put_sync(&mdp->pdev->dev);
 
         return &mdp->stats;
@@ -1291,48 +1599,46 @@ static int sh_eth_do_ioctl(struct net_device *ndev, struct ifreq *rq,
 /* Multicast reception directions set */
 static void sh_eth_set_multicast_list(struct net_device *ndev)
 {
-        u32 ioaddr = ndev->base_addr;
-
         if (ndev->flags & IFF_PROMISC) {
                 /* Set promiscuous. */
-                writel((readl(ioaddr + ECMR) & ~ECMR_MCT) | ECMR_PRM,
-                          ioaddr + ECMR);
+                sh_eth_write(ndev, (sh_eth_read(ndev, ECMR) & ~ECMR_MCT) |
+                                ECMR_PRM, ECMR);
         } else {
                 /* Normal, unicast/broadcast-only mode. */
-                writel((readl(ioaddr + ECMR) & ~ECMR_PRM) | ECMR_MCT,
-                          ioaddr + ECMR);
+                sh_eth_write(ndev, (sh_eth_read(ndev, ECMR) & ~ECMR_PRM) |
+                                ECMR_MCT, ECMR);
         }
 }
+#endif /* SH_ETH_HAS_TSU */
 
 /* SuperH's TSU register init function */
-static void sh_eth_tsu_init(u32 ioaddr)
-{
-        writel(0, ioaddr + TSU_FWEN0);  /* Disable forward(0->1) */
-        writel(0, ioaddr + TSU_FWEN1);  /* Disable forward(1->0) */
-        writel(0, ioaddr + TSU_FCM);    /* forward fifo 3k-3k */
-        writel(0xc, ioaddr + TSU_BSYSL0);
-        writel(0xc, ioaddr + TSU_BSYSL1);
-        writel(0, ioaddr + TSU_PRISL0);
-        writel(0, ioaddr + TSU_PRISL1);
-        writel(0, ioaddr + TSU_FWSL0);
-        writel(0, ioaddr + TSU_FWSL1);
-        writel(TSU_FWSLC_POSTENU | TSU_FWSLC_POSTENL, ioaddr + TSU_FWSLC);
-#if defined(CONFIG_CPU_SUBTYPE_SH7763)
-        writel(0, ioaddr + TSU_QTAG0);  /* Disable QTAG(0->1) */
-        writel(0, ioaddr + TSU_QTAG1);  /* Disable QTAG(1->0) */
-#else
-        writel(0, ioaddr + TSU_QTAGM0); /* Disable QTAG(0->1) */
-        writel(0, ioaddr + TSU_QTAGM1); /* Disable QTAG(1->0) */
-#endif
-        writel(0, ioaddr + TSU_FWSR);   /* all interrupt status clear */
-        writel(0, ioaddr + TSU_FWINMK); /* Disable all interrupt */
-        writel(0, ioaddr + TSU_TEN);    /* Disable all CAM entry */
-        writel(0, ioaddr + TSU_POST1);  /* Disable CAM entry [ 0- 7] */
-        writel(0, ioaddr + TSU_POST2);  /* Disable CAM entry [ 8-15] */
-        writel(0, ioaddr + TSU_POST3);  /* Disable CAM entry [16-23] */
-        writel(0, ioaddr + TSU_POST4);  /* Disable CAM entry [24-31] */
+static void sh_eth_tsu_init(struct sh_eth_private *mdp)
+{
+        sh_eth_tsu_write(mdp, 0, TSU_FWEN0);    /* Disable forward(0->1) */
+        sh_eth_tsu_write(mdp, 0, TSU_FWEN1);    /* Disable forward(1->0) */
+        sh_eth_tsu_write(mdp, 0, TSU_FCM);      /* forward fifo 3k-3k */
+        sh_eth_tsu_write(mdp, 0xc, TSU_BSYSL0);
+        sh_eth_tsu_write(mdp, 0xc, TSU_BSYSL1);
+        sh_eth_tsu_write(mdp, 0, TSU_PRISL0);
+        sh_eth_tsu_write(mdp, 0, TSU_PRISL1);
+        sh_eth_tsu_write(mdp, 0, TSU_FWSL0);
+        sh_eth_tsu_write(mdp, 0, TSU_FWSL1);
+        sh_eth_tsu_write(mdp, TSU_FWSLC_POSTENU | TSU_FWSLC_POSTENL, TSU_FWSLC);
+        if (sh_eth_is_gether(mdp)) {
+                sh_eth_tsu_write(mdp, 0, TSU_QTAG0);    /* Disable QTAG(0->1) */
+                sh_eth_tsu_write(mdp, 0, TSU_QTAG1);    /* Disable QTAG(1->0) */
+        } else {
+                sh_eth_tsu_write(mdp, 0, TSU_QTAGM0);   /* Disable QTAG(0->1) */
+                sh_eth_tsu_write(mdp, 0, TSU_QTAGM1);   /* Disable QTAG(1->0) */
+        }
+        sh_eth_tsu_write(mdp, 0, TSU_FWSR);     /* all interrupt status clear */
+        sh_eth_tsu_write(mdp, 0, TSU_FWINMK);   /* Disable all interrupt */
+        sh_eth_tsu_write(mdp, 0, TSU_TEN);      /* Disable all CAM entry */
+        sh_eth_tsu_write(mdp, 0, TSU_POST1);    /* Disable CAM entry [ 0- 7] */
+        sh_eth_tsu_write(mdp, 0, TSU_POST2);    /* Disable CAM entry [ 8-15] */
+        sh_eth_tsu_write(mdp, 0, TSU_POST3);    /* Disable CAM entry [16-23] */
+        sh_eth_tsu_write(mdp, 0, TSU_POST4);    /* Disable CAM entry [24-31] */
 }
-#endif /* SH_ETH_HAS_TSU */
 
 /* MDIO bus release function */
 static int sh_mdio_release(struct net_device *ndev)
@@ -1355,7 +1661,8 @@ static int sh_mdio_release(struct net_device *ndev)
 }
 
 /* MDIO bus init function */
-static int sh_mdio_init(struct net_device *ndev, int id)
+static int sh_mdio_init(struct net_device *ndev, int id,
+                        struct sh_eth_plat_data *pd)
 {
         int ret, i;
         struct bb_info *bitbang;
@@ -1369,7 +1676,8 @@ static int sh_mdio_init(struct net_device *ndev, int id)
         }
 
         /* bitbang init */
-        bitbang->addr = ndev->base_addr + PIR;
+        bitbang->addr = ndev->base_addr + mdp->reg_offset[PIR];
+        bitbang->set_gate = pd->set_mdio_gate;
         bitbang->mdi_msk = 0x08;
         bitbang->mdo_msk = 0x04;
         bitbang->mmd_msk = 0x02;/* MMD */
@@ -1420,6 +1728,28 @@ out:
         return ret;
 }
 
+static const u16 *sh_eth_get_register_offset(int register_type)
+{
+        const u16 *reg_offset = NULL;
+
+        switch (register_type) {
+        case SH_ETH_REG_GIGABIT:
+                reg_offset = sh_eth_offset_gigabit;
+                break;
+        case SH_ETH_REG_FAST_SH4:
+                reg_offset = sh_eth_offset_fast_sh4;
+                break;
+        case SH_ETH_REG_FAST_SH3_SH2:
+                reg_offset = sh_eth_offset_fast_sh3_sh2;
+                break;
+        default:
+                printk(KERN_ERR "Unknown register type (%d)\n", register_type);
+                break;
+        }
+
+        return reg_offset;
+}
+
 static const struct net_device_ops sh_eth_netdev_ops = {
         .ndo_open               = sh_eth_open,
         .ndo_stop               = sh_eth_close,
@@ -1486,19 +1816,28 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
         pd = (struct sh_eth_plat_data *)(pdev->dev.platform_data);
         /* get PHY ID */
         mdp->phy_id = pd->phy;
+        mdp->phy_interface = pd->phy_interface;
         /* EDMAC endian */
         mdp->edmac_endian = pd->edmac_endian;
         mdp->no_ether_link = pd->no_ether_link;
         mdp->ether_link_active_low = pd->ether_link_active_low;
+        mdp->reg_offset = sh_eth_get_register_offset(pd->register_type);
 
         /* set cpu data */
+#if defined(SH_ETH_HAS_BOTH_MODULES)
+        mdp->cd = sh_eth_get_cpu_data(mdp);
+#else
         mdp->cd = &sh_eth_my_cpu_data;
+#endif
         sh_eth_set_default_cpu_data(mdp->cd);
 
         /* set function */
         ndev->netdev_ops = &sh_eth_netdev_ops;
+        SET_ETHTOOL_OPS(ndev, &sh_eth_ethtool_ops);
         ndev->watchdog_timeo = TX_TIMEOUT;
 
+        /* debug message level */
+        mdp->msg_enable = SH_ETH_DEF_MSG_ENABLE;
         mdp->post_rx = POST_RX >> (devno << 1);
         mdp->post_fw = POST_FW >> (devno << 1);
 
@@ -1507,13 +1846,23 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
 
         /* First device only init */
         if (!devno) {
+                if (mdp->cd->tsu) {
+                        struct resource *rtsu;
+                        rtsu = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+                        if (!rtsu) {
+                                dev_err(&pdev->dev, "Not found TSU resource\n");
+                                goto out_release;
+                        }
+                        mdp->tsu_addr = ioremap(rtsu->start,
+                                                resource_size(rtsu));
+                }
                 if (mdp->cd->chip_reset)
                         mdp->cd->chip_reset(ndev);
 
-#if defined(SH_ETH_HAS_TSU)
-                /* TSU init (Init only)*/
-                sh_eth_tsu_init(SH_TSU_ADDR);
-#endif
+                if (mdp->cd->tsu) {
+                        /* TSU init (Init only)*/
+                        sh_eth_tsu_init(mdp);
+                }
         }
 
         /* network device register */
@@ -1522,7 +1871,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
                 goto out_release;
 
         /* mdio bus init */
-        ret = sh_mdio_init(ndev, pdev->id);
+        ret = sh_mdio_init(ndev, pdev->id, pd);
         if (ret)
                 goto out_unregister;
 
@@ -1539,6 +1888,8 @@ out_unregister:
 
 out_release:
         /* net_dev free */
+        if (mdp->tsu_addr)
+                iounmap(mdp->tsu_addr);
         if (ndev)
                 free_netdev(ndev);
 
@@ -1549,7 +1900,9 @@ out:
 static int sh_eth_drv_remove(struct platform_device *pdev)
 {
         struct net_device *ndev = platform_get_drvdata(pdev);
+        struct sh_eth_private *mdp = netdev_priv(ndev);
 
+        iounmap(mdp->tsu_addr);
         sh_mdio_release(ndev);
         unregister_netdev(ndev);
         pm_runtime_disable(&pdev->dev);
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
index efa64221eed..c3048a6ba67 100644
--- a/drivers/net/sh_eth.h
+++ b/drivers/net/sh_eth.h
@@ -2,7 +2,7 @@
  *  SuperH Ethernet device driver
  *
  *  Copyright (C) 2006-2008 Nobuhiro Iwamatsu
- *  Copyright (C) 2008-2009 Renesas Solutions Corp.
+ *  Copyright (C) 2008-2011 Renesas Solutions Corp.
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms and conditions of the GNU General Public License,
@@ -38,278 +38,340 @@
 #define ETHERSMALL              60
 #define PKT_BUF_SZ              1538
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7763)
-/* This CPU register maps is very difference by other SH4 CPU */
-
-/* Chip Base Address */
-# define SH_TSU_ADDR    0xFEE01800
-# define ARSTR          SH_TSU_ADDR
-
-/* Chip Registers */
-/* E-DMAC */
-# define EDSR    0x000
-# define EDMR    0x400
-# define EDTRR   0x408
-# define EDRRR   0x410
-# define EESR    0x428
-# define EESIPR  0x430
-# define TDLAR   0x010
-# define TDFAR   0x014
-# define TDFXR   0x018
-# define TDFFR   0x01C
-# define RDLAR   0x030
-# define RDFAR   0x034
-# define RDFXR   0x038
-# define RDFFR   0x03C
-# define TRSCER  0x438
-# define RMFCR   0x440
-# define TFTR    0x448
-# define FDR     0x450
-# define RMCR    0x458
-# define RPADIR  0x460
-# define FCFTR   0x468
-
-/* Ether Register */
-# define ECMR    0x500
-# define ECSR    0x510
-# define ECSIPR  0x518
-# define PIR     0x520
-# define PSR     0x528
-# define PIPR    0x52C
-# define RFLR    0x508
-# define APR     0x554
-# define MPR     0x558
-# define PFTCR   0x55C
-# define PFRCR   0x560
-# define TPAUSER 0x564
-# define GECMR   0x5B0
-# define BCULR   0x5B4
-# define MAHR    0x5C0
-# define MALR    0x5C8
-# define TROCR   0x700
-# define CDCR    0x708
-# define LCCR    0x710
-# define CEFCR   0x740
-# define FRECR   0x748
-# define TSFRCR  0x750
-# define TLFRCR  0x758
-# define RFCR    0x760
-# define CERCR   0x768
-# define CEECR   0x770
-# define MAFCR   0x778
-
-/* TSU Absolute Address */
-# define TSU_CTRST       0x004
-# define TSU_FWEN0       0x010
-# define TSU_FWEN1       0x014
-# define TSU_FCM         0x18
-# define TSU_BSYSL0      0x20
-# define TSU_BSYSL1      0x24
-# define TSU_PRISL0      0x28
-# define TSU_PRISL1      0x2C
-# define TSU_FWSL0       0x30
-# define TSU_FWSL1       0x34
-# define TSU_FWSLC       0x38
-# define TSU_QTAG0       0x40
-# define TSU_QTAG1       0x44
-# define TSU_FWSR        0x50
-# define TSU_FWINMK      0x54
-# define TSU_ADQT0       0x48
-# define TSU_ADQT1       0x4C
-# define TSU_VTAG0       0x58
-# define TSU_VTAG1       0x5C
-# define TSU_ADSBSY      0x60
-# define TSU_TEN         0x64
-# define TSU_POST1       0x70
-# define TSU_POST2       0x74
-# define TSU_POST3       0x78
-# define TSU_POST4       0x7C
-# define TSU_ADRH0       0x100
-# define TSU_ADRL0       0x104
-# define TSU_ADRH31      0x1F8
-# define TSU_ADRL31      0x1FC
-
-# define TXNLCR0         0x80
-# define TXALCR0         0x84
-# define RXNLCR0         0x88
-# define RXALCR0         0x8C
-# define FWNLCR0         0x90
-# define FWALCR0         0x94
-# define TXNLCR1         0xA0
-# define TXALCR1         0xA4
-# define RXNLCR1         0xA8
-# define RXALCR1         0xAC
-# define FWNLCR1         0xB0
-# define FWALCR1         0x40
-
-#elif defined(CONFIG_CPU_SH4)   /* #if defined(CONFIG_CPU_SUBTYPE_SH7763) */
-/* EtherC */
-#define ECMR            0x100
-#define RFLR            0x108
-#define ECSR            0x110
-#define ECSIPR          0x118
-#define PIR             0x120
-#define PSR             0x128
-#define RDMLR           0x140
-#define IPGR            0x150
-#define APR             0x154
-#define MPR             0x158
-#define TPAUSER         0x164
-#define RFCF            0x160
-#define TPAUSECR        0x168
-#define BCFRR           0x16c
-#define MAHR            0x1c0
-#define MALR            0x1c8
-#define TROCR           0x1d0
-#define CDCR            0x1d4
-#define LCCR            0x1d8
-#define CNDCR           0x1dc
-#define CEFCR           0x1e4
-#define FRECR           0x1e8
-#define TSFRCR          0x1ec
-#define TLFRCR          0x1f0
-#define RFCR            0x1f4
-#define MAFCR           0x1f8
-#define RTRATE          0x1fc
-
-/* E-DMAC */
-#define EDMR            0x000
-#define EDTRR           0x008
-#define EDRRR           0x010
-#define TDLAR           0x018
-#define RDLAR           0x020
-#define EESR            0x028
-#define EESIPR          0x030
-#define TRSCER          0x038
-#define RMFCR           0x040
-#define TFTR            0x048
-#define FDR             0x050
-#define RMCR            0x058
-#define TFUCR           0x064
-#define RFOCR           0x068
-#define FCFTR           0x070
-#define RPADIR          0x078
-#define TRIMD           0x07c
-#define RBWAR           0x0c8
-#define RDFAR           0x0cc
-#define TBRAR           0x0d4
-#define TDFAR           0x0d8
-#else /* #elif defined(CONFIG_CPU_SH4) */
-/* This section is SH3 or SH2 */
-#ifndef CONFIG_CPU_SUBTYPE_SH7619
-/* Chip base address */
-# define SH_TSU_ADDR  0xA7000804
-# define ARSTR            0xA7000800
-#endif
-/* Chip Registers */
-/* E-DMAC */
-# define EDMR   0x0000
-# define EDTRR  0x0004
-# define EDRRR  0x0008
-# define TDLAR  0x000C
-# define RDLAR  0x0010
-# define EESR   0x0014
-# define EESIPR 0x0018
-# define TRSCER 0x001C
-# define RMFCR  0x0020
-# define TFTR   0x0024
-# define FDR    0x0028
-# define RMCR   0x002C
-# define EDOCR  0x0030
-# define FCFTR  0x0034
-# define RPADIR 0x0038
-# define TRIMD  0x003C
-# define RBWAR  0x0040
-# define RDFAR  0x0044
-# define TBRAR  0x004C
-# define TDFAR  0x0050
-
-/* Ether Register */
-# define ECMR   0x0160
-# define ECSR   0x0164
-# define ECSIPR 0x0168
-# define PIR    0x016C
-# define MAHR   0x0170
-# define MALR   0x0174
-# define RFLR   0x0178
-# define PSR    0x017C
-# define TROCR  0x0180
-# define CDCR   0x0184
-# define LCCR   0x0188
-# define CNDCR  0x018C
-# define CEFCR  0x0194
-# define FRECR  0x0198
-# define TSFRCR 0x019C
-# define TLFRCR 0x01A0
-# define RFCR   0x01A4
-# define MAFCR  0x01A8
-# define IPGR   0x01B4
-# if defined(CONFIG_CPU_SUBTYPE_SH7710)
-# define APR    0x01B8
-# define MPR    0x01BC
-# define TPAUSER 0x1C4
-# define BCFR   0x1CC
-# endif /* CONFIG_CPU_SH7710 */
-
-/* TSU */
-# define TSU_CTRST      0x004
-# define TSU_FWEN0      0x010
-# define TSU_FWEN1      0x014
-# define TSU_FCM        0x018
-# define TSU_BSYSL0     0x020
-# define TSU_BSYSL1     0x024
-# define TSU_PRISL0     0x028
-# define TSU_PRISL1     0x02C
-# define TSU_FWSL0      0x030
-# define TSU_FWSL1      0x034
-# define TSU_FWSLC      0x038
-# define TSU_QTAGM0     0x040
-# define TSU_QTAGM1     0x044
-# define TSU_ADQT0      0x048
-# define TSU_ADQT1      0x04C
-# define TSU_FWSR       0x050
-# define TSU_FWINMK     0x054
-# define TSU_ADSBSY     0x060
-# define TSU_TEN        0x064
-# define TSU_POST1      0x070
-# define TSU_POST2      0x074
-# define TSU_POST3      0x078
-# define TSU_POST4      0x07C
-# define TXNLCR0        0x080
-# define TXALCR0        0x084
-# define RXNLCR0        0x088
-# define RXALCR0        0x08C
-# define FWNLCR0        0x090
-# define FWALCR0        0x094
-# define TXNLCR1        0x0A0
-# define TXALCR1        0x0A4
-# define RXNLCR1        0x0A8
-# define RXALCR1        0x0AC
-# define FWNLCR1        0x0B0
-# define FWALCR1        0x0B4
-
-#define TSU_ADRH0       0x0100
-#define TSU_ADRL0       0x0104
-#define TSU_ADRL31      0x01FC
-
-#endif /* CONFIG_CPU_SUBTYPE_SH7763 */
-
-/* There are avoid compile error... */
-#if !defined(BCULR)
-#define BCULR   0x0fc
-#endif
-#if !defined(TRIMD)
-#define TRIMD   0x0fc
-#endif
-#if !defined(APR)
-#define APR     0x0fc
-#endif
-#if !defined(MPR)
-#define MPR     0x0fc
-#endif
-#if !defined(TPAUSER)
-#define TPAUSER 0x0fc
-#endif
+enum {
+        /* E-DMAC registers */
+        EDSR = 0,
+        EDMR,
+        EDTRR,
+        EDRRR,
+        EESR,
+        EESIPR,
+        TDLAR,
+        TDFAR,
+        TDFXR,
+        TDFFR,
+        RDLAR,
+        RDFAR,
+        RDFXR,
+        RDFFR,
+        TRSCER,
+        RMFCR,
+        TFTR,
+        FDR,
+        RMCR,
+        EDOCR,
+        TFUCR,
+        RFOCR,
+        FCFTR,
+        RPADIR,
+        TRIMD,
+        RBWAR,
+        TBRAR,
+
+        /* Ether registers */
+        ECMR,
+        ECSR,
+        ECSIPR,
+        PIR,
+        PSR,
+        RDMLR,
+        PIPR,
+        RFLR,
+        IPGR,
+        APR,
+        MPR,
+        PFTCR,
+        PFRCR,
+        RFCR,
+        RFCF,
+        TPAUSER,
+        TPAUSECR,
+        BCFR,
+        BCFRR,
+        GECMR,
+        BCULR,
+        MAHR,
+        MALR,
+        TROCR,
+        CDCR,
+        LCCR,
+        CNDCR,
+        CEFCR,
+        FRECR,
+        TSFRCR,
+        TLFRCR,
+        CERCR,
+        CEECR,
+        MAFCR,
+        RTRATE,
+
+        /* TSU Absolute address */
+        ARSTR,
+        TSU_CTRST,
+        TSU_FWEN0,
+        TSU_FWEN1,
+        TSU_FCM,
+        TSU_BSYSL0,
+        TSU_BSYSL1,
+        TSU_PRISL0,
+        TSU_PRISL1,
+        TSU_FWSL0,
+        TSU_FWSL1,
+        TSU_FWSLC,
+        TSU_QTAG0,
+        TSU_QTAG1,
+        TSU_QTAGM0,
+        TSU_QTAGM1,
+        TSU_FWSR,
+        TSU_FWINMK,
+        TSU_ADQT0,
+        TSU_ADQT1,
+        TSU_VTAG0,
+        TSU_VTAG1,
+        TSU_ADSBSY,
+        TSU_TEN,
+        TSU_POST1,
+        TSU_POST2,
+        TSU_POST3,
+        TSU_POST4,
+        TSU_ADRH0,
+        TSU_ADRL0,
+        TSU_ADRH31,
+        TSU_ADRL31,
+
+        TXNLCR0,
+        TXALCR0,
+        RXNLCR0,
+        RXALCR0,
+        FWNLCR0,
+        FWALCR0,
+        TXNLCR1,
+        TXALCR1,
+        RXNLCR1,
+        RXALCR1,
+        FWNLCR1,
+        FWALCR1,
+
+        /* This value must be written at last. */
+        SH_ETH_MAX_REGISTER_OFFSET,
+};
+
+static const u16 sh_eth_offset_gigabit[SH_ETH_MAX_REGISTER_OFFSET] = {
+        [EDSR]  = 0x0000,
+        [EDMR]  = 0x0400,
+        [EDTRR] = 0x0408,
+        [EDRRR] = 0x0410,
+        [EESR]  = 0x0428,
+        [EESIPR]        = 0x0430,
+        [TDLAR] = 0x0010,
+        [TDFAR] = 0x0014,
+        [TDFXR] = 0x0018,
+        [TDFFR] = 0x001c,
+        [RDLAR] = 0x0030,
+        [RDFAR] = 0x0034,
+        [RDFXR] = 0x0038,
+        [RDFFR] = 0x003c,
+        [TRSCER]        = 0x0438,
+        [RMFCR] = 0x0440,
+        [TFTR]  = 0x0448,
+        [FDR]   = 0x0450,
+        [RMCR]  = 0x0458,
+        [RPADIR]        = 0x0460,
+        [FCFTR] = 0x0468,
+
+        [ECMR]  = 0x0500,
+        [ECSR]  = 0x0510,
+        [ECSIPR]        = 0x0518,
+        [PIR]   = 0x0520,
+        [PSR]   = 0x0528,
+        [PIPR]  = 0x052c,
+        [RFLR]  = 0x0508,
+        [APR]   = 0x0554,
+        [MPR]   = 0x0558,
+        [PFTCR] = 0x055c,
+        [PFRCR] = 0x0560,
+        [TPAUSER]       = 0x0564,
+        [GECMR] = 0x05b0,
+        [BCULR] = 0x05b4,
+        [MAHR]  = 0x05c0,
+        [MALR]  = 0x05c8,
+        [TROCR] = 0x0700,
+        [CDCR]  = 0x0708,
+        [LCCR]  = 0x0710,
+        [CEFCR] = 0x0740,
+        [FRECR] = 0x0748,
+        [TSFRCR]        = 0x0750,
+        [TLFRCR]        = 0x0758,
+        [RFCR]  = 0x0760,
+        [CERCR] = 0x0768,
+        [CEECR] = 0x0770,
+        [MAFCR] = 0x0778,
+
+        [ARSTR] = 0x0000,
+        [TSU_CTRST]     = 0x0004,
+        [TSU_FWEN0]     = 0x0010,
+        [TSU_FWEN1]     = 0x0014,
+        [TSU_FCM]       = 0x0018,
+        [TSU_BSYSL0]    = 0x0020,
+        [TSU_BSYSL1]    = 0x0024,
+        [TSU_PRISL0]    = 0x0028,
+        [TSU_PRISL1]    = 0x002c,
+        [TSU_FWSL0]     = 0x0030,
+        [TSU_FWSL1]     = 0x0034,
+        [TSU_FWSLC]     = 0x0038,
+        [TSU_QTAG0]     = 0x0040,
+        [TSU_QTAG1]     = 0x0044,
+        [TSU_FWSR]      = 0x0050,
+        [TSU_FWINMK]    = 0x0054,
+        [TSU_ADQT0]     = 0x0048,
+        [TSU_ADQT1]     = 0x004c,
+        [TSU_VTAG0]     = 0x0058,
+        [TSU_VTAG1]     = 0x005c,
+        [TSU_ADSBSY]    = 0x0060,
+        [TSU_TEN]       = 0x0064,
+        [TSU_POST1]     = 0x0070,
+        [TSU_POST2]     = 0x0074,
+        [TSU_POST3]     = 0x0078,
+        [TSU_POST4]     = 0x007c,
+        [TSU_ADRH0]     = 0x0100,
+        [TSU_ADRL0]     = 0x0104,
+        [TSU_ADRH31]    = 0x01f8,
+        [TSU_ADRL31]    = 0x01fc,
+
+        [TXNLCR0]       = 0x0080,
+        [TXALCR0]       = 0x0084,
+        [RXNLCR0]       = 0x0088,
+        [RXALCR0]       = 0x008c,
+        [FWNLCR0]       = 0x0090,
+        [FWALCR0]       = 0x0094,
+        [TXNLCR1]       = 0x00a0,
+        [TXALCR1]       = 0x00a0,
+        [RXNLCR1]       = 0x00a8,
+        [RXALCR1]       = 0x00ac,
+        [FWNLCR1]       = 0x00b0,
+        [FWALCR1]       = 0x00b4,
+};
+
+static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = {
+        [ECMR]  = 0x0100,
+        [RFLR]  = 0x0108,
+        [ECSR]  = 0x0110,
+        [ECSIPR]        = 0x0118,
+        [PIR]   = 0x0120,
+        [PSR]   = 0x0128,
+        [RDMLR] = 0x0140,
+        [IPGR]  = 0x0150,
+        [APR]   = 0x0154,
+        [MPR]   = 0x0158,
+        [TPAUSER]       = 0x0164,
+        [RFCF]  = 0x0160,
+        [TPAUSECR]      = 0x0168,
+        [BCFRR] = 0x016c,
+        [MAHR]  = 0x01c0,
+        [MALR]  = 0x01c8,
+        [TROCR] = 0x01d0,
+        [CDCR]  = 0x01d4,
+        [LCCR]  = 0x01d8,
+        [CNDCR] = 0x01dc,
+        [CEFCR] = 0x01e4,
+        [FRECR] = 0x01e8,
+        [TSFRCR]        = 0x01ec,
+        [TLFRCR]        = 0x01f0,
+        [RFCR]  = 0x01f4,
+        [MAFCR] = 0x01f8,
+        [RTRATE]        = 0x01fc,
+
+        [EDMR]  = 0x0000,
+        [EDTRR] = 0x0008,
+        [EDRRR] = 0x0010,
+        [TDLAR] = 0x0018,
+        [RDLAR] = 0x0020,
+        [EESR]  = 0x0028,
+        [EESIPR]        = 0x0030,
+        [TRSCER]        = 0x0038,
+        [RMFCR] = 0x0040,
+        [TFTR]  = 0x0048,
+        [FDR]   = 0x0050,
+        [RMCR]  = 0x0058,
+        [TFUCR] = 0x0064,
+        [RFOCR] = 0x0068,
+        [FCFTR] = 0x0070,
+        [RPADIR]        = 0x0078,
+        [TRIMD] = 0x007c,
+        [RBWAR] = 0x00c8,
+        [RDFAR] = 0x00cc,
+        [TBRAR] = 0x00d4,
+        [TDFAR] = 0x00d8,
+};
+
+static const u16 sh_eth_offset_fast_sh3_sh2[SH_ETH_MAX_REGISTER_OFFSET] = {
+        [ECMR]  = 0x0160,
+        [ECSR]  = 0x0164,
+        [ECSIPR]        = 0x0168,
+        [PIR]   = 0x016c,
+        [MAHR]  = 0x0170,
+        [MALR]  = 0x0174,
+        [RFLR]  = 0x0178,
+        [PSR]   = 0x017c,
+        [TROCR] = 0x0180,
+        [CDCR]  = 0x0184,
+        [LCCR]  = 0x0188,
+        [CNDCR] = 0x018c,
+        [CEFCR] = 0x0194,
+        [FRECR] = 0x0198,
+        [TSFRCR]        = 0x019c,
+        [TLFRCR]        = 0x01a0,
+        [RFCR]  = 0x01a4,
+        [MAFCR] = 0x01a8,
+        [IPGR]  = 0x01b4,
+        [APR]   = 0x01b8,
+        [MPR]   = 0x01bc,
+        [TPAUSER]       = 0x01c4,
+        [BCFR]  = 0x01cc,
+
+        [ARSTR] = 0x0000,
+        [TSU_CTRST]     = 0x0004,
+        [TSU_FWEN0]     = 0x0010,
+        [TSU_FWEN1]     = 0x0014,
+        [TSU_FCM]       = 0x0018,
+        [TSU_BSYSL0]    = 0x0020,
+        [TSU_BSYSL1]    = 0x0024,
+        [TSU_PRISL0]    = 0x0028,
+        [TSU_PRISL1]    = 0x002c,
+        [TSU_FWSL0]     = 0x0030,
+        [TSU_FWSL1]     = 0x0034,
+        [TSU_FWSLC]     = 0x0038,
+        [TSU_QTAGM0]    = 0x0040,
+        [TSU_QTAGM1]    = 0x0044,
+        [TSU_ADQT0]     = 0x0048,
+        [TSU_ADQT1]     = 0x004c,
+        [TSU_FWSR]      = 0x0050,
+        [TSU_FWINMK]    = 0x0054,
+        [TSU_ADSBSY]    = 0x0060,
+        [TSU_TEN]       = 0x0064,
+        [TSU_POST1]     = 0x0070,
+        [TSU_POST2]     = 0x0074,
+        [TSU_POST3]     = 0x0078,
+        [TSU_POST4]     = 0x007c,
+
+        [TXNLCR0]       = 0x0080,
+        [TXALCR0]       = 0x0084,
+        [RXNLCR0]       = 0x0088,
+        [RXALCR0]       = 0x008c,
+        [FWNLCR0]       = 0x0090,
+        [FWALCR0]       = 0x0094,
+        [TXNLCR1]       = 0x00a0,
+        [TXALCR1]       = 0x00a0,
+        [RXNLCR1]       = 0x00a8,
+        [RXALCR1]       = 0x00ac,
+        [FWNLCR1]       = 0x00b0,
+        [FWALCR1]       = 0x00b4,
+
+        [TSU_ADRH0]     = 0x0100,
+        [TSU_ADRL0]     = 0x0104,
+        [TSU_ADRL31]    = 0x01fc,
+
+};
 
 /* Driver's parameters */
 #if defined(CONFIG_CPU_SH4)
@@ -338,20 +400,14 @@ enum GECMR_BIT {
 enum DMAC_M_BIT {
         EDMR_EL = 0x40, /* Litte endian */
         EDMR_DL1 = 0x20, EDMR_DL0 = 0x10,
-#ifdef CONFIG_CPU_SUBTYPE_SH7763
-        EDMR_SRST = 0x03,
-#else /* CONFIG_CPU_SUBTYPE_SH7763 */
-        EDMR_SRST = 0x01,
-#endif
+        EDMR_SRST_GETHER = 0x03,
+        EDMR_SRST_ETHER = 0x01,
 };
 
 /* EDTRR */
 enum DMAC_T_BIT {
-#ifdef CONFIG_CPU_SUBTYPE_SH7763
-        EDTRR_TRNS = 0x03,
-#else
-        EDTRR_TRNS = 0x01,
-#endif
+        EDTRR_TRNS_GETHER = 0x03,
+        EDTRR_TRNS_ETHER = 0x01,
 };
 
 /* EDRRR*/
@@ -695,6 +751,7 @@ struct sh_eth_cpu_data {
         unsigned mpr:1;                 /* EtherC have MPR */
         unsigned tpauser:1;             /* EtherC have TPAUSER */
         unsigned bculr:1;               /* EtherC have BCULR */
+        unsigned tsu:1;                 /* EtherC have TSU */
         unsigned hw_swap:1;             /* E-DMAC have DE bit in EDMR */
         unsigned rpadir:1;              /* E-DMAC have RPADIR */
         unsigned no_trimd:1;            /* E-DMAC DO NOT have TRIMD */
@@ -704,6 +761,8 @@ struct sh_eth_cpu_data {
 struct sh_eth_private {
         struct platform_device *pdev;
         struct sh_eth_cpu_data *cd;
+        const u16 *reg_offset;
+        void __iomem *tsu_addr;
         dma_addr_t rx_desc_dma;
         dma_addr_t tx_desc_dma;
         struct sh_eth_rxdesc *rx_ring;
@@ -722,6 +781,7 @@ struct sh_eth_private {
         struct mii_bus *mii_bus;        /* MDIO bus control */
         struct phy_device *phydev;      /* PHY device control */
         enum phy_state link;
+        phy_interface_t phy_interface;
         int msg_enable;
         int speed;
         int duplex;
@@ -746,4 +806,32 @@ static inline void sh_eth_soft_swap(char *src, int len)
 #endif
 }
 
+static inline void sh_eth_write(struct net_device *ndev, unsigned long data,
+                                int enum_index)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+
+        writel(data, ndev->base_addr + mdp->reg_offset[enum_index]);
+}
+
+static inline unsigned long sh_eth_read(struct net_device *ndev,
+                                        int enum_index)
+{
+        struct sh_eth_private *mdp = netdev_priv(ndev);
+
+        return readl(ndev->base_addr + mdp->reg_offset[enum_index]);
+}
+
+static inline void sh_eth_tsu_write(struct sh_eth_private *mdp,
+                                unsigned long data, int enum_index)
+{
+        writel(data, mdp->tsu_addr + mdp->reg_offset[enum_index]);
+}
+
+static inline unsigned long sh_eth_tsu_read(struct sh_eth_private *mdp,
+                                        int enum_index)
+{
+        return readl(mdp->tsu_addr + mdp->reg_offset[enum_index]);
+}
+
 #endif  /* #ifndef __SH_ETH_H__ */
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 5976d1d51df..84d4167eee9 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -495,7 +495,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
         sis_priv->mii_info.reg_num_mask = 0x1f;
 
         /* Get Mac address according to the chip revision */
-        pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &(sis_priv->chipset_rev));
+        sis_priv->chipset_rev = pci_dev->revision;
         if(netif_msg_probe(sis_priv))
                 printk(KERN_DEBUG "%s: detected revision %2.2x, "
                                 "trying to get MAC address...\n",
@@ -532,7 +532,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
         /* save our host bridge revision */
         dev = pci_get_device(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_630, NULL);
         if (dev) {
-                pci_read_config_byte(dev, PCI_CLASS_REVISION, &sis_priv->host_bridge_rev);
+                sis_priv->host_bridge_rev = dev->revision;
                 pci_dev_put(dev);
         }
 
@@ -1777,6 +1777,7 @@ static int sis900_rx(struct net_device *net_dev)
                                               "cur_rx:%4.4d, dirty_rx:%4.4d\n",
                                               net_dev->name, sis_priv->cur_rx,
                                               sis_priv->dirty_rx);
+                                dev_kfree_skb(skb);
                                 break;
                         }
 
diff --git a/drivers/net/skfp/Makefile b/drivers/net/skfp/Makefile
index cb23580fcff..b0be0234abf 100644
--- a/drivers/net/skfp/Makefile
+++ b/drivers/net/skfp/Makefile
@@ -17,4 +17,4 @@ skfp-objs :=  skfddi.o    hwmtm.o    fplustm.o  smt.o      cfm.o     \
 #   projects. To keep the source common for all those drivers (and
 #   thus simplify fixes to it), please do not clean it up!
 
-EXTRA_CFLAGS += -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes 
+ccflags-y := -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 42daf98ba73..35b28f42d20 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -3856,9 +3856,6 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
         memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port*8, ETH_ALEN);
         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
-        /* device is off until link detection */
-        netif_carrier_off(dev);
-
         return dev;
 }
 
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 7d85a38377a..2a91868788f 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4983,7 +4983,7 @@ static int sky2_suspend(struct device *dev)
         return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int sky2_resume(struct device *dev)
 {
         struct pci_dev *pdev = to_pci_dev(dev);
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 726df611ee1..43654a3bb0e 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -81,6 +81,7 @@ static const char version[] =
 #include <linux/ethtool.h>
 #include <linux/mii.h>
 #include <linux/workqueue.h>
+#include <linux/of.h>
 
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -2394,6 +2395,15 @@ static int smc_drv_resume(struct device *dev)
         return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id smc91x_match[] = {
+        { .compatible = "smsc,lan91c94", },
+        { .compatible = "smsc,lan91c111", },
+        {},
+}
+MODULE_DEVICE_TABLE(of, smc91x_match);
+#endif
+
 static struct dev_pm_ops smc_drv_pm_ops = {
         .suspend        = smc_drv_suspend,
         .resume         = smc_drv_resume,
@@ -2406,6 +2416,9 @@ static struct platform_driver smc_driver = {
                 .name   = CARDNAME,
                 .owner  = THIS_MODULE,
                 .pm     = &smc_drv_pm_ops,
+#ifdef CONFIG_OF
+                .of_match_table = smc91x_match,
+#endif
         },
 };
 
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index ee747919a76..68d48ab6eac 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -206,68 +206,6 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #define RPC_LSA_DEFAULT         RPC_LED_TX_RX
 #define RPC_LSB_DEFAULT         RPC_LED_100_10
 
-#elif   defined(CONFIG_MACH_LPD79520) ||        \
-        defined(CONFIG_MACH_LPD7A400) ||        \
-        defined(CONFIG_MACH_LPD7A404)
-
-/* The LPD7X_IOBARRIER is necessary to overcome a mismatch between the
- * way that the CPU handles chip selects and the way that the SMC chip
- * expects the chip select to operate.  Refer to
- * Documentation/arm/Sharp-LH/IOBarrier for details.  The read from
- * IOBARRIER is a byte, in order that we read the least-common
- * denominator.  It would be wasteful to read 32 bits from an 8-bit
- * accessible region.
- *
- * There is no explicit protection against interrupts intervening
- * between the writew and the IOBARRIER.  In SMC ISR there is a
- * preamble that performs an IOBARRIER in the extremely unlikely event
- * that the driver interrupts itself between a writew to the chip an
- * the IOBARRIER that follows *and* the cache is large enough that the
- * first off-chip access while handing the interrupt is to the SMC
- * chip.  Other devices in the same address space as the SMC chip must
- * be aware of the potential for trouble and perform a similar
- * IOBARRIER on entry to their ISR.
- */
-
-#include <mach/constants.h>     /* IOBARRIER_VIRT */
-
-#define SMC_CAN_USE_8BIT        0
-#define SMC_CAN_USE_16BIT       1
-#define SMC_CAN_USE_32BIT       0
-#define SMC_NOWAIT              0
-#define LPD7X_IOBARRIER         readb (IOBARRIER_VIRT)
-
-#define SMC_inw(a,r)\
-   ({ unsigned short v = readw ((void*) ((a) + (r))); LPD7X_IOBARRIER; v; })
-#define SMC_outw(v,a,r)   ({ writew ((v), (a) + (r)); LPD7X_IOBARRIER; })
-
-#define SMC_insw                LPD7_SMC_insw
-static inline void LPD7_SMC_insw (unsigned char* a, int r,
-                                  unsigned char* p, int l)
-{
-        unsigned short* ps = (unsigned short*) p;
-        while (l-- > 0) {
-                *ps++ = readw (a + r);
-                LPD7X_IOBARRIER;
-        }
-}
-
-#define SMC_outsw               LPD7_SMC_outsw
-static inline void LPD7_SMC_outsw (unsigned char* a, int r,
-                                   unsigned char* p, int l)
-{
-        unsigned short* ps = (unsigned short*) p;
-        while (l-- > 0) {
-                writew (*ps++, a + r);
-                LPD7X_IOBARRIER;
-        }
-}
-
-#define SMC_INTERRUPT_PREAMBLE  LPD7X_IOBARRIER
-
-#define RPC_LSA_DEFAULT         RPC_LED_TX_RX
-#define RPC_LSB_DEFAULT         RPC_LED_100_10
-
 #elif   defined(CONFIG_ARCH_VERSATILE)
 
 #define SMC_CAN_USE_8BIT        1
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index 64bfdae5956..1566259c1f2 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -791,8 +791,8 @@ static int smsc911x_mii_probe(struct net_device *dev)
                 return -ENODEV;
         }
 
-        SMSC_TRACE(PROBE, "PHY %d: addr %d, phy_id 0x%08X",
-                        phy_addr, phydev->addr, phydev->phy_id);
+        SMSC_TRACE(PROBE, "PHY: addr %d, phy_id 0x%08X",
+                        phydev->addr, phydev->phy_id);
 
         ret = phy_connect_direct(dev, phydev,
                         &smsc911x_phy_adjust_link, 0,
@@ -1178,6 +1178,11 @@ static int smsc911x_open(struct net_device *dev)
         smsc911x_reg_write(pdata, HW_CFG, 0x00050000);
         smsc911x_reg_write(pdata, AFC_CFG, 0x006E3740);
 
+        /* Increase the legal frame size of VLAN tagged frames to 1522 bytes */
+        spin_lock_irq(&pdata->mac_lock);
+        smsc911x_mac_write(pdata, VLAN1, ETH_P_8021Q);
+        spin_unlock_irq(&pdata->mac_lock);
+
         /* Make sure EEPROM has finished loading before setting GPIO_CFG */
         timeout = 50;
         while ((smsc911x_reg_read(pdata, E2P_CMD) & E2P_CMD_EPC_BUSY_) &&
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index 34a0af3837f..0e5f03135b5 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -1560,8 +1560,10 @@ static int stmmac_mac_device_setup(struct net_device *dev)
 
         priv->hw = device;
 
-        if (device_can_wakeup(priv->device))
+        if (device_can_wakeup(priv->device)) {
                 priv->wolopts = WAKE_MAGIC; /* Magic Frame as default */
+                enable_irq_wake(dev->irq);
+        }
 
         return 0;
 }
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 0a6a5ced3c1..aa4765803a4 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -1242,8 +1242,7 @@ fail_and_cleanup:
 /* QEC can be the parent of either QuadEthernet or a BigMAC.  We want
  * the latter.
  */
-static int __devinit bigmac_sbus_probe(struct platform_device *op,
-                                       const struct of_device_id *match)
+static int __devinit bigmac_sbus_probe(struct platform_device *op)
 {
         struct device *parent = op->dev.parent;
         struct platform_device *qec_op;
@@ -1289,7 +1288,7 @@ static const struct of_device_id bigmac_sbus_match[] = {
 
 MODULE_DEVICE_TABLE(of, bigmac_sbus_match);
 
-static struct of_platform_driver bigmac_sbus_driver = {
+static struct platform_driver bigmac_sbus_driver = {
         .driver = {
                 .name = "sunbmac",
                 .owner = THIS_MODULE,
@@ -1301,12 +1300,12 @@ static struct of_platform_driver bigmac_sbus_driver = {
 
 static int __init bigmac_init(void)
 {
-        return of_register_platform_driver(&bigmac_sbus_driver);
+        return platform_driver_register(&bigmac_sbus_driver);
 }
 
 static void __exit bigmac_exit(void)
 {
-        of_unregister_platform_driver(&bigmac_sbus_driver);
+        platform_driver_unregister(&bigmac_sbus_driver);
 }
 
 module_init(bigmac_init);
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 1c5408f8393..c1a344829b5 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -320,28 +320,28 @@ static int gem_txmac_interrupt(struct net_device *dev, struct gem *gp, u32 gem_s
 
         if (txmac_stat & MAC_TXSTAT_URUN) {
                 netdev_err(dev, "TX MAC xmit underrun\n");
-                gp->net_stats.tx_fifo_errors++;
+                dev->stats.tx_fifo_errors++;
         }
 
         if (txmac_stat & MAC_TXSTAT_MPE) {
                 netdev_err(dev, "TX MAC max packet size error\n");
-                gp->net_stats.tx_errors++;
+                dev->stats.tx_errors++;
         }
 
         /* The rest are all cases of one of the 16-bit TX
          * counters expiring.
          */
         if (txmac_stat & MAC_TXSTAT_NCE)
-                gp->net_stats.collisions += 0x10000;
+                dev->stats.collisions += 0x10000;
 
         if (txmac_stat & MAC_TXSTAT_ECE) {
-                gp->net_stats.tx_aborted_errors += 0x10000;
-                gp->net_stats.collisions += 0x10000;
+                dev->stats.tx_aborted_errors += 0x10000;
+                dev->stats.collisions += 0x10000;
         }
 
         if (txmac_stat & MAC_TXSTAT_LCE) {
-                gp->net_stats.tx_aborted_errors += 0x10000;
-                gp->net_stats.collisions += 0x10000;
+                dev->stats.tx_aborted_errors += 0x10000;
+                dev->stats.collisions += 0x10000;
         }
 
         /* We do not keep track of MAC_TXSTAT_FCE and
@@ -469,20 +469,20 @@ static int gem_rxmac_interrupt(struct net_device *dev, struct gem *gp, u32 gem_s
                 u32 smac = readl(gp->regs + MAC_SMACHINE);
 
                 netdev_err(dev, "RX MAC fifo overflow smac[%08x]\n", smac);
-                gp->net_stats.rx_over_errors++;
-                gp->net_stats.rx_fifo_errors++;
+                dev->stats.rx_over_errors++;
+                dev->stats.rx_fifo_errors++;
 
                 ret = gem_rxmac_reset(gp);
         }
 
         if (rxmac_stat & MAC_RXSTAT_ACE)
-                gp->net_stats.rx_frame_errors += 0x10000;
+                dev->stats.rx_frame_errors += 0x10000;
 
         if (rxmac_stat & MAC_RXSTAT_CCE)
-                gp->net_stats.rx_crc_errors += 0x10000;
+                dev->stats.rx_crc_errors += 0x10000;
 
         if (rxmac_stat & MAC_RXSTAT_LCE)
-                gp->net_stats.rx_length_errors += 0x10000;
+                dev->stats.rx_length_errors += 0x10000;
 
         /* We do not track MAC_RXSTAT_FCE and MAC_RXSTAT_VCE
          * events.
@@ -594,7 +594,7 @@ static int gem_abnormal_irq(struct net_device *dev, struct gem *gp, u32 gem_stat
                 if (netif_msg_rx_err(gp))
                         printk(KERN_DEBUG "%s: no buffer for rx frame\n",
                                 gp->dev->name);
-                gp->net_stats.rx_dropped++;
+                dev->stats.rx_dropped++;
         }
 
         if (gem_status & GREG_STAT_RXTAGERR) {
@@ -602,7 +602,7 @@ static int gem_abnormal_irq(struct net_device *dev, struct gem *gp, u32 gem_stat
                 if (netif_msg_rx_err(gp))
                         printk(KERN_DEBUG "%s: corrupt rx tag framing\n",
                                 gp->dev->name);
-                gp->net_stats.rx_errors++;
+                dev->stats.rx_errors++;
 
                 goto do_reset;
         }
@@ -684,7 +684,7 @@ static __inline__ void gem_tx(struct net_device *dev, struct gem *gp, u32 gem_st
                                 break;
                 }
                 gp->tx_skbs[entry] = NULL;
-                gp->net_stats.tx_bytes += skb->len;
+                dev->stats.tx_bytes += skb->len;
 
                 for (frag = 0; frag <= skb_shinfo(skb)->nr_frags; frag++) {
                         txd = &gp->init_block->txd[entry];
@@ -696,7 +696,7 @@ static __inline__ void gem_tx(struct net_device *dev, struct gem *gp, u32 gem_st
                         entry = NEXT_TX(entry);
                 }
 
-                gp->net_stats.tx_packets++;
+                dev->stats.tx_packets++;
                 dev_kfree_skb_irq(skb);
         }
         gp->tx_old = entry;
@@ -738,6 +738,7 @@ static __inline__ void gem_post_rxds(struct gem *gp, int limit)
 
 static int gem_rx(struct gem *gp, int work_to_do)
 {
+        struct net_device *dev = gp->dev;
         int entry, drops, work_done = 0;
         u32 done;
         __sum16 csum;
@@ -782,15 +783,15 @@ static int gem_rx(struct gem *gp, int work_to_do)
 
                 len = (status & RXDCTRL_BUFSZ) >> 16;
                 if ((len < ETH_ZLEN) || (status & RXDCTRL_BAD)) {
-                        gp->net_stats.rx_errors++;
+                        dev->stats.rx_errors++;
                         if (len < ETH_ZLEN)
-                                gp->net_stats.rx_length_errors++;
+                                dev->stats.rx_length_errors++;
                         if (len & RXDCTRL_BAD)
-                                gp->net_stats.rx_crc_errors++;
+                                dev->stats.rx_crc_errors++;
 
                         /* We'll just return it to GEM. */
                 drop_it:
-                        gp->net_stats.rx_dropped++;
+                        dev->stats.rx_dropped++;
                         goto next;
                 }
 
@@ -843,8 +844,8 @@ static int gem_rx(struct gem *gp, int work_to_do)
 
                 netif_receive_skb(skb);
 
-                gp->net_stats.rx_packets++;
-                gp->net_stats.rx_bytes += len;
+                dev->stats.rx_packets++;
+                dev->stats.rx_bytes += len;
 
         next:
                 entry = NEXT_RX(entry);
@@ -2472,7 +2473,6 @@ static int gem_resume(struct pci_dev *pdev)
 static struct net_device_stats *gem_get_stats(struct net_device *dev)
 {
         struct gem *gp = netdev_priv(dev);
-        struct net_device_stats *stats = &gp->net_stats;
 
         spin_lock_irq(&gp->lock);
         spin_lock(&gp->tx_lock);
@@ -2481,17 +2481,17 @@ static struct net_device_stats *gem_get_stats(struct net_device *dev)
          * so we shield against this
          */
         if (gp->running) {
-                stats->rx_crc_errors += readl(gp->regs + MAC_FCSERR);
+                dev->stats.rx_crc_errors += readl(gp->regs + MAC_FCSERR);
                 writel(0, gp->regs + MAC_FCSERR);
 
-                stats->rx_frame_errors += readl(gp->regs + MAC_AERR);
+                dev->stats.rx_frame_errors += readl(gp->regs + MAC_AERR);
                 writel(0, gp->regs + MAC_AERR);
 
-                stats->rx_length_errors += readl(gp->regs + MAC_LERR);
+                dev->stats.rx_length_errors += readl(gp->regs + MAC_LERR);
                 writel(0, gp->regs + MAC_LERR);
 
-                stats->tx_aborted_errors += readl(gp->regs + MAC_ECOLL);
-                stats->collisions +=
+                dev->stats.tx_aborted_errors += readl(gp->regs + MAC_ECOLL);
+                dev->stats.collisions +=
                         (readl(gp->regs + MAC_ECOLL) +
                          readl(gp->regs + MAC_LCOLL));
                 writel(0, gp->regs + MAC_ECOLL);
@@ -2501,7 +2501,7 @@ static struct net_device_stats *gem_get_stats(struct net_device *dev)
         spin_unlock(&gp->tx_lock);
         spin_unlock_irq(&gp->lock);
 
-        return &gp->net_stats;
+        return &dev->stats;
 }
 
 static int gem_set_mac_address(struct net_device *dev, void *addr)
diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h
index 19905460def..d225077964e 100644
--- a/drivers/net/sungem.h
+++ b/drivers/net/sungem.h
@@ -843,7 +843,7 @@ struct gem_txd {
 
 /* GEM requires that RX descriptors are provided four at a time,
  * aligned.  Also, the RX ring may not wrap around.  This means that
- * there will be at least 4 unused desciptor entries in the middle
+ * there will be at least 4 unused descriptor entries in the middle
  * of the RX ring at all times.
  *
  * Similar to HME, GEM assumes that it can write garbage bytes before
@@ -994,7 +994,6 @@ struct gem {
         u32                     status;
 
         struct napi_struct      napi;
-        struct net_device_stats net_stats;
 
         int                     tx_fifo_sz;
         int                     rx_fifo_sz;
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 55bbb9c15d9..eb4f59fb01e 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -3237,11 +3237,15 @@ static void happy_meal_pci_exit(void)
 #endif
 
 #ifdef CONFIG_SBUS
-static int __devinit hme_sbus_probe(struct platform_device *op, const struct of_device_id *match)
+static int __devinit hme_sbus_probe(struct platform_device *op)
 {
         struct device_node *dp = op->dev.of_node;
         const char *model = of_get_property(dp, "model", NULL);
-        int is_qfe = (match->data != NULL);
+        int is_qfe;
+
+        if (!op->dev.of_match)
+                return -EINVAL;
+        is_qfe = (op->dev.of_match->data != NULL);
 
         if (!is_qfe && model && !strcmp(model, "SUNW,sbus-qfe"))
                 is_qfe = 1;
@@ -3292,7 +3296,7 @@ static const struct of_device_id hme_sbus_match[] = {
 
 MODULE_DEVICE_TABLE(of, hme_sbus_match);
 
-static struct of_platform_driver hme_sbus_driver = {
+static struct platform_driver hme_sbus_driver = {
         .driver = {
                 .name = "hme",
                 .owner = THIS_MODULE,
@@ -3306,7 +3310,7 @@ static int __init happy_meal_sbus_init(void)
 {
         int err;
 
-        err = of_register_platform_driver(&hme_sbus_driver);
+        err = platform_driver_register(&hme_sbus_driver);
         if (!err)
                 err = quattro_sbus_register_irqs();
 
@@ -3315,7 +3319,7 @@ static int __init happy_meal_sbus_init(void)
 
 static void happy_meal_sbus_exit(void)
 {
-        of_unregister_platform_driver(&hme_sbus_driver);
+        platform_driver_unregister(&hme_sbus_driver);
         quattro_sbus_free_irqs();
 
         while (qfe_sbus_list) {
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 767e1e2b210..32a5c7f63c4 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -1495,7 +1495,7 @@ fail:
         return -ENODEV;
 }
 
-static int __devinit sunlance_sbus_probe(struct platform_device *op, const struct of_device_id *match)
+static int __devinit sunlance_sbus_probe(struct platform_device *op)
 {
         struct platform_device *parent = to_platform_device(op->dev.parent);
         struct device_node *parent_dp = parent->dev.of_node;
@@ -1536,7 +1536,7 @@ static const struct of_device_id sunlance_sbus_match[] = {
 
 MODULE_DEVICE_TABLE(of, sunlance_sbus_match);
 
-static struct of_platform_driver sunlance_sbus_driver = {
+static struct platform_driver sunlance_sbus_driver = {
         .driver = {
                 .name = "sunlance",
                 .owner = THIS_MODULE,
@@ -1550,12 +1550,12 @@ static struct of_platform_driver sunlance_sbus_driver = {
 /* Find all the lance cards on the system and initialize them */
 static int __init sparc_lance_init(void)
 {
-        return of_register_platform_driver(&sunlance_sbus_driver);
+        return platform_driver_register(&sunlance_sbus_driver);
 }
 
 static void __exit sparc_lance_exit(void)
 {
-        of_unregister_platform_driver(&sunlance_sbus_driver);
+        platform_driver_unregister(&sunlance_sbus_driver);
 }
 
 module_init(sparc_lance_init);
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 9536b2f010b..18ecdc30375 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -941,7 +941,7 @@ fail:
         return res;
 }
 
-static int __devinit qec_sbus_probe(struct platform_device *op, const struct of_device_id *match)
+static int __devinit qec_sbus_probe(struct platform_device *op)
 {
         return qec_ether_init(op);
 }
@@ -976,7 +976,7 @@ static const struct of_device_id qec_sbus_match[] = {
 
 MODULE_DEVICE_TABLE(of, qec_sbus_match);
 
-static struct of_platform_driver qec_sbus_driver = {
+static struct platform_driver qec_sbus_driver = {
         .driver = {
                 .name = "qec",
                 .owner = THIS_MODULE,
@@ -988,12 +988,12 @@ static struct of_platform_driver qec_sbus_driver = {
 
 static int __init qec_init(void)
 {
-        return of_register_platform_driver(&qec_sbus_driver);
+        return platform_driver_register(&qec_sbus_driver);
 }
 
 static void __exit qec_exit(void)
 {
-        of_unregister_platform_driver(&qec_sbus_driver);
+        platform_driver_unregister(&qec_sbus_driver);
 
         while (root_qec_dev) {
                 struct sunqec *next = root_qec_dev->next_module;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 7841a8f6999..73c942d85f0 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)
  * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com)
  * Copyright (C) 2004 Sun Microsystems Inc.
- * Copyright (C) 2005-2010 Broadcom Corporation.
+ * Copyright (C) 2005-2011 Broadcom Corporation.
  *
  * Firmware is:
  *      Derived from proprietary unpublished source code,
@@ -48,9 +48,9 @@
 #include <net/ip.h>
 
 #include <asm/system.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/byteorder.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #ifdef CONFIG_SPARC
 #include <asm/idprom.h>
@@ -60,20 +60,14 @@
 #define BAR_0   0
 #define BAR_2   2
 
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-#define TG3_VLAN_TAG_USED 1
-#else
-#define TG3_VLAN_TAG_USED 0
-#endif
-
 #include "tg3.h"
 
 #define DRV_MODULE_NAME         "tg3"
 #define TG3_MAJ_NUM                     3
-#define TG3_MIN_NUM                     116
+#define TG3_MIN_NUM                     117
 #define DRV_MODULE_VERSION      \
         __stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)
-#define DRV_MODULE_RELDATE      "December 3, 2010"
+#define DRV_MODULE_RELDATE      "January 25, 2011"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -134,9 +128,6 @@
                                  TG3_TX_RING_SIZE)
 #define NEXT_TX(N)              (((N) + 1) & (TG3_TX_RING_SIZE - 1))
 
-#define TG3_RX_DMA_ALIGN                16
-#define TG3_RX_HEADROOM                 ALIGN(VLAN_HLEN, TG3_RX_DMA_ALIGN)
-
 #define TG3_DMA_BYTE_ENAB               64
 
 #define TG3_RX_STD_DMA_SZ               1536
@@ -1785,9 +1776,29 @@ static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up)
                 tg3_phy_cl45_read(tp, MDIO_MMD_AN,
                                   TG3_CL45_D7_EEERES_STAT, &val);
 
-                if (val == TG3_CL45_D7_EEERES_STAT_LP_1000T ||
-                    val == TG3_CL45_D7_EEERES_STAT_LP_100TX)
+                switch (val) {
+                case TG3_CL45_D7_EEERES_STAT_LP_1000T:
+                        switch (GET_ASIC_REV(tp->pci_chip_rev_id)) {
+                        case ASIC_REV_5717:
+                        case ASIC_REV_5719:
+                        case ASIC_REV_57765:
+                                /* Enable SM_DSP clock and tx 6dB coding. */
+                                val = MII_TG3_AUXCTL_SHDWSEL_AUXCTL |
+                                      MII_TG3_AUXCTL_ACTL_SMDSP_ENA |
+                                      MII_TG3_AUXCTL_ACTL_TX_6DB;
+                                tg3_writephy(tp, MII_TG3_AUX_CTRL, val);
+
+                                tg3_phydsp_write(tp, MII_TG3_DSP_TAP26, 0x0000);
+
+                                /* Turn off SM_DSP clock. */
+                                val = MII_TG3_AUXCTL_SHDWSEL_AUXCTL |
+                                      MII_TG3_AUXCTL_ACTL_TX_6DB;
+                                tg3_writephy(tp, MII_TG3_AUX_CTRL, val);
+                        }
+                        /* Fallthrough */
+                case TG3_CL45_D7_EEERES_STAT_LP_100TX:
                         tp->setlpicnt = 2;
+                }
         }
 
         if (!tp->setlpicnt) {
@@ -2109,7 +2120,7 @@ out:
 
 static void tg3_frob_aux_power(struct tg3 *tp)
 {
-        struct tg3 *tp_peer = tp;
+        bool need_vaux = false;
 
         /* The GPIOs do something completely different on 57765. */
         if ((tp->tg3_flags2 & TG3_FLG2_IS_NIC) == 0 ||
@@ -2117,23 +2128,32 @@ static void tg3_frob_aux_power(struct tg3 *tp)
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765)
                 return;
 
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714 ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) {
+        if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||
+             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714 ||
+             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) &&
+            tp->pdev_peer != tp->pdev) {
                 struct net_device *dev_peer;
 
                 dev_peer = pci_get_drvdata(tp->pdev_peer);
+
                 /* remove_one() may have been run on the peer. */
-                if (!dev_peer)
-                        tp_peer = tp;
-                else
-                        tp_peer = netdev_priv(dev_peer);
+                if (dev_peer) {
+                        struct tg3 *tp_peer = netdev_priv(dev_peer);
+
+                        if (tp_peer->tg3_flags & TG3_FLAG_INIT_COMPLETE)
+                                return;
+
+                        if ((tp_peer->tg3_flags & TG3_FLAG_WOL_ENABLE) ||
+                            (tp_peer->tg3_flags & TG3_FLAG_ENABLE_ASF))
+                                need_vaux = true;
+                }
         }
 
-        if ((tp->tg3_flags & TG3_FLAG_WOL_ENABLE) != 0 ||
-            (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) != 0 ||
-            (tp_peer->tg3_flags & TG3_FLAG_WOL_ENABLE) != 0 ||
-            (tp_peer->tg3_flags & TG3_FLAG_ENABLE_ASF) != 0) {
+        if ((tp->tg3_flags & TG3_FLAG_WOL_ENABLE) ||
+            (tp->tg3_flags & TG3_FLAG_ENABLE_ASF))
+                need_vaux = true;
+
+        if (need_vaux) {
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) {
                         tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
@@ -2163,10 +2183,6 @@ static void tg3_frob_aux_power(struct tg3 *tp)
                         u32 no_gpio2;
                         u32 grc_local_ctrl = 0;
 
-                        if (tp_peer != tp &&
-                            (tp_peer->tg3_flags & TG3_FLAG_INIT_COMPLETE) != 0)
-                                return;
-
                         /* Workaround to prevent overdrawing Amps. */
                         if (GET_ASIC_REV(tp->pci_chip_rev_id) ==
                             ASIC_REV_5714) {
@@ -2205,10 +2221,6 @@ static void tg3_frob_aux_power(struct tg3 *tp)
         } else {
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700 &&
                     GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701) {
-                        if (tp_peer != tp &&
-                            (tp_peer->tg3_flags & TG3_FLAG_INIT_COMPLETE) != 0)
-                                return;
-
                         tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl |
                                     (GRC_LCLCTRL_GPIO_OE1 |
                                      GRC_LCLCTRL_GPIO_OUTPUT1), 100);
@@ -2977,11 +2989,19 @@ static void tg3_phy_copper_begin(struct tg3 *tp)
                       MII_TG3_AUXCTL_ACTL_TX_6DB;
                 tg3_writephy(tp, MII_TG3_AUX_CTRL, val);
 
-                if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
-                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) &&
-                    !tg3_phydsp_read(tp, MII_TG3_DSP_CH34TP2, &val))
-                        tg3_phydsp_write(tp, MII_TG3_DSP_CH34TP2,
-                                         val | MII_TG3_DSP_CH34TP2_HIBW01);
+                switch (GET_ASIC_REV(tp->pci_chip_rev_id)) {
+                case ASIC_REV_5717:
+                case ASIC_REV_57765:
+                        if (!tg3_phydsp_read(tp, MII_TG3_DSP_CH34TP2, &val))
+                                tg3_phydsp_write(tp, MII_TG3_DSP_CH34TP2, val |
+                                                 MII_TG3_DSP_CH34TP2_HIBW01);
+                        /* Fall through */
+                case ASIC_REV_5719:
+                        val = MII_TG3_DSP_TAP26_ALNOKO |
+                              MII_TG3_DSP_TAP26_RMRXSTO |
+                              MII_TG3_DSP_TAP26_OPCSINPT;
+                        tg3_phydsp_write(tp, MII_TG3_DSP_TAP26, val);
+                }
 
                 val = 0;
                 if (tp->link_config.autoneg == AUTONEG_ENABLE) {
@@ -4722,8 +4742,6 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                 struct sk_buff *skb;
                 dma_addr_t dma_addr;
                 u32 opaque_key, desc_idx, *post_ptr;
-                bool hw_vlan __maybe_unused = false;
-                u16 vtag __maybe_unused = 0;
 
                 desc_idx = desc->opaque & RXD_OPAQUE_INDEX_MASK;
                 opaque_key = desc->opaque & RXD_OPAQUE_RING_MASK;
@@ -4782,12 +4800,12 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                         tg3_recycle_rx(tnapi, tpr, opaque_key,
                                        desc_idx, *post_ptr);
 
-                        copy_skb = netdev_alloc_skb(tp->dev, len + VLAN_HLEN +
+                        copy_skb = netdev_alloc_skb(tp->dev, len +
                                                     TG3_RAW_IP_ALIGN);
                         if (copy_skb == NULL)
                                 goto drop_it_no_recycle;
 
-                        skb_reserve(copy_skb, TG3_RAW_IP_ALIGN + VLAN_HLEN);
+                        skb_reserve(copy_skb, TG3_RAW_IP_ALIGN);
                         skb_put(copy_skb, len);
                         pci_dma_sync_single_for_cpu(tp->pdev, dma_addr, len, PCI_DMA_FROMDEVICE);
                         skb_copy_from_linear_data(skb, copy_skb->data, len);
@@ -4814,30 +4832,11 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                 }
 
                 if (desc->type_flags & RXD_FLAG_VLAN &&
-                    !(tp->rx_mode & RX_MODE_KEEP_VLAN_TAG)) {
-                        vtag = desc->err_vlan & RXD_VLAN_MASK;
-#if TG3_VLAN_TAG_USED
-                        if (tp->vlgrp)
-                                hw_vlan = true;
-                        else
-#endif
-                        {
-                                struct vlan_ethhdr *ve = (struct vlan_ethhdr *)
-                                                    __skb_push(skb, VLAN_HLEN);
-
-                                memmove(ve, skb->data + VLAN_HLEN,
-                                        ETH_ALEN * 2);
-                                ve->h_vlan_proto = htons(ETH_P_8021Q);
-                                ve->h_vlan_TCI = htons(vtag);
-                        }
-                }
+                    !(tp->rx_mode & RX_MODE_KEEP_VLAN_TAG))
+                        __vlan_hwaccel_put_tag(skb,
+                                               desc->err_vlan & RXD_VLAN_MASK);
 
-#if TG3_VLAN_TAG_USED
-                if (hw_vlan)
-                        vlan_gro_receive(&tnapi->napi, tp->vlgrp, vtag, skb);
-                else
-#endif
-                        napi_gro_receive(&tnapi->napi, skb);
+                napi_gro_receive(&tnapi->napi, skb);
 
                 received++;
                 budget--;
@@ -5740,11 +5739,9 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb,
                 base_flags |= TXD_FLAG_TCPUDP_CSUM;
         }
 
-#if TG3_VLAN_TAG_USED
         if (vlan_tx_tag_present(skb))
                 base_flags |= (TXD_FLAG_VLAN |
                                (vlan_tx_tag_get(skb) << 16));
-#endif
 
         len = skb_headlen(skb);
 
@@ -5986,11 +5983,10 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
                         }
                 }
         }
-#if TG3_VLAN_TAG_USED
+
         if (vlan_tx_tag_present(skb))
                 base_flags |= (TXD_FLAG_VLAN |
                                (vlan_tx_tag_get(skb) << 16));
-#endif
 
         if ((tp->tg3_flags3 & TG3_FLG3_USE_JUMBO_BDFLAG) &&
             !mss && skb->len > VLAN_ETH_FRAME_LEN)
@@ -7834,7 +7830,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                        TG3_CPMU_DBTMR1_LNKIDLE_2047US);
 
                 tw32_f(TG3_CPMU_EEE_DBTMR2,
-                       TG3_CPMU_DBTMR1_APE_TX_2047US |
+                       TG3_CPMU_DBTMR2_APE_TX_2047US |
                        TG3_CPMU_DBTMR2_TXIDXEQ_2047US);
         }
 
@@ -8108,8 +8104,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         /* Program the jumbo buffer descriptor ring control
          * blocks on those devices that have them.
          */
-        if ((tp->tg3_flags & TG3_FLAG_JUMBO_CAPABLE) &&
-            !(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) {
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 ||
+            ((tp->tg3_flags & TG3_FLAG_JUMBO_CAPABLE) &&
+            !(tp->tg3_flags2 & TG3_FLG2_5780_CLASS))) {
                 /* Setup replenish threshold. */
                 tw32(RCVBDI_JUMBO_THRESH, tp->rx_jumbo_pending / 8);
 
@@ -8196,10 +8193,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                               RDMAC_MODE_MBUF_RBD_CRPT_ENAB |
                               RDMAC_MODE_MBUF_SBD_CRPT_ENAB;
 
-        /* If statement applies to 5705 and 5750 PCI devices only */
-        if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
-             tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) ||
-            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750)) {
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
+            tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) {
                 if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE &&
                     GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
                         rdmac_mode |= RDMAC_MODE_FIFO_SIZE_128;
@@ -8227,8 +8222,12 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
             (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)) {
                 val = tr32(TG3_RDMA_RSRVCTRL_REG);
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) {
-                        val &= ~TG3_RDMA_RSRVCTRL_TXMRGN_MASK;
-                        val |= TG3_RDMA_RSRVCTRL_TXMRGN_320B;
+                        val &= ~(TG3_RDMA_RSRVCTRL_TXMRGN_MASK |
+                                 TG3_RDMA_RSRVCTRL_FIFO_LWM_MASK |
+                                 TG3_RDMA_RSRVCTRL_FIFO_HWM_MASK);
+                        val |= TG3_RDMA_RSRVCTRL_TXMRGN_320B |
+                               TG3_RDMA_RSRVCTRL_FIFO_LWM_1_5K |
+                               TG3_RDMA_RSRVCTRL_FIFO_HWM_1_5K;
                 }
                 tw32(TG3_RDMA_RSRVCTRL_REG,
                      val | TG3_RDMA_RSRVCTRL_FIFO_OFLW_FIX);
@@ -8350,7 +8349,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl);
         udelay(100);
 
-        if (tp->tg3_flags2 & TG3_FLG2_USING_MSIX) {
+        if ((tp->tg3_flags2 & TG3_FLG2_USING_MSIX) &&
+                tp->irq_cnt > 1) {
                 val = tr32(MSGINT_MODE);
                 val |= MSGINT_MODE_MULTIVEC_EN | MSGINT_MODE_ENABLE;
                 tw32(MSGINT_MODE, val);
@@ -8367,17 +8367,14 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                WDMAC_MODE_FIFOURUN_ENAB | WDMAC_MODE_FIFOOREAD_ENAB |
                WDMAC_MODE_LNGREAD_ENAB);
 
-        /* If statement applies to 5705 and 5750 PCI devices only */
-        if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
-             tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) ||
-            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) {
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
+            tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) {
                 if ((tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) &&
                     (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 ||
                      tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) {
                         /* nothing */
                 } else if (!(tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH) &&
-                           !(tp->tg3_flags2 & TG3_FLG2_IS_5788) &&
-                           !(tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS)) {
+                           !(tp->tg3_flags2 & TG3_FLG2_IS_5788)) {
                         val |= WDMAC_MODE_RX_ACCEL;
                 }
         }
@@ -9090,7 +9087,8 @@ static void tg3_ints_init(struct tg3 *tp)
 
         if (tp->tg3_flags2 & TG3_FLG2_USING_MSI_OR_MSIX) {
                 u32 msi_mode = tr32(MSGINT_MODE);
-                if (tp->tg3_flags2 & TG3_FLG2_USING_MSIX)
+                if ((tp->tg3_flags2 & TG3_FLG2_USING_MSIX) &&
+                    tp->irq_cnt > 1)
                         msi_mode |= MSGINT_MODE_MULTIVEC_EN;
                 tw32(MSGINT_MODE, msi_mode | MSGINT_MODE_ENABLE);
         }
@@ -9532,17 +9530,10 @@ static void __tg3_set_rx_mode(struct net_device *dev)
         rx_mode = tp->rx_mode & ~(RX_MODE_PROMISC |
                                   RX_MODE_KEEP_VLAN_TAG);
 
+#if !defined(CONFIG_VLAN_8021Q) && !defined(CONFIG_VLAN_8021Q_MODULE)
         /* When ASF is in use, we always keep the RX_MODE_KEEP_VLAN_TAG
          * flag clear.
          */
-#if TG3_VLAN_TAG_USED
-        if (!tp->vlgrp &&
-            !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF))
-                rx_mode |= RX_MODE_KEEP_VLAN_TAG;
-#else
-        /* By definition, VLAN is disabled always in this
-         * case.
-         */
         if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF))
                 rx_mode |= RX_MODE_KEEP_VLAN_TAG;
 #endif
@@ -10492,16 +10483,53 @@ static int tg3_test_nvram(struct tg3 *tp)
                 goto out;
         }
 
+        err = -EIO;
+
         /* Bootstrap checksum at offset 0x10 */
         csum = calc_crc((unsigned char *) buf, 0x10);
-        if (csum != be32_to_cpu(buf[0x10/4]))
+        if (csum != le32_to_cpu(buf[0x10/4]))
                 goto out;
 
         /* Manufacturing block starts at offset 0x74, checksum at 0xfc */
         csum = calc_crc((unsigned char *) &buf[0x74/4], 0x88);
-        if (csum != be32_to_cpu(buf[0xfc/4]))
+        if (csum != le32_to_cpu(buf[0xfc/4]))
                 goto out;
 
+        for (i = 0; i < TG3_NVM_VPD_LEN; i += 4) {
+                /* The data is in little-endian format in NVRAM.
+                 * Use the big-endian read routines to preserve
+                 * the byte order as it exists in NVRAM.
+                 */
+                if (tg3_nvram_read_be32(tp, TG3_NVM_VPD_OFF + i, &buf[i/4]))
+                        goto out;
+        }
+
+        i = pci_vpd_find_tag((u8 *)buf, 0, TG3_NVM_VPD_LEN,
+                             PCI_VPD_LRDT_RO_DATA);
+        if (i > 0) {
+                j = pci_vpd_lrdt_size(&((u8 *)buf)[i]);
+                if (j < 0)
+                        goto out;
+
+                if (i + PCI_VPD_LRDT_TAG_SIZE + j > TG3_NVM_VPD_LEN)
+                        goto out;
+
+                i += PCI_VPD_LRDT_TAG_SIZE;
+                j = pci_vpd_find_info_keyword((u8 *)buf, i, j,
+                                              PCI_VPD_RO_KEYWORD_CHKSUM);
+                if (j > 0) {
+                        u8 csum8 = 0;
+
+                        j += PCI_VPD_INFO_FLD_HDR_SIZE;
+
+                        for (i = 0; i <= j; i++)
+                                csum8 += ((u8 *)buf)[i];
+
+                        if (csum8)
+                                goto out;
+                }
+        }
+
         err = 0;
 
 out:
@@ -10873,13 +10901,16 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
         if (loopback_mode == TG3_MAC_LOOPBACK) {
                 /* HW errata - mac loopback fails in some cases on 5780.
                  * Normal traffic and PHY loopback are not affected by
-                 * errata.
+                 * errata.  Also, the MAC loopback test is deprecated for
+                 * all newer ASIC revisions.
                  */
-                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5780)
+                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5780 ||
+                    (tp->tg3_flags & TG3_FLAG_CPMU_PRESENT))
                         return 0;
 
-                mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) |
-                           MAC_MODE_PORT_INT_LPBACK;
+                mac_mode = tp->mac_mode &
+                           ~(MAC_MODE_PORT_MODE_MASK | MAC_MODE_HALF_DUPLEX);
+                mac_mode |= MAC_MODE_PORT_INT_LPBACK;
                 if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS))
                         mac_mode |= MAC_MODE_LINK_POLARITY;
                 if (tp->phy_flags & TG3_PHYFLG_10_100_ONLY)
@@ -10901,7 +10932,8 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
                 tg3_writephy(tp, MII_BMCR, val);
                 udelay(40);
 
-                mac_mode = tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK;
+                mac_mode = tp->mac_mode &
+                           ~(MAC_MODE_PORT_MODE_MASK | MAC_MODE_HALF_DUPLEX);
                 if (tp->phy_flags & TG3_PHYFLG_IS_FET) {
                         tg3_writephy(tp, MII_TG3_FET_PTEST,
                                      MII_TG3_FET_PTEST_FRC_TX_LINK |
@@ -10929,6 +10961,13 @@ static int tg3_run_loopback(struct tg3 *tp, int loopback_mode)
                                      MII_TG3_EXT_CTRL_LNK3_LED_MODE);
                 }
                 tw32(MAC_MODE, mac_mode);
+
+                /* Wait for link */
+                for (i = 0; i < 100; i++) {
+                        if (tr32(MAC_TX_STATUS) & TX_STATUS_LINK_UP)
+                                break;
+                        mdelay(1);
+                }
         } else {
                 return -EINVAL;
         }
@@ -11035,14 +11074,19 @@ out:
 static int tg3_test_loopback(struct tg3 *tp)
 {
         int err = 0;
-        u32 cpmuctrl = 0;
+        u32 eee_cap, cpmuctrl = 0;
 
         if (!netif_running(tp->dev))
                 return TG3_LOOPBACK_FAILED;
 
+        eee_cap = tp->phy_flags & TG3_PHYFLG_EEE_CAP;
+        tp->phy_flags &= ~TG3_PHYFLG_EEE_CAP;
+
         err = tg3_reset_hw(tp, 1);
-        if (err)
-                return TG3_LOOPBACK_FAILED;
+        if (err) {
+                err = TG3_LOOPBACK_FAILED;
+                goto done;
+        }
 
         /* Turn off gphy autopowerdown. */
         if (tp->phy_flags & TG3_PHYFLG_ENABLE_APD)
@@ -11062,8 +11106,10 @@ static int tg3_test_loopback(struct tg3 *tp)
                         udelay(10);
                 }
 
-                if (status != CPMU_MUTEX_GNT_DRIVER)
-                        return TG3_LOOPBACK_FAILED;
+                if (status != CPMU_MUTEX_GNT_DRIVER) {
+                        err = TG3_LOOPBACK_FAILED;
+                        goto done;
+                }
 
                 /* Turn off link-based power management. */
                 cpmuctrl = tr32(TG3_CPMU_CTRL);
@@ -11092,6 +11138,9 @@ static int tg3_test_loopback(struct tg3 *tp)
         if (tp->phy_flags & TG3_PHYFLG_ENABLE_APD)
                 tg3_phy_toggle_apd(tp, true);
 
+done:
+        tp->phy_flags |= eee_cap;
+
         return err;
 }
 
@@ -11198,7 +11247,9 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES)
                         break;                  /* We have no PHY */
 
-                if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)
+                if ((tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) ||
+                    ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) &&
+                     !netif_running(dev)))
                         return -EAGAIN;
 
                 spin_lock_bh(&tp->lock);
@@ -11214,7 +11265,9 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES)
                         break;                  /* We have no PHY */
 
-                if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)
+                if ((tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) ||
+                    ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) &&
+                     !netif_running(dev)))
                         return -EAGAIN;
 
                 spin_lock_bh(&tp->lock);
@@ -11230,31 +11283,6 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         return -EOPNOTSUPP;
 }
 
-#if TG3_VLAN_TAG_USED
-static void tg3_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
-{
-        struct tg3 *tp = netdev_priv(dev);
-
-        if (!netif_running(dev)) {
-                tp->vlgrp = grp;
-                return;
-        }
-
-        tg3_netif_stop(tp);
-
-        tg3_full_lock(tp, 0);
-
-        tp->vlgrp = grp;
-
-        /* Update RX_MODE_KEEP_VLAN_TAG bit in RX_MODE register. */
-        __tg3_set_rx_mode(dev);
-
-        tg3_netif_start(tp);
-
-        tg3_full_unlock(tp);
-}
-#endif
-
 static int tg3_get_coalesce(struct net_device *dev, struct ethtool_coalesce *ec)
 {
         struct tg3 *tp = netdev_priv(dev);
@@ -12468,9 +12496,11 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                         tp->tg3_flags3 |= TG3_FLG3_RGMII_EXT_IBND_TX_EN;
         }
 done:
-        device_init_wakeup(&tp->pdev->dev, tp->tg3_flags & TG3_FLAG_WOL_CAP);
-        device_set_wakeup_enable(&tp->pdev->dev,
+        if (tp->tg3_flags & TG3_FLAG_WOL_CAP)
+                device_set_wakeup_enable(&tp->pdev->dev,
                                  tp->tg3_flags & TG3_FLAG_WOL_ENABLE);
+        else
+                device_set_wakeup_capable(&tp->pdev->dev, false);
 }
 
 static int __devinit tg3_issue_otp_command(struct tg3 *tp, u32 cmd)
@@ -12522,12 +12552,45 @@ static u32 __devinit tg3_read_otp_phycfg(struct tg3 *tp)
         return ((thalf_otp & 0x0000ffff) << 16) | (bhalf_otp >> 16);
 }
 
+static void __devinit tg3_phy_init_link_config(struct tg3 *tp)
+{
+        u32 adv = ADVERTISED_Autoneg |
+                  ADVERTISED_Pause;
+
+        if (!(tp->phy_flags & TG3_PHYFLG_10_100_ONLY))
+                adv |= ADVERTISED_1000baseT_Half |
+                       ADVERTISED_1000baseT_Full;
+
+        if (!(tp->phy_flags & TG3_PHYFLG_ANY_SERDES))
+                adv |= ADVERTISED_100baseT_Half |
+                       ADVERTISED_100baseT_Full |
+                       ADVERTISED_10baseT_Half |
+                       ADVERTISED_10baseT_Full |
+                       ADVERTISED_TP;
+        else
+                adv |= ADVERTISED_FIBRE;
+
+        tp->link_config.advertising = adv;
+        tp->link_config.speed = SPEED_INVALID;
+        tp->link_config.duplex = DUPLEX_INVALID;
+        tp->link_config.autoneg = AUTONEG_ENABLE;
+        tp->link_config.active_speed = SPEED_INVALID;
+        tp->link_config.active_duplex = DUPLEX_INVALID;
+        tp->link_config.orig_speed = SPEED_INVALID;
+        tp->link_config.orig_duplex = DUPLEX_INVALID;
+        tp->link_config.orig_autoneg = AUTONEG_INVALID;
+}
+
 static int __devinit tg3_phy_probe(struct tg3 *tp)
 {
         u32 hw_phy_id_1, hw_phy_id_2;
         u32 hw_phy_id, hw_phy_id_masked;
         int err;
 
+        /* flow control autonegotiation is default behavior */
+        tp->tg3_flags |= TG3_FLAG_PAUSE_AUTONEG;
+        tp->link_config.flowctrl = FLOW_CTRL_TX | FLOW_CTRL_RX;
+
         if (tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB)
                 return tg3_phy_init(tp);
 
@@ -12589,6 +12652,8 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
               tp->pci_chip_rev_id != CHIPREV_ID_57765_A0)))
                 tp->phy_flags |= TG3_PHYFLG_EEE_CAP;
 
+        tg3_phy_init_link_config(tp);
+
         if (!(tp->phy_flags & TG3_PHYFLG_ANY_SERDES) &&
             !(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) &&
             !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) {
@@ -12644,17 +12709,6 @@ skip_phy_reset:
                 err = tg3_init_5401phy_dsp(tp);
         }
 
-        if (tp->phy_flags & TG3_PHYFLG_ANY_SERDES)
-                tp->link_config.advertising =
-                        (ADVERTISED_1000baseT_Half |
-                         ADVERTISED_1000baseT_Full |
-                         ADVERTISED_Autoneg |
-                         ADVERTISED_FIBRE);
-        if (tp->phy_flags & TG3_PHYFLG_10_100_ONLY)
-                tp->link_config.advertising &=
-                        ~(ADVERTISED_1000baseT_Half |
-                          ADVERTISED_1000baseT_Full);
-
         return err;
 }
 
@@ -13064,11 +13118,9 @@ done:
 
 static struct pci_dev * __devinit tg3_find_peer(struct tg3 *);
 
-static void inline vlan_features_add(struct net_device *dev, unsigned long flags)
+static inline void vlan_features_add(struct net_device *dev, unsigned long flags)
 {
-#if TG3_VLAN_TAG_USED
         dev->vlan_features |= flags;
-#endif
 }
 
 static inline u32 tg3_rx_ret_ring_size(struct tg3 *tp)
@@ -13083,7 +13135,7 @@ static inline u32 tg3_rx_ret_ring_size(struct tg3 *tp)
                 return 512;
 }
 
-DEFINE_PCI_DEVICE_TABLE(write_reorder_chipsets) = {
+static DEFINE_PCI_DEVICE_TABLE(tg3_write_reorder_chipsets) = {
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_FE_GATE_700C) },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE) },
         { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8385_0) },
@@ -13325,7 +13377,9 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         }
 
         /* Determine TSO capabilities */
-        if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
+                ; /* Do nothing. HW bug. */
+        else if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
                 tp->tg3_flags2 |= TG3_FLG2_HW_TSO_3;
         else if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) ||
                  GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)
@@ -13376,7 +13430,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                 tp->tg3_flags3 |= TG3_FLG3_40BIT_DMA_LIMIT_BUG;
         }
 
-        if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
+        if ((tp->tg3_flags3 & TG3_FLG3_5717_PLUS) &&
+            GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719)
                 tp->tg3_flags3 |= TG3_FLG3_USE_JUMBO_BDFLAG;
 
         if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) ||
@@ -13394,42 +13449,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                 tp->tg3_flags2 |= TG3_FLG2_PCI_EXPRESS;
 
                 tp->pcie_readrq = 4096;
-                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) {
-                        u16 word;
-
-                        pci_read_config_word(tp->pdev,
-                                             tp->pcie_cap + PCI_EXP_LNKSTA,
-                                             &word);
-                        switch (word & PCI_EXP_LNKSTA_CLS) {
-                        case PCI_EXP_LNKSTA_CLS_2_5GB:
-                                word &= PCI_EXP_LNKSTA_NLW;
-                                word >>= PCI_EXP_LNKSTA_NLW_SHIFT;
-                                switch (word) {
-                                case 2:
-                                        tp->pcie_readrq = 2048;
-                                        break;
-                                case 4:
-                                        tp->pcie_readrq = 1024;
-                                        break;
-                                }
-                                break;
-
-                        case PCI_EXP_LNKSTA_CLS_5_0GB:
-                                word &= PCI_EXP_LNKSTA_NLW;
-                                word >>= PCI_EXP_LNKSTA_NLW_SHIFT;
-                                switch (word) {
-                                case 1:
-                                        tp->pcie_readrq = 2048;
-                                        break;
-                                case 2:
-                                        tp->pcie_readrq = 1024;
-                                        break;
-                                case 4:
-                                        tp->pcie_readrq = 512;
-                                        break;
-                                }
-                        }
-                }
+                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
+                        tp->pcie_readrq = 2048;
 
                 pcie_set_readrq(tp->pdev, tp->pcie_readrq);
 
@@ -13468,7 +13489,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
          * every mailbox register write to force the writes to be
          * posted to the chip in order.
          */
-        if (pci_dev_present(write_reorder_chipsets) &&
+        if (pci_dev_present(tg3_write_reorder_chipsets) &&
             !(tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS))
                 tp->tg3_flags |= TG3_FLAG_MBOX_WRITE_REORDER;
 
@@ -13861,11 +13882,11 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         else
                 tp->tg3_flags &= ~TG3_FLAG_POLL_SERDES;
 
-        tp->rx_offset = NET_IP_ALIGN + TG3_RX_HEADROOM;
+        tp->rx_offset = NET_IP_ALIGN;
         tp->rx_copy_thresh = TG3_RX_COPY_THRESHOLD;
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701 &&
             (tp->tg3_flags & TG3_FLAG_PCIX_MODE) != 0) {
-                tp->rx_offset -= NET_IP_ALIGN;
+                tp->rx_offset = 0;
 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
                 tp->rx_copy_thresh = ~(u16)0;
 #endif
@@ -14224,7 +14245,7 @@ static int __devinit tg3_do_test_dma(struct tg3 *tp, u32 *buf, dma_addr_t buf_dm
 
 #define TEST_BUFFER_SIZE        0x2000
 
-DEFINE_PCI_DEVICE_TABLE(dma_wait_state_chipsets) = {
+static DEFINE_PCI_DEVICE_TABLE(tg3_dma_wait_state_chipsets) = {
         { PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_PCI15) },
         { },
 };
@@ -14403,7 +14424,7 @@ static int __devinit tg3_test_dma(struct tg3 *tp)
                  * now look for chipsets that are known to expose the
                  * DMA bug without failing the test.
                  */
-                if (pci_dev_present(dma_wait_state_chipsets)) {
+                if (pci_dev_present(tg3_dma_wait_state_chipsets)) {
                         tp->dma_rwctrl &= ~DMA_RWCTRL_WRITE_BNDRY_MASK;
                         tp->dma_rwctrl |= DMA_RWCTRL_WRITE_BNDRY_16;
                 } else {
@@ -14420,23 +14441,6 @@ out_nofree:
         return ret;
 }
 
-static void __devinit tg3_init_link_config(struct tg3 *tp)
-{
-        tp->link_config.advertising =
-                (ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
-                 ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
-                 ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full |
-                 ADVERTISED_Autoneg | ADVERTISED_MII);
-        tp->link_config.speed = SPEED_INVALID;
-        tp->link_config.duplex = DUPLEX_INVALID;
-        tp->link_config.autoneg = AUTONEG_ENABLE;
-        tp->link_config.active_speed = SPEED_INVALID;
-        tp->link_config.active_duplex = DUPLEX_INVALID;
-        tp->link_config.orig_speed = SPEED_INVALID;
-        tp->link_config.orig_duplex = DUPLEX_INVALID;
-        tp->link_config.orig_autoneg = AUTONEG_INVALID;
-}
-
 static void __devinit tg3_init_bufmgr_config(struct tg3 *tp)
 {
         if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS) {
@@ -14629,9 +14633,6 @@ static const struct net_device_ops tg3_netdev_ops = {
         .ndo_do_ioctl           = tg3_ioctl,
         .ndo_tx_timeout         = tg3_tx_timeout,
         .ndo_change_mtu         = tg3_change_mtu,
-#if TG3_VLAN_TAG_USED
-        .ndo_vlan_rx_register   = tg3_vlan_rx_register,
-#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = tg3_poll_controller,
 #endif
@@ -14648,9 +14649,6 @@ static const struct net_device_ops tg3_netdev_ops_dma_bug = {
         .ndo_do_ioctl           = tg3_ioctl,
         .ndo_tx_timeout         = tg3_tx_timeout,
         .ndo_change_mtu         = tg3_change_mtu,
-#if TG3_VLAN_TAG_USED
-        .ndo_vlan_rx_register   = tg3_vlan_rx_register,
-#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = tg3_poll_controller,
 #endif
@@ -14700,9 +14698,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
 
         SET_NETDEV_DEV(dev, &pdev->dev);
 
-#if TG3_VLAN_TAG_USED
         dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-#endif
 
         tp = netdev_priv(dev);
         tp->pdev = pdev;
@@ -14748,8 +14744,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                 goto err_out_free_dev;
         }
 
-        tg3_init_link_config(tp);
-
         tp->rx_pending = TG3_DEF_RX_RING_PENDING;
         tp->rx_jumbo_pending = TG3_DEF_RX_JUMBO_RING_PENDING;
 
@@ -14897,10 +14891,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                 goto err_out_apeunmap;
         }
 
-        /* flow control autonegotiation is default behavior */
-        tp->tg3_flags |= TG3_FLAG_PAUSE_AUTONEG;
-        tp->link_config.flowctrl = FLOW_CTRL_TX | FLOW_CTRL_RX;
-
         intmbx = MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW;
         rcvmbx = MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW;
         sndmbx = MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW;
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index d62c8d937c8..73884b69b74 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -4,7 +4,7 @@
  * Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)
  * Copyright (C) 2001 Jeff Garzik (jgarzik@pobox.com)
  * Copyright (C) 2004 Sun Microsystems Inc.
- * Copyright (C) 2007-2010 Broadcom Corporation.
+ * Copyright (C) 2007-2011 Broadcom Corporation.
  */
 
 #ifndef _T3_H
@@ -141,6 +141,7 @@
 #define  CHIPREV_ID_57780_A1             0x57780001
 #define  CHIPREV_ID_5717_A0              0x05717000
 #define  CHIPREV_ID_57765_A0             0x57785000
+#define  CHIPREV_ID_5719_A0              0x05719000
 #define  GET_ASIC_REV(CHIP_REV_ID)      ((CHIP_REV_ID) >> 12)
 #define   ASIC_REV_5700                  0x07
 #define   ASIC_REV_5701                  0x00
@@ -1105,7 +1106,7 @@
 #define  TG3_CPMU_DBTMR1_PCIEXIT_2047US  0x07ff0000
 #define  TG3_CPMU_DBTMR1_LNKIDLE_2047US  0x000070ff
 #define TG3_CPMU_EEE_DBTMR2             0x000036b8
-#define  TG3_CPMU_DBTMR1_APE_TX_2047US   0x07ff0000
+#define  TG3_CPMU_DBTMR2_APE_TX_2047US   0x07ff0000
 #define  TG3_CPMU_DBTMR2_TXIDXEQ_2047US  0x000070ff
 #define TG3_CPMU_EEE_LNKIDL_CTRL        0x000036bc
 #define  TG3_CPMU_EEE_LNKIDL_PCIE_NL0    0x01000000
@@ -1333,6 +1334,10 @@
 
 #define TG3_RDMA_RSRVCTRL_REG           0x00004900
 #define TG3_RDMA_RSRVCTRL_FIFO_OFLW_FIX  0x00000004
+#define TG3_RDMA_RSRVCTRL_FIFO_LWM_1_5K  0x00000c00
+#define TG3_RDMA_RSRVCTRL_FIFO_LWM_MASK  0x00000ff0
+#define TG3_RDMA_RSRVCTRL_FIFO_HWM_1_5K  0x000c0000
+#define TG3_RDMA_RSRVCTRL_FIFO_HWM_MASK  0x000ff000
 #define TG3_RDMA_RSRVCTRL_TXMRGN_320B    0x28000000
 #define TG3_RDMA_RSRVCTRL_TXMRGN_MASK    0xffe00000
 /* 0x4904 --> 0x4910 unused */
@@ -2108,6 +2113,10 @@
 
 #define MII_TG3_DSP_TAP1                0x0001
 #define  MII_TG3_DSP_TAP1_AGCTGT_DFLT   0x0007
+#define MII_TG3_DSP_TAP26               0x001a
+#define  MII_TG3_DSP_TAP26_ALNOKO       0x0001
+#define  MII_TG3_DSP_TAP26_RMRXSTO      0x0002
+#define  MII_TG3_DSP_TAP26_OPCSINPT     0x0004
 #define MII_TG3_DSP_AADJ1CH0            0x001f
 #define MII_TG3_DSP_CH34TP2             0x4022
 #define MII_TG3_DSP_CH34TP2_HIBW01      0x0010
@@ -2808,9 +2817,6 @@ struct tg3 {
         u32                             rx_std_max_post;
         u32                             rx_offset;
         u32                             rx_pkt_map_sz;
-#if TG3_VLAN_TAG_USED
-        struct vlan_group               *vlgrp;
-#endif
 
 
         /* begin "everything else" cacheline(s) section */
diff --git a/drivers/net/tile/tilepro.c b/drivers/net/tile/tilepro.c
index 7cb301da747..0825db6d883 100644
--- a/drivers/net/tile/tilepro.c
+++ b/drivers/net/tile/tilepro.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Tilera Corporation. All Rights Reserved.
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or
  *   modify it under the terms of the GNU General Public License
@@ -44,10 +44,6 @@
 #include <linux/tcp.h>
 
 
-/* There is no singlethread_cpu, so schedule work on the current cpu. */
-#define singlethread_cpu -1
-
-
 /*
  * First, "tile_net_init_module()" initializes all four "devices" which
  * can be used by linux.
@@ -73,15 +69,16 @@
  * return, knowing we will be called again later.  Otherwise, we
  * reenable the ingress interrupt, and call "napi_complete()".
  *
+ * HACK: Since disabling the ingress interrupt is not reliable, we
+ * ignore the interrupt if the global "active" flag is false.
+ *
  *
  * NOTE: The use of "native_driver" ensures that EPP exists, and that
- * "epp_sendv" is legal, and that "LIPP" is being used.
+ * we are using "LIPP" and "LEPP".
  *
  * NOTE: Failing to free completions for an arbitrarily long time
  * (which is defined to be illegal) does in fact cause bizarre
  * problems.  The "egress_timer" helps prevent this from happening.
- *
- * NOTE: The egress code can be interrupted by the interrupt handler.
  */
 
 
@@ -142,6 +139,7 @@
 MODULE_AUTHOR("Tilera");
 MODULE_LICENSE("GPL");
 
+
 /*
  * Queue of incoming packets for a specific cpu and device.
  *
@@ -177,7 +175,7 @@ struct tile_net_cpu {
         struct tile_netio_queue queue;
         /* Statistics. */
         struct tile_net_stats_t stats;
-        /* ISSUE: Is this needed? */
+        /* True iff NAPI is enabled. */
         bool napi_enabled;
         /* True if this tile has succcessfully registered with the IPP. */
         bool registered;
@@ -200,20 +198,20 @@ struct tile_net_cpu {
 struct tile_net_priv {
         /* Our network device. */
         struct net_device *dev;
-        /* The actual egress queue. */
-        lepp_queue_t *epp_queue;
-        /* Protects "epp_queue->cmd_tail" and "epp_queue->comp_tail" */
-        spinlock_t cmd_lock;
-        /* Protects "epp_queue->comp_head". */
-        spinlock_t comp_lock;
+        /* Pages making up the egress queue. */
+        struct page *eq_pages;
+        /* Address of the actual egress queue. */
+        lepp_queue_t *eq;
+        /* Protects "eq". */
+        spinlock_t eq_lock;
         /* The hypervisor handle for this interface. */
         int hv_devhdl;
         /* The intr bit mask that IDs this device. */
         u32 intr_id;
         /* True iff "tile_net_open_aux()" has succeeded. */
-        int partly_opened;
-        /* True iff "tile_net_open_inner()" has succeeded. */
-        int fully_opened;
+        bool partly_opened;
+        /* True iff the device is "active". */
+        bool active;
         /* Effective network cpus. */
         struct cpumask network_cpus_map;
         /* Number of network cpus. */
@@ -228,6 +226,10 @@ struct tile_net_priv {
         struct tile_net_cpu *cpu[NR_CPUS];
 };
 
+/* Log2 of the number of small pages needed for the egress queue. */
+#define EQ_ORDER  get_order(sizeof(lepp_queue_t))
+/* Size of the egress queue's pages. */
+#define EQ_SIZE   (1 << (PAGE_SHIFT + EQ_ORDER))
 
 /*
  * The actual devices (xgbe0, xgbe1, gbe0, gbe1).
@@ -284,7 +286,11 @@ static void net_printk(char *fmt, ...)
  */
 static void dump_packet(unsigned char *data, unsigned long length, char *s)
 {
+        int my_cpu = smp_processor_id();
+
         unsigned long i;
+        char buf[128];
+
         static unsigned int count;
 
         pr_info("dump_packet(data %p, length 0x%lx s %s count 0x%x)\n",
@@ -294,10 +300,12 @@ static void dump_packet(unsigned char *data, unsigned long length, char *s)
 
         for (i = 0; i < length; i++) {
                 if ((i & 0xf) == 0)
-                        sprintf(buf, "%8.8lx:", i);
+                        sprintf(buf, "[%02d] %8.8lx:", my_cpu, i);
                 sprintf(buf + strlen(buf), " %2.2x", data[i]);
-                if ((i & 0xf) == 0xf || i == length - 1)
-                        pr_info("%s\n", buf);
+                if ((i & 0xf) == 0xf || i == length - 1) {
+                        strcat(buf, "\n");
+                        pr_info("%s", buf);
+                }
         }
 }
 #endif
@@ -351,60 +359,109 @@ static void tile_net_provide_linux_buffer(struct tile_net_cpu *info,
 
 /*
  * Provide a linux buffer for LIPP.
+ *
+ * Note that the ACTUAL allocation for each buffer is a "struct sk_buff",
+ * plus a chunk of memory that includes not only the requested bytes, but
+ * also NET_SKB_PAD bytes of initial padding, and a "struct skb_shared_info".
+ *
+ * Note that "struct skb_shared_info" is 88 bytes with 64K pages and
+ * 268 bytes with 4K pages (since the frags[] array needs 18 entries).
+ *
+ * Without jumbo packets, the maximum packet size will be 1536 bytes,
+ * and we use 2 bytes (NET_IP_ALIGN) of padding.  ISSUE: If we told
+ * the hardware to clip at 1518 bytes instead of 1536 bytes, then we
+ * could save an entire cache line, but in practice, we don't need it.
+ *
+ * Since CPAs are 38 bits, and we can only encode the high 31 bits in
+ * a "linux_buffer_t", the low 7 bits must be zero, and thus, we must
+ * align the actual "va" mod 128.
+ *
+ * We assume that the underlying "head" will be aligned mod 64.  Note
+ * that in practice, we have seen "head" NOT aligned mod 128 even when
+ * using 2048 byte allocations, which is surprising.
+ *
+ * If "head" WAS always aligned mod 128, we could change LIPP to
+ * assume that the low SIX bits are zero, and the 7th bit is one, that
+ * is, align the actual "va" mod 128 plus 64, which would be "free".
+ *
+ * For now, the actual "head" pointer points at NET_SKB_PAD bytes of
+ * padding, plus 28 or 92 bytes of extra padding, plus the sk_buff
+ * pointer, plus the NET_IP_ALIGN padding, plus 126 or 1536 bytes for
+ * the actual packet, plus 62 bytes of empty padding, plus some
+ * padding and the "struct skb_shared_info".
+ *
+ * With 64K pages, a large buffer thus needs 32+92+4+2+1536+62+88
+ * bytes, or 1816 bytes, which fits comfortably into 2048 bytes.
+ *
+ * With 64K pages, a small buffer thus needs 32+92+4+2+126+88
+ * bytes, or 344 bytes, which means we are wasting 64+ bytes, and
+ * could presumably increase the size of small buffers.
+ *
+ * With 4K pages, a large buffer thus needs 32+92+4+2+1536+62+268
+ * bytes, or 1996 bytes, which fits comfortably into 2048 bytes.
+ *
+ * With 4K pages, a small buffer thus needs 32+92+4+2+126+268
+ * bytes, or 524 bytes, which is annoyingly wasteful.
+ *
+ * Maybe we should increase LIPP_SMALL_PACKET_SIZE to 192?
+ *
+ * ISSUE: Maybe we should increase "NET_SKB_PAD" to 64?
  */
 static bool tile_net_provide_needed_buffer(struct tile_net_cpu *info,
                                            bool small)
 {
-        /* ISSUE: What should we use here? */
+#if TILE_NET_MTU <= 1536
+        /* Without "jumbo", 2 + 1536 should be sufficient. */
+        unsigned int large_size = NET_IP_ALIGN + 1536;
+#else
+        /* ISSUE: This has not been tested. */
         unsigned int large_size = NET_IP_ALIGN + TILE_NET_MTU + 100;
+#endif
 
-        /* Round up to ensure to avoid "false sharing" with last cache line. */
-        unsigned int buffer_size =
+        /* Avoid "false sharing" with last cache line. */
+        /* ISSUE: This is already done by "dev_alloc_skb()". */
+        unsigned int len =
                  (((small ? LIPP_SMALL_PACKET_SIZE : large_size) +
                    CHIP_L2_LINE_SIZE() - 1) & -CHIP_L2_LINE_SIZE());
 
-        /*
-         * ISSUE: Since CPAs are 38 bits, and we can only encode the
-         * high 31 bits in a "linux_buffer_t", the low 7 bits must be
-         * zero, and thus, we must align the actual "va" mod 128.
-         */
-        const unsigned long align = 128;
+        unsigned int padding = 128 - NET_SKB_PAD;
+        unsigned int align;
 
         struct sk_buff *skb;
         void *va;
 
         struct sk_buff **skb_ptr;
 
-        /* Note that "dev_alloc_skb()" adds NET_SKB_PAD more bytes, */
-        /* and also "reserves" that many bytes. */
-        /* ISSUE: Can we "share" the NET_SKB_PAD bytes with "skb_ptr"? */
-        int len = sizeof(*skb_ptr) + align + buffer_size;
-
-        while (1) {
-
-                /* Allocate (or fail). */
-                skb = dev_alloc_skb(len);
-                if (skb == NULL)
-                        return false;
-
-                /* Make room for a back-pointer to 'skb'. */
-                skb_reserve(skb, sizeof(*skb_ptr));
+        /* Request 96 extra bytes for alignment purposes. */
+        skb = dev_alloc_skb(len + padding);
+        if (skb == NULL)
+                return false;
 
-                /* Make sure we are aligned. */
-                skb_reserve(skb, -(long)skb->data & (align - 1));
+        /* Skip 32 or 96 bytes to align "data" mod 128. */
+        align = -(long)skb->data & (128 - 1);
+        BUG_ON(align > padding);
+        skb_reserve(skb, align);
 
-                /* This address is given to IPP. */
-                va = skb->data;
+        /* This address is given to IPP. */
+        va = skb->data;
 
-                if (small)
-                        break;
+        /* Buffers must not span a huge page. */
+        BUG_ON(((((long)va & ~HPAGE_MASK) + len) & HPAGE_MASK) != 0);
 
-                /* ISSUE: This has never been observed! */
-                /* Large buffers must not span a huge page. */
-                if (((((long)va & ~HPAGE_MASK) + 1535) & HPAGE_MASK) == 0)
-                        break;
-                pr_err("Leaking unaligned linux buffer at %p.\n", va);
+#ifdef TILE_NET_PARANOIA
+#if CHIP_HAS_CBOX_HOME_MAP()
+        if (hash_default) {
+                HV_PTE pte = *virt_to_pte(current->mm, (unsigned long)va);
+                if (hv_pte_get_mode(pte) != HV_PTE_MODE_CACHE_HASH_L3)
+                        panic("Non-HFH ingress buffer! VA=%p Mode=%d PTE=%llx",
+                              va, hv_pte_get_mode(pte), hv_pte_val(pte));
         }
+#endif
+#endif
+
+        /* Invalidate the packet buffer. */
+        if (!hash_default)
+                __inv_buffer(va, len);
 
         /* Skip two bytes to satisfy LIPP assumptions. */
         /* Note that this aligns IP on a 16 byte boundary. */
@@ -415,23 +472,9 @@ static bool tile_net_provide_needed_buffer(struct tile_net_cpu *info,
         skb_ptr = va - sizeof(*skb_ptr);
         *skb_ptr = skb;
 
-        /* Invalidate the packet buffer. */
-        if (!hash_default)
-                __inv_buffer(skb->data, buffer_size);
-
         /* Make sure "skb_ptr" has been flushed. */
         __insn_mf();
 
-#ifdef TILE_NET_PARANOIA
-#if CHIP_HAS_CBOX_HOME_MAP()
-        if (hash_default) {
-                HV_PTE pte = *virt_to_pte(current->mm, (unsigned long)va);
-                if (hv_pte_get_mode(pte) != HV_PTE_MODE_CACHE_HASH_L3)
-                        panic("Non-coherent ingress buffer!");
-        }
-#endif
-#endif
-
         /* Provide the new buffer. */
         tile_net_provide_linux_buffer(info, va, small);
 
@@ -469,48 +512,64 @@ oops:
  * Grab some LEPP completions, and store them in "comps", of size
  * "comps_size", and return the number of completions which were
  * stored, so the caller can free them.
- *
- * If "pending" is not NULL, it will be set to true if there might
- * still be some pending completions caused by this tile, else false.
  */
-static unsigned int tile_net_lepp_grab_comps(struct net_device *dev,
+static unsigned int tile_net_lepp_grab_comps(lepp_queue_t *eq,
                                              struct sk_buff *comps[],
                                              unsigned int comps_size,
-                                             bool *pending)
+                                             unsigned int min_size)
 {
-        struct tile_net_priv *priv = netdev_priv(dev);
-
-        lepp_queue_t *eq = priv->epp_queue;
-
         unsigned int n = 0;
 
-        unsigned int comp_head;
-        unsigned int comp_busy;
-        unsigned int comp_tail;
-
-        spin_lock(&priv->comp_lock);
-
-        comp_head = eq->comp_head;
-        comp_busy = eq->comp_busy;
-        comp_tail = eq->comp_tail;
+        unsigned int comp_head = eq->comp_head;
+        unsigned int comp_busy = eq->comp_busy;
 
         while (comp_head != comp_busy && n < comps_size) {
                 comps[n++] = eq->comps[comp_head];
                 LEPP_QINC(comp_head);
         }
 
-        if (pending != NULL)
-                *pending = (comp_head != comp_tail);
+        if (n < min_size)
+                return 0;
 
         eq->comp_head = comp_head;
 
-        spin_unlock(&priv->comp_lock);
-
         return n;
 }
 
 
 /*
+ * Free some comps, and return true iff there are still some pending.
+ */
+static bool tile_net_lepp_free_comps(struct net_device *dev, bool all)
+{
+        struct tile_net_priv *priv = netdev_priv(dev);
+
+        lepp_queue_t *eq = priv->eq;
+
+        struct sk_buff *olds[64];
+        unsigned int wanted = 64;
+        unsigned int i, n;
+        bool pending;
+
+        spin_lock(&priv->eq_lock);
+
+        if (all)
+                eq->comp_busy = eq->comp_tail;
+
+        n = tile_net_lepp_grab_comps(eq, olds, wanted, 0);
+
+        pending = (eq->comp_head != eq->comp_tail);
+
+        spin_unlock(&priv->eq_lock);
+
+        for (i = 0; i < n; i++)
+                kfree_skb(olds[i]);
+
+        return pending;
+}
+
+
+/*
  * Make sure the egress timer is scheduled.
  *
  * Note that we use "schedule if not scheduled" logic instead of the more
@@ -544,21 +603,11 @@ static void tile_net_handle_egress_timer(unsigned long arg)
         struct tile_net_cpu *info = (struct tile_net_cpu *)arg;
         struct net_device *dev = info->napi.dev;
 
-        struct sk_buff *olds[32];
-        unsigned int wanted = 32;
-        unsigned int i, nolds = 0;
-        bool pending;
-
         /* The timer is no longer scheduled. */
         info->egress_timer_scheduled = false;
 
-        nolds = tile_net_lepp_grab_comps(dev, olds, wanted, &pending);
-
-        for (i = 0; i < nolds; i++)
-                kfree_skb(olds[i]);
-
-        /* Reschedule timer if needed. */
-        if (pending)
+        /* Free comps, and reschedule timer if more are pending. */
+        if (tile_net_lepp_free_comps(dev, false))
                 tile_net_schedule_egress_timer(info);
 }
 
@@ -636,8 +685,39 @@ static bool is_dup_ack(char *s1, char *s2, unsigned int len)
 
 
 
+static void tile_net_discard_aux(struct tile_net_cpu *info, int index)
+{
+        struct tile_netio_queue *queue = &info->queue;
+        netio_queue_impl_t *qsp = queue->__system_part;
+        netio_queue_user_impl_t *qup = &queue->__user_part;
+
+        int index2_aux = index + sizeof(netio_pkt_t);
+        int index2 =
+                ((index2_aux ==
+                  qsp->__packet_receive_queue.__last_packet_plus_one) ?
+                 0 : index2_aux);
+
+        netio_pkt_t *pkt = (netio_pkt_t *)((unsigned long) &qsp[1] + index);
+
+        /* Extract the "linux_buffer_t". */
+        unsigned int buffer = pkt->__packet.word;
+
+        /* Convert "linux_buffer_t" to "va". */
+        void *va = __va((phys_addr_t)(buffer >> 1) << 7);
+
+        /* Acquire the associated "skb". */
+        struct sk_buff **skb_ptr = va - sizeof(*skb_ptr);
+        struct sk_buff *skb = *skb_ptr;
+
+        kfree_skb(skb);
+
+        /* Consume this packet. */
+        qup->__packet_receive_read = index2;
+}
+
+
 /*
- * Like "tile_net_handle_packets()", but just discard packets.
+ * Like "tile_net_poll()", but just discard packets.
  */
 static void tile_net_discard_packets(struct net_device *dev)
 {
@@ -650,32 +730,8 @@ static void tile_net_discard_packets(struct net_device *dev)
 
         while (qup->__packet_receive_read !=
                qsp->__packet_receive_queue.__packet_write) {
-
                 int index = qup->__packet_receive_read;
-
-                int index2_aux = index + sizeof(netio_pkt_t);
-                int index2 =
-                        ((index2_aux ==
-                          qsp->__packet_receive_queue.__last_packet_plus_one) ?
-                         0 : index2_aux);
-
-                netio_pkt_t *pkt = (netio_pkt_t *)
-                        ((unsigned long) &qsp[1] + index);
-
-                /* Extract the "linux_buffer_t". */
-                unsigned int buffer = pkt->__packet.word;
-
-                /* Convert "linux_buffer_t" to "va". */
-                void *va = __va((phys_addr_t)(buffer >> 1) << 7);
-
-                /* Acquire the associated "skb". */
-                struct sk_buff **skb_ptr = va - sizeof(*skb_ptr);
-                struct sk_buff *skb = *skb_ptr;
-
-                kfree_skb(skb);
-
-                /* Consume this packet. */
-                qup->__packet_receive_read = index2;
+                tile_net_discard_aux(info, index);
         }
 }
 
@@ -704,7 +760,8 @@ static bool tile_net_poll_aux(struct tile_net_cpu *info, int index)
 
         netio_pkt_metadata_t *metadata = NETIO_PKT_METADATA(pkt);
 
-        /* Extract the packet size. */
+        /* Extract the packet size.  FIXME: Shouldn't the second line */
+        /* get subtracted?  Mostly moot, since it should be "zero". */
         unsigned long len =
                 (NETIO_PKT_CUSTOM_LENGTH(pkt) +
                  NET_IP_ALIGN - NETIO_PACKET_PADDING);
@@ -722,15 +779,6 @@ static bool tile_net_poll_aux(struct tile_net_cpu *info, int index)
         /* Compare to "NETIO_PKT_CUSTOM_DATA(pkt)". */
         unsigned char *buf = va + NET_IP_ALIGN;
 
-#ifdef IGNORE_DUP_ACKS
-
-        static int other;
-        static int final;
-        static int keep;
-        static int skip;
-
-#endif
-
         /* Invalidate the packet buffer. */
         if (!hash_default)
                 __inv_buffer(buf, len);
@@ -745,16 +793,8 @@ static bool tile_net_poll_aux(struct tile_net_cpu *info, int index)
 #ifdef TILE_NET_VERIFY_INGRESS
         if (!NETIO_PKT_L4_CSUM_CORRECT_M(metadata, pkt) &&
             NETIO_PKT_L4_CSUM_CALCULATED_M(metadata, pkt)) {
-                /*
-                 * FIXME: This complains about UDP packets
-                 * with a "zero" checksum (bug 6624).
-                 */
-#ifdef TILE_NET_PANIC_ON_BAD
-                dump_packet(buf, len, "rx");
-                panic("Bad L4 checksum.");
-#else
+                /* Bug 6624: Includes UDP packets with a "zero" checksum. */
                 pr_warning("Bad L4 checksum on %d byte packet.\n", len);
-#endif
         }
         if (!NETIO_PKT_L3_CSUM_CORRECT_M(metadata, pkt) &&
             NETIO_PKT_L3_CSUM_CALCULATED_M(metadata, pkt)) {
@@ -769,90 +809,29 @@ static bool tile_net_poll_aux(struct tile_net_cpu *info, int index)
                 }
                 break;
         case NETIO_PKT_STATUS_BAD:
-#ifdef TILE_NET_PANIC_ON_BAD
-                dump_packet(buf, len, "rx");
-                panic("Unexpected BAD packet.");
-#else
-                pr_warning("Unexpected BAD %d byte packet.\n", len);
-#endif
+                pr_warning("Unexpected BAD %ld byte packet.\n", len);
         }
 #endif
 
         filter = 0;
 
+        /* ISSUE: Filter TCP packets with "bad" checksums? */
+
         if (!(dev->flags & IFF_UP)) {
                 /* Filter packets received before we're up. */
                 filter = 1;
+        } else if (NETIO_PKT_STATUS_M(metadata, pkt) == NETIO_PKT_STATUS_BAD) {
+                /* Filter "truncated" packets. */
+                filter = 1;
         } else if (!(dev->flags & IFF_PROMISC)) {
-                /*
-                 * FIXME: Implement HW multicast filter.
-                 */
-                if (is_unicast_ether_addr(buf)) {
+                /* FIXME: Implement HW multicast filter. */
+                if (!is_multicast_ether_addr(buf)) {
                         /* Filter packets not for our address. */
                         const u8 *mine = dev->dev_addr;
                         filter = compare_ether_addr(mine, buf);
                 }
         }
 
-#ifdef IGNORE_DUP_ACKS
-
-        if (len != 66) {
-                /* FIXME: Must check "is_tcp_ack(buf, len)" somehow. */
-
-                other++;
-
-        } else if (index2 ==
-                   qsp->__packet_receive_queue.__packet_write) {
-
-                final++;
-
-        } else {
-
-                netio_pkt_t *pkt2 = (netio_pkt_t *)
-                        ((unsigned long) &qsp[1] + index2);
-
-                netio_pkt_metadata_t *metadata2 =
-                        NETIO_PKT_METADATA(pkt2);
-
-                /* Extract the packet size. */
-                unsigned long len2 =
-                        (NETIO_PKT_CUSTOM_LENGTH(pkt2) +
-                         NET_IP_ALIGN - NETIO_PACKET_PADDING);
-
-                if (len2 == 66 &&
-                    NETIO_PKT_FLOW_HASH_M(metadata, pkt) ==
-                    NETIO_PKT_FLOW_HASH_M(metadata2, pkt2)) {
-
-                        /* Extract the "linux_buffer_t". */
-                        unsigned int buffer2 = pkt2->__packet.word;
-
-                        /* Convert "linux_buffer_t" to "va". */
-                        void *va2 =
-                                __va((phys_addr_t)(buffer2 >> 1) << 7);
-
-                        /* Extract the packet data pointer. */
-                        /* Compare to "NETIO_PKT_CUSTOM_DATA(pkt)". */
-                        unsigned char *buf2 = va2 + NET_IP_ALIGN;
-
-                        /* Invalidate the packet buffer. */
-                        if (!hash_default)
-                                __inv_buffer(buf2, len2);
-
-                        if (is_dup_ack(buf, buf2, len)) {
-                                skip++;
-                                filter = 1;
-                        } else {
-                                keep++;
-                        }
-                }
-        }
-
-        if (net_ratelimit())
-                pr_info("Other %d Final %d Keep %d Skip %d.\n",
-                        other, final, keep, skip);
-
-#endif
-
         if (filter) {
 
                 /* ISSUE: Update "drop" statistics? */
@@ -877,10 +856,7 @@ static bool tile_net_poll_aux(struct tile_net_cpu *info, int index)
                 /* NOTE: This call also sets "skb->dev = dev". */
                 skb->protocol = eth_type_trans(skb, dev);
 
-                /* ISSUE: Discard corrupt packets? */
-                /* ISSUE: Discard packets with bad checksums? */
-
-                /* Avoid recomputing TCP/UDP checksums. */
+                /* Avoid recomputing "good" TCP/UDP checksums. */
                 if (NETIO_PKT_L4_CSUM_CORRECT_M(metadata, pkt))
                         skb->ip_summed = CHECKSUM_UNNECESSARY;
 
@@ -912,9 +888,14 @@ static bool tile_net_poll_aux(struct tile_net_cpu *info, int index)
 /*
  * Handle some packets for the given device on the current CPU.
  *
- * ISSUE: The "rotting packet" race condition occurs if a packet
- * arrives after the queue appears to be empty, and before the
- * hypervisor interrupt is re-enabled.
+ * If "tile_net_stop()" is called on some other tile while this
+ * function is running, we will return, hopefully before that
+ * other tile asks us to call "napi_disable()".
+ *
+ * The "rotting packet" race condition occurs if a packet arrives
+ * during the extremely narrow window between the queue appearing to
+ * be empty, and the ingress interrupt being re-enabled.  This happens
+ * a LOT under heavy network load.
  */
 static int tile_net_poll(struct napi_struct *napi, int budget)
 {
@@ -928,7 +909,7 @@ static int tile_net_poll(struct napi_struct *napi, int budget)
 
         unsigned int work = 0;
 
-        while (1) {
+        while (priv->active) {
                 int index = qup->__packet_receive_read;
                 if (index == qsp->__packet_receive_queue.__packet_write)
                         break;
@@ -941,19 +922,24 @@ static int tile_net_poll(struct napi_struct *napi, int budget)
 
         napi_complete(&info->napi);
 
-        /* Re-enable hypervisor interrupts. */
+        if (!priv->active)
+                goto done;
+
+        /* Re-enable the ingress interrupt. */
         enable_percpu_irq(priv->intr_id);
 
-        /* HACK: Avoid the "rotting packet" problem. */
+        /* HACK: Avoid the "rotting packet" problem (see above). */
         if (qup->__packet_receive_read !=
-            qsp->__packet_receive_queue.__packet_write)
-                napi_schedule(&info->napi);
-
-        /* ISSUE: Handle completions? */
+            qsp->__packet_receive_queue.__packet_write) {
+                /* ISSUE: Sometimes this returns zero, presumably */
+                /* because an interrupt was handled for this tile. */
+                (void)napi_reschedule(&info->napi);
+        }
 
 done:
 
-        tile_net_provide_needed_buffers(info);
+        if (priv->active)
+                tile_net_provide_needed_buffers(info);
 
         return work;
 }
@@ -961,6 +947,12 @@ done:
 
 /*
  * Handle an ingress interrupt for the given device on the current cpu.
+ *
+ * ISSUE: Sometimes this gets called after "disable_percpu_irq()" has
+ * been called!  This is probably due to "pending hypervisor downcalls".
+ *
+ * ISSUE: Is there any race condition between the "napi_schedule()" here
+ * and the "napi_complete()" call above?
  */
 static irqreturn_t tile_net_handle_ingress_interrupt(int irq, void *dev_ptr)
 {
@@ -969,9 +961,15 @@ static irqreturn_t tile_net_handle_ingress_interrupt(int irq, void *dev_ptr)
         int my_cpu = smp_processor_id();
         struct tile_net_cpu *info = priv->cpu[my_cpu];
 
-        /* Disable hypervisor interrupt. */
+        /* Disable the ingress interrupt. */
         disable_percpu_irq(priv->intr_id);
 
+        /* Ignore unwanted interrupts. */
+        if (!priv->active)
+                return IRQ_HANDLED;
+
+        /* ISSUE: Sometimes "info->napi_enabled" is false here. */
+
         napi_schedule(&info->napi);
 
         return IRQ_HANDLED;
@@ -1005,8 +1003,7 @@ static int tile_net_open_aux(struct net_device *dev)
          */
         {
                 int epp_home = hv_lotar_to_cpu(epp_lotar);
-                struct page *page = virt_to_page(priv->epp_queue);
-                homecache_change_page_home(page, 0, epp_home);
+                homecache_change_page_home(priv->eq_pages, EQ_ORDER, epp_home);
         }
 
         /*
@@ -1015,9 +1012,9 @@ static int tile_net_open_aux(struct net_device *dev)
         {
                 netio_ipp_address_t ea = {
                         .va = 0,
-                        .pa = __pa(priv->epp_queue),
+                        .pa = __pa(priv->eq),
                         .pte = hv_pte(0),
-                        .size = PAGE_SIZE,
+                        .size = EQ_SIZE,
                 };
                 ea.pte = hv_pte_set_lotar(ea.pte, epp_lotar);
                 ea.pte = hv_pte_set_mode(ea.pte, HV_PTE_MODE_CACHE_TILE_L3);
@@ -1043,7 +1040,7 @@ static int tile_net_open_aux(struct net_device *dev)
 
 
 /*
- * Register with hypervisor on each CPU.
+ * Register with hypervisor on the current CPU.
  *
  * Strangely, this function does important things even if it "fails",
  * which is especially common if the link is not up yet.  Hopefully
@@ -1092,7 +1089,8 @@ static void tile_net_register(void *dev_ptr)
         priv->cpu[my_cpu] = info;
 
         /*
-         * Register ourselves with the IPP.
+         * Register ourselves with LIPP.  This does a lot of stuff,
+         * including invoking the LIPP registration code.
          */
         ret = hv_dev_pwrite(priv->hv_devhdl, 0,
                             (HV_VirtAddr)&config,
@@ -1101,8 +1099,11 @@ static void tile_net_register(void *dev_ptr)
         PDEBUG("hv_dev_pwrite(NETIO_IPP_INPUT_REGISTER_OFF) returned %d\n",
                ret);
         if (ret < 0) {
-                printk(KERN_DEBUG "hv_dev_pwrite NETIO_IPP_INPUT_REGISTER_OFF"
-                       " failure %d\n", ret);
+                if (ret != NETIO_LINK_DOWN) {
+                        printk(KERN_DEBUG "hv_dev_pwrite "
+                               "NETIO_IPP_INPUT_REGISTER_OFF failure %d\n",
+                               ret);
+                }
                 info->link_down = (ret == NETIO_LINK_DOWN);
                 return;
         }
@@ -1145,15 +1146,47 @@ static void tile_net_register(void *dev_ptr)
                            NETIO_IPP_GET_FASTIO_OFF);
         PDEBUG("hv_dev_pread(NETIO_IPP_GET_FASTIO_OFF) returned %d\n", ret);
 
-        netif_napi_add(dev, &info->napi, tile_net_poll, 64);
-
         /* Now we are registered. */
         info->registered = true;
 }
 
 
 /*
- * Unregister with hypervisor on each CPU.
+ * Deregister with hypervisor on the current CPU.
+ *
+ * This simply discards all our credits, so no more packets will be
+ * delivered to this tile.  There may still be packets in our queue.
+ *
+ * Also, disable the ingress interrupt.
+ */
+static void tile_net_deregister(void *dev_ptr)
+{
+        struct net_device *dev = (struct net_device *)dev_ptr;
+        struct tile_net_priv *priv = netdev_priv(dev);
+        int my_cpu = smp_processor_id();
+        struct tile_net_cpu *info = priv->cpu[my_cpu];
+
+        /* Disable the ingress interrupt. */
+        disable_percpu_irq(priv->intr_id);
+
+        /* Do nothing else if not registered. */
+        if (info == NULL || !info->registered)
+                return;
+
+        {
+                struct tile_netio_queue *queue = &info->queue;
+                netio_queue_user_impl_t *qup = &queue->__user_part;
+
+                /* Discard all our credits. */
+                __netio_fastio_return_credits(qup->__fastio_index, -1);
+        }
+}
+
+
+/*
+ * Unregister with hypervisor on the current CPU.
+ *
+ * Also, disable the ingress interrupt.
  */
 static void tile_net_unregister(void *dev_ptr)
 {
@@ -1162,35 +1195,23 @@ static void tile_net_unregister(void *dev_ptr)
         int my_cpu = smp_processor_id();
         struct tile_net_cpu *info = priv->cpu[my_cpu];
 
-        int ret = 0;
+        int ret;
         int dummy = 0;
 
-        /* Do nothing if never registered. */
-        if (info == NULL)
-                return;
+        /* Disable the ingress interrupt. */
+        disable_percpu_irq(priv->intr_id);
 
-        /* Do nothing if already unregistered. */
-        if (!info->registered)
+        /* Do nothing else if not registered. */
+        if (info == NULL || !info->registered)
                 return;
 
-        /*
-         * Unregister ourselves with LIPP.
-         */
+        /* Unregister ourselves with LIPP/LEPP. */
         ret = hv_dev_pwrite(priv->hv_devhdl, 0, (HV_VirtAddr)&dummy,
                             sizeof(dummy), NETIO_IPP_INPUT_UNREGISTER_OFF);
-        PDEBUG("hv_dev_pwrite(NETIO_IPP_INPUT_UNREGISTER_OFF) returned %d\n",
-               ret);
-        if (ret < 0) {
-                /* FIXME: Just panic? */
-                pr_err("hv_dev_pwrite NETIO_IPP_INPUT_UNREGISTER_OFF"
-                       " failure %d\n", ret);
-        }
+        if (ret < 0)
+                panic("Failed to unregister with LIPP/LEPP!\n");
 
-        /*
-         * Discard all packets still in our NetIO queue.  Hopefully,
-         * once the unregister call is complete, there will be no
-         * packets still in flight on the IDN.
-         */
+        /* Discard all packets still in our NetIO queue. */
         tile_net_discard_packets(dev);
 
         /* Reset state. */
@@ -1200,11 +1221,6 @@ static void tile_net_unregister(void *dev_ptr)
         /* Cancel egress timer. */
         del_timer(&info->egress_timer);
         info->egress_timer_scheduled = false;
-
-        netif_napi_del(&info->napi);
-
-        /* Now we are unregistered. */
-        info->registered = false;
 }
 
 
@@ -1212,18 +1228,28 @@ static void tile_net_unregister(void *dev_ptr)
  * Helper function for "tile_net_stop()".
  *
  * Also used to handle registration failure in "tile_net_open_inner()",
- * when "fully_opened" is known to be false, and the various extra
- * steps in "tile_net_stop()" are not necessary.  ISSUE: It might be
- * simpler if we could just call "tile_net_stop()" anyway.
+ * when the various extra steps in "tile_net_stop()" are not necessary.
  */
 static void tile_net_stop_aux(struct net_device *dev)
 {
         struct tile_net_priv *priv = netdev_priv(dev);
+        int i;
 
         int dummy = 0;
 
-        /* Unregister all tiles, so LIPP will stop delivering packets. */
+        /*
+         * Unregister all tiles, so LIPP will stop delivering packets.
+         * Also, delete all the "napi" objects (sequentially, to protect
+         * "dev->napi_list").
+         */
         on_each_cpu(tile_net_unregister, (void *)dev, 1);
+        for_each_online_cpu(i) {
+                struct tile_net_cpu *info = priv->cpu[i];
+                if (info != NULL && info->registered) {
+                        netif_napi_del(&info->napi);
+                        info->registered = false;
+                }
+        }
 
         /* Stop LIPP/LEPP. */
         if (hv_dev_pwrite(priv->hv_devhdl, 0, (HV_VirtAddr)&dummy,
@@ -1235,18 +1261,15 @@ static void tile_net_stop_aux(struct net_device *dev)
 
 
 /*
- * Disable ingress interrupts for the given device on the current cpu.
+ * Disable NAPI for the given device on the current cpu.
  */
-static void tile_net_disable_intr(void *dev_ptr)
+static void tile_net_stop_disable(void *dev_ptr)
 {
         struct net_device *dev = (struct net_device *)dev_ptr;
         struct tile_net_priv *priv = netdev_priv(dev);
         int my_cpu = smp_processor_id();
         struct tile_net_cpu *info = priv->cpu[my_cpu];
 
-        /* Disable hypervisor interrupt. */
-        disable_percpu_irq(priv->intr_id);
-
         /* Disable NAPI if needed. */
         if (info != NULL && info->napi_enabled) {
                 napi_disable(&info->napi);
@@ -1256,21 +1279,24 @@ static void tile_net_disable_intr(void *dev_ptr)
 
 
 /*
- * Enable ingress interrupts for the given device on the current cpu.
+ * Enable NAPI and the ingress interrupt for the given device
+ * on the current cpu.
+ *
+ * ISSUE: Only do this for "network cpus"?
  */
-static void tile_net_enable_intr(void *dev_ptr)
+static void tile_net_open_enable(void *dev_ptr)
 {
         struct net_device *dev = (struct net_device *)dev_ptr;
         struct tile_net_priv *priv = netdev_priv(dev);
         int my_cpu = smp_processor_id();
         struct tile_net_cpu *info = priv->cpu[my_cpu];
 
-        /* Enable hypervisor interrupt. */
-        enable_percpu_irq(priv->intr_id);
-
         /* Enable NAPI. */
         napi_enable(&info->napi);
         info->napi_enabled = true;
+
+        /* Enable the ingress interrupt. */
+        enable_percpu_irq(priv->intr_id);
 }
 
 
@@ -1288,8 +1314,9 @@ static int tile_net_open_inner(struct net_device *dev)
         int my_cpu = smp_processor_id();
         struct tile_net_cpu *info;
         struct tile_netio_queue *queue;
-        unsigned int irq;
+        int result = 0;
         int i;
+        int dummy = 0;
 
         /*
          * First try to register just on the local CPU, and handle any
@@ -1307,42 +1334,52 @@ static int tile_net_open_inner(struct net_device *dev)
         /*
          * Now register everywhere else.  If any registration fails,
          * even for "link down" (which might not be possible), we
-         * clean up using "tile_net_stop_aux()".
+         * clean up using "tile_net_stop_aux()".  Also, add all the
+         * "napi" objects (sequentially, to protect "dev->napi_list").
+         * ISSUE: Only use "netif_napi_add()" for "network cpus"?
          */
         smp_call_function(tile_net_register, (void *)dev, 1);
         for_each_online_cpu(i) {
-                if (!priv->cpu[i]->registered) {
-                        tile_net_stop_aux(dev);
-                        return -EAGAIN;
-                }
+                struct tile_net_cpu *info = priv->cpu[i];
+                if (info->registered)
+                        netif_napi_add(dev, &info->napi, tile_net_poll, 64);
+                else
+                        result = -EAGAIN;
+        }
+        if (result != 0) {
+                tile_net_stop_aux(dev);
+                return result;
         }
 
         queue = &info->queue;
 
-        /*
-         * Set the device intr bit mask.
-         * The tile_net_register above sets per tile __intr_id.
-         */
-        priv->intr_id = queue->__system_part->__intr_id;
-        BUG_ON(!priv->intr_id);
-
-        /*
-         * Register the device interrupt handler.
-         * The __ffs() function returns the index into the interrupt handler
-         * table from the interrupt bit mask which should have one bit
-         * and one bit only set.
-         */
-        irq = __ffs(priv->intr_id);
-        tile_irq_activate(irq, TILE_IRQ_PERCPU);
-        BUG_ON(request_irq(irq, tile_net_handle_ingress_interrupt,
-                           0, dev->name, (void *)dev) != 0);
+        if (priv->intr_id == 0) {
+                unsigned int irq;
 
-        /* ISSUE: How could "priv->fully_opened" ever be "true" here? */
-
-        if (!priv->fully_opened) {
+                /*
+                 * Acquire the irq allocated by the hypervisor.  Every
+                 * queue gets the same irq.  The "__intr_id" field is
+                 * "1 << irq", so we use "__ffs()" to extract "irq".
+                 */
+                priv->intr_id = queue->__system_part->__intr_id;
+                BUG_ON(priv->intr_id == 0);
+                irq = __ffs(priv->intr_id);
 
-                int dummy = 0;
+                /*
+                 * Register the ingress interrupt handler for this
+                 * device, permanently.
+                 *
+                 * We used to call "free_irq()" in "tile_net_stop()",
+                 * and then re-register the handler here every time,
+                 * but that caused DNP errors in "handle_IRQ_event()"
+                 * because "desc->action" was NULL.  See bug 9143.
+                 */
+                tile_irq_activate(irq, TILE_IRQ_PERCPU);
+                BUG_ON(request_irq(irq, tile_net_handle_ingress_interrupt,
+                                   0, dev->name, (void *)dev) != 0);
+        }
 
+        {
                 /* Allocate initial buffers. */
 
                 int max_buffers =
@@ -1359,18 +1396,21 @@ static int tile_net_open_inner(struct net_device *dev)
                 if (info->num_needed_small_buffers != 0 ||
                     info->num_needed_large_buffers != 0)
                         panic("Insufficient memory for buffer stack!");
+        }
 
-                /* Start LIPP/LEPP and activate "ingress" at the shim. */
-                if (hv_dev_pwrite(priv->hv_devhdl, 0, (HV_VirtAddr)&dummy,
-                                  sizeof(dummy), NETIO_IPP_INPUT_INIT_OFF) < 0)
-                        panic("Failed to activate the LIPP Shim!\n");
+        /* We are about to be active. */
+        priv->active = true;
 
-                priv->fully_opened = 1;
-        }
+        /* Make sure "active" is visible to all tiles. */
+        mb();
 
-        /* On each tile, enable the hypervisor to trigger interrupts. */
-        /* ISSUE: Do this before starting LIPP/LEPP? */
-        on_each_cpu(tile_net_enable_intr, (void *)dev, 1);
+        /* On each tile, enable NAPI and the ingress interrupt. */
+        on_each_cpu(tile_net_open_enable, (void *)dev, 1);
+
+        /* Start LIPP/LEPP and activate "ingress" at the shim. */
+        if (hv_dev_pwrite(priv->hv_devhdl, 0, (HV_VirtAddr)&dummy,
+                          sizeof(dummy), NETIO_IPP_INPUT_INIT_OFF) < 0)
+                panic("Failed to activate the LIPP Shim!\n");
 
         /* Start our transmit queue. */
         netif_start_queue(dev);
@@ -1396,9 +1436,9 @@ static void tile_net_open_retry(struct work_struct *w)
          * ourselves to try again later; otherwise, tell Linux we now have
          * a working link.  ISSUE: What if the return value is negative?
          */
-        if (tile_net_open_inner(priv->dev))
-                schedule_delayed_work_on(singlethread_cpu, &priv->retry_work,
-                                         TILE_NET_RETRY_INTERVAL);
+        if (tile_net_open_inner(priv->dev) != 0)
+                schedule_delayed_work(&priv->retry_work,
+                                      TILE_NET_RETRY_INTERVAL);
         else
                 netif_carrier_on(priv->dev);
 }
@@ -1412,8 +1452,8 @@ static void tile_net_open_retry(struct work_struct *w)
  * The open entry point is called when a network interface is made
  * active by the system (IFF_UP).  At this point all resources needed
  * for transmit and receive operations are allocated, the interrupt
- * handler is registered with the OS, the watchdog timer is started,
- * and the stack is notified that the interface is ready.
+ * handler is registered with the OS (if needed), the watchdog timer
+ * is started, and the stack is notified that the interface is ready.
  *
  * If the actual link is not available yet, then we tell Linux that
  * we have no carrier, and we keep checking until the link comes up.
@@ -1468,6 +1508,10 @@ static int tile_net_open(struct net_device *dev)
 #endif
 
                 priv->partly_opened = 1;
+
+        } else {
+                /* FIXME: Is this possible? */
+                /* printk("Already partly opened.\n"); */
         }
 
         /*
@@ -1487,57 +1531,17 @@ static int tile_net_open(struct net_device *dev)
          * and then remember to try again later.
          */
         netif_carrier_off(dev);
-        schedule_delayed_work_on(singlethread_cpu, &priv->retry_work,
-                                 TILE_NET_RETRY_INTERVAL);
+        schedule_delayed_work(&priv->retry_work, TILE_NET_RETRY_INTERVAL);
 
         return 0;
 }
 
 
-/*
- * Disables a network interface.
- *
- * Returns 0, this is not allowed to fail.
- *
- * The close entry point is called when an interface is de-activated
- * by the OS.  The hardware is still under the drivers control, but
- * needs to be disabled.  A global MAC reset is issued to stop the
- * hardware, and all transmit and receive resources are freed.
- *
- * ISSUE: Can this can be called while "tile_net_poll()" is running?
- */
-static int tile_net_stop(struct net_device *dev)
+static int tile_net_drain_lipp_buffers(struct tile_net_priv *priv)
 {
-        struct tile_net_priv *priv = netdev_priv(dev);
-
-        bool pending = true;
-
-        PDEBUG("tile_net_stop()\n");
-
-        /* ISSUE: Only needed if not yet fully open. */
-        cancel_delayed_work_sync(&priv->retry_work);
-
-        /* Can't transmit any more. */
-        netif_stop_queue(dev);
-
-        /*
-         * Disable hypervisor interrupts on each tile.
-         */
-        on_each_cpu(tile_net_disable_intr, (void *)dev, 1);
-
-        /*
-         * Unregister the interrupt handler.
-         * The __ffs() function returns the index into the interrupt handler
-         * table from the interrupt bit mask which should have one bit
-         * and one bit only set.
-         */
-        if (priv->intr_id)
-                free_irq(__ffs(priv->intr_id), dev);
-
-        /*
-         * Drain all the LIPP buffers.
-         */
+        int n = 0;
 
+        /* Drain all the LIPP buffers. */
         while (true) {
                 int buffer;
 
@@ -1560,43 +1564,105 @@ static int tile_net_stop(struct net_device *dev)
 
                         kfree_skb(skb);
                 }
+
+                n++;
         }
 
-        /* Stop LIPP/LEPP. */
-        tile_net_stop_aux(dev);
+        return n;
+}
 
 
-        priv->fully_opened = 0;
+/*
+ * Disables a network interface.
+ *
+ * Returns 0, this is not allowed to fail.
+ *
+ * The close entry point is called when an interface is de-activated
+ * by the OS.  The hardware is still under the drivers control, but
+ * needs to be disabled.  A global MAC reset is issued to stop the
+ * hardware, and all transmit and receive resources are freed.
+ *
+ * ISSUE: How closely does "netif_running(dev)" mirror "priv->active"?
+ *
+ * Before we are called by "__dev_close()", "netif_running()" will
+ * have been cleared, so no NEW calls to "tile_net_poll()" will be
+ * made by "netpoll_poll_dev()".
+ *
+ * Often, this can cause some tiles to still have packets in their
+ * queues, so we must call "tile_net_discard_packets()" later.
+ *
+ * Note that some other tile may still be INSIDE "tile_net_poll()",
+ * and in fact, many will be, if there is heavy network load.
+ *
+ * Calling "on_each_cpu(tile_net_stop_disable, (void *)dev, 1)" when
+ * any tile is still "napi_schedule()"'d will induce a horrible crash
+ * when "msleep()" is called.  This includes tiles which are inside
+ * "tile_net_poll()" which have not yet called "napi_complete()".
+ *
+ * So, we must first try to wait long enough for other tiles to finish
+ * with any current "tile_net_poll()" call, and, hopefully, to clear
+ * the "scheduled" flag.  ISSUE: It is unclear what happens to tiles
+ * which have called "napi_schedule()" but which had not yet tried to
+ * call "tile_net_poll()", or which exhausted their budget inside
+ * "tile_net_poll()" just before this function was called.
+ */
+static int tile_net_stop(struct net_device *dev)
+{
+        struct tile_net_priv *priv = netdev_priv(dev);
+
+        PDEBUG("tile_net_stop()\n");
 
+        /* Start discarding packets. */
+        priv->active = false;
+
+        /* Make sure "active" is visible to all tiles. */
+        mb();
 
         /*
-         * XXX: ISSUE: It appears that, in practice anyway, by the
-         * time we get here, there are no pending completions.
+         * On each tile, make sure no NEW packets get delivered, and
+         * disable the ingress interrupt.
+         *
+         * Note that the ingress interrupt can fire AFTER this,
+         * presumably due to packets which were recently delivered,
+         * but it will have no effect.
          */
-        while (pending) {
+        on_each_cpu(tile_net_deregister, (void *)dev, 1);
 
-                struct sk_buff *olds[32];
-                unsigned int wanted = 32;
-                unsigned int i, nolds = 0;
+        /* Optimistically drain LIPP buffers. */
+        (void)tile_net_drain_lipp_buffers(priv);
 
-                nolds = tile_net_lepp_grab_comps(dev, olds,
-                                                 wanted, &pending);
+        /* ISSUE: Only needed if not yet fully open. */
+        cancel_delayed_work_sync(&priv->retry_work);
 
-                /* ISSUE: We have never actually seen this debug spew. */
-                if (nolds != 0)
-                        pr_info("During tile_net_stop(), grabbed %d comps.\n",
-                               nolds);
+        /* Can't transmit any more. */
+        netif_stop_queue(dev);
 
-                for (i = 0; i < nolds; i++)
-                        kfree_skb(olds[i]);
-        }
+        /* Disable NAPI on each tile. */
+        on_each_cpu(tile_net_stop_disable, (void *)dev, 1);
+
+        /*
+         * Drain any remaining LIPP buffers.  NOTE: This "printk()"
+         * has never been observed, but in theory it could happen.
+         */
+        if (tile_net_drain_lipp_buffers(priv) != 0)
+                printk("Had to drain some extra LIPP buffers!\n");
 
+        /* Stop LIPP/LEPP. */
+        tile_net_stop_aux(dev);
+
+        /*
+         * ISSUE: It appears that, in practice anyway, by the time we
+         * get here, there are no pending completions, but just in case,
+         * we free (all of) them anyway.
+         */
+        while (tile_net_lepp_free_comps(dev, true))
+                /* loop */;
 
         /* Wipe the EPP queue. */
-        memset(priv->epp_queue, 0, sizeof(lepp_queue_t));
+        memset(priv->eq, 0, sizeof(lepp_queue_t));
 
         /* Evict the EPP queue. */
-        finv_buffer(priv->epp_queue, PAGE_SIZE);
+        finv_buffer(priv->eq, EQ_SIZE);
 
         return 0;
 }
@@ -1620,7 +1686,7 @@ static unsigned int tile_net_tx_frags(lepp_frag_t *frags,
         if (b_len != 0) {
 
                 if (!hash_default)
-                        finv_buffer_remote(b_data, b_len);
+                        finv_buffer_remote(b_data, b_len, 0);
 
                 cpa = __pa(b_data);
                 frags[n].cpa_lo = cpa;
@@ -1643,7 +1709,7 @@ static unsigned int tile_net_tx_frags(lepp_frag_t *frags,
                 if (!hash_default) {
                         void *va = pfn_to_kaddr(pfn) + f->page_offset;
                         BUG_ON(PageHighMem(f->page));
-                        finv_buffer_remote(va, f->size);
+                        finv_buffer_remote(va, f->size, 0);
                 }
 
                 cpa = ((phys_addr_t)pfn << PAGE_SHIFT) + f->page_offset;
@@ -1742,17 +1808,15 @@ static int tile_net_tx_tso(struct sk_buff *skb, struct net_device *dev)
 
         unsigned long irqflags;
 
-        lepp_queue_t *eq = priv->epp_queue;
+        lepp_queue_t *eq = priv->eq;
 
-        struct sk_buff *olds[4];
-        unsigned int wanted = 4;
+        struct sk_buff *olds[8];
+        unsigned int wanted = 8;
         unsigned int i, nolds = 0;
 
         unsigned int cmd_head, cmd_tail, cmd_next;
         unsigned int comp_tail;
 
-        unsigned int free_slots;
-
 
         /* Paranoia. */
         BUG_ON(skb->protocol != htons(ETH_P_IP));
@@ -1780,34 +1844,32 @@ static int tile_net_tx_tso(struct sk_buff *skb, struct net_device *dev)
 
         /* Enqueue the command. */
 
-        spin_lock_irqsave(&priv->cmd_lock, irqflags);
+        spin_lock_irqsave(&priv->eq_lock, irqflags);
 
         /*
          * Handle completions if needed to make room.
          * HACK: Spin until there is sufficient room.
          */
-        free_slots = lepp_num_free_comp_slots(eq);
-        if (free_slots < 1) {
-spin:
-                nolds += tile_net_lepp_grab_comps(dev, olds + nolds,
-                                                  wanted - nolds, NULL);
-                if (lepp_num_free_comp_slots(eq) < 1)
-                        goto spin;
+        if (lepp_num_free_comp_slots(eq) == 0) {
+                nolds = tile_net_lepp_grab_comps(eq, olds, wanted, 0);
+                if (nolds == 0) {
+busy:
+                        spin_unlock_irqrestore(&priv->eq_lock, irqflags);
+                        return NETDEV_TX_BUSY;
+                }
         }
 
         cmd_head = eq->cmd_head;
         cmd_tail = eq->cmd_tail;
 
-        /* NOTE: The "gotos" below are untested. */
-
         /* Prepare to advance, detecting full queue. */
         cmd_next = cmd_tail + cmd_size;
         if (cmd_tail < cmd_head && cmd_next >= cmd_head)
-                goto spin;
+                goto busy;
         if (cmd_next > LEPP_CMD_LIMIT) {
                 cmd_next = 0;
                 if (cmd_next == cmd_head)
-                        goto spin;
+                        goto busy;
         }
 
         /* Copy the command. */
@@ -1823,14 +1885,18 @@ spin:
         eq->comp_tail = comp_tail;
 
         /* Flush before allowing LEPP to handle the command. */
+        /* ISSUE: Is this the optimal location for the flush? */
         __insn_mf();
 
         eq->cmd_tail = cmd_tail;
 
-        spin_unlock_irqrestore(&priv->cmd_lock, irqflags);
-
+        /* NOTE: Using "4" here is more efficient than "0" or "2", */
+        /* and, strangely, more efficient than pre-checking the number */
+        /* of available completions, and comparing it to 4. */
         if (nolds == 0)
-                nolds = tile_net_lepp_grab_comps(dev, olds, wanted, NULL);
+                nolds = tile_net_lepp_grab_comps(eq, olds, wanted, 4);
+
+        spin_unlock_irqrestore(&priv->eq_lock, irqflags);
 
         /* Handle completions. */
         for (i = 0; i < nolds; i++)
@@ -1870,10 +1936,10 @@ static int tile_net_tx(struct sk_buff *skb, struct net_device *dev)
 
         unsigned int num_frags;
 
-        lepp_queue_t *eq = priv->epp_queue;
+        lepp_queue_t *eq = priv->eq;
 
-        struct sk_buff *olds[4];
-        unsigned int wanted = 4;
+        struct sk_buff *olds[8];
+        unsigned int wanted = 8;
         unsigned int i, nolds = 0;
 
         unsigned int cmd_size = sizeof(lepp_cmd_t);
@@ -1883,8 +1949,6 @@ static int tile_net_tx(struct sk_buff *skb, struct net_device *dev)
 
         lepp_cmd_t cmds[LEPP_MAX_FRAGS];
 
-        unsigned int free_slots;
-
 
         /*
          * This is paranoia, since we think that if the link doesn't come
@@ -1905,7 +1969,8 @@ static int tile_net_tx(struct sk_buff *skb, struct net_device *dev)
         if (hash_default) {
                 HV_PTE pte = *virt_to_pte(current->mm, (unsigned long)data);
                 if (hv_pte_get_mode(pte) != HV_PTE_MODE_CACHE_HASH_L3)
-                        panic("Non-coherent egress buffer!");
+                        panic("Non-HFH egress buffer! VA=%p Mode=%d PTE=%llx",
+                              data, hv_pte_get_mode(pte), hv_pte_val(pte));
         }
 #endif
 #endif
@@ -1958,37 +2023,35 @@ static int tile_net_tx(struct sk_buff *skb, struct net_device *dev)
 
         /* Enqueue the commands. */
 
-        spin_lock_irqsave(&priv->cmd_lock, irqflags);
+        spin_lock_irqsave(&priv->eq_lock, irqflags);
 
         /*
          * Handle completions if needed to make room.
          * HACK: Spin until there is sufficient room.
          */
-        free_slots = lepp_num_free_comp_slots(eq);
-        if (free_slots < 1) {
-spin:
-                nolds += tile_net_lepp_grab_comps(dev, olds + nolds,
-                                                  wanted - nolds, NULL);
-                if (lepp_num_free_comp_slots(eq) < 1)
-                        goto spin;
+        if (lepp_num_free_comp_slots(eq) == 0) {
+                nolds = tile_net_lepp_grab_comps(eq, olds, wanted, 0);
+                if (nolds == 0) {
+busy:
+                        spin_unlock_irqrestore(&priv->eq_lock, irqflags);
+                        return NETDEV_TX_BUSY;
+                }
         }
 
         cmd_head = eq->cmd_head;
         cmd_tail = eq->cmd_tail;
 
-        /* NOTE: The "gotos" below are untested. */
-
         /* Copy the commands, or fail. */
         for (i = 0; i < num_frags; i++) {
 
                 /* Prepare to advance, detecting full queue. */
                 cmd_next = cmd_tail + cmd_size;
                 if (cmd_tail < cmd_head && cmd_next >= cmd_head)
-                        goto spin;
+                        goto busy;
                 if (cmd_next > LEPP_CMD_LIMIT) {
                         cmd_next = 0;
                         if (cmd_next == cmd_head)
-                                goto spin;
+                                goto busy;
                 }
 
                 /* Copy the command. */
@@ -2005,14 +2068,18 @@ spin:
         eq->comp_tail = comp_tail;
 
         /* Flush before allowing LEPP to handle the command. */
+        /* ISSUE: Is this the optimal location for the flush? */
         __insn_mf();
 
         eq->cmd_tail = cmd_tail;
 
-        spin_unlock_irqrestore(&priv->cmd_lock, irqflags);
-
+        /* NOTE: Using "4" here is more efficient than "0" or "2", */
+        /* and, strangely, more efficient than pre-checking the number */
+        /* of available completions, and comparing it to 4. */
         if (nolds == 0)
-                nolds = tile_net_lepp_grab_comps(dev, olds, wanted, NULL);
+                nolds = tile_net_lepp_grab_comps(eq, olds, wanted, 4);
+
+        spin_unlock_irqrestore(&priv->eq_lock, irqflags);
 
         /* Handle completions. */
         for (i = 0; i < nolds; i++)
@@ -2261,7 +2328,6 @@ static struct net_device *tile_net_dev_init(const char *name)
         int ret;
         struct net_device *dev;
         struct tile_net_priv *priv;
-        struct page *page;
 
         /*
          * Allocate the device structure.  This allocates "priv", calls
@@ -2285,23 +2351,21 @@ static struct net_device *tile_net_dev_init(const char *name)
 
         INIT_DELAYED_WORK(&priv->retry_work, tile_net_open_retry);
 
-        spin_lock_init(&priv->cmd_lock);
-        spin_lock_init(&priv->comp_lock);
+        spin_lock_init(&priv->eq_lock);
 
-        /* Allocate "epp_queue". */
-        BUG_ON(get_order(sizeof(lepp_queue_t)) != 0);
-        page = alloc_pages(GFP_KERNEL | __GFP_ZERO, 0);
-        if (!page) {
+        /* Allocate "eq". */
+        priv->eq_pages = alloc_pages(GFP_KERNEL | __GFP_ZERO, EQ_ORDER);
+        if (!priv->eq_pages) {
                 free_netdev(dev);
                 return NULL;
         }
-        priv->epp_queue = page_address(page);
+        priv->eq = page_address(priv->eq_pages);
 
         /* Register the network device. */
         ret = register_netdev(dev);
         if (ret) {
                 pr_err("register_netdev %s failed %d\n", dev->name, ret);
-                free_page((unsigned long)priv->epp_queue);
+                __free_pages(priv->eq_pages, EQ_ORDER);
                 free_netdev(dev);
                 return NULL;
         }
@@ -2310,7 +2374,7 @@ static struct net_device *tile_net_dev_init(const char *name)
         ret = tile_net_get_mac(dev);
         if (ret < 0) {
                 unregister_netdev(dev);
-                free_page((unsigned long)priv->epp_queue);
+                __free_pages(priv->eq_pages, EQ_ORDER);
                 free_netdev(dev);
                 return NULL;
         }
@@ -2321,6 +2385,9 @@ static struct net_device *tile_net_dev_init(const char *name)
 
 /*
  * Module cleanup.
+ *
+ * FIXME: If compiled as a module, this module cannot be "unloaded",
+ * because the "ingress interrupt handler" is registered permanently.
  */
 static void tile_net_cleanup(void)
 {
@@ -2331,8 +2398,8 @@ static void tile_net_cleanup(void)
                         struct net_device *dev = tile_net_devs[i];
                         struct tile_net_priv *priv = netdev_priv(dev);
                         unregister_netdev(dev);
-                        finv_buffer(priv->epp_queue, PAGE_SIZE);
-                        free_page((unsigned long)priv->epp_queue);
+                        finv_buffer(priv->eq, EQ_SIZE);
+                        __free_pages(priv->eq_pages, EQ_ORDER);
                         free_netdev(dev);
                 }
         }
@@ -2355,7 +2422,12 @@ static int tile_net_init_module(void)
 }
 
 
+module_init(tile_net_init_module);
+module_exit(tile_net_cleanup);
+
+
 #ifndef MODULE
+
 /*
  * The "network_cpus" boot argument specifies the cpus that are dedicated
  * to handle ingress packets.
@@ -2391,8 +2463,5 @@ static int __init network_cpus_setup(char *str)
         return 0;
 }
 __setup("network_cpus=", network_cpus_setup);
-#endif
-
 
-module_init(tile_net_init_module);
-module_exit(tile_net_cleanup);
+#endif
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index f8e463cd8ec..ace6404e2fa 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -25,150 +25,9 @@
  *              Microchip Technology, 24C01A/02A/04A Data Sheet
  *                      available in PDF format from www.microchip.com
  *
- * Change History
- *
- *      Tigran Aivazian <tigran@sco.com>:       TLan_PciProbe() now uses
- *                                              new PCI BIOS interface.
- *      Alan Cox        <alan@lxorguk.ukuu.org.uk>:
- *                                              Fixed the out of memory
- *                                              handling.
- *
- *      Torben Mathiasen <torben.mathiasen@compaq.com> New Maintainer!
- *
- *      v1.1 Dec 20, 1999    - Removed linux version checking
- *                             Patch from Tigran Aivazian.
- *                           - v1.1 includes Alan's SMP updates.
- *                           - We still have problems on SMP though,
- *                             but I'm looking into that.
- *
- *      v1.2 Jan 02, 2000    - Hopefully fixed the SMP deadlock.
- *                           - Removed dependency of HZ being 100.
- *                           - We now allow higher priority timers to
- *                             overwrite timers like TLAN_TIMER_ACTIVITY
- *                             Patch from John Cagle <john.cagle@compaq.com>.
- *                           - Fixed a few compiler warnings.
- *
- *      v1.3 Feb 04, 2000    - Fixed the remaining HZ issues.
- *                           - Removed call to pci_present().
- *                           - Removed SA_INTERRUPT flag from irq handler.
- *                           - Added __init and __initdata to reduce resisdent
- *                             code size.
- *                           - Driver now uses module_init/module_exit.
- *                           - Rewrote init_module and tlan_probe to
- *                             share a lot more code. We now use tlan_probe
- *                             with builtin and module driver.
- *                           - Driver ported to new net API.
- *                           - tlan.txt has been reworked to reflect current
- *                             driver (almost)
- *                           - Other minor stuff
- *
- *      v1.4 Feb 10, 2000    - Updated with more changes required after Dave's
- *                             network cleanup in 2.3.43pre7 (Tigran & myself)
- *                           - Minor stuff.
- *
- *      v1.5 March 22, 2000  - Fixed another timer bug that would hang the driver
- *                             if no cable/link were present.
- *                           - Cosmetic changes.
- *                           - TODO: Port completely to new PCI/DMA API
- *                                   Auto-Neg fallback.
- *
- *      v1.6 April 04, 2000  - Fixed driver support for kernel-parameters. Haven't
- *                             tested it though, as the kernel support is currently
- *                             broken (2.3.99p4p3).
- *                           - Updated tlan.txt accordingly.
- *                           - Adjusted minimum/maximum frame length.
- *                           - There is now a TLAN website up at
- *                             http://hp.sourceforge.net/ 
- *
- *      v1.7 April 07, 2000  - Started to implement custom ioctls. Driver now
- *                             reports PHY information when used with Donald
- *                             Beckers userspace MII diagnostics utility.
- *
- *      v1.8 April 23, 2000  - Fixed support for forced speed/duplex settings.
- *                           - Added link information to Auto-Neg and forced
- *                             modes. When NIC operates with auto-neg the driver
- *                             will report Link speed & duplex modes as well as
- *                             link partner abilities. When forced link is used,
- *                             the driver will report status of the established
- *                             link.
- *                             Please read tlan.txt for additional information.
- *                           - Removed call to check_region(), and used
- *                             return value of request_region() instead.
- *
- *      v1.8a May 28, 2000   - Minor updates.
- *
- *      v1.9 July 25, 2000   - Fixed a few remaining Full-Duplex issues.
- *                           - Updated with timer fixes from Andrew Morton.
- *                           - Fixed module race in TLan_Open.
- *                           - Added routine to monitor PHY status.
- *                           - Added activity led support for Proliant devices.
- *
- *      v1.10 Aug 30, 2000   - Added support for EISA based tlan controllers
- *                             like the Compaq NetFlex3/E.
- *                           - Rewrote tlan_probe to better handle multiple
- *                             bus probes. Probing and device setup is now
- *                             done through TLan_Probe and TLan_init_one. Actual
- *                             hardware probe is done with kernel API and
- *                             TLan_EisaProbe.
- *                           - Adjusted debug information for probing.
- *                           - Fixed bug that would cause general debug information
- *                             to be printed after driver removal.
- *                           - Added transmit timeout handling.
- *                           - Fixed OOM return values in tlan_probe.
- *                           - Fixed possible mem leak in tlan_exit
- *                             (now tlan_remove_one).
- *                           - Fixed timer bug in TLan_phyMonitor.
- *                           - This driver version is alpha quality, please
- *                             send me any bug issues you may encounter.
- *
- *      v1.11 Aug 31, 2000   - Do not try to register irq 0 if no irq line was
- *                             set for EISA cards.
- *                           - Added support for NetFlex3/E with nibble-rate
- *                             10Base-T PHY. This is untestet as I haven't got
- *                             one of these cards.
- *                           - Fixed timer being added twice.
- *                           - Disabled PhyMonitoring by default as this is
- *                             work in progress. Define MONITOR to enable it.
- *                           - Now we don't display link info with PHYs that
- *                             doesn't support it (level1).
- *                           - Incresed tx_timeout beacuse of auto-neg.
- *                           - Adjusted timers for forced speeds.
- *
- *      v1.12 Oct 12, 2000   - Minor fixes (memleak, init, etc.)
- *
- *      v1.13 Nov 28, 2000   - Stop flooding console with auto-neg issues
- *                             when link can't be established.
- *                           - Added the bbuf option as a kernel parameter.
- *                           - Fixed ioaddr probe bug.
- *                           - Fixed stupid deadlock with MII interrupts.
- *                           - Added support for speed/duplex selection with
- *                             multiple nics.
- *                           - Added partly fix for TX Channel lockup with
- *                             TLAN v1.0 silicon. This needs to be investigated
- *                             further.
- *
- *      v1.14 Dec 16, 2000   - Added support for servicing multiple frames per.
- *                             interrupt. Thanks goes to
- *                             Adam Keys <adam@ti.com>
- *                             Denis Beaudoin <dbeaudoin@ti.com>
- *                             for providing the patch.
- *                           - Fixed auto-neg output when using multiple
- *                             adapters.
- *                           - Converted to use new taskq interface.
- *
- *      v1.14a Jan 6, 2001   - Minor adjustments (spinlocks, etc.)
- *
- *      Samuel Chessman <chessman@tux.org> New Maintainer!
- *
- *      v1.15 Apr 4, 2002    - Correct operation when aui=1 to be
- *                             10T half duplex no loopback
- *                             Thanks to Gunnar Eikman
- *
- *      Sakari Ailus <sakari.ailus@iki.fi>:
- *
- *      v1.15a Dec 15 2008   - Remove bbuf support, it doesn't work anyway.
- *
- *******************************************************************************/
+ ******************************************************************************/
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/module.h>
 #include <linux/init.h>
@@ -185,13 +44,11 @@
 
 #include "tlan.h"
 
-typedef u32 (TLanIntVectorFunc)( struct net_device *, u16 );
-
 
 /* For removing EISA devices */
-static  struct net_device       *TLan_Eisa_Devices;
+static  struct net_device       *tlan_eisa_devices;
 
-static  int             TLanDevicesInstalled;
+static  int             tlan_devices_installed;
 
 /* Set speed, duplex and aui settings */
 static  int aui[MAX_TLAN_BOARDS];
@@ -202,8 +59,9 @@ module_param_array(aui, int, NULL, 0);
 module_param_array(duplex, int, NULL, 0);
 module_param_array(speed, int, NULL, 0);
 MODULE_PARM_DESC(aui, "ThunderLAN use AUI port(s) (0-1)");
-MODULE_PARM_DESC(duplex, "ThunderLAN duplex setting(s) (0-default, 1-half, 2-full)");
-MODULE_PARM_DESC(speed, "ThunderLAN port speen setting(s) (0,10,100)");
+MODULE_PARM_DESC(duplex,
+                 "ThunderLAN duplex setting(s) (0-default, 1-half, 2-full)");
+MODULE_PARM_DESC(speed, "ThunderLAN port speed setting(s) (0,10,100)");
 
 MODULE_AUTHOR("Maintainer: Samuel Chessman <chessman@tux.org>");
 MODULE_DESCRIPTION("Driver for TI ThunderLAN based ethernet PCI adapters");
@@ -218,139 +76,144 @@ static  int		debug;
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "ThunderLAN debug mask");
 
-static  const char TLanSignature[] = "TLAN";
-static  const char tlan_banner[] = "ThunderLAN driver v1.15a\n";
+static  const char tlan_signature[] = "TLAN";
+static  const char tlan_banner[] = "ThunderLAN driver v1.17\n";
 static  int tlan_have_pci;
 static  int tlan_have_eisa;
 
-static const char *media[] = {
-        "10BaseT-HD ", "10BaseT-FD ","100baseTx-HD ",
-        "100baseTx-FD", "100baseT4", NULL
+static const char * const media[] = {
+        "10BaseT-HD", "10BaseT-FD", "100baseTx-HD",
+        "100BaseTx-FD", "100BaseT4", NULL
 };
 
 static struct board {
-        const char      *deviceLabel;
-        u32             flags;
-        u16             addrOfs;
+        const char      *device_label;
+        u32             flags;
+        u16             addr_ofs;
 } board_info[] = {
         { "Compaq Netelligent 10 T PCI UTP", TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
-        { "Compaq Netelligent 10/100 TX PCI UTP", TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
+        { "Compaq Netelligent 10/100 TX PCI UTP",
+          TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
         { "Compaq Integrated NetFlex-3/P", TLAN_ADAPTER_NONE, 0x83 },
         { "Compaq NetFlex-3/P",
           TLAN_ADAPTER_UNMANAGED_PHY | TLAN_ADAPTER_BIT_RATE_PHY, 0x83 },
         { "Compaq NetFlex-3/P", TLAN_ADAPTER_NONE, 0x83 },
         { "Compaq Netelligent Integrated 10/100 TX UTP",
           TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
-        { "Compaq Netelligent Dual 10/100 TX PCI UTP", TLAN_ADAPTER_NONE, 0x83 },
-        { "Compaq Netelligent 10/100 TX Embedded UTP", TLAN_ADAPTER_NONE, 0x83 },
+        { "Compaq Netelligent Dual 10/100 TX PCI UTP",
+          TLAN_ADAPTER_NONE, 0x83 },
+        { "Compaq Netelligent 10/100 TX Embedded UTP",
+          TLAN_ADAPTER_NONE, 0x83 },
         { "Olicom OC-2183/2185", TLAN_ADAPTER_USE_INTERN_10, 0x83 },
-        { "Olicom OC-2325", TLAN_ADAPTER_UNMANAGED_PHY, 0xF8 },
-        { "Olicom OC-2326", TLAN_ADAPTER_USE_INTERN_10, 0xF8 },
+        { "Olicom OC-2325", TLAN_ADAPTER_UNMANAGED_PHY, 0xf8 },
+        { "Olicom OC-2326", TLAN_ADAPTER_USE_INTERN_10, 0xf8 },
         { "Compaq Netelligent 10/100 TX UTP", TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
-        { "Compaq Netelligent 10 T/2 PCI UTP/Coax", TLAN_ADAPTER_NONE, 0x83 },
+        { "Compaq Netelligent 10 T/2 PCI UTP/coax", TLAN_ADAPTER_NONE, 0x83 },
         { "Compaq NetFlex-3/E",
-          TLAN_ADAPTER_ACTIVITY_LED |   /* EISA card */
+          TLAN_ADAPTER_ACTIVITY_LED |   /* EISA card */
           TLAN_ADAPTER_UNMANAGED_PHY | TLAN_ADAPTER_BIT_RATE_PHY, 0x83 },
-        { "Compaq NetFlex-3/E", TLAN_ADAPTER_ACTIVITY_LED, 0x83 }, /* EISA card */
+        { "Compaq NetFlex-3/E",
+          TLAN_ADAPTER_ACTIVITY_LED, 0x83 }, /* EISA card */
 };
 
 static DEFINE_PCI_DEVICE_TABLE(tlan_pci_tbl) = {
         { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL10,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
         { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
         { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3I,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
         { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_THUNDER,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },
         { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3B,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
         { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100PI,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
         { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100D,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
         { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100I,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 7 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 7 },
         { PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2183,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },
         { PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2325,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9 },
         { PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2326,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10 },
         { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11 },
         { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_T2,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12 },
+          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12 },
         { 0,}
 };
 MODULE_DEVICE_TABLE(pci, tlan_pci_tbl);
 
-static void     TLan_EisaProbe( void );
-static void     TLan_Eisa_Cleanup( void );
-static int      TLan_Init( struct net_device * );
-static int      TLan_Open( struct net_device *dev );
-static netdev_tx_t TLan_StartTx( struct sk_buff *, struct net_device *);
-static irqreturn_t TLan_HandleInterrupt( int, void *);
-static int      TLan_Close( struct net_device *);
-static struct   net_device_stats *TLan_GetStats( struct net_device *);
-static void     TLan_SetMulticastList( struct net_device *);
-static int      TLan_ioctl( struct net_device *dev, struct ifreq *rq, int cmd);
-static int      TLan_probe1( struct pci_dev *pdev, long ioaddr,
-                             int irq, int rev, const struct pci_device_id *ent);
-static void     TLan_tx_timeout( struct net_device *dev);
-static void     TLan_tx_timeout_work(struct work_struct *work);
-static int      tlan_init_one( struct pci_dev *pdev, const struct pci_device_id *ent);
-
-static u32      TLan_HandleTxEOF( struct net_device *, u16 );
-static u32      TLan_HandleStatOverflow( struct net_device *, u16 );
-static u32      TLan_HandleRxEOF( struct net_device *, u16 );
-static u32      TLan_HandleDummy( struct net_device *, u16 );
-static u32      TLan_HandleTxEOC( struct net_device *, u16 );
-static u32      TLan_HandleStatusCheck( struct net_device *, u16 );
-static u32      TLan_HandleRxEOC( struct net_device *, u16 );
-
-static void     TLan_Timer( unsigned long );
-
-static void     TLan_ResetLists( struct net_device * );
-static void     TLan_FreeLists( struct net_device * );
-static void     TLan_PrintDio( u16 );
-static void     TLan_PrintList( TLanList *, char *, int );
-static void     TLan_ReadAndClearStats( struct net_device *, int );
-static void     TLan_ResetAdapter( struct net_device * );
-static void     TLan_FinishReset( struct net_device * );
-static void     TLan_SetMac( struct net_device *, int areg, char *mac );
-
-static void     TLan_PhyPrint( struct net_device * );
-static void     TLan_PhyDetect( struct net_device * );
-static void     TLan_PhyPowerDown( struct net_device * );
-static void     TLan_PhyPowerUp( struct net_device * );
-static void     TLan_PhyReset( struct net_device * );
-static void     TLan_PhyStartLink( struct net_device * );
-static void     TLan_PhyFinishAutoNeg( struct net_device * );
+static void     tlan_eisa_probe(void);
+static void     tlan_eisa_cleanup(void);
+static int      tlan_init(struct net_device *);
+static int      tlan_open(struct net_device *dev);
+static netdev_tx_t tlan_start_tx(struct sk_buff *, struct net_device *);
+static irqreturn_t tlan_handle_interrupt(int, void *);
+static int      tlan_close(struct net_device *);
+static struct   net_device_stats *tlan_get_stats(struct net_device *);
+static void     tlan_set_multicast_list(struct net_device *);
+static int      tlan_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
+static int      tlan_probe1(struct pci_dev *pdev, long ioaddr,
+                            int irq, int rev, const struct pci_device_id *ent);
+static void     tlan_tx_timeout(struct net_device *dev);
+static void     tlan_tx_timeout_work(struct work_struct *work);
+static int      tlan_init_one(struct pci_dev *pdev,
+                              const struct pci_device_id *ent);
+
+static u32      tlan_handle_tx_eof(struct net_device *, u16);
+static u32      tlan_handle_stat_overflow(struct net_device *, u16);
+static u32      tlan_handle_rx_eof(struct net_device *, u16);
+static u32      tlan_handle_dummy(struct net_device *, u16);
+static u32      tlan_handle_tx_eoc(struct net_device *, u16);
+static u32      tlan_handle_status_check(struct net_device *, u16);
+static u32      tlan_handle_rx_eoc(struct net_device *, u16);
+
+static void     tlan_timer(unsigned long);
+
+static void     tlan_reset_lists(struct net_device *);
+static void     tlan_free_lists(struct net_device *);
+static void     tlan_print_dio(u16);
+static void     tlan_print_list(struct tlan_list *, char *, int);
+static void     tlan_read_and_clear_stats(struct net_device *, int);
+static void     tlan_reset_adapter(struct net_device *);
+static void     tlan_finish_reset(struct net_device *);
+static void     tlan_set_mac(struct net_device *, int areg, char *mac);
+
+static void     tlan_phy_print(struct net_device *);
+static void     tlan_phy_detect(struct net_device *);
+static void     tlan_phy_power_down(struct net_device *);
+static void     tlan_phy_power_up(struct net_device *);
+static void     tlan_phy_reset(struct net_device *);
+static void     tlan_phy_start_link(struct net_device *);
+static void     tlan_phy_finish_auto_neg(struct net_device *);
 #ifdef MONITOR
-static void     TLan_PhyMonitor( struct net_device * );
+static void     tlan_phy_monitor(struct net_device *);
 #endif
 
 /*
-static int      TLan_PhyNop( struct net_device * );
-static int      TLan_PhyInternalCheck( struct net_device * );
-static int      TLan_PhyInternalService( struct net_device * );
-static int      TLan_PhyDp83840aCheck( struct net_device * );
+  static int    tlan_phy_nop(struct net_device *);
+  static int    tlan_phy_internal_check(struct net_device *);
+  static int    tlan_phy_internal_service(struct net_device *);
+  static int    tlan_phy_dp83840a_check(struct net_device *);
 */
 
-static bool     TLan_MiiReadReg( struct net_device *, u16, u16, u16 * );
-static void     TLan_MiiSendData( u16, u32, unsigned );
-static void     TLan_MiiSync( u16 );
-static void     TLan_MiiWriteReg( struct net_device *, u16, u16, u16 );
+static bool     tlan_mii_read_reg(struct net_device *, u16, u16, u16 *);
+static void     tlan_mii_send_data(u16, u32, unsigned);
+static void     tlan_mii_sync(u16);
+static void     tlan_mii_write_reg(struct net_device *, u16, u16, u16);
 
-static void     TLan_EeSendStart( u16 );
-static int      TLan_EeSendByte( u16, u8, int );
-static void     TLan_EeReceiveByte( u16, u8 *, int );
-static int      TLan_EeReadByte( struct net_device *, u8, u8 * );
+static void     tlan_ee_send_start(u16);
+static int      tlan_ee_send_byte(u16, u8, int);
+static void     tlan_ee_receive_byte(u16, u8 *, int);
+static int      tlan_ee_read_byte(struct net_device *, u8, u8 *);
 
 
 static inline void
-TLan_StoreSKB( struct tlan_list_tag *tag, struct sk_buff *skb)
+tlan_store_skb(struct tlan_list *tag, struct sk_buff *skb)
 {
         unsigned long addr = (unsigned long)skb;
         tag->buffer[9].address = addr;
@@ -358,7 +221,7 @@ TLan_StoreSKB( struct tlan_list_tag *tag, struct sk_buff *skb)
 }
 
 static inline struct sk_buff *
-TLan_GetSKB( const struct tlan_list_tag *tag)
+tlan_get_skb(const struct tlan_list *tag)
 {
         unsigned long addr;
 
@@ -367,50 +230,50 @@ TLan_GetSKB( const struct tlan_list_tag *tag)
         return (struct sk_buff *) addr;
 }
 
-
-static TLanIntVectorFunc *TLanIntVector[TLAN_INT_NUMBER_OF_INTS] = {
+static u32
+(*tlan_int_vector[TLAN_INT_NUMBER_OF_INTS])(struct net_device *, u16) = {
         NULL,
-        TLan_HandleTxEOF,
-        TLan_HandleStatOverflow,
-        TLan_HandleRxEOF,
-        TLan_HandleDummy,
-        TLan_HandleTxEOC,
-        TLan_HandleStatusCheck,
-        TLan_HandleRxEOC
+        tlan_handle_tx_eof,
+        tlan_handle_stat_overflow,
+        tlan_handle_rx_eof,
+        tlan_handle_dummy,
+        tlan_handle_tx_eoc,
+        tlan_handle_status_check,
+        tlan_handle_rx_eoc
 };
 
 static inline void
-TLan_SetTimer( struct net_device *dev, u32 ticks, u32 type )
+tlan_set_timer(struct net_device *dev, u32 ticks, u32 type)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
         unsigned long flags = 0;
 
         if (!in_irq())
                 spin_lock_irqsave(&priv->lock, flags);
-        if ( priv->timer.function != NULL &&
-                priv->timerType != TLAN_TIMER_ACTIVITY ) {
+        if (priv->timer.function != NULL &&
+            priv->timer_type != TLAN_TIMER_ACTIVITY) {
                 if (!in_irq())
                         spin_unlock_irqrestore(&priv->lock, flags);
                 return;
         }
-        priv->timer.function = TLan_Timer;
+        priv->timer.function = tlan_timer;
         if (!in_irq())
                 spin_unlock_irqrestore(&priv->lock, flags);
 
         priv->timer.data = (unsigned long) dev;
-        priv->timerSetAt = jiffies;
-        priv->timerType = type;
+        priv->timer_set_at = jiffies;
+        priv->timer_type = type;
         mod_timer(&priv->timer, jiffies + ticks);
 
-} /* TLan_SetTimer */
+}
 
 
 /*****************************************************************************
 ******************************************************************************
 
-        ThunderLAN Driver Primary Functions
+ThunderLAN driver primary functions
 
-        These functions are more or less common to all Linux network drivers.
+these functions are more or less common to all linux network drivers.
 
 ******************************************************************************
 *****************************************************************************/
@@ -419,56 +282,124 @@ TLan_SetTimer( struct net_device *dev, u32 ticks, u32 type )
 
 
 
-        /***************************************************************
-         *      tlan_remove_one
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              None
-         *
-         *      Goes through the TLanDevices list and frees the device
-         *      structs and memory associated with each device (lists
-         *      and buffers).  It also ureserves the IO port regions
-         *      associated with this device.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_remove_one
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              None
+ *
+ *      Goes through the TLanDevices list and frees the device
+ *      structs and memory associated with each device (lists
+ *      and buffers).  It also ureserves the IO port regions
+ *      associated with this device.
+ *
+ **************************************************************/
 
 
-static void __devexit tlan_remove_one( struct pci_dev *pdev)
+static void __devexit tlan_remove_one(struct pci_dev *pdev)
 {
-        struct net_device *dev = pci_get_drvdata( pdev );
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct tlan_priv        *priv = netdev_priv(dev);
 
-        unregister_netdev( dev );
+        unregister_netdev(dev);
 
-        if ( priv->dmaStorage ) {
-                pci_free_consistent(priv->pciDev,
-                                    priv->dmaSize, priv->dmaStorage,
-                                    priv->dmaStorageDMA );
+        if (priv->dma_storage) {
+                pci_free_consistent(priv->pci_dev,
+                                    priv->dma_size, priv->dma_storage,
+                                    priv->dma_storage_dma);
         }
 
 #ifdef CONFIG_PCI
         pci_release_regions(pdev);
 #endif
 
-        free_netdev( dev );
+        free_netdev(dev);
 
-        pci_set_drvdata( pdev, NULL );
+        pci_set_drvdata(pdev, NULL);
 }
 
+static void tlan_start(struct net_device *dev)
+{
+        tlan_reset_lists(dev);
+        /* NOTE: It might not be necessary to read the stats before a
+           reset if you don't care what the values are.
+        */
+        tlan_read_and_clear_stats(dev, TLAN_IGNORE);
+        tlan_reset_adapter(dev);
+        netif_wake_queue(dev);
+}
+
+static void tlan_stop(struct net_device *dev)
+{
+        struct tlan_priv *priv = netdev_priv(dev);
+
+        tlan_read_and_clear_stats(dev, TLAN_RECORD);
+        outl(TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD);
+        /* Reset and power down phy */
+        tlan_reset_adapter(dev);
+        if (priv->timer.function != NULL) {
+                del_timer_sync(&priv->timer);
+                priv->timer.function = NULL;
+        }
+}
+
+#ifdef CONFIG_PM
+
+static int tlan_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+
+        if (netif_running(dev))
+                tlan_stop(dev);
+
+        netif_device_detach(dev);
+        pci_save_state(pdev);
+        pci_disable_device(pdev);
+        pci_wake_from_d3(pdev, false);
+        pci_set_power_state(pdev, PCI_D3hot);
+
+        return 0;
+}
+
+static int tlan_resume(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+
+        pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
+        pci_enable_wake(pdev, 0, 0);
+        netif_device_attach(dev);
+
+        if (netif_running(dev))
+                tlan_start(dev);
+
+        return 0;
+}
+
+#else /* CONFIG_PM */
+
+#define tlan_suspend   NULL
+#define tlan_resume    NULL
+
+#endif /* CONFIG_PM */
+
+
 static struct pci_driver tlan_driver = {
         .name           = "tlan",
         .id_table       = tlan_pci_tbl,
         .probe          = tlan_init_one,
         .remove         = __devexit_p(tlan_remove_one),
+        .suspend        = tlan_suspend,
+        .resume         = tlan_resume,
 };
 
 static int __init tlan_probe(void)
 {
         int rc = -ENODEV;
 
-        printk(KERN_INFO "%s", tlan_banner);
+        pr_info("%s", tlan_banner);
 
         TLAN_DBG(TLAN_DEBUG_PROBE, "Starting PCI Probe....\n");
 
@@ -477,18 +408,18 @@ static int __init tlan_probe(void)
         rc = pci_register_driver(&tlan_driver);
 
         if (rc != 0) {
-                printk(KERN_ERR "TLAN: Could not register pci driver.\n");
+                pr_err("Could not register pci driver\n");
                 goto err_out_pci_free;
         }
 
         TLAN_DBG(TLAN_DEBUG_PROBE, "Starting EISA Probe....\n");
-        TLan_EisaProbe();
+        tlan_eisa_probe();
 
-        printk(KERN_INFO "TLAN: %d device%s installed, PCI: %d  EISA: %d\n",
-                 TLanDevicesInstalled, TLanDevicesInstalled == 1 ? "" : "s",
-                 tlan_have_pci, tlan_have_eisa);
+        pr_info("%d device%s installed, PCI: %d  EISA: %d\n",
+                tlan_devices_installed, tlan_devices_installed == 1 ? "" : "s",
+                tlan_have_pci, tlan_have_eisa);
 
-        if (TLanDevicesInstalled == 0) {
+        if (tlan_devices_installed == 0) {
                 rc = -ENODEV;
                 goto  err_out_pci_unreg;
         }
@@ -501,39 +432,39 @@ err_out_pci_free:
 }
 
 
-static int __devinit tlan_init_one( struct pci_dev *pdev,
-                                    const struct pci_device_id *ent)
+static int __devinit tlan_init_one(struct pci_dev *pdev,
+                                   const struct pci_device_id *ent)
 {
-        return TLan_probe1( pdev, -1, -1, 0, ent);
+        return tlan_probe1(pdev, -1, -1, 0, ent);
 }
 
 
 /*
-        ***************************************************************
-         *      tlan_probe1
-         *
-         *      Returns:
-         *              0 on success, error code on error
-         *      Parms:
-         *              none
-         *
-         *      The name is lower case to fit in with all the rest of
-         *      the netcard_probe names.  This function looks for
-         *      another TLan based adapter, setting it up with the
-         *      allocated device struct if one is found.
-         *      tlan_probe has been ported to the new net API and
-         *      now allocates its own device structure. This function
-         *      is also used by modules.
-         *
-         **************************************************************/
-
-static int __devinit TLan_probe1(struct pci_dev *pdev,
+***************************************************************
+*       tlan_probe1
+*
+*       Returns:
+*               0 on success, error code on error
+*       Parms:
+*               none
+*
+*       The name is lower case to fit in with all the rest of
+*       the netcard_probe names.  This function looks for
+*       another TLan based adapter, setting it up with the
+*       allocated device struct if one is found.
+*       tlan_probe has been ported to the new net API and
+*       now allocates its own device structure. This function
+*       is also used by modules.
+*
+**************************************************************/
+
+static int __devinit tlan_probe1(struct pci_dev *pdev,
                                  long ioaddr, int irq, int rev,
-                                 const struct pci_device_id *ent )
+                                 const struct pci_device_id *ent)
 {
 
         struct net_device  *dev;
-        TLanPrivateInfo    *priv;
+        struct tlan_priv  *priv;
         u16                device_id;
         int                reg, rc = -ENODEV;
 
@@ -543,17 +474,17 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
                 if (rc)
                         return rc;
 
-                rc = pci_request_regions(pdev, TLanSignature);
+                rc = pci_request_regions(pdev, tlan_signature);
                 if (rc) {
-                        printk(KERN_ERR "TLAN: Could not reserve IO regions\n");
+                        pr_err("Could not reserve IO regions\n");
                         goto err_out;
                 }
         }
 #endif  /*  CONFIG_PCI  */
 
-        dev = alloc_etherdev(sizeof(TLanPrivateInfo));
+        dev = alloc_etherdev(sizeof(struct tlan_priv));
         if (dev == NULL) {
-                printk(KERN_ERR "TLAN: Could not allocate memory for device.\n");
+                pr_err("Could not allocate memory for device\n");
                 rc = -ENOMEM;
                 goto err_out_regions;
         }
@@ -561,38 +492,39 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
 
         priv = netdev_priv(dev);
 
-        priv->pciDev = pdev;
+        priv->pci_dev = pdev;
         priv->dev = dev;
 
         /* Is this a PCI device? */
         if (pdev) {
-                u32                pci_io_base = 0;
+                u32                pci_io_base = 0;
 
                 priv->adapter = &board_info[ent->driver_data];
 
                 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc) {
-                        printk(KERN_ERR "TLAN: No suitable PCI mapping available.\n");
+                        pr_err("No suitable PCI mapping available\n");
                         goto err_out_free_dev;
                 }
 
-                for ( reg= 0; reg <= 5; reg ++ ) {
+                for (reg = 0; reg <= 5; reg++) {
                         if (pci_resource_flags(pdev, reg) & IORESOURCE_IO) {
                                 pci_io_base = pci_resource_start(pdev, reg);
-                                TLAN_DBG( TLAN_DEBUG_GNRL, "IO mapping is available at %x.\n",
-                                                pci_io_base);
+                                TLAN_DBG(TLAN_DEBUG_GNRL,
+                                         "IO mapping is available at %x.\n",
+                                         pci_io_base);
                                 break;
                         }
                 }
                 if (!pci_io_base) {
-                        printk(KERN_ERR "TLAN: No IO mappings available\n");
+                        pr_err("No IO mappings available\n");
                         rc = -EIO;
                         goto err_out_free_dev;
                 }
 
                 dev->base_addr = pci_io_base;
                 dev->irq = pdev->irq;
-                priv->adapterRev = pdev->revision;
+                priv->adapter_rev = pdev->revision;
                 pci_set_master(pdev);
                 pci_set_drvdata(pdev, dev);
 
@@ -602,11 +534,11 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
                 device_id = inw(ioaddr + EISA_ID2);
                 priv->is_eisa = 1;
                 if (device_id == 0x20F1) {
-                        priv->adapter = &board_info[13];        /* NetFlex-3/E */
-                        priv->adapterRev = 23;                  /* TLAN 2.3 */
+                        priv->adapter = &board_info[13]; /* NetFlex-3/E */
+                        priv->adapter_rev = 23;         /* TLAN 2.3 */
                 } else {
                         priv->adapter = &board_info[14];
-                        priv->adapterRev = 10;                  /* TLAN 1.0 */
+                        priv->adapter_rev = 10;         /* TLAN 1.0 */
                 }
                 dev->base_addr = ioaddr;
                 dev->irq = irq;
@@ -620,11 +552,11 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
                 priv->speed  = ((dev->mem_start & 0x18) == 0x18) ? 0
                         : (dev->mem_start & 0x18) >> 3;
 
-                if (priv->speed == 0x1) {
+                if (priv->speed == 0x1)
                         priv->speed = TLAN_SPEED_10;
-                } else if (priv->speed == 0x2) {
+                else if (priv->speed == 0x2)
                         priv->speed = TLAN_SPEED_100;
-                }
+
                 debug = priv->debug = dev->mem_end;
         } else {
                 priv->aui    = aui[boards_found];
@@ -635,46 +567,45 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
 
         /* This will be used when we get an adapter error from
          * within our irq handler */
-        INIT_WORK(&priv->tlan_tqueue, TLan_tx_timeout_work);
+        INIT_WORK(&priv->tlan_tqueue, tlan_tx_timeout_work);
 
         spin_lock_init(&priv->lock);
 
-        rc = TLan_Init(dev);
+        rc = tlan_init(dev);
         if (rc) {
-                printk(KERN_ERR "TLAN: Could not set up device.\n");
+                pr_err("Could not set up device\n");
                 goto err_out_free_dev;
         }
 
         rc = register_netdev(dev);
         if (rc) {
-                printk(KERN_ERR "TLAN: Could not register device.\n");
+                pr_err("Could not register device\n");
                 goto err_out_uninit;
         }
 
 
-        TLanDevicesInstalled++;
+        tlan_devices_installed++;
         boards_found++;
 
         /* pdev is NULL if this is an EISA device */
         if (pdev)
                 tlan_have_pci++;
         else {
-                priv->nextDevice = TLan_Eisa_Devices;
-                TLan_Eisa_Devices = dev;
+                priv->next_device = tlan_eisa_devices;
+                tlan_eisa_devices = dev;
                 tlan_have_eisa++;
         }
 
-        printk(KERN_INFO "TLAN: %s irq=%2d, io=%04x, %s, Rev. %d\n",
-                        dev->name,
-                        (int) dev->irq,
-                        (int) dev->base_addr,
-                        priv->adapter->deviceLabel,
-                        priv->adapterRev);
+        netdev_info(dev, "irq=%2d, io=%04x, %s, Rev. %d\n",
+                    (int)dev->irq,
+                    (int)dev->base_addr,
+                    priv->adapter->device_label,
+                    priv->adapter_rev);
         return 0;
 
 err_out_uninit:
-        pci_free_consistent(priv->pciDev, priv->dmaSize, priv->dmaStorage,
-                            priv->dmaStorageDMA );
+        pci_free_consistent(priv->pci_dev, priv->dma_size, priv->dma_storage,
+                            priv->dma_storage_dma);
 err_out_free_dev:
         free_netdev(dev);
 err_out_regions:
@@ -689,22 +620,23 @@ err_out:
 }
 
 
-static void TLan_Eisa_Cleanup(void)
+static void tlan_eisa_cleanup(void)
 {
         struct net_device *dev;
-        TLanPrivateInfo *priv;
+        struct tlan_priv *priv;
 
-        while( tlan_have_eisa ) {
-                dev = TLan_Eisa_Devices;
+        while (tlan_have_eisa) {
+                dev = tlan_eisa_devices;
                 priv = netdev_priv(dev);
-                if (priv->dmaStorage) {
-                        pci_free_consistent(priv->pciDev, priv->dmaSize,
-                                            priv->dmaStorage, priv->dmaStorageDMA );
+                if (priv->dma_storage) {
+                        pci_free_consistent(priv->pci_dev, priv->dma_size,
+                                            priv->dma_storage,
+                                            priv->dma_storage_dma);
                 }
-                release_region( dev->base_addr, 0x10);
-                unregister_netdev( dev );
-                TLan_Eisa_Devices = priv->nextDevice;
-                free_netdev( dev );
+                release_region(dev->base_addr, 0x10);
+                unregister_netdev(dev);
+                tlan_eisa_devices = priv->next_device;
+                free_netdev(dev);
                 tlan_have_eisa--;
         }
 }
@@ -715,7 +647,7 @@ static void __exit tlan_exit(void)
         pci_unregister_driver(&tlan_driver);
 
         if (tlan_have_eisa)
-                TLan_Eisa_Cleanup();
+                tlan_eisa_cleanup();
 
 }
 
@@ -726,24 +658,24 @@ module_exit(tlan_exit);
 
 
 
-        /**************************************************************
-         *      TLan_EisaProbe
-         *
-         *      Returns: 0 on success, 1 otherwise
-         *
-         *      Parms:   None
-         *
-         *
-         *      This functions probes for EISA devices and calls
-         *      TLan_probe1 when one is found.
-         *
-         *************************************************************/
+/**************************************************************
+ *      tlan_eisa_probe
+ *
+ *      Returns: 0 on success, 1 otherwise
+ *
+ *      Parms:   None
+ *
+ *
+ *      This functions probes for EISA devices and calls
+ *      TLan_probe1 when one is found.
+ *
+ *************************************************************/
 
-static void  __init TLan_EisaProbe (void)
+static void  __init tlan_eisa_probe(void)
 {
-        long    ioaddr;
-        int     rc = -ENODEV;
-        int     irq;
+        long    ioaddr;
+        int     rc = -ENODEV;
+        int     irq;
         u16     device_id;
 
         if (!EISA_bus) {
@@ -754,15 +686,16 @@ static void  __init TLan_EisaProbe (void)
         /* Loop through all slots of the EISA bus */
         for (ioaddr = 0x1000; ioaddr < 0x9000; ioaddr += 0x1000) {
 
-        TLAN_DBG(TLAN_DEBUG_PROBE,"EISA_ID 0x%4x: 0x%4x\n",
-                 (int) ioaddr + 0xC80, inw(ioaddr + EISA_ID));
-        TLAN_DBG(TLAN_DEBUG_PROBE,"EISA_ID 0x%4x: 0x%4x\n",
-                 (int) ioaddr + 0xC82, inw(ioaddr + EISA_ID2));
+                TLAN_DBG(TLAN_DEBUG_PROBE, "EISA_ID 0x%4x: 0x%4x\n",
+                         (int) ioaddr + 0xc80, inw(ioaddr + EISA_ID));
+                TLAN_DBG(TLAN_DEBUG_PROBE, "EISA_ID 0x%4x: 0x%4x\n",
+                         (int) ioaddr + 0xc82, inw(ioaddr + EISA_ID2));
 
 
-                TLAN_DBG(TLAN_DEBUG_PROBE, "Probing for EISA adapter at IO: 0x%4x : ",
-                                        (int) ioaddr);
-                if (request_region(ioaddr, 0x10, TLanSignature) == NULL)
+                TLAN_DBG(TLAN_DEBUG_PROBE,
+                         "Probing for EISA adapter at IO: 0x%4x : ",
+                         (int) ioaddr);
+                if (request_region(ioaddr, 0x10, tlan_signature) == NULL)
                         goto out;
 
                 if (inw(ioaddr + EISA_ID) != 0x110E) {
@@ -772,326 +705,324 @@ static void  __init TLan_EisaProbe (void)
 
                 device_id = inw(ioaddr + EISA_ID2);
                 if (device_id !=  0x20F1 && device_id != 0x40F1) {
-                        release_region (ioaddr, 0x10);
+                        release_region(ioaddr, 0x10);
                         goto out;
                 }
 
-                if (inb(ioaddr + EISA_CR) != 0x1) {     /* Check if adapter is enabled */
-                        release_region (ioaddr, 0x10);
+                /* check if adapter is enabled */
+                if (inb(ioaddr + EISA_CR) != 0x1) {
+                        release_region(ioaddr, 0x10);
                         goto out2;
                 }
 
                 if (debug == 0x10)
-                        printk("Found one\n");
+                        pr_info("Found one\n");
 
 
                 /* Get irq from board */
-                switch (inb(ioaddr + 0xCC0)) {
-                        case(0x10):
-                                irq=5;
-                                break;
-                        case(0x20):
-                                irq=9;
-                                break;
-                        case(0x40):
-                                irq=10;
-                                break;
-                        case(0x80):
-                                irq=11;
-                                break;
-                        default:
-                                goto out;
+                switch (inb(ioaddr + 0xcc0)) {
+                case(0x10):
+                        irq = 5;
+                        break;
+                case(0x20):
+                        irq = 9;
+                        break;
+                case(0x40):
+                        irq = 10;
+                        break;
+                case(0x80):
+                        irq = 11;
+                        break;
+                default:
+                        goto out;
                 }
 
 
                 /* Setup the newly found eisa adapter */
-                rc = TLan_probe1( NULL, ioaddr, irq,
-                                        12, NULL);
+                rc = tlan_probe1(NULL, ioaddr, irq,
+                                 12, NULL);
                 continue;
 
-                out:
-                        if (debug == 0x10)
-                                printk("None found\n");
-                        continue;
+out:
+                if (debug == 0x10)
+                        pr_info("None found\n");
+                continue;
 
-                out2:   if (debug == 0x10)
-                                printk("Card found but it is not enabled, skipping\n");
-                        continue;
+out2:
+                if (debug == 0x10)
+                        pr_info("Card found but it is not enabled, skipping\n");
+                continue;
 
         }
 
-} /* TLan_EisaProbe */
+}
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-static void TLan_Poll(struct net_device *dev)
+static void tlan_poll(struct net_device *dev)
 {
         disable_irq(dev->irq);
-        TLan_HandleInterrupt(dev->irq, dev);
+        tlan_handle_interrupt(dev->irq, dev);
         enable_irq(dev->irq);
 }
 #endif
 
-static const struct net_device_ops TLan_netdev_ops = {
-        .ndo_open               = TLan_Open,
-        .ndo_stop               = TLan_Close,
-        .ndo_start_xmit         = TLan_StartTx,
-        .ndo_tx_timeout         = TLan_tx_timeout,
-        .ndo_get_stats          = TLan_GetStats,
-        .ndo_set_multicast_list = TLan_SetMulticastList,
-        .ndo_do_ioctl           = TLan_ioctl,
+static const struct net_device_ops tlan_netdev_ops = {
+        .ndo_open               = tlan_open,
+        .ndo_stop               = tlan_close,
+        .ndo_start_xmit         = tlan_start_tx,
+        .ndo_tx_timeout         = tlan_tx_timeout,
+        .ndo_get_stats          = tlan_get_stats,
+        .ndo_set_multicast_list = tlan_set_multicast_list,
+        .ndo_do_ioctl           = tlan_ioctl,
         .ndo_change_mtu         = eth_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
 #ifdef CONFIG_NET_POLL_CONTROLLER
-        .ndo_poll_controller     = TLan_Poll,
+        .ndo_poll_controller     = tlan_poll,
 #endif
 };
 
 
 
-        /***************************************************************
-         *      TLan_Init
-         *
-         *      Returns:
-         *              0 on success, error code otherwise.
-         *      Parms:
-         *              dev     The structure of the device to be
-         *                      init'ed.
-         *
-         *      This function completes the initialization of the
-         *      device structure and driver.  It reserves the IO
-         *      addresses, allocates memory for the lists and bounce
-         *      buffers, retrieves the MAC address from the eeprom
-         *      and assignes the device's methods.
-         *
-         **************************************************************/
-
-static int TLan_Init( struct net_device *dev )
+/***************************************************************
+ *      tlan_init
+ *
+ *      Returns:
+ *              0 on success, error code otherwise.
+ *      Parms:
+ *              dev     The structure of the device to be
+ *                      init'ed.
+ *
+ *      This function completes the initialization of the
+ *      device structure and driver.  It reserves the IO
+ *      addresses, allocates memory for the lists and bounce
+ *      buffers, retrieves the MAC address from the eeprom
+ *      and assignes the device's methods.
+ *
+ **************************************************************/
+
+static int tlan_init(struct net_device *dev)
 {
         int             dma_size;
-        int             err;
+        int             err;
         int             i;
-        TLanPrivateInfo *priv;
+        struct tlan_priv        *priv;
 
         priv = netdev_priv(dev);
 
-        dma_size = ( TLAN_NUM_RX_LISTS + TLAN_NUM_TX_LISTS )
-                * ( sizeof(TLanList) );
-        priv->dmaStorage = pci_alloc_consistent(priv->pciDev,
-                                                dma_size, &priv->dmaStorageDMA);
-        priv->dmaSize = dma_size;
+        dma_size = (TLAN_NUM_RX_LISTS + TLAN_NUM_TX_LISTS)
+                * (sizeof(struct tlan_list));
+        priv->dma_storage = pci_alloc_consistent(priv->pci_dev,
+                                                 dma_size,
+                                                 &priv->dma_storage_dma);
+        priv->dma_size = dma_size;
 
-        if ( priv->dmaStorage == NULL ) {
-                printk(KERN_ERR "TLAN:  Could not allocate lists and buffers for %s.\n",
-                        dev->name );
+        if (priv->dma_storage == NULL) {
+                pr_err("Could not allocate lists and buffers for %s\n",
+                       dev->name);
                 return -ENOMEM;
         }
-        memset( priv->dmaStorage, 0, dma_size );
-        priv->rxList = (TLanList *) ALIGN((unsigned long)priv->dmaStorage, 8);
-        priv->rxListDMA = ALIGN(priv->dmaStorageDMA, 8);
-        priv->txList = priv->rxList + TLAN_NUM_RX_LISTS;
-        priv->txListDMA = priv->rxListDMA + sizeof(TLanList) * TLAN_NUM_RX_LISTS;
+        memset(priv->dma_storage, 0, dma_size);
+        priv->rx_list = (struct tlan_list *)
+                ALIGN((unsigned long)priv->dma_storage, 8);
+        priv->rx_list_dma = ALIGN(priv->dma_storage_dma, 8);
+        priv->tx_list = priv->rx_list + TLAN_NUM_RX_LISTS;
+        priv->tx_list_dma =
+                priv->rx_list_dma + sizeof(struct tlan_list)*TLAN_NUM_RX_LISTS;
 
         err = 0;
-        for ( i = 0;  i < 6 ; i++ )
-                err |= TLan_EeReadByte( dev,
-                                        (u8) priv->adapter->addrOfs + i,
-                                        (u8 *) &dev->dev_addr[i] );
-        if ( err ) {
-                printk(KERN_ERR "TLAN: %s: Error reading MAC from eeprom: %d\n",
-                        dev->name,
-                        err );
+        for (i = 0;  i < 6 ; i++)
+                err |= tlan_ee_read_byte(dev,
+                                         (u8) priv->adapter->addr_ofs + i,
+                                         (u8 *) &dev->dev_addr[i]);
+        if (err) {
+                pr_err("%s: Error reading MAC from eeprom: %d\n",
+                       dev->name, err);
         }
         dev->addr_len = 6;
 
         netif_carrier_off(dev);
 
         /* Device methods */
-        dev->netdev_ops = &TLan_netdev_ops;
+        dev->netdev_ops = &tlan_netdev_ops;
         dev->watchdog_timeo = TX_TIMEOUT;
 
         return 0;
 
-} /* TLan_Init */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_Open
-         *
-         *      Returns:
-         *              0 on success, error code otherwise.
-         *      Parms:
-         *              dev     Structure of device to be opened.
-         *
-         *      This routine puts the driver and TLAN adapter in a
-         *      state where it is ready to send and receive packets.
-         *      It allocates the IRQ, resets and brings the adapter
-         *      out of reset, and allows interrupts.  It also delays
-         *      the startup for autonegotiation or sends a Rx GO
-         *      command to the adapter, as appropriate.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_open
+ *
+ *      Returns:
+ *              0 on success, error code otherwise.
+ *      Parms:
+ *              dev     Structure of device to be opened.
+ *
+ *      This routine puts the driver and TLAN adapter in a
+ *      state where it is ready to send and receive packets.
+ *      It allocates the IRQ, resets and brings the adapter
+ *      out of reset, and allows interrupts.  It also delays
+ *      the startup for autonegotiation or sends a Rx GO
+ *      command to the adapter, as appropriate.
+ *
+ **************************************************************/
 
-static int TLan_Open( struct net_device *dev )
+static int tlan_open(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
         int             err;
 
-        priv->tlanRev = TLan_DioRead8( dev->base_addr, TLAN_DEF_REVISION );
-        err = request_irq( dev->irq, TLan_HandleInterrupt, IRQF_SHARED,
-                           dev->name, dev );
+        priv->tlan_rev = tlan_dio_read8(dev->base_addr, TLAN_DEF_REVISION);
+        err = request_irq(dev->irq, tlan_handle_interrupt, IRQF_SHARED,
+                          dev->name, dev);
 
-        if ( err ) {
-                pr_err("TLAN:  Cannot open %s because IRQ %d is already in use.\n",
-                       dev->name, dev->irq );
+        if (err) {
+                netdev_err(dev, "Cannot open because IRQ %d is already in use\n",
+                           dev->irq);
                 return err;
         }
 
         init_timer(&priv->timer);
-        netif_start_queue(dev);
 
-        /* NOTE: It might not be necessary to read the stats before a
-                         reset if you don't care what the values are.
-        */
-        TLan_ResetLists( dev );
-        TLan_ReadAndClearStats( dev, TLAN_IGNORE );
-        TLan_ResetAdapter( dev );
+        tlan_start(dev);
 
-        TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Opened.  TLAN Chip Rev: %x\n",
-                  dev->name, priv->tlanRev );
+        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Opened.  TLAN Chip Rev: %x\n",
+                 dev->name, priv->tlan_rev);
 
         return 0;
 
-} /* TLan_Open */
+}
 
 
 
-        /**************************************************************
-         *      TLan_ioctl
-         *
-         *      Returns:
-         *              0 on success, error code otherwise
-         *      Params:
-         *              dev     structure of device to receive ioctl.
-         *
-         *              rq      ifreq structure to hold userspace data.
-         *
-         *              cmd     ioctl command.
-         *
-         *
-         *************************************************************/
+/**************************************************************
+ *      tlan_ioctl
+ *
+ *      Returns:
+ *              0 on success, error code otherwise
+ *      Params:
+ *              dev     structure of device to receive ioctl.
+ *
+ *              rq      ifreq structure to hold userspace data.
+ *
+ *              cmd     ioctl command.
+ *
+ *
+ *************************************************************/
 
-static int TLan_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+static int tlan_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
         struct mii_ioctl_data *data = if_mii(rq);
-        u32 phy   = priv->phy[priv->phyNum];
+        u32 phy   = priv->phy[priv->phy_num];
 
-        if (!priv->phyOnline)
+        if (!priv->phy_online)
                 return -EAGAIN;
 
-        switch(cmd) {
-        case SIOCGMIIPHY:               /* Get address of MII PHY in use. */
-                        data->phy_id = phy;
+        switch (cmd) {
+        case SIOCGMIIPHY:               /* get address of MII PHY in use. */
+                data->phy_id = phy;
 
 
-        case SIOCGMIIREG:               /* Read MII PHY register. */
-                        TLan_MiiReadReg(dev, data->phy_id & 0x1f,
-                                        data->reg_num & 0x1f, &data->val_out);
-                        return 0;
+        case SIOCGMIIREG:               /* read MII PHY register. */
+                tlan_mii_read_reg(dev, data->phy_id & 0x1f,
+                                  data->reg_num & 0x1f, &data->val_out);
+                return 0;
 
 
-        case SIOCSMIIREG:               /* Write MII PHY register. */
-                        TLan_MiiWriteReg(dev, data->phy_id & 0x1f,
-                                         data->reg_num & 0x1f, data->val_in);
-                        return 0;
-                default:
-                        return -EOPNOTSUPP;
+        case SIOCSMIIREG:               /* write MII PHY register. */
+                tlan_mii_write_reg(dev, data->phy_id & 0x1f,
+                                   data->reg_num & 0x1f, data->val_in);
+                return 0;
+        default:
+                return -EOPNOTSUPP;
         }
-} /* tlan_ioctl */
+}
 
 
-        /***************************************************************
-         *      TLan_tx_timeout
-         *
-         *      Returns: nothing
-         *
-         *      Params:
-         *              dev     structure of device which timed out
-         *                      during transmit.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_tx_timeout
+ *
+ *      Returns: nothing
+ *
+ *      Params:
+ *              dev     structure of device which timed out
+ *                      during transmit.
+ *
+ **************************************************************/
 
-static void TLan_tx_timeout(struct net_device *dev)
+static void tlan_tx_timeout(struct net_device *dev)
 {
 
-        TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Transmit timed out.\n", dev->name);
+        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Transmit timed out.\n", dev->name);
 
         /* Ok so we timed out, lets see what we can do about it...*/
-        TLan_FreeLists( dev );
-        TLan_ResetLists( dev );
-        TLan_ReadAndClearStats( dev, TLAN_IGNORE );
-        TLan_ResetAdapter( dev );
+        tlan_free_lists(dev);
+        tlan_reset_lists(dev);
+        tlan_read_and_clear_stats(dev, TLAN_IGNORE);
+        tlan_reset_adapter(dev);
         dev->trans_start = jiffies; /* prevent tx timeout */
-        netif_wake_queue( dev );
+        netif_wake_queue(dev);
 
 }
 
 
-        /***************************************************************
-         *      TLan_tx_timeout_work
-         *
-         *      Returns: nothing
-         *
-         *      Params:
-         *              work    work item of device which timed out
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_tx_timeout_work
+ *
+ *      Returns: nothing
+ *
+ *      Params:
+ *              work    work item of device which timed out
+ *
+ **************************************************************/
 
-static void TLan_tx_timeout_work(struct work_struct *work)
+static void tlan_tx_timeout_work(struct work_struct *work)
 {
-        TLanPrivateInfo *priv =
-                container_of(work, TLanPrivateInfo, tlan_tqueue);
+        struct tlan_priv        *priv =
+                container_of(work, struct tlan_priv, tlan_tqueue);
 
-        TLan_tx_timeout(priv->dev);
+        tlan_tx_timeout(priv->dev);
 }
 
 
 
-        /***************************************************************
-         *      TLan_StartTx
-         *
-         *      Returns:
-         *              0 on success, non-zero on failure.
-         *      Parms:
-         *              skb     A pointer to the sk_buff containing the
-         *                      frame to be sent.
-         *              dev     The device to send the data on.
-         *
-         *      This function adds a frame to the Tx list to be sent
-         *      ASAP.  First it verifies that the adapter is ready and
-         *      there is room in the queue.  Then it sets up the next
-         *      available list, copies the frame to the corresponding
-         *      buffer.  If the adapter Tx channel is idle, it gives
-         *      the adapter a Tx Go command on the list, otherwise it
-         *      sets the forward address of the previous list to point
-         *      to this one.  Then it frees the sk_buff.
-         *
-         **************************************************************/
-
-static netdev_tx_t TLan_StartTx( struct sk_buff *skb, struct net_device *dev )
+/***************************************************************
+ *      tlan_start_tx
+ *
+ *      Returns:
+ *              0 on success, non-zero on failure.
+ *      Parms:
+ *              skb     A pointer to the sk_buff containing the
+ *                      frame to be sent.
+ *              dev     The device to send the data on.
+ *
+ *      This function adds a frame to the Tx list to be sent
+ *      ASAP.  First it verifies that the adapter is ready and
+ *      there is room in the queue.  Then it sets up the next
+ *      available list, copies the frame to the corresponding
+ *      buffer.  If the adapter Tx channel is idle, it gives
+ *      the adapter a Tx Go command on the list, otherwise it
+ *      sets the forward address of the previous list to point
+ *      to this one.  Then it frees the sk_buff.
+ *
+ **************************************************************/
+
+static netdev_tx_t tlan_start_tx(struct sk_buff *skb, struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
         dma_addr_t      tail_list_phys;
-        TLanList        *tail_list;
+        struct tlan_list        *tail_list;
         unsigned long   flags;
         unsigned int    txlen;
 
-        if ( ! priv->phyOnline ) {
-                TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  %s PHY is not ready\n",
-                          dev->name );
+        if (!priv->phy_online) {
+                TLAN_DBG(TLAN_DEBUG_TX, "TRANSMIT:  %s PHY is not ready\n",
+                         dev->name);
                 dev_kfree_skb_any(skb);
                 return NETDEV_TX_OK;
         }
@@ -1100,218 +1031,214 @@ static netdev_tx_t TLan_StartTx( struct sk_buff *skb, struct net_device *dev )
                 return NETDEV_TX_OK;
         txlen = max(skb->len, (unsigned int)TLAN_MIN_FRAME_SIZE);
 
-        tail_list = priv->txList + priv->txTail;
-        tail_list_phys = priv->txListDMA + sizeof(TLanList) * priv->txTail;
+        tail_list = priv->tx_list + priv->tx_tail;
+        tail_list_phys =
+                priv->tx_list_dma + sizeof(struct tlan_list)*priv->tx_tail;
 
-        if ( tail_list->cStat != TLAN_CSTAT_UNUSED ) {
-                TLAN_DBG( TLAN_DEBUG_TX,
-                          "TRANSMIT:  %s is busy (Head=%d Tail=%d)\n",
-                          dev->name, priv->txHead, priv->txTail );
+        if (tail_list->c_stat != TLAN_CSTAT_UNUSED) {
+                TLAN_DBG(TLAN_DEBUG_TX,
+                         "TRANSMIT:  %s is busy (Head=%d Tail=%d)\n",
+                         dev->name, priv->tx_head, priv->tx_tail);
                 netif_stop_queue(dev);
-                priv->txBusyCount++;
+                priv->tx_busy_count++;
                 return NETDEV_TX_BUSY;
         }
 
         tail_list->forward = 0;
 
-        tail_list->buffer[0].address = pci_map_single(priv->pciDev,
+        tail_list->buffer[0].address = pci_map_single(priv->pci_dev,
                                                       skb->data, txlen,
                                                       PCI_DMA_TODEVICE);
-        TLan_StoreSKB(tail_list, skb);
+        tlan_store_skb(tail_list, skb);
 
-        tail_list->frameSize = (u16) txlen;
+        tail_list->frame_size = (u16) txlen;
         tail_list->buffer[0].count = TLAN_LAST_BUFFER | (u32) txlen;
         tail_list->buffer[1].count = 0;
         tail_list->buffer[1].address = 0;
 
         spin_lock_irqsave(&priv->lock, flags);
-        tail_list->cStat = TLAN_CSTAT_READY;
-        if ( ! priv->txInProgress ) {
-                priv->txInProgress = 1;
-                TLAN_DBG( TLAN_DEBUG_TX,
-                          "TRANSMIT:  Starting TX on buffer %d\n", priv->txTail );
-                outl( tail_list_phys, dev->base_addr + TLAN_CH_PARM );
-                outl( TLAN_HC_GO, dev->base_addr + TLAN_HOST_CMD );
+        tail_list->c_stat = TLAN_CSTAT_READY;
+        if (!priv->tx_in_progress) {
+                priv->tx_in_progress = 1;
+                TLAN_DBG(TLAN_DEBUG_TX,
+                         "TRANSMIT:  Starting TX on buffer %d\n",
+                         priv->tx_tail);
+                outl(tail_list_phys, dev->base_addr + TLAN_CH_PARM);
+                outl(TLAN_HC_GO, dev->base_addr + TLAN_HOST_CMD);
         } else {
-                TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  Adding buffer %d to TX channel\n",
-                          priv->txTail );
-                if ( priv->txTail == 0 ) {
-                        ( priv->txList + ( TLAN_NUM_TX_LISTS - 1 ) )->forward
+                TLAN_DBG(TLAN_DEBUG_TX,
+                         "TRANSMIT:  Adding buffer %d to TX channel\n",
+                         priv->tx_tail);
+                if (priv->tx_tail == 0) {
+                        (priv->tx_list + (TLAN_NUM_TX_LISTS - 1))->forward
                                 = tail_list_phys;
                 } else {
-                        ( priv->txList + ( priv->txTail - 1 ) )->forward
+                        (priv->tx_list + (priv->tx_tail - 1))->forward
                                 = tail_list_phys;
                 }
         }
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        CIRC_INC( priv->txTail, TLAN_NUM_TX_LISTS );
+        CIRC_INC(priv->tx_tail, TLAN_NUM_TX_LISTS);
 
         return NETDEV_TX_OK;
 
-} /* TLan_StartTx */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_HandleInterrupt
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              irq     The line on which the interrupt
-         *                      occurred.
-         *              dev_id  A pointer to the device assigned to
-         *                      this irq line.
-         *
-         *      This function handles an interrupt generated by its
-         *      assigned TLAN adapter.  The function deactivates
-         *      interrupts on its adapter, records the type of
-         *      interrupt, executes the appropriate subhandler, and
-         *      acknowdges the interrupt to the adapter (thus
-         *      re-enabling adapter interrupts.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_handle_interrupt
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              irq     The line on which the interrupt
+ *                      occurred.
+ *              dev_id  A pointer to the device assigned to
+ *                      this irq line.
+ *
+ *      This function handles an interrupt generated by its
+ *      assigned TLAN adapter.  The function deactivates
+ *      interrupts on its adapter, records the type of
+ *      interrupt, executes the appropriate subhandler, and
+ *      acknowdges the interrupt to the adapter (thus
+ *      re-enabling adapter interrupts.
+ *
+ **************************************************************/
 
-static irqreturn_t TLan_HandleInterrupt(int irq, void *dev_id)
+static irqreturn_t tlan_handle_interrupt(int irq, void *dev_id)
 {
         struct net_device       *dev = dev_id;
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
         u16             host_int;
         u16             type;
 
         spin_lock(&priv->lock);
 
-        host_int = inw( dev->base_addr + TLAN_HOST_INT );
-        type = ( host_int & TLAN_HI_IT_MASK ) >> 2;
-        if ( type ) {
+        host_int = inw(dev->base_addr + TLAN_HOST_INT);
+        type = (host_int & TLAN_HI_IT_MASK) >> 2;
+        if (type) {
                 u32     ack;
                 u32     host_cmd;
 
-                outw( host_int, dev->base_addr + TLAN_HOST_INT );
-                ack = TLanIntVector[type]( dev, host_int );
+                outw(host_int, dev->base_addr + TLAN_HOST_INT);
+                ack = tlan_int_vector[type](dev, host_int);
 
-                if ( ack ) {
-                        host_cmd = TLAN_HC_ACK | ack | ( type << 18 );
-                        outl( host_cmd, dev->base_addr + TLAN_HOST_CMD );
+                if (ack) {
+                        host_cmd = TLAN_HC_ACK | ack | (type << 18);
+                        outl(host_cmd, dev->base_addr + TLAN_HOST_CMD);
                 }
         }
 
         spin_unlock(&priv->lock);
 
         return IRQ_RETVAL(type);
-} /* TLan_HandleInterrupts */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_Close
-         *
-         *      Returns:
-         *              An error code.
-         *      Parms:
-         *              dev     The device structure of the device to
-         *                      close.
-         *
-         *      This function shuts down the adapter.  It records any
-         *      stats, puts the adapter into reset state, deactivates
-         *      its time as needed, and frees the irq it is using.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_close
+ *
+ *      Returns:
+ *              An error code.
+ *      Parms:
+ *              dev     The device structure of the device to
+ *                      close.
+ *
+ *      This function shuts down the adapter.  It records any
+ *      stats, puts the adapter into reset state, deactivates
+ *      its time as needed, and frees the irq it is using.
+ *
+ **************************************************************/
 
-static int TLan_Close(struct net_device *dev)
+static int tlan_close(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
 
-        netif_stop_queue(dev);
         priv->neg_be_verbose = 0;
+        tlan_stop(dev);
 
-        TLan_ReadAndClearStats( dev, TLAN_RECORD );
-        outl( TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD );
-        if ( priv->timer.function != NULL ) {
-                del_timer_sync( &priv->timer );
-                priv->timer.function = NULL;
-        }
-
-        free_irq( dev->irq, dev );
-        TLan_FreeLists( dev );
-        TLAN_DBG( TLAN_DEBUG_GNRL, "Device %s closed.\n", dev->name );
+        free_irq(dev->irq, dev);
+        tlan_free_lists(dev);
+        TLAN_DBG(TLAN_DEBUG_GNRL, "Device %s closed.\n", dev->name);
 
         return 0;
 
-} /* TLan_Close */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_GetStats
-         *
-         *      Returns:
-         *              A pointer to the device's statistics structure.
-         *      Parms:
-         *              dev     The device structure to return the
-         *                      stats for.
-         *
-         *      This function updates the devices statistics by reading
-         *      the TLAN chip's onboard registers.  Then it returns the
-         *      address of the statistics structure.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_get_stats
+ *
+ *      Returns:
+ *              A pointer to the device's statistics structure.
+ *      Parms:
+ *              dev     The device structure to return the
+ *                      stats for.
+ *
+ *      This function updates the devices statistics by reading
+ *      the TLAN chip's onboard registers.  Then it returns the
+ *      address of the statistics structure.
+ *
+ **************************************************************/
 
-static struct net_device_stats *TLan_GetStats( struct net_device *dev )
+static struct net_device_stats *tlan_get_stats(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
         int i;
 
         /* Should only read stats if open ? */
-        TLan_ReadAndClearStats( dev, TLAN_RECORD );
+        tlan_read_and_clear_stats(dev, TLAN_RECORD);
 
-        TLAN_DBG( TLAN_DEBUG_RX, "RECEIVE:  %s EOC count = %d\n", dev->name,
-                  priv->rxEocCount );
-        TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  %s Busy count = %d\n", dev->name,
-                  priv->txBusyCount );
-        if ( debug & TLAN_DEBUG_GNRL ) {
-                TLan_PrintDio( dev->base_addr );
-                TLan_PhyPrint( dev );
+        TLAN_DBG(TLAN_DEBUG_RX, "RECEIVE:  %s EOC count = %d\n", dev->name,
+                 priv->rx_eoc_count);
+        TLAN_DBG(TLAN_DEBUG_TX, "TRANSMIT:  %s Busy count = %d\n", dev->name,
+                 priv->tx_busy_count);
+        if (debug & TLAN_DEBUG_GNRL) {
+                tlan_print_dio(dev->base_addr);
+                tlan_phy_print(dev);
         }
-        if ( debug & TLAN_DEBUG_LIST ) {
-                for ( i = 0; i < TLAN_NUM_RX_LISTS; i++ )
-                        TLan_PrintList( priv->rxList + i, "RX", i );
-                for ( i = 0; i < TLAN_NUM_TX_LISTS; i++ )
-                        TLan_PrintList( priv->txList + i, "TX", i );
+        if (debug & TLAN_DEBUG_LIST) {
+                for (i = 0; i < TLAN_NUM_RX_LISTS; i++)
+                        tlan_print_list(priv->rx_list + i, "RX", i);
+                for (i = 0; i < TLAN_NUM_TX_LISTS; i++)
+                        tlan_print_list(priv->tx_list + i, "TX", i);
         }
 
         return &dev->stats;
 
-} /* TLan_GetStats */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_SetMulticastList
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              dev     The device structure to set the
-         *                      multicast list for.
-         *
-         *      This function sets the TLAN adaptor to various receive
-         *      modes.  If the IFF_PROMISC flag is set, promiscuous
-         *      mode is acitviated.  Otherwise, promiscuous mode is
-         *      turned off.  If the IFF_ALLMULTI flag is set, then
-         *      the hash table is set to receive all group addresses.
-         *      Otherwise, the first three multicast addresses are
-         *      stored in AREG_1-3, and the rest are selected via the
-         *      hash table, as necessary.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_set_multicast_list
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              dev     The device structure to set the
+ *                      multicast list for.
+ *
+ *      This function sets the TLAN adaptor to various receive
+ *      modes.  If the IFF_PROMISC flag is set, promiscuous
+ *      mode is acitviated.  Otherwise, promiscuous mode is
+ *      turned off.  If the IFF_ALLMULTI flag is set, then
+ *      the hash table is set to receive all group addresses.
+ *      Otherwise, the first three multicast addresses are
+ *      stored in AREG_1-3, and the rest are selected via the
+ *      hash table, as necessary.
+ *
+ **************************************************************/
 
-static void TLan_SetMulticastList( struct net_device *dev )
+static void tlan_set_multicast_list(struct net_device *dev)
 {
         struct netdev_hw_addr *ha;
         u32                     hash1 = 0;
@@ -1320,53 +1247,56 @@ static void TLan_SetMulticastList( struct net_device *dev )
         u32                     offset;
         u8                      tmp;
 
-        if ( dev->flags & IFF_PROMISC ) {
-                tmp = TLan_DioRead8( dev->base_addr, TLAN_NET_CMD );
-                TLan_DioWrite8( dev->base_addr,
-                                TLAN_NET_CMD, tmp | TLAN_NET_CMD_CAF );
+        if (dev->flags & IFF_PROMISC) {
+                tmp = tlan_dio_read8(dev->base_addr, TLAN_NET_CMD);
+                tlan_dio_write8(dev->base_addr,
+                                TLAN_NET_CMD, tmp | TLAN_NET_CMD_CAF);
         } else {
-                tmp = TLan_DioRead8( dev->base_addr, TLAN_NET_CMD );
-                TLan_DioWrite8( dev->base_addr,
-                                TLAN_NET_CMD, tmp & ~TLAN_NET_CMD_CAF );
-                if ( dev->flags & IFF_ALLMULTI ) {
-                        for ( i = 0; i < 3; i++ )
-                                TLan_SetMac( dev, i + 1, NULL );
-                        TLan_DioWrite32( dev->base_addr, TLAN_HASH_1, 0xFFFFFFFF );
-                        TLan_DioWrite32( dev->base_addr, TLAN_HASH_2, 0xFFFFFFFF );
+                tmp = tlan_dio_read8(dev->base_addr, TLAN_NET_CMD);
+                tlan_dio_write8(dev->base_addr,
+                                TLAN_NET_CMD, tmp & ~TLAN_NET_CMD_CAF);
+                if (dev->flags & IFF_ALLMULTI) {
+                        for (i = 0; i < 3; i++)
+                                tlan_set_mac(dev, i + 1, NULL);
+                        tlan_dio_write32(dev->base_addr, TLAN_HASH_1,
+                                         0xffffffff);
+                        tlan_dio_write32(dev->base_addr, TLAN_HASH_2,
+                                         0xffffffff);
                 } else {
                         i = 0;
                         netdev_for_each_mc_addr(ha, dev) {
-                                if ( i < 3 ) {
-                                        TLan_SetMac( dev, i + 1,
+                                if (i < 3) {
+                                        tlan_set_mac(dev, i + 1,
                                                      (char *) &ha->addr);
                                 } else {
-                                        offset = TLan_HashFunc((u8 *)&ha->addr);
-                                        if ( offset < 32 )
-                                                hash1 |= ( 1 << offset );
+                                        offset =
+                                                tlan_hash_func((u8 *)&ha->addr);
+                                        if (offset < 32)
+                                                hash1 |= (1 << offset);
                                         else
-                                                hash2 |= ( 1 << ( offset - 32 ) );
+                                                hash2 |= (1 << (offset - 32));
                                 }
                                 i++;
                         }
-                        for ( ; i < 3; i++ )
-                                TLan_SetMac( dev, i + 1, NULL );
-                        TLan_DioWrite32( dev->base_addr, TLAN_HASH_1, hash1 );
-                        TLan_DioWrite32( dev->base_addr, TLAN_HASH_2, hash2 );
+                        for ( ; i < 3; i++)
+                                tlan_set_mac(dev, i + 1, NULL);
+                        tlan_dio_write32(dev->base_addr, TLAN_HASH_1, hash1);
+                        tlan_dio_write32(dev->base_addr, TLAN_HASH_2, hash2);
                 }
         }
 
-} /* TLan_SetMulticastList */
+}
 
 
 
 /*****************************************************************************
 ******************************************************************************
 
-        ThunderLAN Driver Interrupt Vectors and Table
+ThunderLAN driver interrupt vectors and table
 
-        Please see Chap. 4, "Interrupt Handling" of the "ThunderLAN
-        Programmer's Guide" for more informations on handling interrupts
-        generated by TLAN based adapters.
+please see chap. 4, "Interrupt Handling" of the "ThunderLAN
+Programmer's Guide" for more informations on handling interrupts
+generated by TLAN based adapters.
 
 ******************************************************************************
 *****************************************************************************/
@@ -1374,46 +1304,48 @@ static void TLan_SetMulticastList( struct net_device *dev )
 
 
 
-        /***************************************************************
-         *      TLan_HandleTxEOF
-         *
-         *      Returns:
-         *              1
-         *      Parms:
-         *              dev             Device assigned the IRQ that was
-         *                              raised.
-         *              host_int        The contents of the HOST_INT
-         *                              port.
-         *
-         *      This function handles Tx EOF interrupts which are raised
-         *      by the adapter when it has completed sending the
-         *      contents of a buffer.  If detemines which list/buffer
-         *      was completed and resets it.  If the buffer was the last
-         *      in the channel (EOC), then the function checks to see if
-         *      another buffer is ready to send, and if so, sends a Tx
-         *      Go command.  Finally, the driver activates/continues the
-         *      activity LED.
-         *
-         **************************************************************/
-
-static u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int )
+/***************************************************************
+ *      tlan_handle_tx_eof
+ *
+ *      Returns:
+ *              1
+ *      Parms:
+ *              dev             Device assigned the IRQ that was
+ *                              raised.
+ *              host_int        The contents of the HOST_INT
+ *                              port.
+ *
+ *      This function handles Tx EOF interrupts which are raised
+ *      by the adapter when it has completed sending the
+ *      contents of a buffer.  If detemines which list/buffer
+ *      was completed and resets it.  If the buffer was the last
+ *      in the channel (EOC), then the function checks to see if
+ *      another buffer is ready to send, and if so, sends a Tx
+ *      Go command.  Finally, the driver activates/continues the
+ *      activity LED.
+ *
+ **************************************************************/
+
+static u32 tlan_handle_tx_eof(struct net_device *dev, u16 host_int)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
         int             eoc = 0;
-        TLanList        *head_list;
+        struct tlan_list        *head_list;
         dma_addr_t      head_list_phys;
         u32             ack = 0;
-        u16             tmpCStat;
+        u16             tmp_c_stat;
 
-        TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  Handling TX EOF (Head=%d Tail=%d)\n",
-                  priv->txHead, priv->txTail );
-        head_list = priv->txList + priv->txHead;
+        TLAN_DBG(TLAN_DEBUG_TX,
+                 "TRANSMIT:  Handling TX EOF (Head=%d Tail=%d)\n",
+                 priv->tx_head, priv->tx_tail);
+        head_list = priv->tx_list + priv->tx_head;
 
-        while (((tmpCStat = head_list->cStat ) & TLAN_CSTAT_FRM_CMP) && (ack < 255)) {
-                struct sk_buff *skb = TLan_GetSKB(head_list);
+        while (((tmp_c_stat = head_list->c_stat) & TLAN_CSTAT_FRM_CMP)
+               && (ack < 255)) {
+                struct sk_buff *skb = tlan_get_skb(head_list);
 
                 ack++;
-                pci_unmap_single(priv->pciDev, head_list->buffer[0].address,
+                pci_unmap_single(priv->pci_dev, head_list->buffer[0].address,
                                  max(skb->len,
                                      (unsigned int)TLAN_MIN_FRAME_SIZE),
                                  PCI_DMA_TODEVICE);
@@ -1421,304 +1353,313 @@ static u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int )
                 head_list->buffer[8].address = 0;
                 head_list->buffer[9].address = 0;
 
-                if ( tmpCStat & TLAN_CSTAT_EOC )
+                if (tmp_c_stat & TLAN_CSTAT_EOC)
                         eoc = 1;
 
-                dev->stats.tx_bytes += head_list->frameSize;
+                dev->stats.tx_bytes += head_list->frame_size;
 
-                head_list->cStat = TLAN_CSTAT_UNUSED;
+                head_list->c_stat = TLAN_CSTAT_UNUSED;
                 netif_start_queue(dev);
-                CIRC_INC( priv->txHead, TLAN_NUM_TX_LISTS );
-                head_list = priv->txList + priv->txHead;
+                CIRC_INC(priv->tx_head, TLAN_NUM_TX_LISTS);
+                head_list = priv->tx_list + priv->tx_head;
         }
 
         if (!ack)
-                printk(KERN_INFO "TLAN: Received interrupt for uncompleted TX frame.\n");
-
-        if ( eoc ) {
-                TLAN_DBG( TLAN_DEBUG_TX,
-                          "TRANSMIT:  Handling TX EOC (Head=%d Tail=%d)\n",
-                          priv->txHead, priv->txTail );
-                head_list = priv->txList + priv->txHead;
-                head_list_phys = priv->txListDMA + sizeof(TLanList) * priv->txHead;
-                if ( ( head_list->cStat & TLAN_CSTAT_READY ) == TLAN_CSTAT_READY ) {
-                        outl(head_list_phys, dev->base_addr + TLAN_CH_PARM );
+                netdev_info(dev,
+                            "Received interrupt for uncompleted TX frame\n");
+
+        if (eoc) {
+                TLAN_DBG(TLAN_DEBUG_TX,
+                         "TRANSMIT:  handling TX EOC (Head=%d Tail=%d)\n",
+                         priv->tx_head, priv->tx_tail);
+                head_list = priv->tx_list + priv->tx_head;
+                head_list_phys = priv->tx_list_dma
+                        + sizeof(struct tlan_list)*priv->tx_head;
+                if ((head_list->c_stat & TLAN_CSTAT_READY)
+                    == TLAN_CSTAT_READY) {
+                        outl(head_list_phys, dev->base_addr + TLAN_CH_PARM);
                         ack |= TLAN_HC_GO;
                 } else {
-                        priv->txInProgress = 0;
+                        priv->tx_in_progress = 0;
                 }
         }
 
-        if ( priv->adapter->flags & TLAN_ADAPTER_ACTIVITY_LED ) {
-                TLan_DioWrite8( dev->base_addr,
-                                TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT );
-                if ( priv->timer.function == NULL ) {
-                         priv->timer.function = TLan_Timer;
-                         priv->timer.data = (unsigned long) dev;
-                         priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
-                         priv->timerSetAt = jiffies;
-                         priv->timerType = TLAN_TIMER_ACTIVITY;
-                         add_timer(&priv->timer);
-                } else if ( priv->timerType == TLAN_TIMER_ACTIVITY ) {
-                        priv->timerSetAt = jiffies;
+        if (priv->adapter->flags & TLAN_ADAPTER_ACTIVITY_LED) {
+                tlan_dio_write8(dev->base_addr,
+                                TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT);
+                if (priv->timer.function == NULL) {
+                        priv->timer.function = tlan_timer;
+                        priv->timer.data = (unsigned long) dev;
+                        priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
+                        priv->timer_set_at = jiffies;
+                        priv->timer_type = TLAN_TIMER_ACTIVITY;
+                        add_timer(&priv->timer);
+                } else if (priv->timer_type == TLAN_TIMER_ACTIVITY) {
+                        priv->timer_set_at = jiffies;
                 }
         }
 
         return ack;
 
-} /* TLan_HandleTxEOF */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_HandleStatOverflow
-         *
-         *      Returns:
-         *              1
-         *      Parms:
-         *              dev             Device assigned the IRQ that was
-         *                              raised.
-         *              host_int        The contents of the HOST_INT
-         *                              port.
-         *
-         *      This function handles the Statistics Overflow interrupt
-         *      which means that one or more of the TLAN statistics
-         *      registers has reached 1/2 capacity and needs to be read.
-         *
-         **************************************************************/
+/***************************************************************
+ *      TLan_HandleStatOverflow
+ *
+ *      Returns:
+ *              1
+ *      Parms:
+ *              dev             Device assigned the IRQ that was
+ *                              raised.
+ *              host_int        The contents of the HOST_INT
+ *                              port.
+ *
+ *      This function handles the Statistics Overflow interrupt
+ *      which means that one or more of the TLAN statistics
+ *      registers has reached 1/2 capacity and needs to be read.
+ *
+ **************************************************************/
 
-static u32 TLan_HandleStatOverflow( struct net_device *dev, u16 host_int )
+static u32 tlan_handle_stat_overflow(struct net_device *dev, u16 host_int)
 {
-        TLan_ReadAndClearStats( dev, TLAN_RECORD );
+        tlan_read_and_clear_stats(dev, TLAN_RECORD);
 
         return 1;
 
-} /* TLan_HandleStatOverflow */
-
-
-
-
-        /***************************************************************
-         *      TLan_HandleRxEOF
-         *
-         *      Returns:
-         *              1
-         *      Parms:
-         *              dev             Device assigned the IRQ that was
-         *                              raised.
-         *              host_int        The contents of the HOST_INT
-         *                              port.
-         *
-         *      This function handles the Rx EOF interrupt which
-         *      indicates a frame has been received by the adapter from
-         *      the net and the frame has been transferred to memory.
-         *      The function determines the bounce buffer the frame has
-         *      been loaded into, creates a new sk_buff big enough to
-         *      hold the frame, and sends it to protocol stack.  It
-         *      then resets the used buffer and appends it to the end
-         *      of the list.  If the frame was the last in the Rx
-         *      channel (EOC), the function restarts the receive channel
-         *      by sending an Rx Go command to the adapter.  Then it
-         *      activates/continues the activity LED.
-         *
-         **************************************************************/
-
-static u32 TLan_HandleRxEOF( struct net_device *dev, u16 host_int )
+}
+
+
+
+
+/***************************************************************
+ *      TLan_HandleRxEOF
+ *
+ *      Returns:
+ *              1
+ *      Parms:
+ *              dev             Device assigned the IRQ that was
+ *                              raised.
+ *              host_int        The contents of the HOST_INT
+ *                              port.
+ *
+ *      This function handles the Rx EOF interrupt which
+ *      indicates a frame has been received by the adapter from
+ *      the net and the frame has been transferred to memory.
+ *      The function determines the bounce buffer the frame has
+ *      been loaded into, creates a new sk_buff big enough to
+ *      hold the frame, and sends it to protocol stack.  It
+ *      then resets the used buffer and appends it to the end
+ *      of the list.  If the frame was the last in the Rx
+ *      channel (EOC), the function restarts the receive channel
+ *      by sending an Rx Go command to the adapter.  Then it
+ *      activates/continues the activity LED.
+ *
+ **************************************************************/
+
+static u32 tlan_handle_rx_eof(struct net_device *dev, u16 host_int)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
         u32             ack = 0;
         int             eoc = 0;
-        TLanList        *head_list;
+        struct tlan_list        *head_list;
         struct sk_buff  *skb;
-        TLanList        *tail_list;
-        u16             tmpCStat;
+        struct tlan_list        *tail_list;
+        u16             tmp_c_stat;
         dma_addr_t      head_list_phys;
 
-        TLAN_DBG( TLAN_DEBUG_RX, "RECEIVE:  Handling RX EOF (Head=%d Tail=%d)\n",
-                  priv->rxHead, priv->rxTail );
-        head_list = priv->rxList + priv->rxHead;
-        head_list_phys = priv->rxListDMA + sizeof(TLanList) * priv->rxHead;
+        TLAN_DBG(TLAN_DEBUG_RX, "RECEIVE:  handling RX EOF (Head=%d Tail=%d)\n",
+                 priv->rx_head, priv->rx_tail);
+        head_list = priv->rx_list + priv->rx_head;
+        head_list_phys =
+                priv->rx_list_dma + sizeof(struct tlan_list)*priv->rx_head;
 
-        while (((tmpCStat = head_list->cStat) & TLAN_CSTAT_FRM_CMP) && (ack < 255)) {
-                dma_addr_t frameDma = head_list->buffer[0].address;
-                u32 frameSize = head_list->frameSize;
+        while (((tmp_c_stat = head_list->c_stat) & TLAN_CSTAT_FRM_CMP)
+               && (ack < 255)) {
+                dma_addr_t frame_dma = head_list->buffer[0].address;
+                u32 frame_size = head_list->frame_size;
                 struct sk_buff *new_skb;
 
                 ack++;
-                if (tmpCStat & TLAN_CSTAT_EOC)
+                if (tmp_c_stat & TLAN_CSTAT_EOC)
                         eoc = 1;
 
                 new_skb = netdev_alloc_skb_ip_align(dev,
                                                     TLAN_MAX_FRAME_SIZE + 5);
-                if ( !new_skb )
+                if (!new_skb)
                         goto drop_and_reuse;
 
-                skb = TLan_GetSKB(head_list);
-                pci_unmap_single(priv->pciDev, frameDma,
+                skb = tlan_get_skb(head_list);
+                pci_unmap_single(priv->pci_dev, frame_dma,
                                  TLAN_MAX_FRAME_SIZE, PCI_DMA_FROMDEVICE);
-                skb_put( skb, frameSize );
+                skb_put(skb, frame_size);
 
-                dev->stats.rx_bytes += frameSize;
+                dev->stats.rx_bytes += frame_size;
 
-                skb->protocol = eth_type_trans( skb, dev );
-                netif_rx( skb );
+                skb->protocol = eth_type_trans(skb, dev);
+                netif_rx(skb);
 
-                head_list->buffer[0].address = pci_map_single(priv->pciDev,
-                                                              new_skb->data,
-                                                              TLAN_MAX_FRAME_SIZE,
-                                                              PCI_DMA_FROMDEVICE);
+                head_list->buffer[0].address =
+                        pci_map_single(priv->pci_dev, new_skb->data,
+                                       TLAN_MAX_FRAME_SIZE, PCI_DMA_FROMDEVICE);
 
-                TLan_StoreSKB(head_list, new_skb);
+                tlan_store_skb(head_list, new_skb);
 drop_and_reuse:
                 head_list->forward = 0;
-                head_list->cStat = 0;
-                tail_list = priv->rxList + priv->rxTail;
+                head_list->c_stat = 0;
+                tail_list = priv->rx_list + priv->rx_tail;
                 tail_list->forward = head_list_phys;
 
-                CIRC_INC( priv->rxHead, TLAN_NUM_RX_LISTS );
-                CIRC_INC( priv->rxTail, TLAN_NUM_RX_LISTS );
-                head_list = priv->rxList + priv->rxHead;
-                head_list_phys = priv->rxListDMA + sizeof(TLanList) * priv->rxHead;
+                CIRC_INC(priv->rx_head, TLAN_NUM_RX_LISTS);
+                CIRC_INC(priv->rx_tail, TLAN_NUM_RX_LISTS);
+                head_list = priv->rx_list + priv->rx_head;
+                head_list_phys = priv->rx_list_dma
+                        + sizeof(struct tlan_list)*priv->rx_head;
         }
 
         if (!ack)
-                printk(KERN_INFO "TLAN: Received interrupt for uncompleted RX frame.\n");
-
-
-        if ( eoc ) {
-                TLAN_DBG( TLAN_DEBUG_RX,
-                          "RECEIVE:  Handling RX EOC (Head=%d Tail=%d)\n",
-                          priv->rxHead, priv->rxTail );
-                head_list = priv->rxList + priv->rxHead;
-                head_list_phys = priv->rxListDMA + sizeof(TLanList) * priv->rxHead;
-                outl(head_list_phys, dev->base_addr + TLAN_CH_PARM );
+                netdev_info(dev,
+                            "Received interrupt for uncompleted RX frame\n");
+
+
+        if (eoc) {
+                TLAN_DBG(TLAN_DEBUG_RX,
+                         "RECEIVE:  handling RX EOC (Head=%d Tail=%d)\n",
+                         priv->rx_head, priv->rx_tail);
+                head_list = priv->rx_list + priv->rx_head;
+                head_list_phys = priv->rx_list_dma
+                        + sizeof(struct tlan_list)*priv->rx_head;
+                outl(head_list_phys, dev->base_addr + TLAN_CH_PARM);
                 ack |= TLAN_HC_GO | TLAN_HC_RT;
-                priv->rxEocCount++;
+                priv->rx_eoc_count++;
         }
 
-        if ( priv->adapter->flags & TLAN_ADAPTER_ACTIVITY_LED ) {
-                TLan_DioWrite8( dev->base_addr,
-                                TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT );
-                if ( priv->timer.function == NULL )  {
-                        priv->timer.function = TLan_Timer;
+        if (priv->adapter->flags & TLAN_ADAPTER_ACTIVITY_LED) {
+                tlan_dio_write8(dev->base_addr,
+                                TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT);
+                if (priv->timer.function == NULL)  {
+                        priv->timer.function = tlan_timer;
                         priv->timer.data = (unsigned long) dev;
                         priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
-                        priv->timerSetAt = jiffies;
-                        priv->timerType = TLAN_TIMER_ACTIVITY;
+                        priv->timer_set_at = jiffies;
+                        priv->timer_type = TLAN_TIMER_ACTIVITY;
                         add_timer(&priv->timer);
-                } else if ( priv->timerType == TLAN_TIMER_ACTIVITY ) {
-                        priv->timerSetAt = jiffies;
+                } else if (priv->timer_type == TLAN_TIMER_ACTIVITY) {
+                        priv->timer_set_at = jiffies;
                 }
         }
 
         return ack;
 
-} /* TLan_HandleRxEOF */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_HandleDummy
-         *
-         *      Returns:
-         *              1
-         *      Parms:
-         *              dev             Device assigned the IRQ that was
-         *                              raised.
-         *              host_int        The contents of the HOST_INT
-         *                              port.
-         *
-         *      This function handles the Dummy interrupt, which is
-         *      raised whenever a test interrupt is generated by setting
-         *      the Req_Int bit of HOST_CMD to 1.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_handle_dummy
+ *
+ *      Returns:
+ *              1
+ *      Parms:
+ *              dev             Device assigned the IRQ that was
+ *                              raised.
+ *              host_int        The contents of the HOST_INT
+ *                              port.
+ *
+ *      This function handles the Dummy interrupt, which is
+ *      raised whenever a test interrupt is generated by setting
+ *      the Req_Int bit of HOST_CMD to 1.
+ *
+ **************************************************************/
 
-static u32 TLan_HandleDummy( struct net_device *dev, u16 host_int )
+static u32 tlan_handle_dummy(struct net_device *dev, u16 host_int)
 {
-        printk( "TLAN:  Test interrupt on %s.\n", dev->name );
+        netdev_info(dev, "Test interrupt\n");
         return 1;
 
-} /* TLan_HandleDummy */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_HandleTxEOC
-         *
-         *      Returns:
-         *              1
-         *      Parms:
-         *              dev             Device assigned the IRQ that was
-         *                              raised.
-         *              host_int        The contents of the HOST_INT
-         *                              port.
-         *
-         *      This driver is structured to determine EOC occurrences by
-         *      reading the CSTAT member of the list structure.  Tx EOC
-         *      interrupts are disabled via the DIO INTDIS register.
-         *      However, TLAN chips before revision 3.0 didn't have this
-         *      functionality, so process EOC events if this is the
-         *      case.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_handle_tx_eoc
+ *
+ *      Returns:
+ *              1
+ *      Parms:
+ *              dev             Device assigned the IRQ that was
+ *                              raised.
+ *              host_int        The contents of the HOST_INT
+ *                              port.
+ *
+ *      This driver is structured to determine EOC occurrences by
+ *      reading the CSTAT member of the list structure.  Tx EOC
+ *      interrupts are disabled via the DIO INTDIS register.
+ *      However, TLAN chips before revision 3.0 didn't have this
+ *      functionality, so process EOC events if this is the
+ *      case.
+ *
+ **************************************************************/
 
-static u32 TLan_HandleTxEOC( struct net_device *dev, u16 host_int )
+static u32 tlan_handle_tx_eoc(struct net_device *dev, u16 host_int)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
-        TLanList                *head_list;
+        struct tlan_priv        *priv = netdev_priv(dev);
+        struct tlan_list                *head_list;
         dma_addr_t              head_list_phys;
         u32                     ack = 1;
 
         host_int = 0;
-        if ( priv->tlanRev < 0x30 ) {
-                TLAN_DBG( TLAN_DEBUG_TX,
-                          "TRANSMIT:  Handling TX EOC (Head=%d Tail=%d) -- IRQ\n",
-                          priv->txHead, priv->txTail );
-                head_list = priv->txList + priv->txHead;
-                head_list_phys = priv->txListDMA + sizeof(TLanList) * priv->txHead;
-                if ( ( head_list->cStat & TLAN_CSTAT_READY ) == TLAN_CSTAT_READY ) {
+        if (priv->tlan_rev < 0x30) {
+                TLAN_DBG(TLAN_DEBUG_TX,
+                         "TRANSMIT:  handling TX EOC (Head=%d Tail=%d) -- IRQ\n",
+                         priv->tx_head, priv->tx_tail);
+                head_list = priv->tx_list + priv->tx_head;
+                head_list_phys = priv->tx_list_dma
+                        + sizeof(struct tlan_list)*priv->tx_head;
+                if ((head_list->c_stat & TLAN_CSTAT_READY)
+                    == TLAN_CSTAT_READY) {
                         netif_stop_queue(dev);
-                        outl( head_list_phys, dev->base_addr + TLAN_CH_PARM );
+                        outl(head_list_phys, dev->base_addr + TLAN_CH_PARM);
                         ack |= TLAN_HC_GO;
                 } else {
-                        priv->txInProgress = 0;
+                        priv->tx_in_progress = 0;
                 }
         }
 
         return ack;
 
-} /* TLan_HandleTxEOC */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_HandleStatusCheck
-         *
-         *      Returns:
-         *              0 if Adapter check, 1 if Network Status check.
-         *      Parms:
-         *              dev             Device assigned the IRQ that was
-         *                              raised.
-         *              host_int        The contents of the HOST_INT
-         *                              port.
-         *
-         *      This function handles Adapter Check/Network Status
-         *      interrupts generated by the adapter.  It checks the
-         *      vector in the HOST_INT register to determine if it is
-         *      an Adapter Check interrupt.  If so, it resets the
-         *      adapter.  Otherwise it clears the status registers
-         *      and services the PHY.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_handle_status_check
+ *
+ *      Returns:
+ *              0 if Adapter check, 1 if Network Status check.
+ *      Parms:
+ *              dev             Device assigned the IRQ that was
+ *                              raised.
+ *              host_int        The contents of the HOST_INT
+ *                              port.
+ *
+ *      This function handles Adapter Check/Network Status
+ *      interrupts generated by the adapter.  It checks the
+ *      vector in the HOST_INT register to determine if it is
+ *      an Adapter Check interrupt.  If so, it resets the
+ *      adapter.  Otherwise it clears the status registers
+ *      and services the PHY.
+ *
+ **************************************************************/
 
-static u32 TLan_HandleStatusCheck( struct net_device *dev, u16 host_int )
+static u32 tlan_handle_status_check(struct net_device *dev, u16 host_int)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
         u32             ack;
         u32             error;
         u8              net_sts;
@@ -1727,92 +1668,94 @@ static u32 TLan_HandleStatusCheck( struct net_device *dev, u16 host_int )
         u16             tlphy_sts;
 
         ack = 1;
-        if ( host_int & TLAN_HI_IV_MASK ) {
-                netif_stop_queue( dev );
-                error = inl( dev->base_addr + TLAN_CH_PARM );
-                printk( "TLAN:  %s: Adaptor Error = 0x%x\n", dev->name, error );
-                TLan_ReadAndClearStats( dev, TLAN_RECORD );
-                outl( TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD );
+        if (host_int & TLAN_HI_IV_MASK) {
+                netif_stop_queue(dev);
+                error = inl(dev->base_addr + TLAN_CH_PARM);
+                netdev_info(dev, "Adaptor Error = 0x%x\n", error);
+                tlan_read_and_clear_stats(dev, TLAN_RECORD);
+                outl(TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD);
 
                 schedule_work(&priv->tlan_tqueue);
 
                 netif_wake_queue(dev);
                 ack = 0;
         } else {
-                TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Status Check\n", dev->name );
-                phy = priv->phy[priv->phyNum];
-
-                net_sts = TLan_DioRead8( dev->base_addr, TLAN_NET_STS );
-                if ( net_sts ) {
-                        TLan_DioWrite8( dev->base_addr, TLAN_NET_STS, net_sts );
-                        TLAN_DBG( TLAN_DEBUG_GNRL, "%s:    Net_Sts = %x\n",
-                                  dev->name, (unsigned) net_sts );
+                TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Status Check\n", dev->name);
+                phy = priv->phy[priv->phy_num];
+
+                net_sts = tlan_dio_read8(dev->base_addr, TLAN_NET_STS);
+                if (net_sts) {
+                        tlan_dio_write8(dev->base_addr, TLAN_NET_STS, net_sts);
+                        TLAN_DBG(TLAN_DEBUG_GNRL, "%s:    Net_Sts = %x\n",
+                                 dev->name, (unsigned) net_sts);
                 }
-                if ( ( net_sts & TLAN_NET_STS_MIRQ ) &&  ( priv->phyNum == 0 ) ) {
-                        TLan_MiiReadReg( dev, phy, TLAN_TLPHY_STS, &tlphy_sts );
-                        TLan_MiiReadReg( dev, phy, TLAN_TLPHY_CTL, &tlphy_ctl );
-                        if ( ! ( tlphy_sts & TLAN_TS_POLOK ) &&
-                             ! ( tlphy_ctl & TLAN_TC_SWAPOL ) ) {
-                                tlphy_ctl |= TLAN_TC_SWAPOL;
-                                TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl);
-                        } else if ( ( tlphy_sts & TLAN_TS_POLOK ) &&
-                                    ( tlphy_ctl & TLAN_TC_SWAPOL ) ) {
-                                tlphy_ctl &= ~TLAN_TC_SWAPOL;
-                                TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl);
-                        }
-
-                        if (debug) {
-                                TLan_PhyPrint( dev );
+                if ((net_sts & TLAN_NET_STS_MIRQ) &&  (priv->phy_num == 0)) {
+                        tlan_mii_read_reg(dev, phy, TLAN_TLPHY_STS, &tlphy_sts);
+                        tlan_mii_read_reg(dev, phy, TLAN_TLPHY_CTL, &tlphy_ctl);
+                        if (!(tlphy_sts & TLAN_TS_POLOK) &&
+                            !(tlphy_ctl & TLAN_TC_SWAPOL)) {
+                                tlphy_ctl |= TLAN_TC_SWAPOL;
+                                tlan_mii_write_reg(dev, phy, TLAN_TLPHY_CTL,
+                                                   tlphy_ctl);
+                        } else if ((tlphy_sts & TLAN_TS_POLOK) &&
+                                   (tlphy_ctl & TLAN_TC_SWAPOL)) {
+                                tlphy_ctl &= ~TLAN_TC_SWAPOL;
+                                tlan_mii_write_reg(dev, phy, TLAN_TLPHY_CTL,
+                                                   tlphy_ctl);
                         }
+
+                        if (debug)
+                                tlan_phy_print(dev);
                 }
         }
 
         return ack;
 
-} /* TLan_HandleStatusCheck */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_HandleRxEOC
-         *
-         *      Returns:
-         *              1
-         *      Parms:
-         *              dev             Device assigned the IRQ that was
-         *                              raised.
-         *              host_int        The contents of the HOST_INT
-         *                              port.
-         *
-         *      This driver is structured to determine EOC occurrences by
-         *      reading the CSTAT member of the list structure.  Rx EOC
-         *      interrupts are disabled via the DIO INTDIS register.
-         *      However, TLAN chips before revision 3.0 didn't have this
-         *      CSTAT member or a INTDIS register, so if this chip is
-         *      pre-3.0, process EOC interrupts normally.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_handle_rx_eoc
+ *
+ *      Returns:
+ *              1
+ *      Parms:
+ *              dev             Device assigned the IRQ that was
+ *                              raised.
+ *              host_int        The contents of the HOST_INT
+ *                              port.
+ *
+ *      This driver is structured to determine EOC occurrences by
+ *      reading the CSTAT member of the list structure.  Rx EOC
+ *      interrupts are disabled via the DIO INTDIS register.
+ *      However, TLAN chips before revision 3.0 didn't have this
+ *      CSTAT member or a INTDIS register, so if this chip is
+ *      pre-3.0, process EOC interrupts normally.
+ *
+ **************************************************************/
 
-static u32 TLan_HandleRxEOC( struct net_device *dev, u16 host_int )
+static u32 tlan_handle_rx_eoc(struct net_device *dev, u16 host_int)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
         dma_addr_t      head_list_phys;
         u32             ack = 1;
 
-        if (  priv->tlanRev < 0x30 ) {
-                TLAN_DBG( TLAN_DEBUG_RX,
-                          "RECEIVE:  Handling RX EOC (Head=%d Tail=%d) -- IRQ\n",
-                          priv->rxHead, priv->rxTail );
-                head_list_phys = priv->rxListDMA + sizeof(TLanList) * priv->rxHead;
-                outl( head_list_phys, dev->base_addr + TLAN_CH_PARM );
+        if (priv->tlan_rev < 0x30) {
+                TLAN_DBG(TLAN_DEBUG_RX,
+                         "RECEIVE:  Handling RX EOC (head=%d tail=%d) -- IRQ\n",
+                         priv->rx_head, priv->rx_tail);
+                head_list_phys = priv->rx_list_dma
+                        + sizeof(struct tlan_list)*priv->rx_head;
+                outl(head_list_phys, dev->base_addr + TLAN_CH_PARM);
                 ack |= TLAN_HC_GO | TLAN_HC_RT;
-                priv->rxEocCount++;
+                priv->rx_eoc_count++;
         }
 
         return ack;
 
-} /* TLan_HandleRxEOC */
+}
 
 
 
@@ -1820,98 +1763,98 @@ static u32 TLan_HandleRxEOC( struct net_device *dev, u16 host_int )
 /*****************************************************************************
 ******************************************************************************
 
-        ThunderLAN Driver Timer Function
+ThunderLAN driver timer function
 
 ******************************************************************************
 *****************************************************************************/
 
 
-        /***************************************************************
-         *      TLan_Timer
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              data    A value given to add timer when
-         *                      add_timer was called.
-         *
-         *      This function handles timed functionality for the
-         *      TLAN driver.  The two current timer uses are for
-         *      delaying for autonegotionation and driving the ACT LED.
-         *      -       Autonegotiation requires being allowed about
-         *              2 1/2 seconds before attempting to transmit a
-         *              packet.  It would be a very bad thing to hang
-         *              the kernel this long, so the driver doesn't
-         *              allow transmission 'til after this time, for
-         *              certain PHYs.  It would be much nicer if all
-         *              PHYs were interrupt-capable like the internal
-         *              PHY.
-         *      -       The ACT LED, which shows adapter activity, is
-         *              driven by the driver, and so must be left on
-         *              for a short period to power up the LED so it
-         *              can be seen.  This delay can be changed by
-         *              changing the TLAN_TIMER_ACT_DELAY in tlan.h,
-         *              if desired.  100 ms  produces a slightly
-         *              sluggish response.
-         *
-         **************************************************************/
-
-static void TLan_Timer( unsigned long data )
+/***************************************************************
+ *      tlan_timer
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              data    A value given to add timer when
+ *                      add_timer was called.
+ *
+ *      This function handles timed functionality for the
+ *      TLAN driver.  The two current timer uses are for
+ *      delaying for autonegotionation and driving the ACT LED.
+ *      -       Autonegotiation requires being allowed about
+ *              2 1/2 seconds before attempting to transmit a
+ *              packet.  It would be a very bad thing to hang
+ *              the kernel this long, so the driver doesn't
+ *              allow transmission 'til after this time, for
+ *              certain PHYs.  It would be much nicer if all
+ *              PHYs were interrupt-capable like the internal
+ *              PHY.
+ *      -       The ACT LED, which shows adapter activity, is
+ *              driven by the driver, and so must be left on
+ *              for a short period to power up the LED so it
+ *              can be seen.  This delay can be changed by
+ *              changing the TLAN_TIMER_ACT_DELAY in tlan.h,
+ *              if desired.  100 ms  produces a slightly
+ *              sluggish response.
+ *
+ **************************************************************/
+
+static void tlan_timer(unsigned long data)
 {
         struct net_device       *dev = (struct net_device *) data;
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
         u32             elapsed;
         unsigned long   flags = 0;
 
         priv->timer.function = NULL;
 
-        switch ( priv->timerType ) {
+        switch (priv->timer_type) {
 #ifdef MONITOR
-                case TLAN_TIMER_LINK_BEAT:
-                        TLan_PhyMonitor( dev );
-                        break;
+        case TLAN_TIMER_LINK_BEAT:
+                tlan_phy_monitor(dev);
+                break;
 #endif
-                case TLAN_TIMER_PHY_PDOWN:
-                        TLan_PhyPowerDown( dev );
-                        break;
-                case TLAN_TIMER_PHY_PUP:
-                        TLan_PhyPowerUp( dev );
-                        break;
-                case TLAN_TIMER_PHY_RESET:
-                        TLan_PhyReset( dev );
-                        break;
-                case TLAN_TIMER_PHY_START_LINK:
-                        TLan_PhyStartLink( dev );
-                        break;
-                case TLAN_TIMER_PHY_FINISH_AN:
-                        TLan_PhyFinishAutoNeg( dev );
-                        break;
-                case TLAN_TIMER_FINISH_RESET:
-                        TLan_FinishReset( dev );
-                        break;
-                case TLAN_TIMER_ACTIVITY:
-                        spin_lock_irqsave(&priv->lock, flags);
-                        if ( priv->timer.function == NULL ) {
-                                elapsed = jiffies - priv->timerSetAt;
-                                if ( elapsed >= TLAN_TIMER_ACT_DELAY ) {
-                                        TLan_DioWrite8( dev->base_addr,
-                                                        TLAN_LED_REG, TLAN_LED_LINK );
-                                } else  {
-                                        priv->timer.function = TLan_Timer;
-                                        priv->timer.expires = priv->timerSetAt
-                                                + TLAN_TIMER_ACT_DELAY;
-                                        spin_unlock_irqrestore(&priv->lock, flags);
-                                        add_timer( &priv->timer );
-                                        break;
-                                }
+        case TLAN_TIMER_PHY_PDOWN:
+                tlan_phy_power_down(dev);
+                break;
+        case TLAN_TIMER_PHY_PUP:
+                tlan_phy_power_up(dev);
+                break;
+        case TLAN_TIMER_PHY_RESET:
+                tlan_phy_reset(dev);
+                break;
+        case TLAN_TIMER_PHY_START_LINK:
+                tlan_phy_start_link(dev);
+                break;
+        case TLAN_TIMER_PHY_FINISH_AN:
+                tlan_phy_finish_auto_neg(dev);
+                break;
+        case TLAN_TIMER_FINISH_RESET:
+                tlan_finish_reset(dev);
+                break;
+        case TLAN_TIMER_ACTIVITY:
+                spin_lock_irqsave(&priv->lock, flags);
+                if (priv->timer.function == NULL) {
+                        elapsed = jiffies - priv->timer_set_at;
+                        if (elapsed >= TLAN_TIMER_ACT_DELAY) {
+                                tlan_dio_write8(dev->base_addr,
+                                                TLAN_LED_REG, TLAN_LED_LINK);
+                        } else  {
+                                priv->timer.function = tlan_timer;
+                                priv->timer.expires = priv->timer_set_at
+                                        + TLAN_TIMER_ACT_DELAY;
+                                spin_unlock_irqrestore(&priv->lock, flags);
+                                add_timer(&priv->timer);
+                                break;
                         }
-                        spin_unlock_irqrestore(&priv->lock, flags);
-                        break;
-                default:
-                        break;
+                }
+                spin_unlock_irqrestore(&priv->lock, flags);
+                break;
+        default:
+                break;
         }
 
-} /* TLan_Timer */
+}
 
 
 
@@ -1919,39 +1862,39 @@ static void TLan_Timer( unsigned long data )
 /*****************************************************************************
 ******************************************************************************
 
-        ThunderLAN Driver Adapter Related Routines
+ThunderLAN driver adapter related routines
 
 ******************************************************************************
 *****************************************************************************/
 
 
-        /***************************************************************
-         *      TLan_ResetLists
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              dev     The device structure with the list
-         *                      stuctures to be reset.
-         *
-         *      This routine sets the variables associated with managing
-         *      the TLAN lists to their initial values.
-         *
-         **************************************************************/
-
-static void TLan_ResetLists( struct net_device *dev )
+/***************************************************************
+ *      tlan_reset_lists
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              dev     The device structure with the list
+ *                      stuctures to be reset.
+ *
+ *      This routine sets the variables associated with managing
+ *      the TLAN lists to their initial values.
+ *
+ **************************************************************/
+
+static void tlan_reset_lists(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
         int             i;
-        TLanList        *list;
+        struct tlan_list        *list;
         dma_addr_t      list_phys;
         struct sk_buff  *skb;
 
-        priv->txHead = 0;
-        priv->txTail = 0;
-        for ( i = 0; i < TLAN_NUM_TX_LISTS; i++ ) {
-                list = priv->txList + i;
-                list->cStat = TLAN_CSTAT_UNUSED;
+        priv->tx_head = 0;
+        priv->tx_tail = 0;
+        for (i = 0; i < TLAN_NUM_TX_LISTS; i++) {
+                list = priv->tx_list + i;
+                list->c_stat = TLAN_CSTAT_UNUSED;
                 list->buffer[0].address = 0;
                 list->buffer[2].count = 0;
                 list->buffer[2].address = 0;
@@ -1959,169 +1902,169 @@ static void TLan_ResetLists( struct net_device *dev )
                 list->buffer[9].address = 0;
         }
 
-        priv->rxHead = 0;
-        priv->rxTail = TLAN_NUM_RX_LISTS - 1;
-        for ( i = 0; i < TLAN_NUM_RX_LISTS; i++ ) {
-                list = priv->rxList + i;
-                list_phys = priv->rxListDMA + sizeof(TLanList) * i;
-                list->cStat = TLAN_CSTAT_READY;
-                list->frameSize = TLAN_MAX_FRAME_SIZE;
+        priv->rx_head = 0;
+        priv->rx_tail = TLAN_NUM_RX_LISTS - 1;
+        for (i = 0; i < TLAN_NUM_RX_LISTS; i++) {
+                list = priv->rx_list + i;
+                list_phys = priv->rx_list_dma + sizeof(struct tlan_list)*i;
+                list->c_stat = TLAN_CSTAT_READY;
+                list->frame_size = TLAN_MAX_FRAME_SIZE;
                 list->buffer[0].count = TLAN_MAX_FRAME_SIZE | TLAN_LAST_BUFFER;
                 skb = netdev_alloc_skb_ip_align(dev, TLAN_MAX_FRAME_SIZE + 5);
-                if ( !skb ) {
-                        pr_err("TLAN: out of memory for received data.\n" );
+                if (!skb) {
+                        netdev_err(dev, "Out of memory for received data\n");
                         break;
                 }
 
-                list->buffer[0].address = pci_map_single(priv->pciDev,
+                list->buffer[0].address = pci_map_single(priv->pci_dev,
                                                          skb->data,
                                                          TLAN_MAX_FRAME_SIZE,
                                                          PCI_DMA_FROMDEVICE);
-                TLan_StoreSKB(list, skb);
+                tlan_store_skb(list, skb);
                 list->buffer[1].count = 0;
                 list->buffer[1].address = 0;
-                list->forward = list_phys + sizeof(TLanList);
+                list->forward = list_phys + sizeof(struct tlan_list);
         }
 
         /* in case ran out of memory early, clear bits */
         while (i < TLAN_NUM_RX_LISTS) {
-                TLan_StoreSKB(priv->rxList + i, NULL);
+                tlan_store_skb(priv->rx_list + i, NULL);
                 ++i;
         }
         list->forward = 0;
 
-} /* TLan_ResetLists */
+}
 
 
-static void TLan_FreeLists( struct net_device *dev )
+static void tlan_free_lists(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
         int             i;
-        TLanList        *list;
+        struct tlan_list        *list;
         struct sk_buff  *skb;
 
-        for ( i = 0; i < TLAN_NUM_TX_LISTS; i++ ) {
-                list = priv->txList + i;
-                skb = TLan_GetSKB(list);
-                if ( skb ) {
+        for (i = 0; i < TLAN_NUM_TX_LISTS; i++) {
+                list = priv->tx_list + i;
+                skb = tlan_get_skb(list);
+                if (skb) {
                         pci_unmap_single(
-                                priv->pciDev,
+                                priv->pci_dev,
                                 list->buffer[0].address,
                                 max(skb->len,
                                     (unsigned int)TLAN_MIN_FRAME_SIZE),
                                 PCI_DMA_TODEVICE);
-                        dev_kfree_skb_any( skb );
+                        dev_kfree_skb_any(skb);
                         list->buffer[8].address = 0;
                         list->buffer[9].address = 0;
                 }
         }
 
-        for ( i = 0; i < TLAN_NUM_RX_LISTS; i++ ) {
-                list = priv->rxList + i;
-                skb = TLan_GetSKB(list);
-                if ( skb ) {
-                        pci_unmap_single(priv->pciDev,
+        for (i = 0; i < TLAN_NUM_RX_LISTS; i++) {
+                list = priv->rx_list + i;
+                skb = tlan_get_skb(list);
+                if (skb) {
+                        pci_unmap_single(priv->pci_dev,
                                          list->buffer[0].address,
                                          TLAN_MAX_FRAME_SIZE,
                                          PCI_DMA_FROMDEVICE);
-                        dev_kfree_skb_any( skb );
+                        dev_kfree_skb_any(skb);
                         list->buffer[8].address = 0;
                         list->buffer[9].address = 0;
                 }
         }
-} /* TLan_FreeLists */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_PrintDio
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              io_base         Base IO port of the device of
-         *                              which to print DIO registers.
-         *
-         *      This function prints out all the internal (DIO)
-         *      registers of a TLAN chip.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_print_dio
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              io_base         Base IO port of the device of
+ *                              which to print DIO registers.
+ *
+ *      This function prints out all the internal (DIO)
+ *      registers of a TLAN chip.
+ *
+ **************************************************************/
 
-static void TLan_PrintDio( u16 io_base )
+static void tlan_print_dio(u16 io_base)
 {
         u32 data0, data1;
         int     i;
 
-        printk( "TLAN:   Contents of internal registers for io base 0x%04hx.\n",
-                io_base );
-        printk( "TLAN:      Off.  +0         +4\n" );
-        for ( i = 0; i < 0x4C; i+= 8 ) {
-                data0 = TLan_DioRead32( io_base, i );
-                data1 = TLan_DioRead32( io_base, i + 0x4 );
-                printk( "TLAN:      0x%02x  0x%08x 0x%08x\n", i, data0, data1 );
+        pr_info("Contents of internal registers for io base 0x%04hx\n",
+                io_base);
+        pr_info("Off.  +0        +4\n");
+        for (i = 0; i < 0x4C; i += 8) {
+                data0 = tlan_dio_read32(io_base, i);
+                data1 = tlan_dio_read32(io_base, i + 0x4);
+                pr_info("0x%02x  0x%08x 0x%08x\n", i, data0, data1);
         }
 
-} /* TLan_PrintDio */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_PrintList
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              list    A pointer to the TLanList structure to
-         *                      be printed.
-         *              type    A string to designate type of list,
-         *                      "Rx" or "Tx".
-         *              num     The index of the list.
-         *
-         *      This function prints out the contents of the list
-         *      pointed to by the list parameter.
-         *
-         **************************************************************/
+/***************************************************************
+ *      TLan_PrintList
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              list    A pointer to the struct tlan_list structure to
+ *                      be printed.
+ *              type    A string to designate type of list,
+ *                      "Rx" or "Tx".
+ *              num     The index of the list.
+ *
+ *      This function prints out the contents of the list
+ *      pointed to by the list parameter.
+ *
+ **************************************************************/
 
-static void TLan_PrintList( TLanList *list, char *type, int num)
+static void tlan_print_list(struct tlan_list *list, char *type, int num)
 {
         int i;
 
-        printk( "TLAN:   %s List %d at %p\n", type, num, list );
-        printk( "TLAN:      Forward    = 0x%08x\n",  list->forward );
-        printk( "TLAN:      CSTAT      = 0x%04hx\n", list->cStat );
-        printk( "TLAN:      Frame Size = 0x%04hx\n", list->frameSize );
-        /* for ( i = 0; i < 10; i++ ) { */
-        for ( i = 0; i < 2; i++ ) {
-                printk( "TLAN:      Buffer[%d].count, addr = 0x%08x, 0x%08x\n",
-                        i, list->buffer[i].count, list->buffer[i].address );
+        pr_info("%s List %d at %p\n", type, num, list);
+        pr_info("   Forward    = 0x%08x\n",  list->forward);
+        pr_info("   CSTAT      = 0x%04hx\n", list->c_stat);
+        pr_info("   Frame Size = 0x%04hx\n", list->frame_size);
+        /* for (i = 0; i < 10; i++) { */
+        for (i = 0; i < 2; i++) {
+                pr_info("   Buffer[%d].count, addr = 0x%08x, 0x%08x\n",
+                        i, list->buffer[i].count, list->buffer[i].address);
         }
 
-} /* TLan_PrintList */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_ReadAndClearStats
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              dev     Pointer to device structure of adapter
-         *                      to which to read stats.
-         *              record  Flag indicating whether to add
-         *
-         *      This functions reads all the internal status registers
-         *      of the TLAN chip, which clears them as a side effect.
-         *      It then either adds the values to the device's status
-         *      struct, or discards them, depending on whether record
-         *      is TLAN_RECORD (!=0)  or TLAN_IGNORE (==0).
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_read_and_clear_stats
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              dev     Pointer to device structure of adapter
+ *                      to which to read stats.
+ *              record  Flag indicating whether to add
+ *
+ *      This functions reads all the internal status registers
+ *      of the TLAN chip, which clears them as a side effect.
+ *      It then either adds the values to the device's status
+ *      struct, or discards them, depending on whether record
+ *      is TLAN_RECORD (!=0)  or TLAN_IGNORE (==0).
+ *
+ **************************************************************/
 
-static void TLan_ReadAndClearStats( struct net_device *dev, int record )
+static void tlan_read_and_clear_stats(struct net_device *dev, int record)
 {
         u32             tx_good, tx_under;
         u32             rx_good, rx_over;
@@ -2129,41 +2072,42 @@ static void TLan_ReadAndClearStats( struct net_device *dev, int record )
         u32             multi_col, single_col;
         u32             excess_col, late_col, loss;
 
-        outw( TLAN_GOOD_TX_FRMS, dev->base_addr + TLAN_DIO_ADR );
-        tx_good  = inb( dev->base_addr + TLAN_DIO_DATA );
-        tx_good += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
-        tx_good += inb( dev->base_addr + TLAN_DIO_DATA + 2 ) << 16;
-        tx_under = inb( dev->base_addr + TLAN_DIO_DATA + 3 );
-
-        outw( TLAN_GOOD_RX_FRMS, dev->base_addr + TLAN_DIO_ADR );
-        rx_good  = inb( dev->base_addr + TLAN_DIO_DATA );
-        rx_good += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
-        rx_good += inb( dev->base_addr + TLAN_DIO_DATA + 2 ) << 16;
-        rx_over  = inb( dev->base_addr + TLAN_DIO_DATA + 3 );
-
-        outw( TLAN_DEFERRED_TX, dev->base_addr + TLAN_DIO_ADR );
-        def_tx  = inb( dev->base_addr + TLAN_DIO_DATA );
-        def_tx += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
-        crc     = inb( dev->base_addr + TLAN_DIO_DATA + 2 );
-        code    = inb( dev->base_addr + TLAN_DIO_DATA + 3 );
-
-        outw( TLAN_MULTICOL_FRMS, dev->base_addr + TLAN_DIO_ADR );
-        multi_col   = inb( dev->base_addr + TLAN_DIO_DATA );
-        multi_col  += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
-        single_col  = inb( dev->base_addr + TLAN_DIO_DATA + 2 );
-        single_col += inb( dev->base_addr + TLAN_DIO_DATA + 3 ) << 8;
-
-        outw( TLAN_EXCESSCOL_FRMS, dev->base_addr + TLAN_DIO_ADR );
-        excess_col = inb( dev->base_addr + TLAN_DIO_DATA );
-        late_col   = inb( dev->base_addr + TLAN_DIO_DATA + 1 );
-        loss       = inb( dev->base_addr + TLAN_DIO_DATA + 2 );
-
-        if ( record ) {
+        outw(TLAN_GOOD_TX_FRMS, dev->base_addr + TLAN_DIO_ADR);
+        tx_good  = inb(dev->base_addr + TLAN_DIO_DATA);
+        tx_good += inb(dev->base_addr + TLAN_DIO_DATA + 1) << 8;
+        tx_good += inb(dev->base_addr + TLAN_DIO_DATA + 2) << 16;
+        tx_under = inb(dev->base_addr + TLAN_DIO_DATA + 3);
+
+        outw(TLAN_GOOD_RX_FRMS, dev->base_addr + TLAN_DIO_ADR);
+        rx_good  = inb(dev->base_addr + TLAN_DIO_DATA);
+        rx_good += inb(dev->base_addr + TLAN_DIO_DATA + 1) << 8;
+        rx_good += inb(dev->base_addr + TLAN_DIO_DATA + 2) << 16;
+        rx_over  = inb(dev->base_addr + TLAN_DIO_DATA + 3);
+
+        outw(TLAN_DEFERRED_TX, dev->base_addr + TLAN_DIO_ADR);
+        def_tx  = inb(dev->base_addr + TLAN_DIO_DATA);
+        def_tx += inb(dev->base_addr + TLAN_DIO_DATA + 1) << 8;
+        crc     = inb(dev->base_addr + TLAN_DIO_DATA + 2);
+        code    = inb(dev->base_addr + TLAN_DIO_DATA + 3);
+
+        outw(TLAN_MULTICOL_FRMS, dev->base_addr + TLAN_DIO_ADR);
+        multi_col   = inb(dev->base_addr + TLAN_DIO_DATA);
+        multi_col  += inb(dev->base_addr + TLAN_DIO_DATA + 1) << 8;
+        single_col  = inb(dev->base_addr + TLAN_DIO_DATA + 2);
+        single_col += inb(dev->base_addr + TLAN_DIO_DATA + 3) << 8;
+
+        outw(TLAN_EXCESSCOL_FRMS, dev->base_addr + TLAN_DIO_ADR);
+        excess_col = inb(dev->base_addr + TLAN_DIO_DATA);
+        late_col   = inb(dev->base_addr + TLAN_DIO_DATA + 1);
+        loss       = inb(dev->base_addr + TLAN_DIO_DATA + 2);
+
+        if (record) {
                 dev->stats.rx_packets += rx_good;
                 dev->stats.rx_errors  += rx_over + crc + code;
                 dev->stats.tx_packets += tx_good;
                 dev->stats.tx_errors  += tx_under + loss;
-                dev->stats.collisions += multi_col + single_col + excess_col + late_col;
+                dev->stats.collisions += multi_col
+                        + single_col + excess_col + late_col;
 
                 dev->stats.rx_over_errors    += rx_over;
                 dev->stats.rx_crc_errors     += crc;
@@ -2173,39 +2117,39 @@ static void TLan_ReadAndClearStats( struct net_device *dev, int record )
                 dev->stats.tx_carrier_errors += loss;
         }
 
-} /* TLan_ReadAndClearStats */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_Reset
-         *
-         *      Returns:
-         *              0
-         *      Parms:
-         *              dev     Pointer to device structure of adapter
-         *                      to be reset.
-         *
-         *      This function resets the adapter and it's physical
-         *      device.  See Chap. 3, pp. 9-10 of the "ThunderLAN
-         *      Programmer's Guide" for details.  The routine tries to
-         *      implement what is detailed there, though adjustments
-         *      have been made.
-         *
-         **************************************************************/
+/***************************************************************
+ *      TLan_Reset
+ *
+ *      Returns:
+ *              0
+ *      Parms:
+ *              dev     Pointer to device structure of adapter
+ *                      to be reset.
+ *
+ *      This function resets the adapter and it's physical
+ *      device.  See Chap. 3, pp. 9-10 of the "ThunderLAN
+ *      Programmer's Guide" for details.  The routine tries to
+ *      implement what is detailed there, though adjustments
+ *      have been made.
+ *
+ **************************************************************/
 
 static void
-TLan_ResetAdapter( struct net_device *dev )
+tlan_reset_adapter(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
         int             i;
         u32             addr;
         u32             data;
         u8              data8;
 
-        priv->tlanFullDuplex = false;
-        priv->phyOnline=0;
+        priv->tlan_full_duplex = false;
+        priv->phy_online = 0;
         netif_carrier_off(dev);
 
 /*  1.  Assert reset bit. */
@@ -2216,7 +2160,7 @@ TLan_ResetAdapter( struct net_device *dev )
 
         udelay(1000);
 
-/*  2.  Turn off interrupts. ( Probably isn't necessary ) */
+/*  2.  Turn off interrupts. (Probably isn't necessary) */
 
         data = inl(dev->base_addr + TLAN_HOST_CMD);
         data |= TLAN_HC_INT_OFF;
@@ -2224,207 +2168,204 @@ TLan_ResetAdapter( struct net_device *dev )
 
 /*  3.  Clear AREGs and HASHs. */
 
-        for ( i = TLAN_AREG_0; i <= TLAN_HASH_2; i += 4 ) {
-                TLan_DioWrite32( dev->base_addr, (u16) i, 0 );
-        }
+        for (i = TLAN_AREG_0; i <= TLAN_HASH_2; i += 4)
+                tlan_dio_write32(dev->base_addr, (u16) i, 0);
 
 /*  4.  Setup NetConfig register. */
 
         data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN | TLAN_NET_CFG_PHY_EN;
-        TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, (u16) data );
+        tlan_dio_write16(dev->base_addr, TLAN_NET_CONFIG, (u16) data);
 
 /*  5.  Load Ld_Tmr and Ld_Thr in HOST_CMD. */
 
-        outl( TLAN_HC_LD_TMR | 0x3f, dev->base_addr + TLAN_HOST_CMD );
-        outl( TLAN_HC_LD_THR | 0x9, dev->base_addr + TLAN_HOST_CMD );
+        outl(TLAN_HC_LD_TMR | 0x3f, dev->base_addr + TLAN_HOST_CMD);
+        outl(TLAN_HC_LD_THR | 0x9, dev->base_addr + TLAN_HOST_CMD);
 
 /*  6.  Unreset the MII by setting NMRST (in NetSio) to 1. */
 
-        outw( TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR );
+        outw(TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR);
         addr = dev->base_addr + TLAN_DIO_DATA + TLAN_NET_SIO;
-        TLan_SetBit( TLAN_NET_SIO_NMRST, addr );
+        tlan_set_bit(TLAN_NET_SIO_NMRST, addr);
 
 /*  7.  Setup the remaining registers. */
 
-        if ( priv->tlanRev >= 0x30 ) {
+        if (priv->tlan_rev >= 0x30) {
                 data8 = TLAN_ID_TX_EOC | TLAN_ID_RX_EOC;
-                TLan_DioWrite8( dev->base_addr, TLAN_INT_DIS, data8 );
+                tlan_dio_write8(dev->base_addr, TLAN_INT_DIS, data8);
         }
-        TLan_PhyDetect( dev );
+        tlan_phy_detect(dev);
         data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN;
 
-        if ( priv->adapter->flags & TLAN_ADAPTER_BIT_RATE_PHY ) {
+        if (priv->adapter->flags & TLAN_ADAPTER_BIT_RATE_PHY) {
                 data |= TLAN_NET_CFG_BIT;
-                if ( priv->aui == 1 ) {
-                        TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x0a );
-                } else if ( priv->duplex == TLAN_DUPLEX_FULL ) {
-                        TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x00 );
-                        priv->tlanFullDuplex = true;
+                if (priv->aui == 1) {
+                        tlan_dio_write8(dev->base_addr, TLAN_ACOMMIT, 0x0a);
+                } else if (priv->duplex == TLAN_DUPLEX_FULL) {
+                        tlan_dio_write8(dev->base_addr, TLAN_ACOMMIT, 0x00);
+                        priv->tlan_full_duplex = true;
                 } else {
-                        TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x08 );
+                        tlan_dio_write8(dev->base_addr, TLAN_ACOMMIT, 0x08);
                 }
         }
 
-        if ( priv->phyNum == 0 ) {
+        if (priv->phy_num == 0)
                 data |= TLAN_NET_CFG_PHY_EN;
-        }
-        TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, (u16) data );
+        tlan_dio_write16(dev->base_addr, TLAN_NET_CONFIG, (u16) data);
 
-        if ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) {
-                TLan_FinishReset( dev );
-        } else {
-                TLan_PhyPowerDown( dev );
-        }
+        if (priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY)
+                tlan_finish_reset(dev);
+        else
+                tlan_phy_power_down(dev);
 
-} /* TLan_ResetAdapter */
+}
 
 
 
 
 static void
-TLan_FinishReset( struct net_device *dev )
+tlan_finish_reset(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
         u8              data;
         u32             phy;
         u8              sio;
         u16             status;
         u16             partner;
         u16             tlphy_ctl;
-        u16             tlphy_par;
+        u16             tlphy_par;
         u16             tlphy_id1, tlphy_id2;
-        int             i;
+        int             i;
 
-        phy = priv->phy[priv->phyNum];
+        phy = priv->phy[priv->phy_num];
 
         data = TLAN_NET_CMD_NRESET | TLAN_NET_CMD_NWRAP;
-        if ( priv->tlanFullDuplex ) {
+        if (priv->tlan_full_duplex)
                 data |= TLAN_NET_CMD_DUPLEX;
-        }
-        TLan_DioWrite8( dev->base_addr, TLAN_NET_CMD, data );
+        tlan_dio_write8(dev->base_addr, TLAN_NET_CMD, data);
         data = TLAN_NET_MASK_MASK4 | TLAN_NET_MASK_MASK5;
-        if ( priv->phyNum == 0 ) {
+        if (priv->phy_num == 0)
                 data |= TLAN_NET_MASK_MASK7;
-        }
-        TLan_DioWrite8( dev->base_addr, TLAN_NET_MASK, data );
-        TLan_DioWrite16( dev->base_addr, TLAN_MAX_RX, ((1536)+7)&~7 );
-        TLan_MiiReadReg( dev, phy, MII_GEN_ID_HI, &tlphy_id1 );
-        TLan_MiiReadReg( dev, phy, MII_GEN_ID_LO, &tlphy_id2 );
+        tlan_dio_write8(dev->base_addr, TLAN_NET_MASK, data);
+        tlan_dio_write16(dev->base_addr, TLAN_MAX_RX, ((1536)+7)&~7);
+        tlan_mii_read_reg(dev, phy, MII_GEN_ID_HI, &tlphy_id1);
+        tlan_mii_read_reg(dev, phy, MII_GEN_ID_LO, &tlphy_id2);
 
-        if ( ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) ||
-             ( priv->aui ) ) {
+        if ((priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY) ||
+            (priv->aui)) {
                 status = MII_GS_LINK;
-                printk( "TLAN:  %s: Link forced.\n", dev->name );
+                netdev_info(dev, "Link forced\n");
         } else {
-                TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
-                udelay( 1000 );
-                TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
-                if ( (status & MII_GS_LINK) &&
-                     /* We only support link info on Nat.Sem. PHY's */
-                        (tlphy_id1 == NAT_SEM_ID1) &&
-                        (tlphy_id2 == NAT_SEM_ID2) ) {
-                        TLan_MiiReadReg( dev, phy, MII_AN_LPA, &partner );
-                        TLan_MiiReadReg( dev, phy, TLAN_TLPHY_PAR, &tlphy_par );
-
-                        printk( "TLAN: %s: Link active with ", dev->name );
-                        if (!(tlphy_par & TLAN_PHY_AN_EN_STAT)) {
-                                 printk( "forced 10%sMbps %s-Duplex\n",
-                                         tlphy_par & TLAN_PHY_SPEED_100 ? "" : "0",
-                                         tlphy_par & TLAN_PHY_DUPLEX_FULL ? "Full" : "Half");
-                        } else {
-                                printk( "AutoNegotiation enabled, at 10%sMbps %s-Duplex\n",
-                                        tlphy_par & TLAN_PHY_SPEED_100 ? "" : "0",
-                                        tlphy_par & TLAN_PHY_DUPLEX_FULL ? "Full" : "Half");
-                                printk("TLAN: Partner capability: ");
-                                        for (i = 5; i <= 10; i++)
-                                                if (partner & (1<<i))
-                                                        printk("%s",media[i-5]);
-                                printk("\n");
+                tlan_mii_read_reg(dev, phy, MII_GEN_STS, &status);
+                udelay(1000);
+                tlan_mii_read_reg(dev, phy, MII_GEN_STS, &status);
+                if ((status & MII_GS_LINK) &&
+                    /* We only support link info on Nat.Sem. PHY's */
+                    (tlphy_id1 == NAT_SEM_ID1) &&
+                    (tlphy_id2 == NAT_SEM_ID2)) {
+                        tlan_mii_read_reg(dev, phy, MII_AN_LPA, &partner);
+                        tlan_mii_read_reg(dev, phy, TLAN_TLPHY_PAR, &tlphy_par);
+
+                        netdev_info(dev,
+                                    "Link active with %s %uMbps %s-Duplex\n",
+                                    !(tlphy_par & TLAN_PHY_AN_EN_STAT)
+                                    ? "forced" : "Autonegotiation enabled,",
+                                    tlphy_par & TLAN_PHY_SPEED_100
+                                    ? 100 : 10,
+                                    tlphy_par & TLAN_PHY_DUPLEX_FULL
+                                    ? "Full" : "Half");
+
+                        if (tlphy_par & TLAN_PHY_AN_EN_STAT) {
+                                netdev_info(dev, "Partner capability:");
+                                for (i = 5; i < 10; i++)
+                                        if (partner & (1 << i))
+                                                pr_cont(" %s", media[i-5]);
+                                pr_cont("\n");
                         }
 
-                        TLan_DioWrite8( dev->base_addr, TLAN_LED_REG, TLAN_LED_LINK );
+                        tlan_dio_write8(dev->base_addr, TLAN_LED_REG,
+                                        TLAN_LED_LINK);
 #ifdef MONITOR
                         /* We have link beat..for now anyway */
-                        priv->link = 1;
-                        /*Enabling link beat monitoring */
-                        TLan_SetTimer( dev, (10*HZ), TLAN_TIMER_LINK_BEAT );
+                        priv->link = 1;
+                        /*Enabling link beat monitoring */
+                        tlan_set_timer(dev, (10*HZ), TLAN_TIMER_LINK_BEAT);
 #endif
                 } else if (status & MII_GS_LINK)  {
-                        printk( "TLAN: %s: Link active\n", dev->name );
-                        TLan_DioWrite8( dev->base_addr, TLAN_LED_REG, TLAN_LED_LINK );
+                        netdev_info(dev, "Link active\n");
+                        tlan_dio_write8(dev->base_addr, TLAN_LED_REG,
+                                        TLAN_LED_LINK);
                 }
         }
 
-        if ( priv->phyNum == 0 ) {
-                TLan_MiiReadReg( dev, phy, TLAN_TLPHY_CTL, &tlphy_ctl );
-                tlphy_ctl |= TLAN_TC_INTEN;
-                TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl );
-                sio = TLan_DioRead8( dev->base_addr, TLAN_NET_SIO );
-                sio |= TLAN_NET_SIO_MINTEN;
-                TLan_DioWrite8( dev->base_addr, TLAN_NET_SIO, sio );
-        }
-
-        if ( status & MII_GS_LINK ) {
-                TLan_SetMac( dev, 0, dev->dev_addr );
-                priv->phyOnline = 1;
-                outb( ( TLAN_HC_INT_ON >> 8 ), dev->base_addr + TLAN_HOST_CMD + 1 );
-                if ( debug >= 1 && debug != TLAN_DEBUG_PROBE ) {
-                        outb( ( TLAN_HC_REQ_INT >> 8 ), dev->base_addr + TLAN_HOST_CMD + 1 );
-                }
-                outl( priv->rxListDMA, dev->base_addr + TLAN_CH_PARM );
-                outl( TLAN_HC_GO | TLAN_HC_RT, dev->base_addr + TLAN_HOST_CMD );
+        if (priv->phy_num == 0) {
+                tlan_mii_read_reg(dev, phy, TLAN_TLPHY_CTL, &tlphy_ctl);
+                tlphy_ctl |= TLAN_TC_INTEN;
+                tlan_mii_write_reg(dev, phy, TLAN_TLPHY_CTL, tlphy_ctl);
+                sio = tlan_dio_read8(dev->base_addr, TLAN_NET_SIO);
+                sio |= TLAN_NET_SIO_MINTEN;
+                tlan_dio_write8(dev->base_addr, TLAN_NET_SIO, sio);
+        }
+
+        if (status & MII_GS_LINK) {
+                tlan_set_mac(dev, 0, dev->dev_addr);
+                priv->phy_online = 1;
+                outb((TLAN_HC_INT_ON >> 8), dev->base_addr + TLAN_HOST_CMD + 1);
+                if (debug >= 1 && debug != TLAN_DEBUG_PROBE)
+                        outb((TLAN_HC_REQ_INT >> 8),
+                             dev->base_addr + TLAN_HOST_CMD + 1);
+                outl(priv->rx_list_dma, dev->base_addr + TLAN_CH_PARM);
+                outl(TLAN_HC_GO | TLAN_HC_RT, dev->base_addr + TLAN_HOST_CMD);
                 netif_carrier_on(dev);
         } else {
-                printk( "TLAN: %s: Link inactive, will retry in 10 secs...\n",
-                        dev->name );
-                TLan_SetTimer( dev, (10*HZ), TLAN_TIMER_FINISH_RESET );
+                netdev_info(dev, "Link inactive, will retry in 10 secs...\n");
+                tlan_set_timer(dev, (10*HZ), TLAN_TIMER_FINISH_RESET);
                 return;
         }
-        TLan_SetMulticastList(dev);
+        tlan_set_multicast_list(dev);
 
-} /* TLan_FinishReset */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_SetMac
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              dev     Pointer to device structure of adapter
-         *                      on which to change the AREG.
-         *              areg    The AREG to set the address in (0 - 3).
-         *              mac     A pointer to an array of chars.  Each
-         *                      element stores one byte of the address.
-         *                      IE, it isn't in ascii.
-         *
-         *      This function transfers a MAC address to one of the
-         *      TLAN AREGs (address registers).  The TLAN chip locks
-         *      the register on writing to offset 0 and unlocks the
-         *      register after writing to offset 5.  If NULL is passed
-         *      in mac, then the AREG is filled with 0's.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_set_mac
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              dev     Pointer to device structure of adapter
+ *                      on which to change the AREG.
+ *              areg    The AREG to set the address in (0 - 3).
+ *              mac     A pointer to an array of chars.  Each
+ *                      element stores one byte of the address.
+ *                      IE, it isn't in ascii.
+ *
+ *      This function transfers a MAC address to one of the
+ *      TLAN AREGs (address registers).  The TLAN chip locks
+ *      the register on writing to offset 0 and unlocks the
+ *      register after writing to offset 5.  If NULL is passed
+ *      in mac, then the AREG is filled with 0's.
+ *
+ **************************************************************/
 
-static void TLan_SetMac( struct net_device *dev, int areg, char *mac )
+static void tlan_set_mac(struct net_device *dev, int areg, char *mac)
 {
         int i;
 
         areg *= 6;
 
-        if ( mac != NULL ) {
-                for ( i = 0; i < 6; i++ )
-                        TLan_DioWrite8( dev->base_addr,
-                                        TLAN_AREG_0 + areg + i, mac[i] );
+        if (mac != NULL) {
+                for (i = 0; i < 6; i++)
+                        tlan_dio_write8(dev->base_addr,
+                                        TLAN_AREG_0 + areg + i, mac[i]);
         } else {
-                for ( i = 0; i < 6; i++ )
-                        TLan_DioWrite8( dev->base_addr,
-                                        TLAN_AREG_0 + areg + i, 0 );
+                for (i = 0; i < 6; i++)
+                        tlan_dio_write8(dev->base_addr,
+                                        TLAN_AREG_0 + areg + i, 0);
         }
 
-} /* TLan_SetMac */
+}
 
 
 
@@ -2432,205 +2373,199 @@ static void TLan_SetMac( struct net_device *dev, int areg, char *mac )
 /*****************************************************************************
 ******************************************************************************
 
-        ThunderLAN Driver PHY Layer Routines
+ThunderLAN driver PHY layer routines
 
 ******************************************************************************
 *****************************************************************************/
 
 
 
-        /*********************************************************************
-         *      TLan_PhyPrint
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              dev     A pointer to the device structure of the
-         *                      TLAN device having the PHYs to be detailed.
-         *
-         *      This function prints the registers a PHY (aka transceiver).
-         *
-         ********************************************************************/
+/*********************************************************************
+ *      tlan_phy_print
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              dev     A pointer to the device structure of the
+ *                      TLAN device having the PHYs to be detailed.
+ *
+ *      This function prints the registers a PHY (aka transceiver).
+ *
+ ********************************************************************/
 
-static void TLan_PhyPrint( struct net_device *dev )
+static void tlan_phy_print(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
         u16 i, data0, data1, data2, data3, phy;
 
-        phy = priv->phy[priv->phyNum];
-
-        if ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) {
-                printk( "TLAN:   Device %s, Unmanaged PHY.\n", dev->name );
-        } else if ( phy <= TLAN_PHY_MAX_ADDR ) {
-                printk( "TLAN:   Device %s, PHY 0x%02x.\n", dev->name, phy );
-                printk( "TLAN:      Off.  +0     +1     +2     +3\n" );
-                for ( i = 0; i < 0x20; i+= 4 ) {
-                        printk( "TLAN:      0x%02x", i );
-                        TLan_MiiReadReg( dev, phy, i, &data0 );
-                        printk( " 0x%04hx", data0 );
-                        TLan_MiiReadReg( dev, phy, i + 1, &data1 );
-                        printk( " 0x%04hx", data1 );
-                        TLan_MiiReadReg( dev, phy, i + 2, &data2 );
-                        printk( " 0x%04hx", data2 );
-                        TLan_MiiReadReg( dev, phy, i + 3, &data3 );
-                        printk( " 0x%04hx\n", data3 );
+        phy = priv->phy[priv->phy_num];
+
+        if (priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY) {
+                netdev_info(dev, "Unmanaged PHY\n");
+        } else if (phy <= TLAN_PHY_MAX_ADDR) {
+                netdev_info(dev, "PHY 0x%02x\n", phy);
+                pr_info("   Off.  +0     +1     +2     +3\n");
+                for (i = 0; i < 0x20; i += 4) {
+                        tlan_mii_read_reg(dev, phy, i, &data0);
+                        tlan_mii_read_reg(dev, phy, i + 1, &data1);
+                        tlan_mii_read_reg(dev, phy, i + 2, &data2);
+                        tlan_mii_read_reg(dev, phy, i + 3, &data3);
+                        pr_info("   0x%02x 0x%04hx 0x%04hx 0x%04hx 0x%04hx\n",
+                                i, data0, data1, data2, data3);
                 }
         } else {
-                printk( "TLAN:   Device %s, Invalid PHY.\n", dev->name );
+                netdev_info(dev, "Invalid PHY\n");
         }
 
-} /* TLan_PhyPrint */
+}
 
 
 
 
-        /*********************************************************************
-         *      TLan_PhyDetect
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              dev     A pointer to the device structure of the adapter
-         *                      for which the PHY needs determined.
-         *
-         *      So far I've found that adapters which have external PHYs
-         *      may also use the internal PHY for part of the functionality.
-         *      (eg, AUI/Thinnet).  This function finds out if this TLAN
-         *      chip has an internal PHY, and then finds the first external
-         *      PHY (starting from address 0) if it exists).
-         *
-         ********************************************************************/
+/*********************************************************************
+ *      tlan_phy_detect
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              dev     A pointer to the device structure of the adapter
+ *                      for which the PHY needs determined.
+ *
+ *      So far I've found that adapters which have external PHYs
+ *      may also use the internal PHY for part of the functionality.
+ *      (eg, AUI/Thinnet).  This function finds out if this TLAN
+ *      chip has an internal PHY, and then finds the first external
+ *      PHY (starting from address 0) if it exists).
+ *
+ ********************************************************************/
 
-static void TLan_PhyDetect( struct net_device *dev )
+static void tlan_phy_detect(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
         u16             control;
         u16             hi;
         u16             lo;
         u32             phy;
 
-        if ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) {
-                priv->phyNum = 0xFFFF;
+        if (priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY) {
+                priv->phy_num = 0xffff;
                 return;
         }
 
-        TLan_MiiReadReg( dev, TLAN_PHY_MAX_ADDR, MII_GEN_ID_HI, &hi );
+        tlan_mii_read_reg(dev, TLAN_PHY_MAX_ADDR, MII_GEN_ID_HI, &hi);
 
-        if ( hi != 0xFFFF ) {
+        if (hi != 0xffff)
                 priv->phy[0] = TLAN_PHY_MAX_ADDR;
-        } else {
+        else
                 priv->phy[0] = TLAN_PHY_NONE;
-        }
 
         priv->phy[1] = TLAN_PHY_NONE;
-        for ( phy = 0; phy <= TLAN_PHY_MAX_ADDR; phy++ ) {
-                TLan_MiiReadReg( dev, phy, MII_GEN_CTL, &control );
-                TLan_MiiReadReg( dev, phy, MII_GEN_ID_HI, &hi );
-                TLan_MiiReadReg( dev, phy, MII_GEN_ID_LO, &lo );
-                if ( ( control != 0xFFFF ) ||
-                     ( hi != 0xFFFF ) || ( lo != 0xFFFF ) ) {
-                        TLAN_DBG( TLAN_DEBUG_GNRL,
-                                  "PHY found at %02x %04x %04x %04x\n",
-                                  phy, control, hi, lo );
-                        if ( ( priv->phy[1] == TLAN_PHY_NONE ) &&
-                             ( phy != TLAN_PHY_MAX_ADDR ) ) {
+        for (phy = 0; phy <= TLAN_PHY_MAX_ADDR; phy++) {
+                tlan_mii_read_reg(dev, phy, MII_GEN_CTL, &control);
+                tlan_mii_read_reg(dev, phy, MII_GEN_ID_HI, &hi);
+                tlan_mii_read_reg(dev, phy, MII_GEN_ID_LO, &lo);
+                if ((control != 0xffff) ||
+                    (hi != 0xffff) || (lo != 0xffff)) {
+                        TLAN_DBG(TLAN_DEBUG_GNRL,
+                                 "PHY found at %02x %04x %04x %04x\n",
+                                 phy, control, hi, lo);
+                        if ((priv->phy[1] == TLAN_PHY_NONE) &&
+                            (phy != TLAN_PHY_MAX_ADDR)) {
                                 priv->phy[1] = phy;
                         }
                 }
         }
 
-        if ( priv->phy[1] != TLAN_PHY_NONE ) {
-                priv->phyNum = 1;
-        } else if ( priv->phy[0] != TLAN_PHY_NONE ) {
-                priv->phyNum = 0;
-        } else {
-                printk( "TLAN:  Cannot initialize device, no PHY was found!\n" );
-        }
+        if (priv->phy[1] != TLAN_PHY_NONE)
+                priv->phy_num = 1;
+        else if (priv->phy[0] != TLAN_PHY_NONE)
+                priv->phy_num = 0;
+        else
+                netdev_info(dev, "Cannot initialize device, no PHY was found!\n");
 
-} /* TLan_PhyDetect */
+}
 
 
 
 
-static void TLan_PhyPowerDown( struct net_device *dev )
+static void tlan_phy_power_down(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
         u16             value;
 
-        TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Powering down PHY(s).\n", dev->name );
+        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Powering down PHY(s).\n", dev->name);
         value = MII_GC_PDOWN | MII_GC_LOOPBK | MII_GC_ISOLATE;
-        TLan_MiiSync( dev->base_addr );
-        TLan_MiiWriteReg( dev, priv->phy[priv->phyNum], MII_GEN_CTL, value );
-        if ( ( priv->phyNum == 0 ) &&
-             ( priv->phy[1] != TLAN_PHY_NONE ) &&
-             ( ! ( priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10 ) ) ) {
-                TLan_MiiSync( dev->base_addr );
-                TLan_MiiWriteReg( dev, priv->phy[1], MII_GEN_CTL, value );
+        tlan_mii_sync(dev->base_addr);
+        tlan_mii_write_reg(dev, priv->phy[priv->phy_num], MII_GEN_CTL, value);
+        if ((priv->phy_num == 0) &&
+            (priv->phy[1] != TLAN_PHY_NONE) &&
+            (!(priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10))) {
+                tlan_mii_sync(dev->base_addr);
+                tlan_mii_write_reg(dev, priv->phy[1], MII_GEN_CTL, value);
         }
 
         /* Wait for 50 ms and powerup
          * This is abitrary.  It is intended to make sure the
          * transceiver settles.
          */
-        TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_PUP );
+        tlan_set_timer(dev, (HZ/20), TLAN_TIMER_PHY_PUP);
 
-} /* TLan_PhyPowerDown */
+}
 
 
 
 
-static void TLan_PhyPowerUp( struct net_device *dev )
+static void tlan_phy_power_up(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
         u16             value;
 
-        TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Powering up PHY.\n", dev->name );
-        TLan_MiiSync( dev->base_addr );
+        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Powering up PHY.\n", dev->name);
+        tlan_mii_sync(dev->base_addr);
         value = MII_GC_LOOPBK;
-        TLan_MiiWriteReg( dev, priv->phy[priv->phyNum], MII_GEN_CTL, value );
-        TLan_MiiSync(dev->base_addr);
+        tlan_mii_write_reg(dev, priv->phy[priv->phy_num], MII_GEN_CTL, value);
+        tlan_mii_sync(dev->base_addr);
         /* Wait for 500 ms and reset the
          * transceiver.  The TLAN docs say both 50 ms and
          * 500 ms, so do the longer, just in case.
          */
-        TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_RESET );
+        tlan_set_timer(dev, (HZ/20), TLAN_TIMER_PHY_RESET);
 
-} /* TLan_PhyPowerUp */
+}
 
 
 
 
-static void TLan_PhyReset( struct net_device *dev )
+static void tlan_phy_reset(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
         u16             phy;
         u16             value;
 
-        phy = priv->phy[priv->phyNum];
+        phy = priv->phy[priv->phy_num];
 
-        TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Reseting PHY.\n", dev->name );
-        TLan_MiiSync( dev->base_addr );
+        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Reseting PHY.\n", dev->name);
+        tlan_mii_sync(dev->base_addr);
         value = MII_GC_LOOPBK | MII_GC_RESET;
-        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, value );
-        TLan_MiiReadReg( dev, phy, MII_GEN_CTL, &value );
-        while ( value & MII_GC_RESET ) {
-                TLan_MiiReadReg( dev, phy, MII_GEN_CTL, &value );
-        }
+        tlan_mii_write_reg(dev, phy, MII_GEN_CTL, value);
+        tlan_mii_read_reg(dev, phy, MII_GEN_CTL, &value);
+        while (value & MII_GC_RESET)
+                tlan_mii_read_reg(dev, phy, MII_GEN_CTL, &value);
 
         /* Wait for 500 ms and initialize.
          * I don't remember why I wait this long.
          * I've changed this to 50ms, as it seems long enough.
          */
-        TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_START_LINK );
+        tlan_set_timer(dev, (HZ/20), TLAN_TIMER_PHY_START_LINK);
 
-} /* TLan_PhyReset */
+}
 
 
 
 
-static void TLan_PhyStartLink( struct net_device *dev )
+static void tlan_phy_start_link(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
         u16             ability;
         u16             control;
         u16             data;
@@ -2638,86 +2573,87 @@ static void TLan_PhyStartLink( struct net_device *dev )
         u16             status;
         u16             tctl;
 
-        phy = priv->phy[priv->phyNum];
-        TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Trying to activate link.\n", dev->name );
-        TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
-        TLan_MiiReadReg( dev, phy, MII_GEN_STS, &ability );
+        phy = priv->phy[priv->phy_num];
+        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Trying to activate link.\n", dev->name);
+        tlan_mii_read_reg(dev, phy, MII_GEN_STS, &status);
+        tlan_mii_read_reg(dev, phy, MII_GEN_STS, &ability);
 
-        if ( ( status & MII_GS_AUTONEG ) &&
-             ( ! priv->aui ) ) {
+        if ((status & MII_GS_AUTONEG) &&
+            (!priv->aui)) {
                 ability = status >> 11;
-                if ( priv->speed  == TLAN_SPEED_10 &&
-                     priv->duplex == TLAN_DUPLEX_HALF) {
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x0000);
-                } else if ( priv->speed == TLAN_SPEED_10 &&
-                            priv->duplex == TLAN_DUPLEX_FULL) {
-                        priv->tlanFullDuplex = true;
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x0100);
-                } else if ( priv->speed == TLAN_SPEED_100 &&
-                            priv->duplex == TLAN_DUPLEX_HALF) {
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x2000);
-                } else if ( priv->speed == TLAN_SPEED_100 &&
-                            priv->duplex == TLAN_DUPLEX_FULL) {
-                        priv->tlanFullDuplex = true;
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x2100);
+                if (priv->speed  == TLAN_SPEED_10 &&
+                    priv->duplex == TLAN_DUPLEX_HALF) {
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL, 0x0000);
+                } else if (priv->speed == TLAN_SPEED_10 &&
+                           priv->duplex == TLAN_DUPLEX_FULL) {
+                        priv->tlan_full_duplex = true;
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL, 0x0100);
+                } else if (priv->speed == TLAN_SPEED_100 &&
+                           priv->duplex == TLAN_DUPLEX_HALF) {
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL, 0x2000);
+                } else if (priv->speed == TLAN_SPEED_100 &&
+                           priv->duplex == TLAN_DUPLEX_FULL) {
+                        priv->tlan_full_duplex = true;
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL, 0x2100);
                 } else {
 
                         /* Set Auto-Neg advertisement */
-                        TLan_MiiWriteReg( dev, phy, MII_AN_ADV, (ability << 5) | 1);
+                        tlan_mii_write_reg(dev, phy, MII_AN_ADV,
+                                           (ability << 5) | 1);
                         /* Enablee Auto-Neg */
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x1000 );
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL, 0x1000);
                         /* Restart Auto-Neg */
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x1200 );
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL, 0x1200);
                         /* Wait for 4 sec for autonegotiation
-                        * to complete.  The max spec time is less than this
-                        * but the card need additional time to start AN.
-                        * .5 sec should be plenty extra.
-                        */
-                        printk( "TLAN: %s: Starting autonegotiation.\n", dev->name );
-                        TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_PHY_FINISH_AN );
+                         * to complete.  The max spec time is less than this
+                         * but the card need additional time to start AN.
+                         * .5 sec should be plenty extra.
+                         */
+                        netdev_info(dev, "Starting autonegotiation\n");
+                        tlan_set_timer(dev, (2*HZ), TLAN_TIMER_PHY_FINISH_AN);
                         return;
                 }
 
         }
 
-        if ( ( priv->aui ) && ( priv->phyNum != 0 ) ) {
-                priv->phyNum = 0;
-                data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN | TLAN_NET_CFG_PHY_EN;
-                TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, data );
-                TLan_SetTimer( dev, (40*HZ/1000), TLAN_TIMER_PHY_PDOWN );
+        if ((priv->aui) && (priv->phy_num != 0)) {
+                priv->phy_num = 0;
+                data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN
+                        | TLAN_NET_CFG_PHY_EN;
+                tlan_dio_write16(dev->base_addr, TLAN_NET_CONFIG, data);
+                tlan_set_timer(dev, (40*HZ/1000), TLAN_TIMER_PHY_PDOWN);
                 return;
-        }  else if ( priv->phyNum == 0 ) {
+        } else if (priv->phy_num == 0) {
                 control = 0;
-                TLan_MiiReadReg( dev, phy, TLAN_TLPHY_CTL, &tctl );
-                if ( priv->aui ) {
-                        tctl |= TLAN_TC_AUISEL;
+                tlan_mii_read_reg(dev, phy, TLAN_TLPHY_CTL, &tctl);
+                if (priv->aui) {
+                        tctl |= TLAN_TC_AUISEL;
                 } else {
-                        tctl &= ~TLAN_TC_AUISEL;
-                        if ( priv->duplex == TLAN_DUPLEX_FULL ) {
+                        tctl &= ~TLAN_TC_AUISEL;
+                        if (priv->duplex == TLAN_DUPLEX_FULL) {
                                 control |= MII_GC_DUPLEX;
-                                priv->tlanFullDuplex = true;
+                                priv->tlan_full_duplex = true;
                         }
-                        if ( priv->speed == TLAN_SPEED_100 ) {
+                        if (priv->speed == TLAN_SPEED_100)
                                 control |= MII_GC_SPEEDSEL;
-                        }
                 }
-                TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, control );
-                TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tctl );
+                tlan_mii_write_reg(dev, phy, MII_GEN_CTL, control);
+                tlan_mii_write_reg(dev, phy, TLAN_TLPHY_CTL, tctl);
         }
 
         /* Wait for 2 sec to give the transceiver time
          * to establish link.
          */
-        TLan_SetTimer( dev, (4*HZ), TLAN_TIMER_FINISH_RESET );
+        tlan_set_timer(dev, (4*HZ), TLAN_TIMER_FINISH_RESET);
 
-} /* TLan_PhyStartLink */
+}
 
 
 
 
-static void TLan_PhyFinishAutoNeg( struct net_device *dev )
+static void tlan_phy_finish_auto_neg(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv        *priv = netdev_priv(dev);
         u16             an_adv;
         u16             an_lpa;
         u16             data;
@@ -2725,115 +2661,118 @@ static void TLan_PhyFinishAutoNeg( struct net_device *dev )
         u16             phy;
         u16             status;
 
-        phy = priv->phy[priv->phyNum];
+        phy = priv->phy[priv->phy_num];
 
-        TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
-        udelay( 1000 );
-        TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
+        tlan_mii_read_reg(dev, phy, MII_GEN_STS, &status);
+        udelay(1000);
+        tlan_mii_read_reg(dev, phy, MII_GEN_STS, &status);
 
-        if ( ! ( status & MII_GS_AUTOCMPLT ) ) {
+        if (!(status & MII_GS_AUTOCMPLT)) {
                 /* Wait for 8 sec to give the process
                  * more time.  Perhaps we should fail after a while.
                  */
-                 if (!priv->neg_be_verbose++) {
-                         pr_info("TLAN:  Giving autonegotiation more time.\n");
-                         pr_info("TLAN:  Please check that your adapter has\n");
-                         pr_info("TLAN:  been properly connected to a HUB or Switch.\n");
-                         pr_info("TLAN:  Trying to establish link in the background...\n");
-                 }
-                TLan_SetTimer( dev, (8*HZ), TLAN_TIMER_PHY_FINISH_AN );
+                if (!priv->neg_be_verbose++) {
+                        pr_info("Giving autonegotiation more time.\n");
+                        pr_info("Please check that your adapter has\n");
+                        pr_info("been properly connected to a HUB or Switch.\n");
+                        pr_info("Trying to establish link in the background...\n");
+                }
+                tlan_set_timer(dev, (8*HZ), TLAN_TIMER_PHY_FINISH_AN);
                 return;
         }
 
-        printk( "TLAN: %s: Autonegotiation complete.\n", dev->name );
-        TLan_MiiReadReg( dev, phy, MII_AN_ADV, &an_adv );
-        TLan_MiiReadReg( dev, phy, MII_AN_LPA, &an_lpa );
+        netdev_info(dev, "Autonegotiation complete\n");
+        tlan_mii_read_reg(dev, phy, MII_AN_ADV, &an_adv);
+        tlan_mii_read_reg(dev, phy, MII_AN_LPA, &an_lpa);
         mode = an_adv & an_lpa & 0x03E0;
-        if ( mode & 0x0100 ) {
-                priv->tlanFullDuplex = true;
-        } else if ( ! ( mode & 0x0080 ) && ( mode & 0x0040 ) ) {
-                priv->tlanFullDuplex = true;
-        }
-
-        if ( ( ! ( mode & 0x0180 ) ) &&
-             ( priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10 ) &&
-             ( priv->phyNum != 0 ) ) {
-                priv->phyNum = 0;
-                data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN | TLAN_NET_CFG_PHY_EN;
-                TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, data );
-                TLan_SetTimer( dev, (400*HZ/1000), TLAN_TIMER_PHY_PDOWN );
+        if (mode & 0x0100)
+                priv->tlan_full_duplex = true;
+        else if (!(mode & 0x0080) && (mode & 0x0040))
+                priv->tlan_full_duplex = true;
+
+        if ((!(mode & 0x0180)) &&
+            (priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10) &&
+            (priv->phy_num != 0)) {
+                priv->phy_num = 0;
+                data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN
+                        | TLAN_NET_CFG_PHY_EN;
+                tlan_dio_write16(dev->base_addr, TLAN_NET_CONFIG, data);
+                tlan_set_timer(dev, (400*HZ/1000), TLAN_TIMER_PHY_PDOWN);
                 return;
         }
 
-        if ( priv->phyNum == 0 ) {
-                if ( ( priv->duplex == TLAN_DUPLEX_FULL ) ||
-                     ( an_adv & an_lpa & 0x0040 ) ) {
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL,
-                                          MII_GC_AUTOENB | MII_GC_DUPLEX );
-                        pr_info("TLAN:  Starting internal PHY with FULL-DUPLEX\n" );
+        if (priv->phy_num == 0) {
+                if ((priv->duplex == TLAN_DUPLEX_FULL) ||
+                    (an_adv & an_lpa & 0x0040)) {
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL,
+                                           MII_GC_AUTOENB | MII_GC_DUPLEX);
+                        netdev_info(dev, "Starting internal PHY with FULL-DUPLEX\n");
                 } else {
-                        TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, MII_GC_AUTOENB );
-                        pr_info( "TLAN:  Starting internal PHY with HALF-DUPLEX\n" );
+                        tlan_mii_write_reg(dev, phy, MII_GEN_CTL,
+                                           MII_GC_AUTOENB);
+                        netdev_info(dev, "Starting internal PHY with HALF-DUPLEX\n");
                 }
         }
 
         /* Wait for 100 ms.  No reason in partiticular.
          */
-        TLan_SetTimer( dev, (HZ/10), TLAN_TIMER_FINISH_RESET );
+        tlan_set_timer(dev, (HZ/10), TLAN_TIMER_FINISH_RESET);
 
-} /* TLan_PhyFinishAutoNeg */
+}
 
 #ifdef MONITOR
 
-        /*********************************************************************
-        *
-        *      TLan_phyMonitor
-        *
-        *      Returns:
-        *              None
-        *
-        *      Params:
-        *              dev             The device structure of this device.
-        *
-        *
-        *      This function monitors PHY condition by reading the status
-        *      register via the MII bus. This can be used to give info
-        *      about link changes (up/down), and possible switch to alternate
-        *      media.
-        *
-        * ******************************************************************/
-
-void TLan_PhyMonitor( struct net_device *dev )
+/*********************************************************************
+ *
+ *     tlan_phy_monitor
+ *
+ *     Returns:
+ *            None
+ *
+ *     Params:
+ *            dev            The device structure of this device.
+ *
+ *
+ *     This function monitors PHY condition by reading the status
+ *     register via the MII bus. This can be used to give info
+ *     about link changes (up/down), and possible switch to alternate
+ *     media.
+ *
+ *******************************************************************/
+
+void tlan_phy_monitor(struct net_device *dev)
 {
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
         u16     phy;
         u16     phy_status;
 
-        phy = priv->phy[priv->phyNum];
+        phy = priv->phy[priv->phy_num];
 
-        /* Get PHY status register */
-        TLan_MiiReadReg( dev, phy, MII_GEN_STS, &phy_status );
+        /* Get PHY status register */
+        tlan_mii_read_reg(dev, phy, MII_GEN_STS, &phy_status);
 
-        /* Check if link has been lost */
-        if (!(phy_status & MII_GS_LINK)) {
-               if (priv->link) {
-                      priv->link = 0;
-                      printk(KERN_DEBUG "TLAN: %s has lost link\n", dev->name);
-                      netif_carrier_off(dev);
-                      TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT );
-                      return;
+        /* Check if link has been lost */
+        if (!(phy_status & MII_GS_LINK)) {
+                if (priv->link) {
+                        priv->link = 0;
+                        printk(KERN_DEBUG "TLAN: %s has lost link\n",
+                               dev->name);
+                        netif_carrier_off(dev);
+                        tlan_set_timer(dev, (2*HZ), TLAN_TIMER_LINK_BEAT);
+                        return;
                 }
         }
 
-        /* Link restablished? */
-        if ((phy_status & MII_GS_LINK) && !priv->link) {
-                priv->link = 1;
-                printk(KERN_DEBUG "TLAN: %s has reestablished link\n", dev->name);
+        /* Link restablished? */
+        if ((phy_status & MII_GS_LINK) && !priv->link) {
+                priv->link = 1;
+                printk(KERN_DEBUG "TLAN: %s has reestablished link\n",
+                       dev->name);
                 netif_carrier_on(dev);
-        }
+        }
 
         /* Setup a new monitor */
-        TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT );
+        tlan_set_timer(dev, (2*HZ), TLAN_TIMER_LINK_BEAT);
 }
 
 #endif /* MONITOR */
@@ -2842,47 +2781,48 @@ void TLan_PhyMonitor( struct net_device *dev )
 /*****************************************************************************
 ******************************************************************************
 
-        ThunderLAN Driver MII Routines
+ThunderLAN driver MII routines
 
-        These routines are based on the information in Chap. 2 of the
-        "ThunderLAN Programmer's Guide", pp. 15-24.
+these routines are based on the information in chap. 2 of the
+"ThunderLAN Programmer's Guide", pp. 15-24.
 
 ******************************************************************************
 *****************************************************************************/
 
 
-        /***************************************************************
-         *      TLan_MiiReadReg
-         *
-         *      Returns:
-         *              false   if ack received ok
-         *              true    if no ack received or other error
-         *
-         *      Parms:
-         *              dev             The device structure containing
-         *                              The io address and interrupt count
-         *                              for this device.
-         *              phy             The address of the PHY to be queried.
-         *              reg             The register whose contents are to be
-         *                              retrieved.
-         *              val             A pointer to a variable to store the
-         *                              retrieved value.
-         *
-         *      This function uses the TLAN's MII bus to retrieve the contents
-         *      of a given register on a PHY.  It sends the appropriate info
-         *      and then reads the 16-bit register value from the MII bus via
-         *      the TLAN SIO register.
-         *
-         **************************************************************/
-
-static bool TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val )
+/***************************************************************
+ *      tlan_mii_read_reg
+ *
+ *      Returns:
+ *              false   if ack received ok
+ *              true    if no ack received or other error
+ *
+ *      Parms:
+ *              dev             The device structure containing
+ *                              The io address and interrupt count
+ *                              for this device.
+ *              phy             The address of the PHY to be queried.
+ *              reg             The register whose contents are to be
+ *                              retrieved.
+ *              val             A pointer to a variable to store the
+ *                              retrieved value.
+ *
+ *      This function uses the TLAN's MII bus to retrieve the contents
+ *      of a given register on a PHY.  It sends the appropriate info
+ *      and then reads the 16-bit register value from the MII bus via
+ *      the TLAN SIO register.
+ *
+ **************************************************************/
+
+static bool
+tlan_mii_read_reg(struct net_device *dev, u16 phy, u16 reg, u16 *val)
 {
         u8      nack;
         u16     sio, tmp;
-        u32     i;
+        u32     i;
         bool    err;
         int     minten;
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
         unsigned long flags = 0;
 
         err = false;
@@ -2892,48 +2832,48 @@ static bool TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val
         if (!in_irq())
                 spin_lock_irqsave(&priv->lock, flags);
 
-        TLan_MiiSync(dev->base_addr);
+        tlan_mii_sync(dev->base_addr);
 
-        minten = TLan_GetBit( TLAN_NET_SIO_MINTEN, sio );
-        if ( minten )
-                TLan_ClearBit(TLAN_NET_SIO_MINTEN, sio);
+        minten = tlan_get_bit(TLAN_NET_SIO_MINTEN, sio);
+        if (minten)
+                tlan_clear_bit(TLAN_NET_SIO_MINTEN, sio);
 
-        TLan_MiiSendData( dev->base_addr, 0x1, 2 );     /* Start ( 01b ) */
-        TLan_MiiSendData( dev->base_addr, 0x2, 2 );     /* Read  ( 10b ) */
-        TLan_MiiSendData( dev->base_addr, phy, 5 );     /* Device #      */
-        TLan_MiiSendData( dev->base_addr, reg, 5 );     /* Register #    */
+        tlan_mii_send_data(dev->base_addr, 0x1, 2);     /* start (01b) */
+        tlan_mii_send_data(dev->base_addr, 0x2, 2);     /* read  (10b) */
+        tlan_mii_send_data(dev->base_addr, phy, 5);     /* device #      */
+        tlan_mii_send_data(dev->base_addr, reg, 5);     /* register #    */
 
 
-        TLan_ClearBit(TLAN_NET_SIO_MTXEN, sio);         /* Change direction */
+        tlan_clear_bit(TLAN_NET_SIO_MTXEN, sio);        /* change direction */
 
-        TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);          /* Clock Idle bit */
-        TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
-        TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);          /* Wait 300ns */
+        tlan_clear_bit(TLAN_NET_SIO_MCLK, sio);         /* clock idle bit */
+        tlan_set_bit(TLAN_NET_SIO_MCLK, sio);
+        tlan_clear_bit(TLAN_NET_SIO_MCLK, sio);         /* wait 300ns */
 
-        nack = TLan_GetBit(TLAN_NET_SIO_MDATA, sio);    /* Check for ACK */
-        TLan_SetBit(TLAN_NET_SIO_MCLK, sio);            /* Finish ACK */
-        if (nack) {                                     /* No ACK, so fake it */
+        nack = tlan_get_bit(TLAN_NET_SIO_MDATA, sio);   /* check for ACK */
+        tlan_set_bit(TLAN_NET_SIO_MCLK, sio);           /* finish ACK */
+        if (nack) {                                     /* no ACK, so fake it */
                 for (i = 0; i < 16; i++) {
-                        TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
-                        TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
+                        tlan_clear_bit(TLAN_NET_SIO_MCLK, sio);
+                        tlan_set_bit(TLAN_NET_SIO_MCLK, sio);
                 }
                 tmp = 0xffff;
                 err = true;
         } else {                                        /* ACK, so read data */
                 for (tmp = 0, i = 0x8000; i; i >>= 1) {
-                        TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
-                        if (TLan_GetBit(TLAN_NET_SIO_MDATA, sio))
+                        tlan_clear_bit(TLAN_NET_SIO_MCLK, sio);
+                        if (tlan_get_bit(TLAN_NET_SIO_MDATA, sio))
                                 tmp |= i;
-                        TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
+                        tlan_set_bit(TLAN_NET_SIO_MCLK, sio);
                 }
         }
 
 
-        TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);          /* Idle cycle */
-        TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
+        tlan_clear_bit(TLAN_NET_SIO_MCLK, sio);         /* idle cycle */
+        tlan_set_bit(TLAN_NET_SIO_MCLK, sio);
 
-        if ( minten )
-                TLan_SetBit(TLAN_NET_SIO_MINTEN, sio);
+        if (minten)
+                tlan_set_bit(TLAN_NET_SIO_MINTEN, sio);
 
         *val = tmp;
 
@@ -2942,116 +2882,117 @@ static bool TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val
 
         return err;
 
-} /* TLan_MiiReadReg */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_MiiSendData
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              base_port       The base IO port of the adapter in
-         *                              question.
-         *              dev             The address of the PHY to be queried.
-         *              data            The value to be placed on the MII bus.
-         *              num_bits        The number of bits in data that are to
-         *                              be placed on the MII bus.
-         *
-         *      This function sends on sequence of bits on the MII
-         *      configuration bus.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_mii_send_data
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              base_port       The base IO port of the adapter in
+ *                              question.
+ *              dev             The address of the PHY to be queried.
+ *              data            The value to be placed on the MII bus.
+ *              num_bits        The number of bits in data that are to
+ *                              be placed on the MII bus.
+ *
+ *      This function sends on sequence of bits on the MII
+ *      configuration bus.
+ *
+ **************************************************************/
 
-static void TLan_MiiSendData( u16 base_port, u32 data, unsigned num_bits )
+static void tlan_mii_send_data(u16 base_port, u32 data, unsigned num_bits)
 {
         u16 sio;
         u32 i;
 
-        if ( num_bits == 0 )
+        if (num_bits == 0)
                 return;
 
-        outw( TLAN_NET_SIO, base_port + TLAN_DIO_ADR );
+        outw(TLAN_NET_SIO, base_port + TLAN_DIO_ADR);
         sio = base_port + TLAN_DIO_DATA + TLAN_NET_SIO;
-        TLan_SetBit( TLAN_NET_SIO_MTXEN, sio );
+        tlan_set_bit(TLAN_NET_SIO_MTXEN, sio);
 
-        for ( i = ( 0x1 << ( num_bits - 1 ) ); i; i >>= 1 ) {
-                TLan_ClearBit( TLAN_NET_SIO_MCLK, sio );
-                (void) TLan_GetBit( TLAN_NET_SIO_MCLK, sio );
-                if ( data & i )
-                        TLan_SetBit( TLAN_NET_SIO_MDATA, sio );
+        for (i = (0x1 << (num_bits - 1)); i; i >>= 1) {
+                tlan_clear_bit(TLAN_NET_SIO_MCLK, sio);
+                (void) tlan_get_bit(TLAN_NET_SIO_MCLK, sio);
+                if (data & i)
+                        tlan_set_bit(TLAN_NET_SIO_MDATA, sio);
                 else
-                        TLan_ClearBit( TLAN_NET_SIO_MDATA, sio );
-                TLan_SetBit( TLAN_NET_SIO_MCLK, sio );
-                (void) TLan_GetBit( TLAN_NET_SIO_MCLK, sio );
+                        tlan_clear_bit(TLAN_NET_SIO_MDATA, sio);
+                tlan_set_bit(TLAN_NET_SIO_MCLK, sio);
+                (void) tlan_get_bit(TLAN_NET_SIO_MCLK, sio);
         }
 
-} /* TLan_MiiSendData */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_MiiSync
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              base_port       The base IO port of the adapter in
-         *                              question.
-         *
-         *      This functions syncs all PHYs in terms of the MII configuration
-         *      bus.
-         *
-         **************************************************************/
+/***************************************************************
+ *      TLan_MiiSync
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              base_port       The base IO port of the adapter in
+ *                              question.
+ *
+ *      This functions syncs all PHYs in terms of the MII configuration
+ *      bus.
+ *
+ **************************************************************/
 
-static void TLan_MiiSync( u16 base_port )
+static void tlan_mii_sync(u16 base_port)
 {
         int i;
         u16 sio;
 
-        outw( TLAN_NET_SIO, base_port + TLAN_DIO_ADR );
+        outw(TLAN_NET_SIO, base_port + TLAN_DIO_ADR);
         sio = base_port + TLAN_DIO_DATA + TLAN_NET_SIO;
 
-        TLan_ClearBit( TLAN_NET_SIO_MTXEN, sio );
-        for ( i = 0; i < 32; i++ ) {
-                TLan_ClearBit( TLAN_NET_SIO_MCLK, sio );
-                TLan_SetBit( TLAN_NET_SIO_MCLK, sio );
+        tlan_clear_bit(TLAN_NET_SIO_MTXEN, sio);
+        for (i = 0; i < 32; i++) {
+                tlan_clear_bit(TLAN_NET_SIO_MCLK, sio);
+                tlan_set_bit(TLAN_NET_SIO_MCLK, sio);
         }
 
-} /* TLan_MiiSync */
+}
 
 
 
 
-        /***************************************************************
-         *      TLan_MiiWriteReg
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              dev             The device structure for the device
-         *                              to write to.
-         *              phy             The address of the PHY to be written to.
-         *              reg             The register whose contents are to be
-         *                              written.
-         *              val             The value to be written to the register.
-         *
-         *      This function uses the TLAN's MII bus to write the contents of a
-         *      given register on a PHY.  It sends the appropriate info and then
-         *      writes the 16-bit register value from the MII configuration bus
-         *      via the TLAN SIO register.
-         *
-         **************************************************************/
+/***************************************************************
+ *      tlan_mii_write_reg
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              dev             The device structure for the device
+ *                              to write to.
+ *              phy             The address of the PHY to be written to.
+ *              reg             The register whose contents are to be
+ *                              written.
+ *              val             The value to be written to the register.
+ *
+ *      This function uses the TLAN's MII bus to write the contents of a
+ *      given register on a PHY.  It sends the appropriate info and then
+ *      writes the 16-bit register value from the MII configuration bus
+ *      via the TLAN SIO register.
+ *
+ **************************************************************/
 
-static void TLan_MiiWriteReg( struct net_device *dev, u16 phy, u16 reg, u16 val )
+static void
+tlan_mii_write_reg(struct net_device *dev, u16 phy, u16 reg, u16 val)
 {
         u16     sio;
         int     minten;
         unsigned long flags = 0;
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
 
         outw(TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR);
         sio = dev->base_addr + TLAN_DIO_DATA + TLAN_NET_SIO;
@@ -3059,30 +3000,30 @@ static void TLan_MiiWriteReg( struct net_device *dev, u16 phy, u16 reg, u16 val
         if (!in_irq())
                 spin_lock_irqsave(&priv->lock, flags);
 
-        TLan_MiiSync( dev->base_addr );
+        tlan_mii_sync(dev->base_addr);
 
-        minten = TLan_GetBit( TLAN_NET_SIO_MINTEN, sio );
-        if ( minten )
-                TLan_ClearBit( TLAN_NET_SIO_MINTEN, sio );
+        minten = tlan_get_bit(TLAN_NET_SIO_MINTEN, sio);
+        if (minten)
+                tlan_clear_bit(TLAN_NET_SIO_MINTEN, sio);
 
-        TLan_MiiSendData( dev->base_addr, 0x1, 2 );     /* Start ( 01b ) */
-        TLan_MiiSendData( dev->base_addr, 0x1, 2 );     /* Write ( 01b ) */
-        TLan_MiiSendData( dev->base_addr, phy, 5 );     /* Device #      */
-        TLan_MiiSendData( dev->base_addr, reg, 5 );     /* Register #    */
+        tlan_mii_send_data(dev->base_addr, 0x1, 2);     /* start (01b) */
+        tlan_mii_send_data(dev->base_addr, 0x1, 2);     /* write (01b) */
+        tlan_mii_send_data(dev->base_addr, phy, 5);     /* device #      */
+        tlan_mii_send_data(dev->base_addr, reg, 5);     /* register #    */
 
-        TLan_MiiSendData( dev->base_addr, 0x2, 2 );     /* Send ACK */
-        TLan_MiiSendData( dev->base_addr, val, 16 );    /* Send Data */
+        tlan_mii_send_data(dev->base_addr, 0x2, 2);     /* send ACK */
+        tlan_mii_send_data(dev->base_addr, val, 16);    /* send data */
 
-        TLan_ClearBit( TLAN_NET_SIO_MCLK, sio );        /* Idle cycle */
-        TLan_SetBit( TLAN_NET_SIO_MCLK, sio );
+        tlan_clear_bit(TLAN_NET_SIO_MCLK, sio); /* idle cycle */
+        tlan_set_bit(TLAN_NET_SIO_MCLK, sio);
 
-        if ( minten )
-                TLan_SetBit( TLAN_NET_SIO_MINTEN, sio );
+        if (minten)
+                tlan_set_bit(TLAN_NET_SIO_MINTEN, sio);
 
         if (!in_irq())
                 spin_unlock_irqrestore(&priv->lock, flags);
 
-} /* TLan_MiiWriteReg */
+}
 
 
 
@@ -3090,229 +3031,226 @@ static void TLan_MiiWriteReg( struct net_device *dev, u16 phy, u16 reg, u16 val
 /*****************************************************************************
 ******************************************************************************
 
-        ThunderLAN Driver Eeprom routines
+ThunderLAN driver eeprom routines
 
-        The Compaq Netelligent 10 and 10/100 cards use a Microchip 24C02A
-        EEPROM.  These functions are based on information in Microchip's
-        data sheet.  I don't know how well this functions will work with
-        other EEPROMs.
+the Compaq netelligent 10 and 10/100 cards use a microchip 24C02A
+EEPROM.  these functions are based on information in microchip's
+data sheet.  I don't know how well this functions will work with
+other Eeproms.
 
 ******************************************************************************
 *****************************************************************************/
 
 
-        /***************************************************************
-         *      TLan_EeSendStart
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              io_base         The IO port base address for the
-         *                              TLAN device with the EEPROM to
-         *                              use.
-         *
-         *      This function sends a start cycle to an EEPROM attached
-         *      to a TLAN chip.
-         *
-         **************************************************************/
-
-static void TLan_EeSendStart( u16 io_base )
+/***************************************************************
+ *      tlan_ee_send_start
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              io_base         The IO port base address for the
+ *                              TLAN device with the EEPROM to
+ *                              use.
+ *
+ *      This function sends a start cycle to an EEPROM attached
+ *      to a TLAN chip.
+ *
+ **************************************************************/
+
+static void tlan_ee_send_start(u16 io_base)
 {
         u16     sio;
 
-        outw( TLAN_NET_SIO, io_base + TLAN_DIO_ADR );
+        outw(TLAN_NET_SIO, io_base + TLAN_DIO_ADR);
         sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
 
-        TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
-        TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
-        TLan_SetBit( TLAN_NET_SIO_ETXEN, sio );
-        TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );
-        TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
-
-} /* TLan_EeSendStart */
-
-
-
-
-        /***************************************************************
-         *      TLan_EeSendByte
-         *
-         *      Returns:
-         *              If the correct ack was received, 0, otherwise 1
-         *      Parms:  io_base         The IO port base address for the
-         *                              TLAN device with the EEPROM to
-         *                              use.
-         *              data            The 8 bits of information to
-         *                              send to the EEPROM.
-         *              stop            If TLAN_EEPROM_STOP is passed, a
-         *                              stop cycle is sent after the
-         *                              byte is sent after the ack is
-         *                              read.
-         *
-         *      This function sends a byte on the serial EEPROM line,
-         *      driving the clock to send each bit. The function then
-         *      reverses transmission direction and reads an acknowledge
-         *      bit.
-         *
-         **************************************************************/
-
-static int TLan_EeSendByte( u16 io_base, u8 data, int stop )
+        tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
+        tlan_set_bit(TLAN_NET_SIO_EDATA, sio);
+        tlan_set_bit(TLAN_NET_SIO_ETXEN, sio);
+        tlan_clear_bit(TLAN_NET_SIO_EDATA, sio);
+        tlan_clear_bit(TLAN_NET_SIO_ECLOK, sio);
+
+}
+
+
+
+
+/***************************************************************
+ *      tlan_ee_send_byte
+ *
+ *      Returns:
+ *              If the correct ack was received, 0, otherwise 1
+ *      Parms:  io_base         The IO port base address for the
+ *                              TLAN device with the EEPROM to
+ *                              use.
+ *              data            The 8 bits of information to
+ *                              send to the EEPROM.
+ *              stop            If TLAN_EEPROM_STOP is passed, a
+ *                              stop cycle is sent after the
+ *                              byte is sent after the ack is
+ *                              read.
+ *
+ *      This function sends a byte on the serial EEPROM line,
+ *      driving the clock to send each bit. The function then
+ *      reverses transmission direction and reads an acknowledge
+ *      bit.
+ *
+ **************************************************************/
+
+static int tlan_ee_send_byte(u16 io_base, u8 data, int stop)
 {
         int     err;
         u8      place;
         u16     sio;
 
-        outw( TLAN_NET_SIO, io_base + TLAN_DIO_ADR );
+        outw(TLAN_NET_SIO, io_base + TLAN_DIO_ADR);
         sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
 
         /* Assume clock is low, tx is enabled; */
-        for ( place = 0x80; place != 0; place >>= 1 ) {
-                if ( place & data )
-                        TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
+        for (place = 0x80; place != 0; place >>= 1) {
+                if (place & data)
+                        tlan_set_bit(TLAN_NET_SIO_EDATA, sio);
                 else
-                        TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );
-                TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
-                TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
+                        tlan_clear_bit(TLAN_NET_SIO_EDATA, sio);
+                tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
+                tlan_clear_bit(TLAN_NET_SIO_ECLOK, sio);
         }
-        TLan_ClearBit( TLAN_NET_SIO_ETXEN, sio );
-        TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
-        err = TLan_GetBit( TLAN_NET_SIO_EDATA, sio );
-        TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
-        TLan_SetBit( TLAN_NET_SIO_ETXEN, sio );
+        tlan_clear_bit(TLAN_NET_SIO_ETXEN, sio);
+        tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
+        err = tlan_get_bit(TLAN_NET_SIO_EDATA, sio);
+        tlan_clear_bit(TLAN_NET_SIO_ECLOK, sio);
+        tlan_set_bit(TLAN_NET_SIO_ETXEN, sio);
 
-        if ( ( ! err ) && stop ) {
+        if ((!err) && stop) {
                 /* STOP, raise data while clock is high */
-                TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );
-                TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
-                TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
+                tlan_clear_bit(TLAN_NET_SIO_EDATA, sio);
+                tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
+                tlan_set_bit(TLAN_NET_SIO_EDATA, sio);
         }
 
         return err;
 
-} /* TLan_EeSendByte */
-
-
-
-
-        /***************************************************************
-         *      TLan_EeReceiveByte
-         *
-         *      Returns:
-         *              Nothing
-         *      Parms:
-         *              io_base         The IO port base address for the
-         *                              TLAN device with the EEPROM to
-         *                              use.
-         *              data            An address to a char to hold the
-         *                              data sent from the EEPROM.
-         *              stop            If TLAN_EEPROM_STOP is passed, a
-         *                              stop cycle is sent after the
-         *                              byte is received, and no ack is
-         *                              sent.
-         *
-         *      This function receives 8 bits of data from the EEPROM
-         *      over the serial link.  It then sends and ack bit, or no
-         *      ack and a stop bit.  This function is used to retrieve
-         *      data after the address of a byte in the EEPROM has been
-         *      sent.
-         *
-         **************************************************************/
-
-static void TLan_EeReceiveByte( u16 io_base, u8 *data, int stop )
+}
+
+
+
+
+/***************************************************************
+ *      tlan_ee_receive_byte
+ *
+ *      Returns:
+ *              Nothing
+ *      Parms:
+ *              io_base         The IO port base address for the
+ *                              TLAN device with the EEPROM to
+ *                              use.
+ *              data            An address to a char to hold the
+ *                              data sent from the EEPROM.
+ *              stop            If TLAN_EEPROM_STOP is passed, a
+ *                              stop cycle is sent after the
+ *                              byte is received, and no ack is
+ *                              sent.
+ *
+ *      This function receives 8 bits of data from the EEPROM
+ *      over the serial link.  It then sends and ack bit, or no
+ *      ack and a stop bit.  This function is used to retrieve
+ *      data after the address of a byte in the EEPROM has been
+ *      sent.
+ *
+ **************************************************************/
+
+static void tlan_ee_receive_byte(u16 io_base, u8 *data, int stop)
 {
         u8  place;
         u16 sio;
 
-        outw( TLAN_NET_SIO, io_base + TLAN_DIO_ADR );
+        outw(TLAN_NET_SIO, io_base + TLAN_DIO_ADR);
         sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
         *data = 0;
 
         /* Assume clock is low, tx is enabled; */
-        TLan_ClearBit( TLAN_NET_SIO_ETXEN, sio );
-        for ( place = 0x80; place; place >>= 1 ) {
-                TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
-                if ( TLan_GetBit( TLAN_NET_SIO_EDATA, sio ) )
+        tlan_clear_bit(TLAN_NET_SIO_ETXEN, sio);
+        for (place = 0x80; place; place >>= 1) {
+                tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
+                if (tlan_get_bit(TLAN_NET_SIO_EDATA, sio))
                         *data |= place;
-                TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
+                tlan_clear_bit(TLAN_NET_SIO_ECLOK, sio);
         }
 
-        TLan_SetBit( TLAN_NET_SIO_ETXEN, sio );
-        if ( ! stop ) {
-                TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );       /* Ack = 0 */
-                TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
-                TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
+        tlan_set_bit(TLAN_NET_SIO_ETXEN, sio);
+        if (!stop) {
+                tlan_clear_bit(TLAN_NET_SIO_EDATA, sio); /* ack = 0 */
+                tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
+                tlan_clear_bit(TLAN_NET_SIO_ECLOK, sio);
         } else {
-                TLan_SetBit( TLAN_NET_SIO_EDATA, sio );         /* No ack = 1 (?) */
-                TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
-                TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
+                tlan_set_bit(TLAN_NET_SIO_EDATA, sio);  /* no ack = 1 (?) */
+                tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
+                tlan_clear_bit(TLAN_NET_SIO_ECLOK, sio);
                 /* STOP, raise data while clock is high */
-                TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );
-                TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
-                TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
-        }
-
-} /* TLan_EeReceiveByte */
-
-
-
-
-        /***************************************************************
-         *      TLan_EeReadByte
-         *
-         *      Returns:
-         *              No error = 0, else, the stage at which the error
-         *              occurred.
-         *      Parms:
-         *              io_base         The IO port base address for the
-         *                              TLAN device with the EEPROM to
-         *                              use.
-         *              ee_addr         The address of the byte in the
-         *                              EEPROM whose contents are to be
-         *                              retrieved.
-         *              data            An address to a char to hold the
-         *                              data obtained from the EEPROM.
-         *
-         *      This function reads a byte of information from an byte
-         *      cell in the EEPROM.
-         *
-         **************************************************************/
-
-static int TLan_EeReadByte( struct net_device *dev, u8 ee_addr, u8 *data )
+                tlan_clear_bit(TLAN_NET_SIO_EDATA, sio);
+                tlan_set_bit(TLAN_NET_SIO_ECLOK, sio);
+                tlan_set_bit(TLAN_NET_SIO_EDATA, sio);
+        }
+
+}
+
+
+
+
+/***************************************************************
+ *      tlan_ee_read_byte
+ *
+ *      Returns:
+ *              No error = 0, else, the stage at which the error
+ *              occurred.
+ *      Parms:
+ *              io_base         The IO port base address for the
+ *                              TLAN device with the EEPROM to
+ *                              use.
+ *              ee_addr         The address of the byte in the
+ *                              EEPROM whose contents are to be
+ *                              retrieved.
+ *              data            An address to a char to hold the
+ *                              data obtained from the EEPROM.
+ *
+ *      This function reads a byte of information from an byte
+ *      cell in the EEPROM.
+ *
+ **************************************************************/
+
+static int tlan_ee_read_byte(struct net_device *dev, u8 ee_addr, u8 *data)
 {
         int err;
-        TLanPrivateInfo *priv = netdev_priv(dev);
+        struct tlan_priv *priv = netdev_priv(dev);
         unsigned long flags = 0;
-        int ret=0;
+        int ret = 0;
 
         spin_lock_irqsave(&priv->lock, flags);
 
-        TLan_EeSendStart( dev->base_addr );
-        err = TLan_EeSendByte( dev->base_addr, 0xA0, TLAN_EEPROM_ACK );
-        if (err)
-        {
-                ret=1;
+        tlan_ee_send_start(dev->base_addr);
+        err = tlan_ee_send_byte(dev->base_addr, 0xa0, TLAN_EEPROM_ACK);
+        if (err) {
+                ret = 1;
                 goto fail;
         }
-        err = TLan_EeSendByte( dev->base_addr, ee_addr, TLAN_EEPROM_ACK );
-        if (err)
-        {
-                ret=2;
+        err = tlan_ee_send_byte(dev->base_addr, ee_addr, TLAN_EEPROM_ACK);
+        if (err) {
+                ret = 2;
                 goto fail;
         }
-        TLan_EeSendStart( dev->base_addr );
-        err = TLan_EeSendByte( dev->base_addr, 0xA1, TLAN_EEPROM_ACK );
-        if (err)
-        {
-                ret=3;
+        tlan_ee_send_start(dev->base_addr);
+        err = tlan_ee_send_byte(dev->base_addr, 0xa1, TLAN_EEPROM_ACK);
+        if (err) {
+                ret = 3;
                 goto fail;
         }
-        TLan_EeReceiveByte( dev->base_addr, data, TLAN_EEPROM_STOP );
+        tlan_ee_receive_byte(dev->base_addr, data, TLAN_EEPROM_STOP);
 fail:
         spin_unlock_irqrestore(&priv->lock, flags);
 
         return ret;
 
-} /* TLan_EeReadByte */
+}
 
 
 
diff --git a/drivers/net/tlan.h b/drivers/net/tlan.h
index 3315ced774e..5fc98a8e488 100644
--- a/drivers/net/tlan.h
+++ b/drivers/net/tlan.h
@@ -20,8 +20,8 @@
  ********************************************************************/
 
 
-#include <asm/io.h>
-#include <asm/types.h>
+#include <linux/io.h>
+#include <linux/types.h>
 #include <linux/netdevice.h>
 
 
@@ -40,8 +40,11 @@
 #define TLAN_IGNORE             0
 #define TLAN_RECORD             1
 
-#define TLAN_DBG(lvl, format, args...)  \
-        do { if (debug&lvl) printk(KERN_DEBUG "TLAN: " format, ##args ); } while(0)
+#define TLAN_DBG(lvl, format, args...)                                  \
+        do {                                                            \
+                if (debug&lvl)                                          \
+                        printk(KERN_DEBUG "TLAN: " format, ##args);     \
+        } while (0)
 
 #define TLAN_DEBUG_GNRL         0x0001
 #define TLAN_DEBUG_TX           0x0002
@@ -50,7 +53,8 @@
 #define TLAN_DEBUG_PROBE        0x0010
 
 #define TX_TIMEOUT              (10*HZ)  /* We need time for auto-neg */
-#define MAX_TLAN_BOARDS         8        /* Max number of boards installed at a time */
+#define MAX_TLAN_BOARDS         8        /* Max number of boards installed
+                                            at a time */
 
 
         /*****************************************************************
@@ -70,13 +74,13 @@
 #define PCI_DEVICE_ID_OLICOM_OC2326                     0x0014
 #endif
 
-typedef struct tlan_adapter_entry {
-        u16     vendorId;
-        u16     deviceId;
-        char    *deviceLabel;
+struct tlan_adapter_entry {
+        u16     vendor_id;
+        u16     device_id;
+        char    *device_label;
         u32     flags;
-        u16     addrOfs;
-} TLanAdapterEntry;
+        u16     addr_ofs;
+};
 
 #define TLAN_ADAPTER_NONE               0x00000000
 #define TLAN_ADAPTER_UNMANAGED_PHY      0x00000001
@@ -129,18 +133,18 @@ typedef struct tlan_adapter_entry {
 #define TLAN_CSTAT_DP_PR        0x0100
 
 
-typedef struct tlan_buffer_ref_tag {
+struct tlan_buffer {
         u32     count;
         u32     address;
-} TLanBufferRef;
+};
 
 
-typedef struct tlan_list_tag {
+struct tlan_list {
         u32             forward;
-        u16             cStat;
-        u16             frameSize;
-        TLanBufferRef   buffer[TLAN_BUFFERS_PER_LIST];
-} TLanList;
+        u16             c_stat;
+        u16             frame_size;
+        struct tlan_buffer buffer[TLAN_BUFFERS_PER_LIST];
+};
 
 
 typedef u8 TLanBuffer[TLAN_MAX_FRAME_SIZE];
@@ -164,49 +168,49 @@ typedef u8 TLanBuffer[TLAN_MAX_FRAME_SIZE];
          *
          ****************************************************************/
 
-typedef struct tlan_private_tag {
-        struct net_device       *nextDevice;
-        struct pci_dev          *pciDev;
+struct tlan_priv {
+        struct net_device       *next_device;
+        struct pci_dev          *pci_dev;
         struct net_device       *dev;
-        void                    *dmaStorage;
-        dma_addr_t              dmaStorageDMA;
-        unsigned int            dmaSize;
-        u8                      *padBuffer;
-        TLanList                *rxList;
-        dma_addr_t              rxListDMA;
-        u8                      *rxBuffer;
-        dma_addr_t              rxBufferDMA;
-        u32                     rxHead;
-        u32                     rxTail;
-        u32                     rxEocCount;
-        TLanList                *txList;
-        dma_addr_t              txListDMA;
-        u8                      *txBuffer;
-        dma_addr_t              txBufferDMA;
-        u32                     txHead;
-        u32                     txInProgress;
-        u32                     txTail;
-        u32                     txBusyCount;
-        u32                     phyOnline;
-        u32                     timerSetAt;
-        u32                     timerType;
+        void                    *dma_storage;
+        dma_addr_t              dma_storage_dma;
+        unsigned int            dma_size;
+        u8                      *pad_buffer;
+        struct tlan_list        *rx_list;
+        dma_addr_t              rx_list_dma;
+        u8                      *rx_buffer;
+        dma_addr_t              rx_buffer_dma;
+        u32                     rx_head;
+        u32                     rx_tail;
+        u32                     rx_eoc_count;
+        struct tlan_list        *tx_list;
+        dma_addr_t              tx_list_dma;
+        u8                      *tx_buffer;
+        dma_addr_t              tx_buffer_dma;
+        u32                     tx_head;
+        u32                     tx_in_progress;
+        u32                     tx_tail;
+        u32                     tx_busy_count;
+        u32                     phy_online;
+        u32                     timer_set_at;
+        u32                     timer_type;
         struct timer_list       timer;
         struct board            *adapter;
-        u32                     adapterRev;
+        u32                     adapter_rev;
         u32                     aui;
         u32                     debug;
         u32                     duplex;
         u32                     phy[2];
-        u32                     phyNum;
+        u32                     phy_num;
         u32                     speed;
-        u8                      tlanRev;
-        u8                      tlanFullDuplex;
+        u8                      tlan_rev;
+        u8                      tlan_full_duplex;
         spinlock_t              lock;
         u8                      link;
         u8                      is_eisa;
         struct work_struct                      tlan_tqueue;
         u8                      neg_be_verbose;
-} TLanPrivateInfo;
+};
 
 
 
@@ -247,7 +251,7 @@ typedef struct tlan_private_tag {
          ****************************************************************/
 
 #define TLAN_HOST_CMD                   0x00
-#define         TLAN_HC_GO              0x80000000
+#define TLAN_HC_GO              0x80000000
 #define         TLAN_HC_STOP            0x40000000
 #define         TLAN_HC_ACK             0x20000000
 #define         TLAN_HC_CS_MASK         0x1FE00000
@@ -283,7 +287,7 @@ typedef struct tlan_private_tag {
 #define         TLAN_NET_CMD_TRFRAM     0x02
 #define         TLAN_NET_CMD_TXPACE     0x01
 #define TLAN_NET_SIO                    0x01
-#define         TLAN_NET_SIO_MINTEN     0x80
+#define TLAN_NET_SIO_MINTEN     0x80
 #define         TLAN_NET_SIO_ECLOK      0x40
 #define         TLAN_NET_SIO_ETXEN      0x20
 #define         TLAN_NET_SIO_EDATA      0x10
@@ -304,7 +308,7 @@ typedef struct tlan_private_tag {
 #define         TLAN_NET_MASK_MASK4     0x10
 #define         TLAN_NET_MASK_RSRVD     0x0F
 #define TLAN_NET_CONFIG                 0x04
-#define         TLAN_NET_CFG_RCLK       0x8000
+#define TLAN_NET_CFG_RCLK       0x8000
 #define         TLAN_NET_CFG_TCLK       0x4000
 #define         TLAN_NET_CFG_BIT        0x2000
 #define         TLAN_NET_CFG_RXCRC      0x1000
@@ -372,7 +376,7 @@ typedef struct tlan_private_tag {
 /* Generic MII/PHY Registers */
 
 #define MII_GEN_CTL                     0x00
-#define         MII_GC_RESET            0x8000
+#define MII_GC_RESET            0x8000
 #define         MII_GC_LOOPBK           0x4000
 #define         MII_GC_SPEEDSEL         0x2000
 #define         MII_GC_AUTOENB          0x1000
@@ -397,9 +401,9 @@ typedef struct tlan_private_tag {
 #define         MII_GS_EXTCAP           0x0001
 #define MII_GEN_ID_HI                   0x02
 #define MII_GEN_ID_LO                   0x03
-#define         MII_GIL_OUI             0xFC00
-#define         MII_GIL_MODEL           0x03F0
-#define         MII_GIL_REVISION        0x000F
+#define MII_GIL_OUI             0xFC00
+#define MII_GIL_MODEL           0x03F0
+#define MII_GIL_REVISION        0x000F
 #define MII_AN_ADV                      0x04
 #define MII_AN_LPA                      0x05
 #define MII_AN_EXP                      0x06
@@ -408,7 +412,7 @@ typedef struct tlan_private_tag {
 
 #define TLAN_TLPHY_ID                   0x10
 #define TLAN_TLPHY_CTL                  0x11
-#define         TLAN_TC_IGLINK          0x8000
+#define TLAN_TC_IGLINK          0x8000
 #define         TLAN_TC_SWAPOL          0x4000
 #define         TLAN_TC_AUISEL          0x2000
 #define         TLAN_TC_SQEEN           0x1000
@@ -435,41 +439,41 @@ typedef struct tlan_private_tag {
 #define LEVEL1_ID1                      0x7810
 #define LEVEL1_ID2                      0x0000
 
-#define CIRC_INC( a, b ) if ( ++a >= b ) a = 0
+#define CIRC_INC(a, b) if (++a >= b) a = 0
 
 /* Routines to access internal registers. */
 
-static inline u8 TLan_DioRead8(u16 base_addr, u16 internal_addr)
+static inline u8 tlan_dio_read8(u16 base_addr, u16 internal_addr)
 {
         outw(internal_addr, base_addr + TLAN_DIO_ADR);
         return inb((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x3));
 
-} /* TLan_DioRead8 */
+}
 
 
 
 
-static inline u16 TLan_DioRead16(u16 base_addr, u16 internal_addr)
+static inline u16 tlan_dio_read16(u16 base_addr, u16 internal_addr)
 {
         outw(internal_addr, base_addr + TLAN_DIO_ADR);
         return inw((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x2));
 
-} /* TLan_DioRead16 */
+}
 
 
 
 
-static inline u32 TLan_DioRead32(u16 base_addr, u16 internal_addr)
+static inline u32 tlan_dio_read32(u16 base_addr, u16 internal_addr)
 {
         outw(internal_addr, base_addr + TLAN_DIO_ADR);
         return inl(base_addr + TLAN_DIO_DATA);
 
-} /* TLan_DioRead32 */
+}
 
 
 
 
-static inline void TLan_DioWrite8(u16 base_addr, u16 internal_addr, u8 data)
+static inline void tlan_dio_write8(u16 base_addr, u16 internal_addr, u8 data)
 {
         outw(internal_addr, base_addr + TLAN_DIO_ADR);
         outb(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x3));
@@ -479,7 +483,7 @@ static inline void TLan_DioWrite8(u16 base_addr, u16 internal_addr, u8 data)
 
 
 
-static inline void TLan_DioWrite16(u16 base_addr, u16 internal_addr, u16 data)
+static inline void tlan_dio_write16(u16 base_addr, u16 internal_addr, u16 data)
 {
         outw(internal_addr, base_addr + TLAN_DIO_ADR);
         outw(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2));
@@ -489,16 +493,16 @@ static inline void TLan_DioWrite16(u16 base_addr, u16 internal_addr, u16 data)
 
 
 
-static inline void TLan_DioWrite32(u16 base_addr, u16 internal_addr, u32 data)
+static inline void tlan_dio_write32(u16 base_addr, u16 internal_addr, u32 data)
 {
         outw(internal_addr, base_addr + TLAN_DIO_ADR);
         outl(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2));
 
 }
 
-#define TLan_ClearBit( bit, port )      outb_p(inb_p(port) & ~bit, port)
-#define TLan_GetBit( bit, port )        ((int) (inb_p(port) & bit))
-#define TLan_SetBit( bit, port )        outb_p(inb_p(port) | bit, port)
+#define tlan_clear_bit(bit, port)       outb_p(inb_p(port) & ~bit, port)
+#define tlan_get_bit(bit, port) ((int) (inb_p(port) & bit))
+#define tlan_set_bit(bit, port) outb_p(inb_p(port) | bit, port)
 
 /*
  * given 6 bytes, view them as 8 6-bit numbers and return the XOR of those
@@ -506,37 +510,37 @@ static inline void TLan_DioWrite32(u16 base_addr, u16 internal_addr, u32 data)
  *
  * The original code was:
  *
- * u32  xor( u32 a, u32 b ) {   return ( ( a && ! b ) || ( ! a && b ) ); }
+ * u32  xor(u32 a, u32 b) {     return ((a && !b ) || (! a && b )); }
  *
- * #define XOR8( a, b, c, d, e, f, g, h )       \
- *      xor( a, xor( b, xor( c, xor( d, xor( e, xor( f, xor( g, h ) ) ) ) ) ) )
- * #define DA( a, bit )         ( ( (u8) a[bit/8] ) & ( (u8) ( 1 << bit%8 ) ) )
+ * #define XOR8(a, b, c, d, e, f, g, h) \
+ *      xor(a, xor(b, xor(c, xor(d, xor(e, xor(f, xor(g, h)) ) ) ) ) )
+ * #define DA(a, bit)           (( (u8) a[bit/8] ) & ( (u8) (1 << bit%8)) )
  *
- *      hash  = XOR8( DA(a,0), DA(a, 6), DA(a,12), DA(a,18), DA(a,24),
- *                    DA(a,30), DA(a,36), DA(a,42) );
- *      hash |= XOR8( DA(a,1), DA(a, 7), DA(a,13), DA(a,19), DA(a,25),
- *                    DA(a,31), DA(a,37), DA(a,43) ) << 1;
- *      hash |= XOR8( DA(a,2), DA(a, 8), DA(a,14), DA(a,20), DA(a,26),
- *                    DA(a,32), DA(a,38), DA(a,44) ) << 2;
- *      hash |= XOR8( DA(a,3), DA(a, 9), DA(a,15), DA(a,21), DA(a,27),
- *                    DA(a,33), DA(a,39), DA(a,45) ) << 3;
- *      hash |= XOR8( DA(a,4), DA(a,10), DA(a,16), DA(a,22), DA(a,28),
- *                    DA(a,34), DA(a,40), DA(a,46) ) << 4;
- *      hash |= XOR8( DA(a,5), DA(a,11), DA(a,17), DA(a,23), DA(a,29),
- *                    DA(a,35), DA(a,41), DA(a,47) ) << 5;
+ *      hash  = XOR8(DA(a,0), DA(a, 6), DA(a,12), DA(a,18), DA(a,24),
+ *                    DA(a,30), DA(a,36), DA(a,42));
+ *      hash |= XOR8(DA(a,1), DA(a, 7), DA(a,13), DA(a,19), DA(a,25),
+ *                    DA(a,31), DA(a,37), DA(a,43)) << 1;
+ *      hash |= XOR8(DA(a,2), DA(a, 8), DA(a,14), DA(a,20), DA(a,26),
+ *                    DA(a,32), DA(a,38), DA(a,44)) << 2;
+ *      hash |= XOR8(DA(a,3), DA(a, 9), DA(a,15), DA(a,21), DA(a,27),
+ *                    DA(a,33), DA(a,39), DA(a,45)) << 3;
+ *      hash |= XOR8(DA(a,4), DA(a,10), DA(a,16), DA(a,22), DA(a,28),
+ *                    DA(a,34), DA(a,40), DA(a,46)) << 4;
+ *      hash |= XOR8(DA(a,5), DA(a,11), DA(a,17), DA(a,23), DA(a,29),
+ *                    DA(a,35), DA(a,41), DA(a,47)) << 5;
  *
  */
-static inline u32 TLan_HashFunc( const u8 *a )
+static inline u32 tlan_hash_func(const u8 *a)
 {
-        u8     hash;
+        u8     hash;
 
-        hash = (a[0]^a[3]);             /* & 077 */
-        hash ^= ((a[0]^a[3])>>6);       /* & 003 */
-        hash ^= ((a[1]^a[4])<<2);       /* & 074 */
-        hash ^= ((a[1]^a[4])>>4);       /* & 017 */
-        hash ^= ((a[2]^a[5])<<4);       /* & 060 */
-        hash ^= ((a[2]^a[5])>>2);       /* & 077 */
+        hash = (a[0]^a[3]);             /* & 077 */
+        hash ^= ((a[0]^a[3])>>6);       /* & 003 */
+        hash ^= ((a[1]^a[4])<<2);       /* & 074 */
+        hash ^= ((a[1]^a[4])>>4);       /* & 017 */
+        hash ^= ((a[2]^a[5])<<4);       /* & 060 */
+        hash ^= ((a[2]^a[5])>>2);       /* & 077 */
 
-        return hash & 077;
+        return hash & 077;
 }
 #endif
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index b100bd50a0d..f5e9ac00a07 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -34,6 +34,8 @@
  *    Modifications for 2.3.99-pre5 kernel.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define DRV_NAME        "tun"
 #define DRV_VERSION     "1.6"
 #define DRV_DESCRIPTION "Universal TUN/TAP device driver"
@@ -76,11 +78,27 @@
 #ifdef TUN_DEBUG
 static int debug;
 
-#define DBG  if(tun->debug)printk
-#define DBG1 if(debug==2)printk
+#define tun_debug(level, tun, fmt, args...)                     \
+do {                                                            \
+        if (tun->debug)                                         \
+                netdev_printk(level, tun->dev, fmt, ##args);    \
+} while (0)
+#define DBG1(level, fmt, args...)                               \
+do {                                                            \
+        if (debug == 2)                                         \
+                printk(level fmt, ##args);                      \
+} while (0)
 #else
-#define DBG( a... )
-#define DBG1( a... )
+#define tun_debug(level, tun, fmt, args...)                     \
+do {                                                            \
+        if (0)                                                  \
+                netdev_printk(level, tun->dev, fmt, ##args);    \
+} while (0)
+#define DBG1(level, fmt, args...)                               \
+do {                                                            \
+        if (0)                                                  \
+                printk(level fmt, ##args);                      \
+} while (0)
 #endif
 
 #define FLT_EXACT_COUNT 8
@@ -205,7 +223,7 @@ static void tun_put(struct tun_struct *tun)
                 tun_detach(tfile->tun);
 }
 
-/* TAP filterting */
+/* TAP filtering */
 static void addr_hash_set(u32 *mask, const u8 *addr)
 {
         int n = ether_crc(ETH_ALEN, addr) >> 26;
@@ -360,7 +378,7 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct tun_struct *tun = netdev_priv(dev);
 
-        DBG(KERN_INFO "%s: tun_net_xmit %d\n", tun->dev->name, skb->len);
+        tun_debug(KERN_INFO, tun, "tun_net_xmit %d\n", skb->len);
 
         /* Drop packet if interface is not attached */
         if (!tun->tfile)
@@ -499,7 +517,7 @@ static unsigned int tun_chr_poll(struct file *file, poll_table * wait)
 
         sk = tun->socket.sk;
 
-        DBG(KERN_INFO "%s: tun_chr_poll\n", tun->dev->name);
+        tun_debug(KERN_INFO, tun, "tun_chr_poll\n");
 
         poll_wait(file, &tun->wq.wait, wait);
 
@@ -690,7 +708,7 @@ static ssize_t tun_chr_aio_write(struct kiocb *iocb, const struct iovec *iv,
         if (!tun)
                 return -EBADFD;
 
-        DBG(KERN_INFO "%s: tun_chr_write %ld\n", tun->dev->name, count);
+        tun_debug(KERN_INFO, tun, "tun_chr_write %ld\n", count);
 
         result = tun_get_user(tun, iv, iov_length(iv, count),
                               file->f_flags & O_NONBLOCK);
@@ -739,7 +757,7 @@ static __inline__ ssize_t tun_put_user(struct tun_struct *tun,
                         else if (sinfo->gso_type & SKB_GSO_UDP)
                                 gso.gso_type = VIRTIO_NET_HDR_GSO_UDP;
                         else {
-                                printk(KERN_ERR "tun: unexpected GSO type: "
+                                pr_err("unexpected GSO type: "
                                        "0x%x, gso_size %d, hdr_len %d\n",
                                        sinfo->gso_type, gso.gso_size,
                                        gso.hdr_len);
@@ -786,7 +804,7 @@ static ssize_t tun_do_read(struct tun_struct *tun,
         struct sk_buff *skb;
         ssize_t ret = 0;
 
-        DBG(KERN_INFO "%s: tun_chr_read\n", tun->dev->name);
+        tun_debug(KERN_INFO, tun, "tun_chr_read\n");
 
         add_wait_queue(&tun->wq.wait, &wait);
         while (len) {
@@ -1083,7 +1101,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                 if (device_create_file(&tun->dev->dev, &dev_attr_tun_flags) ||
                     device_create_file(&tun->dev->dev, &dev_attr_owner) ||
                     device_create_file(&tun->dev->dev, &dev_attr_group))
-                        printk(KERN_ERR "Failed to create tun sysfs files\n");
+                        pr_err("Failed to create tun sysfs files\n");
 
                 sk->sk_destruct = tun_sock_destruct;
 
@@ -1092,7 +1110,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                         goto failed;
         }
 
-        DBG(KERN_INFO "%s: tun_set_iff\n", tun->dev->name);
+        tun_debug(KERN_INFO, tun, "tun_set_iff\n");
 
         if (ifr->ifr_flags & IFF_NO_PI)
                 tun->flags |= TUN_NO_PI;
@@ -1129,7 +1147,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 static int tun_get_iff(struct net *net, struct tun_struct *tun,
                        struct ifreq *ifr)
 {
-        DBG(KERN_INFO "%s: tun_get_iff\n", tun->dev->name);
+        tun_debug(KERN_INFO, tun, "tun_get_iff\n");
 
         strcpy(ifr->ifr_name, tun->dev->name);
 
@@ -1142,7 +1160,7 @@ static int tun_get_iff(struct net *net, struct tun_struct *tun,
  * privs required. */
 static int set_offload(struct net_device *dev, unsigned long arg)
 {
-        unsigned int old_features, features;
+        u32 old_features, features;
 
         old_features = dev->features;
         /* Unset features, set them as we chew on the arg. */
@@ -1229,7 +1247,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
         if (!tun)
                 goto unlock;
 
-        DBG(KERN_INFO "%s: tun_chr_ioctl cmd %d\n", tun->dev->name, cmd);
+        tun_debug(KERN_INFO, tun, "tun_chr_ioctl cmd %d\n", cmd);
 
         ret = 0;
         switch (cmd) {
@@ -1249,8 +1267,8 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
                 else
                         tun->flags &= ~TUN_NOCHECKSUM;
 
-                DBG(KERN_INFO "%s: checksum %s\n",
-                    tun->dev->name, arg ? "disabled" : "enabled");
+                tun_debug(KERN_INFO, tun, "checksum %s\n",
+                          arg ? "disabled" : "enabled");
                 break;
 
         case TUNSETPERSIST:
@@ -1260,33 +1278,34 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
                 else
                         tun->flags &= ~TUN_PERSIST;
 
-                DBG(KERN_INFO "%s: persist %s\n",
-                    tun->dev->name, arg ? "enabled" : "disabled");
+                tun_debug(KERN_INFO, tun, "persist %s\n",
+                          arg ? "enabled" : "disabled");
                 break;
 
         case TUNSETOWNER:
                 /* Set owner of the device */
                 tun->owner = (uid_t) arg;
 
-                DBG(KERN_INFO "%s: owner set to %d\n", tun->dev->name, tun->owner);
+                tun_debug(KERN_INFO, tun, "owner set to %d\n", tun->owner);
                 break;
 
         case TUNSETGROUP:
                 /* Set group of the device */
                 tun->group= (gid_t) arg;
 
-                DBG(KERN_INFO "%s: group set to %d\n", tun->dev->name, tun->group);
+                tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group);
                 break;
 
         case TUNSETLINK:
                 /* Only allow setting the type when the interface is down */
                 if (tun->dev->flags & IFF_UP) {
-                        DBG(KERN_INFO "%s: Linktype set failed because interface is up\n",
-                                tun->dev->name);
+                        tun_debug(KERN_INFO, tun,
+                                  "Linktype set failed because interface is up\n");
                         ret = -EBUSY;
                 } else {
                         tun->dev->type = (int) arg;
-                        DBG(KERN_INFO "%s: linktype set to %d\n", tun->dev->name, tun->dev->type);
+                        tun_debug(KERN_INFO, tun, "linktype set to %d\n",
+                                  tun->dev->type);
                         ret = 0;
                 }
                 break;
@@ -1318,8 +1337,8 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
 
         case SIOCSIFHWADDR:
                 /* Set hw address */
-                DBG(KERN_DEBUG "%s: set hw address: %pM\n",
-                        tun->dev->name, ifr.ifr_hwaddr.sa_data);
+                tun_debug(KERN_DEBUG, tun, "set hw address: %pM\n",
+                          ifr.ifr_hwaddr.sa_data);
 
                 ret = dev_set_mac_address(tun->dev, &ifr.ifr_hwaddr);
                 break;
@@ -1433,7 +1452,7 @@ static int tun_chr_fasync(int fd, struct file *file, int on)
         if (!tun)
                 return -EBADFD;
 
-        DBG(KERN_INFO "%s: tun_chr_fasync %d\n", tun->dev->name, on);
+        tun_debug(KERN_INFO, tun, "tun_chr_fasync %d\n", on);
 
         if ((ret = fasync_helper(fd, file, on, &tun->fasync)) < 0)
                 goto out;
@@ -1455,7 +1474,7 @@ static int tun_chr_open(struct inode *inode, struct file * file)
 {
         struct tun_file *tfile;
 
-        DBG1(KERN_INFO "tunX: tun_chr_open\n");
+        DBG1(KERN_INFO, "tunX: tun_chr_open\n");
 
         tfile = kmalloc(sizeof(*tfile), GFP_KERNEL);
         if (!tfile)
@@ -1476,7 +1495,7 @@ static int tun_chr_close(struct inode *inode, struct file *file)
         if (tun) {
                 struct net_device *dev = tun->dev;
 
-                DBG(KERN_INFO "%s: tun_chr_close\n", dev->name);
+                tun_debug(KERN_INFO, tun, "tun_chr_close\n");
 
                 __tun_detach(tun);
 
@@ -1607,18 +1626,18 @@ static int __init tun_init(void)
 {
         int ret = 0;
 
-        printk(KERN_INFO "tun: %s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
-        printk(KERN_INFO "tun: %s\n", DRV_COPYRIGHT);
+        pr_info("%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
+        pr_info("%s\n", DRV_COPYRIGHT);
 
         ret = rtnl_link_register(&tun_link_ops);
         if (ret) {
-                printk(KERN_ERR "tun: Can't register link_ops\n");
+                pr_err("Can't register link_ops\n");
                 goto err_linkops;
         }
 
         ret = misc_register(&tun_miscdev);
         if (ret) {
-                printk(KERN_ERR "tun: Can't register misc device %d\n", TUN_MINOR);
+                pr_err("Can't register misc device %d\n", TUN_MINOR);
                 goto err_misc;
         }
         return  0;
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index a3c46f6a15e..7fa5ec2de94 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -123,12 +123,11 @@ static const int multicast_filter_limit = 32;
 #include <linux/in6.h>
 #include <linux/dma-mapping.h>
 #include <linux/firmware.h>
-#include <generated/utsrelease.h>
 
 #include "typhoon.h"
 
 MODULE_AUTHOR("David Dillow <dave@thedillows.org>");
-MODULE_VERSION(UTS_RELEASE);
+MODULE_VERSION("1.0");
 MODULE_LICENSE("GPL");
 MODULE_FIRMWARE(FIRMWARE_NAME);
 MODULE_DESCRIPTION("3Com Typhoon Family (3C990, 3CR990, and variants)");
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 715e7b47e7e..ef041057d9d 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3740,7 +3740,7 @@ static const struct net_device_ops ucc_geth_netdev_ops = {
 #endif
 };
 
-static int ucc_geth_probe(struct platform_device* ofdev, const struct of_device_id *match)
+static int ucc_geth_probe(struct platform_device* ofdev)
 {
         struct device *device = &ofdev->dev;
         struct device_node *np = ofdev->dev.of_node;
@@ -3986,7 +3986,7 @@ static struct of_device_id ucc_geth_match[] = {
 
 MODULE_DEVICE_TABLE(of, ucc_geth_match);
 
-static struct of_platform_driver ucc_geth_driver = {
+static struct platform_driver ucc_geth_driver = {
         .driver = {
                 .name = DRV_NAME,
                 .owner = THIS_MODULE,
@@ -4008,14 +4008,14 @@ static int __init ucc_geth_init(void)
                 memcpy(&(ugeth_info[i]), &ugeth_primary_info,
                        sizeof(ugeth_primary_info));
 
-        ret = of_register_platform_driver(&ucc_geth_driver);
+        ret = platform_driver_register(&ucc_geth_driver);
 
         return ret;
 }
 
 static void __exit ucc_geth_exit(void)
 {
-        of_unregister_platform_driver(&ucc_geth_driver);
+        platform_driver_unregister(&ucc_geth_driver);
 }
 
 module_init(ucc_geth_init);
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index 109751bad3b..f967913e11b 100644
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -328,13 +328,13 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
         static const char ifname[] = "usbpn%d";
         const struct usb_cdc_union_desc *union_header = NULL;
-        const struct usb_cdc_header_desc *phonet_header = NULL;
         const struct usb_host_interface *data_desc;
         struct usb_interface *data_intf;
         struct usb_device *usbdev = interface_to_usbdev(intf);
         struct net_device *dev;
         struct usbpn_dev *pnd;
         u8 *data;
+        int phonet = 0;
         int len, err;
 
         data = intf->altsetting->extra;
@@ -355,10 +355,7 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                         (struct usb_cdc_union_desc *)data;
                                 break;
                         case 0xAB:
-                                if (phonet_header || dlen < 5)
-                                        break;
-                                phonet_header =
-                                        (struct usb_cdc_header_desc *)data;
+                                phonet = 1;
                                 break;
                         }
                 }
@@ -366,7 +363,7 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 len -= dlen;
         }
 
-        if (!union_header || !phonet_header)
+        if (!union_header || !phonet)
                 return -EINVAL;
 
         data_intf = usb_ifnum_to_if(usbdev, union_header->bSlaveInterface0);
@@ -392,7 +389,6 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
         pnd = netdev_priv(dev);
         SET_NETDEV_DEV(dev, &intf->dev);
-        netif_stop_queue(dev);
 
         pnd->dev = dev;
         pnd->usb = usb_get_dev(usbdev);
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index d776c4a8d3c..7113168473c 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -1,7 +1,7 @@
 /*
  * cdc_ncm.c
  *
- * Copyright (C) ST-Ericsson 2010
+ * Copyright (C) ST-Ericsson 2010-2011
  * Contact: Alexey Orishko <alexey.orishko@stericsson.com>
  * Original author: Hans Petter Selasky <hans.petter.selasky@stericsson.com>
  *
@@ -54,7 +54,7 @@
 #include <linux/usb/usbnet.h>
 #include <linux/usb/cdc.h>
 
-#define DRIVER_VERSION                          "30-Nov-2010"
+#define DRIVER_VERSION                          "7-Feb-2011"
 
 /* CDC NCM subclass 3.2.1 */
 #define USB_CDC_NCM_NDP16_LENGTH_MIN            0x10
@@ -77,6 +77,9 @@
  */
 #define CDC_NCM_DPT_DATAGRAMS_MAX               32
 
+/* Maximum amount of IN datagrams in NTB */
+#define CDC_NCM_DPT_DATAGRAMS_IN_MAX            0 /* unlimited */
+
 /* Restart the timer, if amount of datagrams is less than given value */
 #define CDC_NCM_RESTART_TIMER_DATAGRAM_CNT      3
 
@@ -85,11 +88,6 @@
         (sizeof(struct usb_cdc_ncm_nth16) + sizeof(struct usb_cdc_ncm_ndp16) + \
         (CDC_NCM_DPT_DATAGRAMS_MAX + 1) * sizeof(struct usb_cdc_ncm_dpe16))
 
-struct connection_speed_change {
-        __le32  USBitRate; /* holds 3GPP downlink value, bits per second */
-        __le32  DSBitRate; /* holds 3GPP uplink value, bits per second */
-} __attribute__ ((packed));
-
 struct cdc_ncm_data {
         struct usb_cdc_ncm_nth16 nth16;
         struct usb_cdc_ncm_ndp16 ndp16;
@@ -198,10 +196,10 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
 {
         struct usb_cdc_notification req;
         u32 val;
-        __le16 max_datagram_size;
         u8 flags;
         u8 iface_no;
         int err;
+        u16 ntb_fmt_supported;
 
         iface_no = ctx->control->cur_altsetting->desc.bInterfaceNumber;
 
@@ -223,6 +221,9 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
         ctx->tx_remainder = le16_to_cpu(ctx->ncm_parm.wNdpOutPayloadRemainder);
         ctx->tx_modulus = le16_to_cpu(ctx->ncm_parm.wNdpOutDivisor);
         ctx->tx_ndp_modulus = le16_to_cpu(ctx->ncm_parm.wNdpOutAlignment);
+        /* devices prior to NCM Errata shall set this field to zero */
+        ctx->tx_max_datagrams = le16_to_cpu(ctx->ncm_parm.wNtbOutMaxDatagrams);
+        ntb_fmt_supported = le16_to_cpu(ctx->ncm_parm.bmNtbFormatsSupported);
 
         if (ctx->func_desc != NULL)
                 flags = ctx->func_desc->bmNetworkCapabilities;
@@ -231,22 +232,58 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
 
         pr_debug("dwNtbInMaxSize=%u dwNtbOutMaxSize=%u "
                  "wNdpOutPayloadRemainder=%u wNdpOutDivisor=%u "
-                 "wNdpOutAlignment=%u flags=0x%x\n",
+                 "wNdpOutAlignment=%u wNtbOutMaxDatagrams=%u flags=0x%x\n",
                  ctx->rx_max, ctx->tx_max, ctx->tx_remainder, ctx->tx_modulus,
-                 ctx->tx_ndp_modulus, flags);
+                 ctx->tx_ndp_modulus, ctx->tx_max_datagrams, flags);
 
-        /* max count of tx datagrams without terminating NULL entry */
-        ctx->tx_max_datagrams = CDC_NCM_DPT_DATAGRAMS_MAX;
+        /* max count of tx datagrams */
+        if ((ctx->tx_max_datagrams == 0) ||
+                        (ctx->tx_max_datagrams > CDC_NCM_DPT_DATAGRAMS_MAX))
+                ctx->tx_max_datagrams = CDC_NCM_DPT_DATAGRAMS_MAX;
 
         /* verify maximum size of received NTB in bytes */
-        if ((ctx->rx_max <
-            (CDC_NCM_MIN_HDR_SIZE + CDC_NCM_MIN_DATAGRAM_SIZE)) ||
-            (ctx->rx_max > CDC_NCM_NTB_MAX_SIZE_RX)) {
+        if (ctx->rx_max < USB_CDC_NCM_NTB_MIN_IN_SIZE) {
+                pr_debug("Using min receive length=%d\n",
+                                                USB_CDC_NCM_NTB_MIN_IN_SIZE);
+                ctx->rx_max = USB_CDC_NCM_NTB_MIN_IN_SIZE;
+        }
+
+        if (ctx->rx_max > CDC_NCM_NTB_MAX_SIZE_RX) {
                 pr_debug("Using default maximum receive length=%d\n",
                                                 CDC_NCM_NTB_MAX_SIZE_RX);
                 ctx->rx_max = CDC_NCM_NTB_MAX_SIZE_RX;
         }
 
+        /* inform device about NTB input size changes */
+        if (ctx->rx_max != le32_to_cpu(ctx->ncm_parm.dwNtbInMaxSize)) {
+                req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT |
+                                                        USB_RECIP_INTERFACE;
+                req.bNotificationType = USB_CDC_SET_NTB_INPUT_SIZE;
+                req.wValue = 0;
+                req.wIndex = cpu_to_le16(iface_no);
+
+                if (flags & USB_CDC_NCM_NCAP_NTB_INPUT_SIZE) {
+                        struct usb_cdc_ncm_ndp_input_size ndp_in_sz;
+
+                        req.wLength = 8;
+                        ndp_in_sz.dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);
+                        ndp_in_sz.wNtbInMaxDatagrams =
+                                        cpu_to_le16(CDC_NCM_DPT_DATAGRAMS_MAX);
+                        ndp_in_sz.wReserved = 0;
+                        err = cdc_ncm_do_request(ctx, &req, &ndp_in_sz, 0, NULL,
+                                                                        1000);
+                } else {
+                        __le32 dwNtbInMaxSize = cpu_to_le32(ctx->rx_max);
+
+                        req.wLength = 4;
+                        err = cdc_ncm_do_request(ctx, &req, &dwNtbInMaxSize, 0,
+                                                                NULL, 1000);
+                }
+
+                if (err)
+                        pr_debug("Setting NTB Input Size failed\n");
+        }
+
         /* verify maximum size of transmitted NTB in bytes */
         if ((ctx->tx_max <
             (CDC_NCM_MIN_HDR_SIZE + CDC_NCM_MIN_DATAGRAM_SIZE)) ||
@@ -297,47 +334,84 @@ static u8 cdc_ncm_setup(struct cdc_ncm_ctx *ctx)
         /* additional configuration */
 
         /* set CRC Mode */
-        req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT | USB_RECIP_INTERFACE;
-        req.bNotificationType = USB_CDC_SET_CRC_MODE;
-        req.wValue = cpu_to_le16(USB_CDC_NCM_CRC_NOT_APPENDED);
-        req.wIndex = cpu_to_le16(iface_no);
-        req.wLength = 0;
-
-        err = cdc_ncm_do_request(ctx, &req, NULL, 0, NULL, 1000);
-        if (err)
-                pr_debug("Setting CRC mode off failed\n");
+        if (flags & USB_CDC_NCM_NCAP_CRC_MODE) {
+                req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT |
+                                                        USB_RECIP_INTERFACE;
+                req.bNotificationType = USB_CDC_SET_CRC_MODE;
+                req.wValue = cpu_to_le16(USB_CDC_NCM_CRC_NOT_APPENDED);
+                req.wIndex = cpu_to_le16(iface_no);
+                req.wLength = 0;
+
+                err = cdc_ncm_do_request(ctx, &req, NULL, 0, NULL, 1000);
+                if (err)
+                        pr_debug("Setting CRC mode off failed\n");
+        }
 
-        /* set NTB format */
-        req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT | USB_RECIP_INTERFACE;
-        req.bNotificationType = USB_CDC_SET_NTB_FORMAT;
-        req.wValue = cpu_to_le16(USB_CDC_NCM_NTB16_FORMAT);
-        req.wIndex = cpu_to_le16(iface_no);
-        req.wLength = 0;
+        /* set NTB format, if both formats are supported */
+        if (ntb_fmt_supported & USB_CDC_NCM_NTH32_SIGN) {
+                req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT |
+                                                        USB_RECIP_INTERFACE;
+                req.bNotificationType = USB_CDC_SET_NTB_FORMAT;
+                req.wValue = cpu_to_le16(USB_CDC_NCM_NTB16_FORMAT);
+                req.wIndex = cpu_to_le16(iface_no);
+                req.wLength = 0;
+
+                err = cdc_ncm_do_request(ctx, &req, NULL, 0, NULL, 1000);
+                if (err)
+                        pr_debug("Setting NTB format to 16-bit failed\n");
+        }
 
-        err = cdc_ncm_do_request(ctx, &req, NULL, 0, NULL, 1000);
-        if (err)
-                pr_debug("Setting NTB format to 16-bit failed\n");
+        ctx->max_datagram_size = CDC_NCM_MIN_DATAGRAM_SIZE;
 
         /* set Max Datagram Size (MTU) */
-        req.bmRequestType = USB_TYPE_CLASS | USB_DIR_IN | USB_RECIP_INTERFACE;
-        req.bNotificationType = USB_CDC_GET_MAX_DATAGRAM_SIZE;
-        req.wValue = 0;
-        req.wIndex = cpu_to_le16(iface_no);
-        req.wLength = cpu_to_le16(2);
+        if (flags & USB_CDC_NCM_NCAP_MAX_DATAGRAM_SIZE) {
+                __le16 max_datagram_size;
+                u16 eth_max_sz = le16_to_cpu(ctx->ether_desc->wMaxSegmentSize);
+
+                req.bmRequestType = USB_TYPE_CLASS | USB_DIR_IN |
+                                                        USB_RECIP_INTERFACE;
+                req.bNotificationType = USB_CDC_GET_MAX_DATAGRAM_SIZE;
+                req.wValue = 0;
+                req.wIndex = cpu_to_le16(iface_no);
+                req.wLength = cpu_to_le16(2);
+
+                err = cdc_ncm_do_request(ctx, &req, &max_datagram_size, 0, NULL,
+                                                                        1000);
+                if (err) {
+                        pr_debug("GET_MAX_DATAGRAM_SIZE failed, use size=%u\n",
+                                                CDC_NCM_MIN_DATAGRAM_SIZE);
+                } else {
+                        ctx->max_datagram_size = le16_to_cpu(max_datagram_size);
+                        /* Check Eth descriptor value */
+                        if (eth_max_sz < CDC_NCM_MAX_DATAGRAM_SIZE) {
+                                if (ctx->max_datagram_size > eth_max_sz)
+                                        ctx->max_datagram_size = eth_max_sz;
+                        } else {
+                                if (ctx->max_datagram_size >
+                                                CDC_NCM_MAX_DATAGRAM_SIZE)
+                                        ctx->max_datagram_size =
+                                                CDC_NCM_MAX_DATAGRAM_SIZE;
+                        }
 
-        err = cdc_ncm_do_request(ctx, &req, &max_datagram_size, 0, NULL, 1000);
-        if (err) {
-                pr_debug(" GET_MAX_DATAGRAM_SIZE failed, using size=%u\n",
-                         CDC_NCM_MIN_DATAGRAM_SIZE);
-                /* use default */
-                ctx->max_datagram_size = CDC_NCM_MIN_DATAGRAM_SIZE;
-        } else {
-                ctx->max_datagram_size = le16_to_cpu(max_datagram_size);
+                        if (ctx->max_datagram_size < CDC_NCM_MIN_DATAGRAM_SIZE)
+                                ctx->max_datagram_size =
+                                        CDC_NCM_MIN_DATAGRAM_SIZE;
+
+                        /* if value changed, update device */
+                        req.bmRequestType = USB_TYPE_CLASS | USB_DIR_OUT |
+                                                        USB_RECIP_INTERFACE;
+                        req.bNotificationType = USB_CDC_SET_MAX_DATAGRAM_SIZE;
+                        req.wValue = 0;
+                        req.wIndex = cpu_to_le16(iface_no);
+                        req.wLength = 2;
+                        max_datagram_size = cpu_to_le16(ctx->max_datagram_size);
+
+                        err = cdc_ncm_do_request(ctx, &req, &max_datagram_size,
+                                                                0, NULL, 1000);
+                        if (err)
+                                pr_debug("SET_MAX_DATAGRAM_SIZE failed\n");
+                }
 
-                if (ctx->max_datagram_size < CDC_NCM_MIN_DATAGRAM_SIZE)
-                        ctx->max_datagram_size = CDC_NCM_MIN_DATAGRAM_SIZE;
-                else if (ctx->max_datagram_size > CDC_NCM_MAX_DATAGRAM_SIZE)
-                        ctx->max_datagram_size = CDC_NCM_MAX_DATAGRAM_SIZE;
         }
 
         if (ctx->netdev->mtu != (ctx->max_datagram_size - ETH_HLEN))
@@ -466,19 +540,13 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf)
 
                         ctx->ether_desc =
                                         (const struct usb_cdc_ether_desc *)buf;
-
                         dev->hard_mtu =
                                 le16_to_cpu(ctx->ether_desc->wMaxSegmentSize);
 
-                        if (dev->hard_mtu <
-                            (CDC_NCM_MIN_DATAGRAM_SIZE - ETH_HLEN))
-                                dev->hard_mtu =
-                                        CDC_NCM_MIN_DATAGRAM_SIZE - ETH_HLEN;
-
-                        else if (dev->hard_mtu >
-                                 (CDC_NCM_MAX_DATAGRAM_SIZE - ETH_HLEN))
-                                dev->hard_mtu =
-                                        CDC_NCM_MAX_DATAGRAM_SIZE - ETH_HLEN;
+                        if (dev->hard_mtu < CDC_NCM_MIN_DATAGRAM_SIZE)
+                                dev->hard_mtu = CDC_NCM_MIN_DATAGRAM_SIZE;
+                        else if (dev->hard_mtu > CDC_NCM_MAX_DATAGRAM_SIZE)
+                                dev->hard_mtu = CDC_NCM_MAX_DATAGRAM_SIZE;
                         break;
 
                 case USB_CDC_NCM_TYPE:
@@ -628,13 +696,13 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
         u32 offset;
         u32 last_offset;
         u16 n = 0;
-        u8 timeout = 0;
+        u8 ready2send = 0;
 
         /* if there is a remaining skb, it gets priority */
         if (skb != NULL)
                 swap(skb, ctx->tx_rem_skb);
         else
-                timeout = 1;
+                ready2send = 1;
 
         /*
          * +----------------+
@@ -682,9 +750,10 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
 
         for (; n < ctx->tx_max_datagrams; n++) {
                 /* check if end of transmit buffer is reached */
-                if (offset >= ctx->tx_max)
+                if (offset >= ctx->tx_max) {
+                        ready2send = 1;
                         break;
-
+                }
                 /* compute maximum buffer size */
                 rem = ctx->tx_max - offset;
 
@@ -711,9 +780,7 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
                                 }
                                 ctx->tx_rem_skb = skb;
                                 skb = NULL;
-
-                                /* loop one more time */
-                                timeout = 1;
+                                ready2send = 1;
                         }
                         break;
                 }
@@ -756,7 +823,7 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
                 ctx->tx_curr_last_offset = last_offset;
                 goto exit_no_skb;
 
-        } else if ((n < ctx->tx_max_datagrams) && (timeout == 0)) {
+        } else if ((n < ctx->tx_max_datagrams) && (ready2send == 0)) {
                 /* wait for more frames */
                 /* push variables */
                 ctx->tx_curr_skb = skb_out;
@@ -813,7 +880,7 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
                                         cpu_to_le16(sizeof(ctx->tx_ncm.nth16));
         ctx->tx_ncm.nth16.wSequence = cpu_to_le16(ctx->tx_seq);
         ctx->tx_ncm.nth16.wBlockLength = cpu_to_le16(last_offset);
-        ctx->tx_ncm.nth16.wFpIndex = ALIGN(sizeof(struct usb_cdc_ncm_nth16),
+        ctx->tx_ncm.nth16.wNdpIndex = ALIGN(sizeof(struct usb_cdc_ncm_nth16),
                                                         ctx->tx_ndp_modulus);
 
         memcpy(skb_out->data, &(ctx->tx_ncm.nth16), sizeof(ctx->tx_ncm.nth16));
@@ -825,13 +892,13 @@ cdc_ncm_fill_tx_frame(struct cdc_ncm_ctx *ctx, struct sk_buff *skb)
         rem = sizeof(ctx->tx_ncm.ndp16) + ((ctx->tx_curr_frame_num + 1) *
                                         sizeof(struct usb_cdc_ncm_dpe16));
         ctx->tx_ncm.ndp16.wLength = cpu_to_le16(rem);
-        ctx->tx_ncm.ndp16.wNextFpIndex = 0; /* reserved */
+        ctx->tx_ncm.ndp16.wNextNdpIndex = 0; /* reserved */
 
-        memcpy(((u8 *)skb_out->data) + ctx->tx_ncm.nth16.wFpIndex,
+        memcpy(((u8 *)skb_out->data) + ctx->tx_ncm.nth16.wNdpIndex,
                                                 &(ctx->tx_ncm.ndp16),
                                                 sizeof(ctx->tx_ncm.ndp16));
 
-        memcpy(((u8 *)skb_out->data) + ctx->tx_ncm.nth16.wFpIndex +
+        memcpy(((u8 *)skb_out->data) + ctx->tx_ncm.nth16.wNdpIndex +
                                         sizeof(ctx->tx_ncm.ndp16),
                                         &(ctx->tx_ncm.dpe16),
                                         (ctx->tx_curr_frame_num + 1) *
@@ -868,15 +935,19 @@ static void cdc_ncm_tx_timeout(unsigned long arg)
         if (ctx->tx_timer_pending != 0) {
                 ctx->tx_timer_pending--;
                 restart = 1;
-        } else
+        } else {
                 restart = 0;
+        }
 
         spin_unlock(&ctx->mtx);
 
-        if (restart)
+        if (restart) {
+                spin_lock(&ctx->mtx);
                 cdc_ncm_tx_timeout_start(ctx);
-        else if (ctx->netdev != NULL)
+                spin_unlock(&ctx->mtx);
+        } else if (ctx->netdev != NULL) {
                 usbnet_start_xmit(NULL, ctx->netdev);
+        }
 }
 
 static struct sk_buff *
@@ -900,7 +971,6 @@ cdc_ncm_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
         skb_out = cdc_ncm_fill_tx_frame(ctx, skb);
         if (ctx->tx_curr_skb != NULL)
                 need_timer = 1;
-        spin_unlock(&ctx->mtx);
 
         /* Start timer, if there is a remaining skb */
         if (need_timer)
@@ -908,6 +978,8 @@ cdc_ncm_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
 
         if (skb_out)
                 dev->net->stats.tx_packets += ctx->tx_curr_frame_num;
+
+        spin_unlock(&ctx->mtx);
         return skb_out;
 
 error:
@@ -956,7 +1028,7 @@ static int cdc_ncm_rx_fixup(struct usbnet *dev, struct sk_buff *skb_in)
                 goto error;
         }
 
-        temp = le16_to_cpu(ctx->rx_ncm.nth16.wFpIndex);
+        temp = le16_to_cpu(ctx->rx_ncm.nth16.wNdpIndex);
         if ((temp + sizeof(ctx->rx_ncm.ndp16)) > actlen) {
                 pr_debug("invalid DPT16 index\n");
                 goto error;
@@ -1020,8 +1092,8 @@ static int cdc_ncm_rx_fixup(struct usbnet *dev, struct sk_buff *skb_in)
                 if (((offset + temp) > actlen) ||
                     (temp > CDC_NCM_MAX_DATAGRAM_SIZE) || (temp < ETH_HLEN)) {
                         pr_debug("invalid frame detected (ignored)"
-                                "offset[%u]=%u, length=%u, skb=%p\n",
-                                                        x, offset, temp, skb_in);
+                                        "offset[%u]=%u, length=%u, skb=%p\n",
+                                        x, offset, temp, skb_in);
                         if (!x)
                                 goto error;
                         break;
@@ -1043,10 +1115,10 @@ error:
 
 static void
 cdc_ncm_speed_change(struct cdc_ncm_ctx *ctx,
-                     struct connection_speed_change *data)
+                     struct usb_cdc_speed_change *data)
 {
-        uint32_t rx_speed = le32_to_cpu(data->USBitRate);
-        uint32_t tx_speed = le32_to_cpu(data->DSBitRate);
+        uint32_t rx_speed = le32_to_cpu(data->DLBitRRate);
+        uint32_t tx_speed = le32_to_cpu(data->ULBitRate);
 
         /*
          * Currently the USB-NET API does not support reporting the actual
@@ -1087,7 +1159,7 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)
         /* test for split data in 8-byte chunks */
         if (test_and_clear_bit(EVENT_STS_SPLIT, &dev->flags)) {
                 cdc_ncm_speed_change(ctx,
-                      (struct connection_speed_change *)urb->transfer_buffer);
+                      (struct usb_cdc_speed_change *)urb->transfer_buffer);
                 return;
         }
 
@@ -1115,12 +1187,12 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)
                 break;
 
         case USB_CDC_NOTIFY_SPEED_CHANGE:
-                if (urb->actual_length <
-                    (sizeof(*event) + sizeof(struct connection_speed_change)))
+                if (urb->actual_length < (sizeof(*event) +
+                                        sizeof(struct usb_cdc_speed_change)))
                         set_bit(EVENT_STS_SPLIT, &dev->flags);
                 else
                         cdc_ncm_speed_change(ctx,
-                                (struct connection_speed_change *) &event[1]);
+                                (struct usb_cdc_speed_change *) &event[1]);
                 break;
 
         default:
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 02b622e3b9f..5002f5be47b 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -651,6 +651,10 @@ static const struct usb_device_id products[] = {
         .driver_info = (unsigned long)&dm9601_info,
          },
         {
+         USB_DEVICE(0x0fe6, 0x9700),    /* DM9601 USB to Fast Ethernet Adapter */
+         .driver_info = (unsigned long)&dm9601_info,
+         },
+        {
          USB_DEVICE(0x0a46, 0x9000),    /* DM9000E */
          .driver_info = (unsigned long)&dm9601_info,
          },
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index bed8fcedff4..387ca43f26f 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -324,7 +324,7 @@ struct hso_device {
 /* Prototypes                                                                */
 /*****************************************************************************/
 /* Serial driver functions */
-static int hso_serial_tiocmset(struct tty_struct *tty, struct file *file,
+static int hso_serial_tiocmset(struct tty_struct *tty,
                                unsigned int set, unsigned int clear);
 static void ctrl_callback(struct urb *urb);
 static int put_rxbuf_data(struct urb *urb, struct hso_serial *serial);
@@ -1335,7 +1335,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
 
         /* done */
         if (result)
-                hso_serial_tiocmset(tty, NULL, TIOCM_RTS | TIOCM_DTR, 0);
+                hso_serial_tiocmset(tty, TIOCM_RTS | TIOCM_DTR, 0);
 err_out:
         mutex_unlock(&serial->parent->mutex);
         return result;
@@ -1656,7 +1656,7 @@ static int hso_get_count(struct tty_struct *tty,
 }
 
 
-static int hso_serial_tiocmget(struct tty_struct *tty, struct file *file)
+static int hso_serial_tiocmget(struct tty_struct *tty)
 {
         int retval;
         struct hso_serial *serial = get_serial_by_tty(tty);
@@ -1687,7 +1687,7 @@ static int hso_serial_tiocmget(struct tty_struct *tty, struct file *file)
         return retval;
 }
 
-static int hso_serial_tiocmset(struct tty_struct *tty, struct file *file,
+static int hso_serial_tiocmset(struct tty_struct *tty,
                                unsigned int set, unsigned int clear)
 {
         int val = 0;
@@ -1730,7 +1730,7 @@ static int hso_serial_tiocmset(struct tty_struct *tty, struct file *file,
                                USB_CTRL_SET_TIMEOUT);
 }
 
-static int hso_serial_ioctl(struct tty_struct *tty, struct file *file,
+static int hso_serial_ioctl(struct tty_struct *tty,
                             unsigned int cmd, unsigned long arg)
 {
         struct hso_serial *serial =  get_serial_by_tty(tty);
@@ -2628,15 +2628,15 @@ exit:
 
 static void hso_free_tiomget(struct hso_serial *serial)
 {
-        struct hso_tiocmget *tiocmget = serial->tiocmget;
+        struct hso_tiocmget *tiocmget;
+        if (!serial)
+                return;
+        tiocmget = serial->tiocmget;
         if (tiocmget) {
-                if (tiocmget->urb) {
-                        usb_free_urb(tiocmget->urb);
-                        tiocmget->urb = NULL;
-                }
+                usb_free_urb(tiocmget->urb);
+                tiocmget->urb = NULL;
                 serial->tiocmget = NULL;
                 kfree(tiocmget);
-
         }
 }
 
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 5e98643a4a2..7dc84971f26 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -406,6 +406,7 @@ static int kaweth_download_firmware(struct kaweth_device *kaweth,
 
         if (fw->size > KAWETH_FIRMWARE_BUF_SIZE) {
                 err("Firmware too big: %zu", fw->size);
+                release_firmware(fw);
                 return -ENOSPC;
         }
         data_len = fw->size;
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index bc86f4b6ecc..727874d9deb 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -49,6 +49,8 @@
 
 struct smsc95xx_priv {
         u32 mac_cr;
+        u32 hash_hi;
+        u32 hash_lo;
         spinlock_t mac_cr_lock;
         bool use_tx_csum;
         bool use_rx_csum;
@@ -370,10 +372,11 @@ static void smsc95xx_set_multicast(struct net_device *netdev)
 {
         struct usbnet *dev = netdev_priv(netdev);
         struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
-        u32 hash_hi = 0;
-        u32 hash_lo = 0;
         unsigned long flags;
 
+        pdata->hash_hi = 0;
+        pdata->hash_lo = 0;
+
         spin_lock_irqsave(&pdata->mac_cr_lock, flags);
 
         if (dev->net->flags & IFF_PROMISC) {
@@ -394,13 +397,13 @@ static void smsc95xx_set_multicast(struct net_device *netdev)
                         u32 bitnum = smsc95xx_hash(ha->addr);
                         u32 mask = 0x01 << (bitnum & 0x1F);
                         if (bitnum & 0x20)
-                                hash_hi |= mask;
+                                pdata->hash_hi |= mask;
                         else
-                                hash_lo |= mask;
+                                pdata->hash_lo |= mask;
                 }
 
                 netif_dbg(dev, drv, dev->net, "HASHH=0x%08X, HASHL=0x%08X\n",
-                                   hash_hi, hash_lo);
+                                   pdata->hash_hi, pdata->hash_lo);
         } else {
                 netif_dbg(dev, drv, dev->net, "receive own packets only\n");
                 pdata->mac_cr &=
@@ -410,8 +413,8 @@ static void smsc95xx_set_multicast(struct net_device *netdev)
         spin_unlock_irqrestore(&pdata->mac_cr_lock, flags);
 
         /* Initiate async writes, as we can't wait for completion here */
-        smsc95xx_write_reg_async(dev, HASHH, &hash_hi);
-        smsc95xx_write_reg_async(dev, HASHL, &hash_lo);
+        smsc95xx_write_reg_async(dev, HASHH, &pdata->hash_hi);
+        smsc95xx_write_reg_async(dev, HASHL, &pdata->hash_lo);
         smsc95xx_write_reg_async(dev, MAC_CR, &pdata->mac_cr);
 }
 
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index ed9a41643ff..95c41d56631 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -931,8 +931,10 @@ fail_halt:
                 if (urb != NULL) {
                         clear_bit (EVENT_RX_MEMORY, &dev->flags);
                         status = usb_autopm_get_interface(dev->intf);
-                        if (status < 0)
+                        if (status < 0) {
+                                usb_free_urb(urb);
                                 goto fail_lowmem;
+                        }
                         if (rx_submit (dev, urb, GFP_KERNEL) == -ENOLINK)
                                 resched = 0;
                         usb_autopm_put_interface(dev->intf);
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index cc83fa71c3f..2de9b90c5f8 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -171,7 +171,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
         if (skb->ip_summed == CHECKSUM_NONE)
                 skb->ip_summed = rcv_priv->ip_summed;
 
-        length = skb->len + ETH_HLEN;
+        length = skb->len;
         if (dev_forward_skb(rcv, skb) != NET_RX_SUCCESS)
                 goto rx_drop;
 
@@ -403,17 +403,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
         if (tb[IFLA_ADDRESS] == NULL)
                 random_ether_addr(dev->dev_addr);
 
-        if (tb[IFLA_IFNAME])
-                nla_strlcpy(dev->name, tb[IFLA_IFNAME], IFNAMSIZ);
-        else
-                snprintf(dev->name, IFNAMSIZ, DRV_NAME "%%d");
-
-        if (strchr(dev->name, '%')) {
-                err = dev_alloc_name(dev, dev->name);
-                if (err < 0)
-                        goto err_alloc_name;
-        }
-
         err = register_netdevice(dev);
         if (err < 0)
                 goto err_register_dev;
@@ -433,7 +422,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
 
 err_register_dev:
         /* nothing to do */
-err_alloc_name:
 err_configure_peer:
         unregister_netdevice(peer);
         return err;
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 09cac704fdd..0d6fec6b7d9 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -2923,6 +2923,7 @@ static u16 wol_calc_crc(int size, u8 *pattern, u8 *mask_pattern)
 static int velocity_set_wol(struct velocity_info *vptr)
 {
         struct mac_regs __iomem *regs = vptr->mac_regs;
+        enum speed_opt spd_dpx = vptr->options.spd_dpx;
         static u8 buf[256];
         int i;
 
@@ -2968,6 +2969,12 @@ static int velocity_set_wol(struct velocity_info *vptr)
 
         writew(0x0FFF, &regs->WOLSRClr);
 
+        if (spd_dpx == SPD_DPX_1000_FULL)
+                goto mac_done;
+
+        if (spd_dpx != SPD_DPX_AUTO)
+                goto advertise_done;
+
         if (vptr->mii_status & VELOCITY_AUTONEG_ENABLE) {
                 if (PHYID_GET_PHY_ID(vptr->phy_id) == PHYID_CICADA_CS8201)
                         MII_REG_BITS_ON(AUXCR_MDPPS, MII_NCONFIG, vptr->mac_regs);
@@ -2978,6 +2985,7 @@ static int velocity_set_wol(struct velocity_info *vptr)
         if (vptr->mii_status & VELOCITY_SPEED_1000)
                 MII_REG_BITS_ON(BMCR_ANRESTART, MII_BMCR, vptr->mac_regs);
 
+advertise_done:
         BYTE_REG_BITS_ON(CHIPGCR_FCMODE, &regs->CHIPGCR);
 
         {
@@ -2987,6 +2995,7 @@ static int velocity_set_wol(struct velocity_info *vptr)
                 writeb(GCR, &regs->CHIPGCR);
         }
 
+mac_done:
         BYTE_REG_BITS_OFF(ISR_PWEI, &regs->ISR);
         /* Turn on SWPTAG just before entering power mode */
         BYTE_REG_BITS_ON(STICKHW_SWPTAG, &regs->STICKHW);
diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h
index aa2e69b9ff6..d7227539484 100644
--- a/drivers/net/via-velocity.h
+++ b/drivers/net/via-velocity.h
@@ -361,7 +361,7 @@ enum  velocity_owner {
 #define MAC_REG_CHIPGSR     0x9C
 #define MAC_REG_TESTCFG     0x9D
 #define MAC_REG_DEBUG       0x9E
-#define MAC_REG_CHIPGCR     0x9F
+#define MAC_REG_CHIPGCR     0x9F        /* Chip Operation and Diagnostic Control */
 #define MAC_REG_WOLCR0_SET  0xA0
 #define MAC_REG_WOLCR1_SET  0xA1
 #define MAC_REG_PWCFG_SET   0xA2
@@ -848,10 +848,10 @@ enum  velocity_owner {
  *      Bits in CHIPGCR register
  */
 
-#define CHIPGCR_FCGMII      0x80        /* enable GMII mode */
-#define CHIPGCR_FCFDX       0x40
+#define CHIPGCR_FCGMII      0x80        /* force GMII (else MII only) */
+#define CHIPGCR_FCFDX       0x40        /* force full duplex */
 #define CHIPGCR_FCRESV      0x20
-#define CHIPGCR_FCMODE      0x10
+#define CHIPGCR_FCMODE      0x10        /* enable MAC forced mode */
 #define CHIPGCR_LPSOPT      0x08
 #define CHIPGCR_TM1US       0x04
 #define CHIPGCR_TM0US       0x02
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 90a23e410d1..82dba5aaf42 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -446,6 +446,20 @@ static void skb_recv_done(struct virtqueue *rvq)
         }
 }
 
+static void virtnet_napi_enable(struct virtnet_info *vi)
+{
+        napi_enable(&vi->napi);
+
+        /* If all buffers were filled by other side before we napi_enabled, we
+         * won't get another interrupt, so process any outstanding packets
+         * now.  virtnet_poll wants re-enable the queue, so we disable here.
+         * We synchronize against interrupts via NAPI_STATE_SCHED */
+        if (napi_schedule_prep(&vi->napi)) {
+                virtqueue_disable_cb(vi->rvq);
+                __napi_schedule(&vi->napi);
+        }
+}
+
 static void refill_work(struct work_struct *work)
 {
         struct virtnet_info *vi;
@@ -454,7 +468,7 @@ static void refill_work(struct work_struct *work)
         vi = container_of(work, struct virtnet_info, refill.work);
         napi_disable(&vi->napi);
         still_empty = !try_fill_recv(vi, GFP_KERNEL);
-        napi_enable(&vi->napi);
+        virtnet_napi_enable(vi);
 
         /* In theory, this can happen: if we don't get any buffers in
          * we will *never* try to fill again. */
@@ -638,16 +652,7 @@ static int virtnet_open(struct net_device *dev)
 {
         struct virtnet_info *vi = netdev_priv(dev);
 
-        napi_enable(&vi->napi);
-
-        /* If all buffers were filled by other side before we napi_enabled, we
-         * won't get another interrupt, so process any outstanding packets
-         * now.  virtnet_poll wants re-enable the queue, so we disable here.
-         * We synchronize against interrupts via NAPI_STATE_SCHED */
-        if (napi_schedule_prep(&vi->napi)) {
-                virtqueue_disable_cb(vi->rvq);
-                __napi_schedule(&vi->napi);
-        }
+        virtnet_napi_enable(vi);
         return 0;
 }
 
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index d143e8b72b5..cc14b4a7504 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -48,6 +48,9 @@ static atomic_t devices_found;
 static int enable_mq = 1;
 static int irq_share_mode;
 
+static void
+vmxnet3_write_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac);
+
 /*
  *    Enable/Disable the given intr
  */
@@ -139,9 +142,13 @@ vmxnet3_check_link(struct vmxnet3_adapter *adapter, bool affectTxQueue)
 {
         u32 ret;
         int i;
+        unsigned long flags;
 
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_LINK);
         ret = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
+
         adapter->link_speed = ret >> 16;
         if (ret & 1) { /* Link is up. */
                 printk(KERN_INFO "%s: NIC Link is Up %d Mbps\n",
@@ -183,8 +190,10 @@ vmxnet3_process_events(struct vmxnet3_adapter *adapter)
 
         /* Check if there is an error on xmit/recv queues */
         if (events & (VMXNET3_ECR_TQERR | VMXNET3_ECR_RQERR)) {
+                spin_lock(&adapter->cmd_lock);
                 VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                        VMXNET3_CMD_GET_QUEUE_STATUS);
+                spin_unlock(&adapter->cmd_lock);
 
                 for (i = 0; i < adapter->num_tx_queues; i++)
                         if (adapter->tqd_start[i].status.stopped)
@@ -804,30 +813,25 @@ vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
                                    skb_transport_header(skb))->doff * 4;
                 ctx->copy_size = ctx->eth_ip_hdr_size + ctx->l4_hdr_size;
         } else {
-                unsigned int pull_size;
-
                 if (skb->ip_summed == CHECKSUM_PARTIAL) {
                         ctx->eth_ip_hdr_size = skb_checksum_start_offset(skb);
 
                         if (ctx->ipv4) {
                                 struct iphdr *iph = (struct iphdr *)
                                                     skb_network_header(skb);
-                                if (iph->protocol == IPPROTO_TCP) {
-                                        pull_size = ctx->eth_ip_hdr_size +
-                                                    sizeof(struct tcphdr);
-
-                                        if (unlikely(!pskb_may_pull(skb,
-                                                                pull_size))) {
-                                                goto err;
-                                        }
+                                if (iph->protocol == IPPROTO_TCP)
                                         ctx->l4_hdr_size = ((struct tcphdr *)
                                            skb_transport_header(skb))->doff * 4;
-                                } else if (iph->protocol == IPPROTO_UDP) {
+                                else if (iph->protocol == IPPROTO_UDP)
+                                        /*
+                                         * Use tcp header size so that bytes to
+                                         * be copied are more than required by
+                                         * the device.
+                                         */
                                         ctx->l4_hdr_size =
-                                                        sizeof(struct udphdr);
-                                } else {
+                                                        sizeof(struct tcphdr);
+                                else
                                         ctx->l4_hdr_size = 0;
-                                }
                         } else {
                                 /* for simplicity, don't copy L4 headers */
                                 ctx->l4_hdr_size = 0;
@@ -1859,18 +1863,14 @@ vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         struct Vmxnet3_DriverShared *shared = adapter->shared;
         u32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
+        unsigned long flags;
 
         if (grp) {
                 /* add vlan rx stripping. */
                 if (adapter->netdev->features & NETIF_F_HW_VLAN_RX) {
                         int i;
-                        struct Vmxnet3_DSDevRead *devRead = &shared->devRead;
                         adapter->vlan_grp = grp;
 
-                        /* update FEATURES to device */
-                        devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
-                        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
-                                               VMXNET3_CMD_UPDATE_FEATURE);
                         /*
                          *  Clear entire vfTable; then enable untagged pkts.
                          *  Note: setting one entry in vfTable to non-zero turns
@@ -1880,8 +1880,10 @@ vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                                 vfTable[i] = 0;
 
                         VMXNET3_SET_VFTABLE_ENTRY(vfTable, 0);
+                        spin_lock_irqsave(&adapter->cmd_lock, flags);
                         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                                VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+                        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
                 } else {
                         printk(KERN_ERR "%s: vlan_rx_register when device has "
                                "no NETIF_F_HW_VLAN_RX\n", netdev->name);
@@ -1900,13 +1902,10 @@ vmxnet3_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
                                  */
                                 vfTable[i] = 0;
                         }
+                        spin_lock_irqsave(&adapter->cmd_lock, flags);
                         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                                VMXNET3_CMD_UPDATE_VLAN_FILTERS);
-
-                        /* update FEATURES to device */
-                        devRead->misc.uptFeatures &= ~UPT1_F_RXVLAN;
-                        VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
-                                               VMXNET3_CMD_UPDATE_FEATURE);
+                        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
                 }
         }
 }
@@ -1939,10 +1938,13 @@ vmxnet3_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         u32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
+        unsigned long flags;
 
         VMXNET3_SET_VFTABLE_ENTRY(vfTable, vid);
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 }
 
 
@@ -1951,10 +1953,13 @@ vmxnet3_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         u32 *vfTable = adapter->shared->devRead.rxFilterConf.vfTable;
+        unsigned long flags;
 
         VMXNET3_CLEAR_VFTABLE_ENTRY(vfTable, vid);
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_UPDATE_VLAN_FILTERS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 }
 
 
@@ -1985,6 +1990,7 @@ static void
 vmxnet3_set_mc(struct net_device *netdev)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
+        unsigned long flags;
         struct Vmxnet3_RxFilterConf *rxConf =
                                         &adapter->shared->devRead.rxFilterConf;
         u8 *new_table = NULL;
@@ -2020,6 +2026,7 @@ vmxnet3_set_mc(struct net_device *netdev)
                 rxConf->mfTablePA = 0;
         }
 
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         if (new_mode != rxConf->rxMode) {
                 rxConf->rxMode = cpu_to_le32(new_mode);
                 VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
@@ -2028,6 +2035,7 @@ vmxnet3_set_mc(struct net_device *netdev)
 
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_UPDATE_MAC_FILTERS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 
         kfree(new_table);
 }
@@ -2080,10 +2088,8 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
                 devRead->misc.uptFeatures |= UPT1_F_LRO;
                 devRead->misc.maxNumRxSG = cpu_to_le16(1 + MAX_SKB_FRAGS);
         }
-        if ((adapter->netdev->features & NETIF_F_HW_VLAN_RX) &&
-            adapter->vlan_grp) {
+        if (adapter->netdev->features & NETIF_F_HW_VLAN_RX)
                 devRead->misc.uptFeatures |= UPT1_F_RXVLAN;
-        }
 
         devRead->misc.mtu = cpu_to_le32(adapter->netdev->mtu);
         devRead->misc.queueDescPA = cpu_to_le64(adapter->queue_desc_pa);
@@ -2168,6 +2174,8 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
         /* rx filter settings */
         devRead->rxFilterConf.rxMode = 0;
         vmxnet3_restore_vlan(adapter);
+        vmxnet3_write_mac_addr(adapter, adapter->netdev->dev_addr);
+
         /* the rest are already zeroed */
 }
 
@@ -2177,6 +2185,7 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
 {
         int err, i;
         u32 ret;
+        unsigned long flags;
 
         dev_dbg(&adapter->netdev->dev, "%s: skb_buf_size %d, rx_buf_per_pkt %d,"
                 " ring sizes %u %u %u\n", adapter->netdev->name,
@@ -2206,9 +2215,11 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
                                adapter->shared_pa));
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_DSAH, VMXNET3_GET_ADDR_HI(
                                adapter->shared_pa));
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_ACTIVATE_DEV);
         ret = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 
         if (ret != 0) {
                 printk(KERN_ERR "Failed to activate dev %s: error %u\n",
@@ -2255,7 +2266,10 @@ rq_err:
 void
 vmxnet3_reset_dev(struct vmxnet3_adapter *adapter)
 {
+        unsigned long flags;
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_RESET_DEV);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 }
 
 
@@ -2263,12 +2277,15 @@ int
 vmxnet3_quiesce_dev(struct vmxnet3_adapter *adapter)
 {
         int i;
+        unsigned long flags;
         if (test_and_set_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state))
                 return 0;
 
 
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_QUIESCE_DEV);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
         vmxnet3_disable_all_intrs(adapter);
 
         for (i = 0; i < adapter->num_rx_queues; i++)
@@ -2426,7 +2443,7 @@ vmxnet3_adjust_rx_ring_size(struct vmxnet3_adapter *adapter)
         sz = adapter->rx_buf_per_pkt * VMXNET3_RING_SIZE_ALIGN;
         ring0_size = adapter->rx_queue[0].rx_ring[0].size;
         ring0_size = (ring0_size + sz - 1) / sz * sz;
-        ring0_size = min_t(u32, rq->rx_ring[0].size, VMXNET3_RX_RING_MAX_SIZE /
+        ring0_size = min_t(u32, ring0_size, VMXNET3_RX_RING_MAX_SIZE /
                            sz * sz);
         ring1_size = adapter->rx_queue[0].rx_ring[1].size;
         comp_size = ring0_size + ring1_size;
@@ -2695,7 +2712,7 @@ vmxnet3_acquire_msix_vectors(struct vmxnet3_adapter *adapter,
                         break;
                 } else {
                         /* If fails to enable required number of MSI-x vectors
-                         * try enabling 3 of them. One each for rx, tx and event
+                         * try enabling minimum number of vectors required.
                          */
                         vectors = vector_threshold;
                         printk(KERN_ERR "Failed to enable %d MSI-X for %s, try"
@@ -2718,9 +2735,11 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
         u32 cfg;
 
         /* intr settings */
+        spin_lock(&adapter->cmd_lock);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_GET_CONF_INTR);
         cfg = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_CMD);
+        spin_unlock(&adapter->cmd_lock);
         adapter->intr.type = cfg & 0x3;
         adapter->intr.mask_mode = (cfg >> 2) & 0x3;
 
@@ -2755,7 +2774,7 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
                  */
                 if (err == VMXNET3_LINUX_MIN_MSIX_VECT) {
                         if (adapter->share_intr != VMXNET3_INTR_BUDDYSHARE
-                            || adapter->num_rx_queues != 2) {
+                            || adapter->num_rx_queues != 1) {
                                 adapter->share_intr = VMXNET3_INTR_TXSHARE;
                                 printk(KERN_ERR "Number of rx queues : 1\n");
                                 adapter->num_rx_queues = 1;
@@ -2905,6 +2924,7 @@ vmxnet3_probe_device(struct pci_dev *pdev,
         adapter->netdev = netdev;
         adapter->pdev = pdev;
 
+        spin_lock_init(&adapter->cmd_lock);
         adapter->shared = pci_alloc_consistent(adapter->pdev,
                           sizeof(struct Vmxnet3_DriverShared),
                           &adapter->shared_pa);
@@ -3108,11 +3128,15 @@ vmxnet3_suspend(struct device *device)
         u8 *arpreq;
         struct in_device *in_dev;
         struct in_ifaddr *ifa;
+        unsigned long flags;
         int i = 0;
 
         if (!netif_running(netdev))
                 return 0;
 
+        for (i = 0; i < adapter->num_rx_queues; i++)
+                napi_disable(&adapter->rx_queue[i].napi);
+
         vmxnet3_disable_all_intrs(adapter);
         vmxnet3_free_irqs(adapter);
         vmxnet3_free_intr_resources(adapter);
@@ -3188,8 +3212,10 @@ skip_arp:
         adapter->shared->devRead.pmConfDesc.confPA = cpu_to_le64(virt_to_phys(
                                                                  pmConf));
 
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_UPDATE_PMCFG);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 
         pci_save_state(pdev);
         pci_enable_wake(pdev, pci_choose_state(pdev, PMSG_SUSPEND),
@@ -3204,7 +3230,8 @@ skip_arp:
 static int
 vmxnet3_resume(struct device *device)
 {
-        int err;
+        int err, i = 0;
+        unsigned long flags;
         struct pci_dev *pdev = to_pci_dev(device);
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
@@ -3232,10 +3259,14 @@ vmxnet3_resume(struct device *device)
 
         pci_enable_wake(pdev, PCI_D0, 0);
 
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_UPDATE_PMCFG);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
         vmxnet3_alloc_intr_resources(adapter);
         vmxnet3_request_irqs(adapter);
+        for (i = 0; i < adapter->num_rx_queues; i++)
+                napi_enable(&adapter->rx_queue[i].napi);
         vmxnet3_enable_all_intrs(adapter);
 
         return 0;
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index 8e17fc8a7fe..51f2ef142a5 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@ -45,6 +45,7 @@ static int
 vmxnet3_set_rx_csum(struct net_device *netdev, u32 val)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
+        unsigned long flags;
 
         if (adapter->rxcsum != val) {
                 adapter->rxcsum = val;
@@ -56,8 +57,10 @@ vmxnet3_set_rx_csum(struct net_device *netdev, u32 val)
                                 adapter->shared->devRead.misc.uptFeatures &=
                                 ~UPT1_F_RXCSUM;
 
+                        spin_lock_irqsave(&adapter->cmd_lock, flags);
                         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                                VMXNET3_CMD_UPDATE_FEATURE);
+                        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
                 }
         }
         return 0;
@@ -68,76 +71,78 @@ vmxnet3_set_rx_csum(struct net_device *netdev, u32 val)
 static const struct vmxnet3_stat_desc
 vmxnet3_tq_dev_stats[] = {
         /* description,         offset */
-        { "TSO pkts tx",        offsetof(struct UPT1_TxStats, TSOPktsTxOK) },
-        { "TSO bytes tx",       offsetof(struct UPT1_TxStats, TSOBytesTxOK) },
-        { "ucast pkts tx",      offsetof(struct UPT1_TxStats, ucastPktsTxOK) },
-        { "ucast bytes tx",     offsetof(struct UPT1_TxStats, ucastBytesTxOK) },
-        { "mcast pkts tx",      offsetof(struct UPT1_TxStats, mcastPktsTxOK) },
-        { "mcast bytes tx",     offsetof(struct UPT1_TxStats, mcastBytesTxOK) },
-        { "bcast pkts tx",      offsetof(struct UPT1_TxStats, bcastPktsTxOK) },
-        { "bcast bytes tx",     offsetof(struct UPT1_TxStats, bcastBytesTxOK) },
-        { "pkts tx err",        offsetof(struct UPT1_TxStats, pktsTxError) },
-        { "pkts tx discard",    offsetof(struct UPT1_TxStats, pktsTxDiscard) },
+        { "Tx Queue#",        0 },
+        { "  TSO pkts tx",      offsetof(struct UPT1_TxStats, TSOPktsTxOK) },
+        { "  TSO bytes tx",     offsetof(struct UPT1_TxStats, TSOBytesTxOK) },
+        { "  ucast pkts tx",    offsetof(struct UPT1_TxStats, ucastPktsTxOK) },
+        { "  ucast bytes tx",   offsetof(struct UPT1_TxStats, ucastBytesTxOK) },
+        { "  mcast pkts tx",    offsetof(struct UPT1_TxStats, mcastPktsTxOK) },
+        { "  mcast bytes tx",   offsetof(struct UPT1_TxStats, mcastBytesTxOK) },
+        { "  bcast pkts tx",    offsetof(struct UPT1_TxStats, bcastPktsTxOK) },
+        { "  bcast bytes tx",   offsetof(struct UPT1_TxStats, bcastBytesTxOK) },
+        { "  pkts tx err",      offsetof(struct UPT1_TxStats, pktsTxError) },
+        { "  pkts tx discard",  offsetof(struct UPT1_TxStats, pktsTxDiscard) },
 };
 
 /* per tq stats maintained by the driver */
 static const struct vmxnet3_stat_desc
 vmxnet3_tq_driver_stats[] = {
         /* description,         offset */
-        {"drv dropped tx total", offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_total) },
-        { "   too many frags",  offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_too_many_frags) },
-        { "   giant hdr",       offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_oversized_hdr) },
-        { "   hdr err",         offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_hdr_inspect_err) },
-        { "   tso",             offsetof(struct vmxnet3_tq_driver_stats,
-                                        drop_tso) },
-        { "ring full",          offsetof(struct vmxnet3_tq_driver_stats,
-                                        tx_ring_full) },
-        { "pkts linearized",    offsetof(struct vmxnet3_tq_driver_stats,
-                                        linearized) },
-        { "hdr cloned",         offsetof(struct vmxnet3_tq_driver_stats,
-                                        copy_skb_header) },
-        { "giant hdr",          offsetof(struct vmxnet3_tq_driver_stats,
-                                        oversized_hdr) },
+        {"  drv dropped tx total",      offsetof(struct vmxnet3_tq_driver_stats,
+                                                 drop_total) },
+        { "     too many frags", offsetof(struct vmxnet3_tq_driver_stats,
+                                          drop_too_many_frags) },
+        { "     giant hdr",     offsetof(struct vmxnet3_tq_driver_stats,
+                                         drop_oversized_hdr) },
+        { "     hdr err",       offsetof(struct vmxnet3_tq_driver_stats,
+                                         drop_hdr_inspect_err) },
+        { "     tso",           offsetof(struct vmxnet3_tq_driver_stats,
+                                         drop_tso) },
+        { "  ring full",        offsetof(struct vmxnet3_tq_driver_stats,
+                                         tx_ring_full) },
+        { "  pkts linearized",  offsetof(struct vmxnet3_tq_driver_stats,
+                                         linearized) },
+        { "  hdr cloned",       offsetof(struct vmxnet3_tq_driver_stats,
+                                         copy_skb_header) },
+        { "  giant hdr",        offsetof(struct vmxnet3_tq_driver_stats,
+                                         oversized_hdr) },
 };
 
 /* per rq stats maintained by the device */
 static const struct vmxnet3_stat_desc
 vmxnet3_rq_dev_stats[] = {
-        { "LRO pkts rx",        offsetof(struct UPT1_RxStats, LROPktsRxOK) },
-        { "LRO byte rx",        offsetof(struct UPT1_RxStats, LROBytesRxOK) },
-        { "ucast pkts rx",      offsetof(struct UPT1_RxStats, ucastPktsRxOK) },
-        { "ucast bytes rx",     offsetof(struct UPT1_RxStats, ucastBytesRxOK) },
-        { "mcast pkts rx",      offsetof(struct UPT1_RxStats, mcastPktsRxOK) },
-        { "mcast bytes rx",     offsetof(struct UPT1_RxStats, mcastBytesRxOK) },
-        { "bcast pkts rx",      offsetof(struct UPT1_RxStats, bcastPktsRxOK) },
-        { "bcast bytes rx",     offsetof(struct UPT1_RxStats, bcastBytesRxOK) },
-        { "pkts rx out of buf", offsetof(struct UPT1_RxStats, pktsRxOutOfBuf) },
-        { "pkts rx err",        offsetof(struct UPT1_RxStats, pktsRxError) },
+        { "Rx Queue#",        0 },
+        { "  LRO pkts rx",      offsetof(struct UPT1_RxStats, LROPktsRxOK) },
+        { "  LRO byte rx",      offsetof(struct UPT1_RxStats, LROBytesRxOK) },
+        { "  ucast pkts rx",    offsetof(struct UPT1_RxStats, ucastPktsRxOK) },
+        { "  ucast bytes rx",   offsetof(struct UPT1_RxStats, ucastBytesRxOK) },
+        { "  mcast pkts rx",    offsetof(struct UPT1_RxStats, mcastPktsRxOK) },
+        { "  mcast bytes rx",   offsetof(struct UPT1_RxStats, mcastBytesRxOK) },
+        { "  bcast pkts rx",    offsetof(struct UPT1_RxStats, bcastPktsRxOK) },
+        { "  bcast bytes rx",   offsetof(struct UPT1_RxStats, bcastBytesRxOK) },
+        { "  pkts rx OOB",      offsetof(struct UPT1_RxStats, pktsRxOutOfBuf) },
+        { "  pkts rx err",      offsetof(struct UPT1_RxStats, pktsRxError) },
 };
 
 /* per rq stats maintained by the driver */
 static const struct vmxnet3_stat_desc
 vmxnet3_rq_driver_stats[] = {
         /* description,         offset */
-        { "drv dropped rx total", offsetof(struct vmxnet3_rq_driver_stats,
-                                           drop_total) },
-        { "   err",            offsetof(struct vmxnet3_rq_driver_stats,
-                                        drop_err) },
-        { "   fcs",            offsetof(struct vmxnet3_rq_driver_stats,
-                                        drop_fcs) },
-        { "rx buf alloc fail", offsetof(struct vmxnet3_rq_driver_stats,
-                                        rx_buf_alloc_failure) },
+        { "  drv dropped rx total", offsetof(struct vmxnet3_rq_driver_stats,
+                                             drop_total) },
+        { "     err",           offsetof(struct vmxnet3_rq_driver_stats,
+                                         drop_err) },
+        { "     fcs",           offsetof(struct vmxnet3_rq_driver_stats,
+                                         drop_fcs) },
+        { "  rx buf alloc fail", offsetof(struct vmxnet3_rq_driver_stats,
+                                          rx_buf_alloc_failure) },
 };
 
 /* gloabl stats maintained by the driver */
 static const struct vmxnet3_stat_desc
 vmxnet3_global_stats[] = {
         /* description,         offset */
-        { "tx timeout count",   offsetof(struct vmxnet3_adapter,
+        { "tx timeout count",   offsetof(struct vmxnet3_adapter,
                                          tx_timeout_count) }
 };
 
@@ -151,12 +156,15 @@ vmxnet3_get_stats(struct net_device *netdev)
         struct UPT1_TxStats *devTxStats;
         struct UPT1_RxStats *devRxStats;
         struct net_device_stats *net_stats = &netdev->stats;
+        unsigned long flags;
         int i;
 
         adapter = netdev_priv(netdev);
 
         /* Collect the dev stats into the shared area */
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 
         memset(net_stats, 0, sizeof(*net_stats));
         for (i = 0; i < adapter->num_tx_queues; i++) {
@@ -193,12 +201,15 @@ vmxnet3_get_stats(struct net_device *netdev)
 static int
 vmxnet3_get_sset_count(struct net_device *netdev, int sset)
 {
+        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         switch (sset) {
         case ETH_SS_STATS:
-                return ARRAY_SIZE(vmxnet3_tq_dev_stats) +
-                        ARRAY_SIZE(vmxnet3_tq_driver_stats) +
-                        ARRAY_SIZE(vmxnet3_rq_dev_stats) +
-                        ARRAY_SIZE(vmxnet3_rq_driver_stats) +
+                return (ARRAY_SIZE(vmxnet3_tq_dev_stats) +
+                        ARRAY_SIZE(vmxnet3_tq_driver_stats)) *
+                       adapter->num_tx_queues +
+                       (ARRAY_SIZE(vmxnet3_rq_dev_stats) +
+                        ARRAY_SIZE(vmxnet3_rq_driver_stats)) *
+                       adapter->num_rx_queues +
                         ARRAY_SIZE(vmxnet3_global_stats);
         default:
                 return -EOPNOTSUPP;
@@ -206,10 +217,16 @@ vmxnet3_get_sset_count(struct net_device *netdev, int sset)
 }
 
 
+/* Should be multiple of 4 */
+#define NUM_TX_REGS     8
+#define NUM_RX_REGS     12
+
 static int
 vmxnet3_get_regs_len(struct net_device *netdev)
 {
-        return 20 * sizeof(u32);
+        struct vmxnet3_adapter *adapter = netdev_priv(netdev);
+        return (adapter->num_tx_queues * NUM_TX_REGS * sizeof(u32) +
+                adapter->num_rx_queues * NUM_RX_REGS * sizeof(u32));
 }
 
 
@@ -240,29 +257,37 @@ vmxnet3_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
 static void
 vmxnet3_get_strings(struct net_device *netdev, u32 stringset, u8 *buf)
 {
+         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         if (stringset == ETH_SS_STATS) {
-                int i;
-
-                for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++) {
-                        memcpy(buf, vmxnet3_tq_dev_stats[i].desc,
-                               ETH_GSTRING_LEN);
-                        buf += ETH_GSTRING_LEN;
-                }
-                for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats); i++) {
-                        memcpy(buf, vmxnet3_tq_driver_stats[i].desc,
-                               ETH_GSTRING_LEN);
-                        buf += ETH_GSTRING_LEN;
-                }
-                for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++) {
-                        memcpy(buf, vmxnet3_rq_dev_stats[i].desc,
-                               ETH_GSTRING_LEN);
-                        buf += ETH_GSTRING_LEN;
+                int i, j;
+                for (j = 0; j < adapter->num_tx_queues; j++) {
+                        for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++) {
+                                memcpy(buf, vmxnet3_tq_dev_stats[i].desc,
+                                       ETH_GSTRING_LEN);
+                                buf += ETH_GSTRING_LEN;
+                        }
+                        for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats);
+                             i++) {
+                                memcpy(buf, vmxnet3_tq_driver_stats[i].desc,
+                                       ETH_GSTRING_LEN);
+                                buf += ETH_GSTRING_LEN;
+                        }
                 }
-                for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats); i++) {
-                        memcpy(buf, vmxnet3_rq_driver_stats[i].desc,
-                               ETH_GSTRING_LEN);
-                        buf += ETH_GSTRING_LEN;
+
+                for (j = 0; j < adapter->num_rx_queues; j++) {
+                        for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++) {
+                                memcpy(buf, vmxnet3_rq_dev_stats[i].desc,
+                                       ETH_GSTRING_LEN);
+                                buf += ETH_GSTRING_LEN;
+                        }
+                        for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats);
+                             i++) {
+                                memcpy(buf, vmxnet3_rq_driver_stats[i].desc,
+                                       ETH_GSTRING_LEN);
+                                buf += ETH_GSTRING_LEN;
+                        }
                 }
+
                 for (i = 0; i < ARRAY_SIZE(vmxnet3_global_stats); i++) {
                         memcpy(buf, vmxnet3_global_stats[i].desc,
                                 ETH_GSTRING_LEN);
@@ -277,9 +302,10 @@ vmxnet3_set_flags(struct net_device *netdev, u32 data)
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         u8 lro_requested = (data & ETH_FLAG_LRO) == 0 ? 0 : 1;
         u8 lro_present = (netdev->features & NETIF_F_LRO) == 0 ? 0 : 1;
+        unsigned long flags;
 
-        if (data & ~ETH_FLAG_LRO)
-                return -EOPNOTSUPP;
+        if (ethtool_invalid_flags(netdev, data, ETH_FLAG_LRO))
+                return -EINVAL;
 
         if (lro_requested ^ lro_present) {
                 /* toggle the LRO feature*/
@@ -292,8 +318,10 @@ vmxnet3_set_flags(struct net_device *netdev, u32 data)
                 else
                         adapter->shared->devRead.misc.uptFeatures &=
                                                         ~UPT1_F_LRO;
+                spin_lock_irqsave(&adapter->cmd_lock, flags);
                 VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                        VMXNET3_CMD_UPDATE_FEATURE);
+                spin_unlock_irqrestore(&adapter->cmd_lock, flags);
         }
         return 0;
 }
@@ -303,30 +331,41 @@ vmxnet3_get_ethtool_stats(struct net_device *netdev,
                           struct ethtool_stats *stats, u64  *buf)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
+        unsigned long flags;
         u8 *base;
         int i;
         int j = 0;
 
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD, VMXNET3_CMD_GET_STATS);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 
         /* this does assume each counter is 64-bit wide */
-/* TODO change this for multiple queues */
-
-        base = (u8 *)&adapter->tqd_start[j].stats;
-        for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++)
-                *buf++ = *(u64 *)(base + vmxnet3_tq_dev_stats[i].offset);
-
-        base = (u8 *)&adapter->tx_queue[j].stats;
-        for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats); i++)
-                *buf++ = *(u64 *)(base + vmxnet3_tq_driver_stats[i].offset);
-
-        base = (u8 *)&adapter->rqd_start[j].stats;
-        for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++)
-                *buf++ = *(u64 *)(base + vmxnet3_rq_dev_stats[i].offset);
+        for (j = 0; j < adapter->num_tx_queues; j++) {
+                base = (u8 *)&adapter->tqd_start[j].stats;
+                *buf++ = (u64)j;
+                for (i = 1; i < ARRAY_SIZE(vmxnet3_tq_dev_stats); i++)
+                        *buf++ = *(u64 *)(base +
+                                          vmxnet3_tq_dev_stats[i].offset);
+
+                base = (u8 *)&adapter->tx_queue[j].stats;
+                for (i = 0; i < ARRAY_SIZE(vmxnet3_tq_driver_stats); i++)
+                        *buf++ = *(u64 *)(base +
+                                          vmxnet3_tq_driver_stats[i].offset);
+        }
 
-        base = (u8 *)&adapter->rx_queue[j].stats;
-        for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats); i++)
-                *buf++ = *(u64 *)(base + vmxnet3_rq_driver_stats[i].offset);
+        for (j = 0; j < adapter->num_tx_queues; j++) {
+                base = (u8 *)&adapter->rqd_start[j].stats;
+                *buf++ = (u64) j;
+                for (i = 1; i < ARRAY_SIZE(vmxnet3_rq_dev_stats); i++)
+                        *buf++ = *(u64 *)(base +
+                                          vmxnet3_rq_dev_stats[i].offset);
+
+                base = (u8 *)&adapter->rx_queue[j].stats;
+                for (i = 0; i < ARRAY_SIZE(vmxnet3_rq_driver_stats); i++)
+                        *buf++ = *(u64 *)(base +
+                                          vmxnet3_rq_driver_stats[i].offset);
+        }
 
         base = (u8 *)adapter;
         for (i = 0; i < ARRAY_SIZE(vmxnet3_global_stats); i++)
@@ -339,7 +378,7 @@ vmxnet3_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *p)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         u32 *buf = p;
-        int i = 0;
+        int i = 0, j = 0;
 
         memset(p, 0, vmxnet3_get_regs_len(netdev));
 
@@ -348,31 +387,35 @@ vmxnet3_get_regs(struct net_device *netdev, struct ethtool_regs *regs, void *p)
         /* Update vmxnet3_get_regs_len if we want to dump more registers */
 
         /* make each ring use multiple of 16 bytes */
-/* TODO change this for multiple queues */
-        buf[0] = adapter->tx_queue[i].tx_ring.next2fill;
-        buf[1] = adapter->tx_queue[i].tx_ring.next2comp;
-        buf[2] = adapter->tx_queue[i].tx_ring.gen;
-        buf[3] = 0;
-
-        buf[4] = adapter->tx_queue[i].comp_ring.next2proc;
-        buf[5] = adapter->tx_queue[i].comp_ring.gen;
-        buf[6] = adapter->tx_queue[i].stopped;
-        buf[7] = 0;
-
-        buf[8] = adapter->rx_queue[i].rx_ring[0].next2fill;
-        buf[9] = adapter->rx_queue[i].rx_ring[0].next2comp;
-        buf[10] = adapter->rx_queue[i].rx_ring[0].gen;
-        buf[11] = 0;
-
-        buf[12] = adapter->rx_queue[i].rx_ring[1].next2fill;
-        buf[13] = adapter->rx_queue[i].rx_ring[1].next2comp;
-        buf[14] = adapter->rx_queue[i].rx_ring[1].gen;
-        buf[15] = 0;
-
-        buf[16] = adapter->rx_queue[i].comp_ring.next2proc;
-        buf[17] = adapter->rx_queue[i].comp_ring.gen;
-        buf[18] = 0;
-        buf[19] = 0;
+        for (i = 0; i < adapter->num_tx_queues; i++) {
+                buf[j++] = adapter->tx_queue[i].tx_ring.next2fill;
+                buf[j++] = adapter->tx_queue[i].tx_ring.next2comp;
+                buf[j++] = adapter->tx_queue[i].tx_ring.gen;
+                buf[j++] = 0;
+
+                buf[j++] = adapter->tx_queue[i].comp_ring.next2proc;
+                buf[j++] = adapter->tx_queue[i].comp_ring.gen;
+                buf[j++] = adapter->tx_queue[i].stopped;
+                buf[j++] = 0;
+        }
+
+        for (i = 0; i < adapter->num_rx_queues; i++) {
+                buf[j++] = adapter->rx_queue[i].rx_ring[0].next2fill;
+                buf[j++] = adapter->rx_queue[i].rx_ring[0].next2comp;
+                buf[j++] = adapter->rx_queue[i].rx_ring[0].gen;
+                buf[j++] = 0;
+
+                buf[j++] = adapter->rx_queue[i].rx_ring[1].next2fill;
+                buf[j++] = adapter->rx_queue[i].rx_ring[1].next2comp;
+                buf[j++] = adapter->rx_queue[i].rx_ring[1].gen;
+                buf[j++] = 0;
+
+                buf[j++] = adapter->rx_queue[i].comp_ring.next2proc;
+                buf[j++] = adapter->rx_queue[i].comp_ring.gen;
+                buf[j++] = 0;
+                buf[j++] = 0;
+        }
+
 }
 
 
@@ -574,6 +617,7 @@ vmxnet3_set_rss_indir(struct net_device *netdev,
                       const struct ethtool_rxfh_indir *p)
 {
         unsigned int i;
+        unsigned long flags;
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         struct UPT1_RSSConf *rssConf = adapter->rss_conf;
 
@@ -592,8 +636,10 @@ vmxnet3_set_rss_indir(struct net_device *netdev,
         for (i = 0; i < rssConf->indTableSize; i++)
                 rssConf->indTable[i] = p->ring_index[i];
 
+        spin_lock_irqsave(&adapter->cmd_lock, flags);
         VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_CMD,
                                VMXNET3_CMD_UPDATE_RSSIDT);
+        spin_unlock_irqrestore(&adapter->cmd_lock, flags);
 
         return 0;
 
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 7fadeed37f0..fb5d245ac87 100644
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -68,10 +68,10 @@
 /*
  * Version numbers
  */
-#define VMXNET3_DRIVER_VERSION_STRING   "1.0.16.0-k"
+#define VMXNET3_DRIVER_VERSION_STRING   "1.0.25.0-k"
 
 /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
-#define VMXNET3_DRIVER_VERSION_NUM      0x01001000
+#define VMXNET3_DRIVER_VERSION_NUM      0x01001900
 
 #if defined(CONFIG_PCI_MSI)
         /* RSS only makes sense if MSI-X is supported. */
@@ -289,7 +289,7 @@ struct vmxnet3_rx_queue {
 
 #define VMXNET3_LINUX_MAX_MSIX_VECT     (VMXNET3_DEVICE_MAX_TX_QUEUES + \
                                          VMXNET3_DEVICE_MAX_RX_QUEUES + 1)
-#define VMXNET3_LINUX_MIN_MSIX_VECT     3    /* 1 for each : tx, rx and event */
+#define VMXNET3_LINUX_MIN_MSIX_VECT     2 /* 1 for tx-rx pair and 1 for event */
 
 
 struct vmxnet3_intr {
@@ -317,6 +317,7 @@ struct vmxnet3_adapter {
         struct vmxnet3_rx_queue         rx_queue[VMXNET3_DEVICE_MAX_RX_QUEUES];
         struct vlan_group               *vlan_grp;
         struct vmxnet3_intr             intr;
+        spinlock_t                      cmd_lock;
         struct Vmxnet3_DriverShared     *shared;
         struct Vmxnet3_PMConf           *pm_conf;
         struct Vmxnet3_TxQueueDesc      *tqd_start;     /* all tx queue desc */
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c
index 01c05f53e2f..e74e4b42592 100644
--- a/drivers/net/vxge/vxge-config.c
+++ b/drivers/net/vxge/vxge-config.c
@@ -387,8 +387,8 @@ vxge_hw_vpath_eprom_img_ver_get(struct __vxge_hw_device *hldev,
                 data1 = steer_ctrl = 0;
 
                 status = vxge_hw_vpath_fw_api(vpath,
-                        VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO,
                         VXGE_HW_FW_API_GET_EPROM_REV,
+                        VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_FW_MEMO,
                         0, &data0, &data1, &steer_ctrl);
                 if (status != VXGE_HW_OK)
                         break;
@@ -2868,6 +2868,8 @@ __vxge_hw_ring_create(struct __vxge_hw_vpath_handle *vp,
         ring->rxd_init = attr->rxd_init;
         ring->rxd_term = attr->rxd_term;
         ring->buffer_mode = config->buffer_mode;
+        ring->tim_rti_cfg1_saved = vp->vpath->tim_rti_cfg1_saved;
+        ring->tim_rti_cfg3_saved = vp->vpath->tim_rti_cfg3_saved;
         ring->rxds_limit = config->rxds_limit;
 
         ring->rxd_size = vxge_hw_ring_rxd_size_get(config->buffer_mode);
@@ -3511,6 +3513,8 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
 
         /* apply "interrupts per txdl" attribute */
         fifo->interrupt_type = VXGE_HW_FIFO_TXD_INT_TYPE_UTILZ;
+        fifo->tim_tti_cfg1_saved = vpath->tim_tti_cfg1_saved;
+        fifo->tim_tti_cfg3_saved = vpath->tim_tti_cfg3_saved;
 
         if (fifo->config->intr)
                 fifo->interrupt_type = VXGE_HW_FIFO_TXD_INT_TYPE_PER_LIST;
@@ -3690,7 +3694,7 @@ __vxge_hw_vpath_rts_table_get(struct __vxge_hw_vpath_handle *vp,
         if (status != VXGE_HW_OK)
                 goto exit;
 
-        if ((rts_table != VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_DA) ||
+        if ((rts_table != VXGE_HW_RTS_ACCESS_STEER_CTRL_DATA_STRUCT_SEL_DA) &&
             (rts_table !=
              VXGE_HW_RTS_ACS_STEER_CTRL_DATA_STRUCT_SEL_RTH_MULTI_IT))
                 *data1 = 0;
@@ -4377,6 +4381,8 @@ __vxge_hw_vpath_tim_configure(struct __vxge_hw_device *hldev, u32 vp_id)
                 }
 
                 writeq(val64, &vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]);
+                vpath->tim_tti_cfg1_saved = val64;
+
                 val64 = readq(&vp_reg->tim_cfg2_int_num[VXGE_HW_VPATH_INTR_TX]);
 
                 if (config->tti.uec_a != VXGE_HW_USE_FLASH_DEFAULT) {
@@ -4433,6 +4439,7 @@ __vxge_hw_vpath_tim_configure(struct __vxge_hw_device *hldev, u32 vp_id)
                 }
 
                 writeq(val64, &vp_reg->tim_cfg3_int_num[VXGE_HW_VPATH_INTR_TX]);
+                vpath->tim_tti_cfg3_saved = val64;
         }
 
         if (config->ring.enable == VXGE_HW_RING_ENABLE) {
@@ -4481,6 +4488,8 @@ __vxge_hw_vpath_tim_configure(struct __vxge_hw_device *hldev, u32 vp_id)
                 }
 
                 writeq(val64, &vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_RX]);
+                vpath->tim_rti_cfg1_saved = val64;
+
                 val64 = readq(&vp_reg->tim_cfg2_int_num[VXGE_HW_VPATH_INTR_RX]);
 
                 if (config->rti.uec_a != VXGE_HW_USE_FLASH_DEFAULT) {
@@ -4537,6 +4546,7 @@ __vxge_hw_vpath_tim_configure(struct __vxge_hw_device *hldev, u32 vp_id)
                 }
 
                 writeq(val64, &vp_reg->tim_cfg3_int_num[VXGE_HW_VPATH_INTR_RX]);
+                vpath->tim_rti_cfg3_saved = val64;
         }
 
         val64 = 0;
@@ -4555,26 +4565,6 @@ __vxge_hw_vpath_tim_configure(struct __vxge_hw_device *hldev, u32 vp_id)
         return status;
 }
 
-void vxge_hw_vpath_tti_ci_set(struct __vxge_hw_device *hldev, u32 vp_id)
-{
-        struct __vxge_hw_virtualpath *vpath;
-        struct vxge_hw_vpath_reg __iomem *vp_reg;
-        struct vxge_hw_vp_config *config;
-        u64 val64;
-
-        vpath = &hldev->virtual_paths[vp_id];
-        vp_reg = vpath->vp_reg;
-        config = vpath->vp_config;
-
-        if (config->fifo.enable == VXGE_HW_FIFO_ENABLE &&
-            config->tti.timer_ci_en != VXGE_HW_TIM_TIMER_CI_ENABLE) {
-                config->tti.timer_ci_en = VXGE_HW_TIM_TIMER_CI_ENABLE;
-                val64 = readq(&vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]);
-                val64 |= VXGE_HW_TIM_CFG1_INT_NUM_TIMER_CI;
-                writeq(val64, &vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]);
-        }
-}
-
 /*
  * __vxge_hw_vpath_initialize
  * This routine is the final phase of init which initializes the
diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/vxge/vxge-config.h
index e249e288d16..3c53aa732c9 100644
--- a/drivers/net/vxge/vxge-config.h
+++ b/drivers/net/vxge/vxge-config.h
@@ -682,6 +682,10 @@ struct __vxge_hw_virtualpath {
         u32                             vsport_number;
         u32                             max_kdfc_db;
         u32                             max_nofl_db;
+        u64                             tim_tti_cfg1_saved;
+        u64                             tim_tti_cfg3_saved;
+        u64                             tim_rti_cfg1_saved;
+        u64                             tim_rti_cfg3_saved;
 
         struct __vxge_hw_ring *____cacheline_aligned ringh;
         struct __vxge_hw_fifo *____cacheline_aligned fifoh;
@@ -921,6 +925,9 @@ struct __vxge_hw_ring {
         u32                                     doorbell_cnt;
         u32                                     total_db_cnt;
         u64                                     rxds_limit;
+        u32                                     rtimer;
+        u64                                     tim_rti_cfg1_saved;
+        u64                                     tim_rti_cfg3_saved;
 
         enum vxge_hw_status (*callback)(
                         struct __vxge_hw_ring *ringh,
@@ -1000,6 +1007,9 @@ struct __vxge_hw_fifo {
         u32                                     per_txdl_space;
         u32                                     vp_id;
         u32                                     tx_intr_num;
+        u32                                     rtimer;
+        u64                                     tim_tti_cfg1_saved;
+        u64                                     tim_tti_cfg3_saved;
 
         enum vxge_hw_status (*callback)(
                         struct __vxge_hw_fifo *fifo_handle,
diff --git a/drivers/net/vxge/vxge-ethtool.c b/drivers/net/vxge/vxge-ethtool.c
index 1dd3a21b3a4..c5eb034107f 100644
--- a/drivers/net/vxge/vxge-ethtool.c
+++ b/drivers/net/vxge/vxge-ethtool.c
@@ -1117,8 +1117,8 @@ static int vxge_set_flags(struct net_device *dev, u32 data)
         struct vxgedev *vdev = netdev_priv(dev);
         enum vxge_hw_status status;
 
-        if (data & ~ETH_FLAG_RXHASH)
-                return -EOPNOTSUPP;
+        if (ethtool_invalid_flags(dev, data, ETH_FLAG_RXHASH))
+                return -EINVAL;
 
         if (!!(data & ETH_FLAG_RXHASH) == vdev->devh->config.rth_en)
                 return 0;
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index c81a6512c68..395423aeec0 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -371,9 +371,6 @@ vxge_rx_1b_compl(struct __vxge_hw_ring *ringh, void *dtr,
         struct vxge_hw_ring_rxd_info ext_info;
         vxge_debug_entryexit(VXGE_TRACE, "%s: %s:%d",
                 ring->ndev->name, __func__, __LINE__);
-        ring->pkts_processed = 0;
-
-        vxge_hw_ring_replenish(ringh);
 
         do {
                 prefetch((char *)dtr + L1_CACHE_BYTES);
@@ -1588,6 +1585,36 @@ static int vxge_reset_vpath(struct vxgedev *vdev, int vp_id)
         return ret;
 }
 
+/* Configure CI */
+static void vxge_config_ci_for_tti_rti(struct vxgedev *vdev)
+{
+        int i = 0;
+
+        /* Enable CI for RTI */
+        if (vdev->config.intr_type == MSI_X) {
+                for (i = 0; i < vdev->no_of_vpath; i++) {
+                        struct __vxge_hw_ring *hw_ring;
+
+                        hw_ring = vdev->vpaths[i].ring.handle;
+                        vxge_hw_vpath_dynamic_rti_ci_set(hw_ring);
+                }
+        }
+
+        /* Enable CI for TTI */
+        for (i = 0; i < vdev->no_of_vpath; i++) {
+                struct __vxge_hw_fifo *hw_fifo = vdev->vpaths[i].fifo.handle;
+                vxge_hw_vpath_tti_ci_set(hw_fifo);
+                /*
+                 * For Inta (with or without napi), Set CI ON for only one
+                 * vpath. (Have only one free running timer).
+                 */
+                if ((vdev->config.intr_type == INTA) && (i == 0))
+                        break;
+        }
+
+        return;
+}
+
 static int do_vxge_reset(struct vxgedev *vdev, int event)
 {
         enum vxge_hw_status status;
@@ -1753,6 +1780,9 @@ static int do_vxge_reset(struct vxgedev *vdev, int event)
                 netif_tx_wake_all_queues(vdev->ndev);
         }
 
+        /* configure CI */
+        vxge_config_ci_for_tti_rti(vdev);
+
 out:
         vxge_debug_entryexit(VXGE_TRACE,
                 "%s:%d  Exiting...", __func__, __LINE__);
@@ -1793,22 +1823,29 @@ static void vxge_reset(struct work_struct *work)
  */
 static int vxge_poll_msix(struct napi_struct *napi, int budget)
 {
-        struct vxge_ring *ring =
-                container_of(napi, struct vxge_ring, napi);
+        struct vxge_ring *ring = container_of(napi, struct vxge_ring, napi);
+        int pkts_processed;
         int budget_org = budget;
-        ring->budget = budget;
 
+        ring->budget = budget;
+        ring->pkts_processed = 0;
         vxge_hw_vpath_poll_rx(ring->handle);
+        pkts_processed = ring->pkts_processed;
 
         if (ring->pkts_processed < budget_org) {
                 napi_complete(napi);
+
                 /* Re enable the Rx interrupts for the vpath */
                 vxge_hw_channel_msix_unmask(
                                 (struct __vxge_hw_channel *)ring->handle,
                                 ring->rx_vector_no);
+                mmiowb();
         }
 
-        return ring->pkts_processed;
+        /* We are copying and returning the local variable, in case if after
+         * clearing the msix interrupt above, if the interrupt fires right
+         * away which can preempt this NAPI thread */
+        return pkts_processed;
 }
 
 static int vxge_poll_inta(struct napi_struct *napi, int budget)
@@ -1824,6 +1861,7 @@ static int vxge_poll_inta(struct napi_struct *napi, int budget)
         for (i = 0; i < vdev->no_of_vpath; i++) {
                 ring = &vdev->vpaths[i].ring;
                 ring->budget = budget;
+                ring->pkts_processed = 0;
                 vxge_hw_vpath_poll_rx(ring->handle);
                 pkts_processed += ring->pkts_processed;
                 budget -= ring->pkts_processed;
@@ -2054,6 +2092,7 @@ static int vxge_open_vpaths(struct vxgedev *vdev)
                                         netdev_get_tx_queue(vdev->ndev, 0);
                         vpath->fifo.indicate_max_pkts =
                                 vdev->config.fifo_indicate_max_pkts;
+                        vpath->fifo.tx_vector_no = 0;
                         vpath->ring.rx_vector_no = 0;
                         vpath->ring.rx_csum = vdev->rx_csum;
                         vpath->ring.rx_hwts = vdev->rx_hwts;
@@ -2079,6 +2118,61 @@ static int vxge_open_vpaths(struct vxgedev *vdev)
         return VXGE_HW_OK;
 }
 
+/**
+ *  adaptive_coalesce_tx_interrupts - Changes the interrupt coalescing
+ *  if the interrupts are not within a range
+ *  @fifo: pointer to transmit fifo structure
+ *  Description: The function changes boundary timer and restriction timer
+ *  value depends on the traffic
+ *  Return Value: None
+ */
+static void adaptive_coalesce_tx_interrupts(struct vxge_fifo *fifo)
+{
+        fifo->interrupt_count++;
+        if (jiffies > fifo->jiffies + HZ / 100) {
+                struct __vxge_hw_fifo *hw_fifo = fifo->handle;
+
+                fifo->jiffies = jiffies;
+                if (fifo->interrupt_count > VXGE_T1A_MAX_TX_INTERRUPT_COUNT &&
+                    hw_fifo->rtimer != VXGE_TTI_RTIMER_ADAPT_VAL) {
+                        hw_fifo->rtimer = VXGE_TTI_RTIMER_ADAPT_VAL;
+                        vxge_hw_vpath_dynamic_tti_rtimer_set(hw_fifo);
+                } else if (hw_fifo->rtimer != 0) {
+                        hw_fifo->rtimer = 0;
+                        vxge_hw_vpath_dynamic_tti_rtimer_set(hw_fifo);
+                }
+                fifo->interrupt_count = 0;
+        }
+}
+
+/**
+ *  adaptive_coalesce_rx_interrupts - Changes the interrupt coalescing
+ *  if the interrupts are not within a range
+ *  @ring: pointer to receive ring structure
+ *  Description: The function increases of decreases the packet counts within
+ *  the ranges of traffic utilization, if the interrupts due to this ring are
+ *  not within a fixed range.
+ *  Return Value: Nothing
+ */
+static void adaptive_coalesce_rx_interrupts(struct vxge_ring *ring)
+{
+        ring->interrupt_count++;
+        if (jiffies > ring->jiffies + HZ / 100) {
+                struct __vxge_hw_ring *hw_ring = ring->handle;
+
+                ring->jiffies = jiffies;
+                if (ring->interrupt_count > VXGE_T1A_MAX_INTERRUPT_COUNT &&
+                    hw_ring->rtimer != VXGE_RTI_RTIMER_ADAPT_VAL) {
+                        hw_ring->rtimer = VXGE_RTI_RTIMER_ADAPT_VAL;
+                        vxge_hw_vpath_dynamic_rti_rtimer_set(hw_ring);
+                } else if (hw_ring->rtimer != 0) {
+                        hw_ring->rtimer = 0;
+                        vxge_hw_vpath_dynamic_rti_rtimer_set(hw_ring);
+                }
+                ring->interrupt_count = 0;
+        }
+}
+
 /*
  *  vxge_isr_napi
  *  @irq: the irq of the device.
@@ -2139,24 +2233,39 @@ static irqreturn_t vxge_isr_napi(int irq, void *dev_id)
 
 #ifdef CONFIG_PCI_MSI
 
-static irqreturn_t
-vxge_tx_msix_handle(int irq, void *dev_id)
+static irqreturn_t vxge_tx_msix_handle(int irq, void *dev_id)
 {
         struct vxge_fifo *fifo = (struct vxge_fifo *)dev_id;
 
+        adaptive_coalesce_tx_interrupts(fifo);
+
+        vxge_hw_channel_msix_mask((struct __vxge_hw_channel *)fifo->handle,
+                                  fifo->tx_vector_no);
+
+        vxge_hw_channel_msix_clear((struct __vxge_hw_channel *)fifo->handle,
+                                   fifo->tx_vector_no);
+
         VXGE_COMPLETE_VPATH_TX(fifo);
 
+        vxge_hw_channel_msix_unmask((struct __vxge_hw_channel *)fifo->handle,
+                                    fifo->tx_vector_no);
+
+        mmiowb();
+
         return IRQ_HANDLED;
 }
 
-static irqreturn_t
-vxge_rx_msix_napi_handle(int irq, void *dev_id)
+static irqreturn_t vxge_rx_msix_napi_handle(int irq, void *dev_id)
 {
         struct vxge_ring *ring = (struct vxge_ring *)dev_id;
 
-        /* MSIX_IDX for Rx is 1 */
+        adaptive_coalesce_rx_interrupts(ring);
+
         vxge_hw_channel_msix_mask((struct __vxge_hw_channel *)ring->handle,
-                                        ring->rx_vector_no);
+                                  ring->rx_vector_no);
+
+        vxge_hw_channel_msix_clear((struct __vxge_hw_channel *)ring->handle,
+                                   ring->rx_vector_no);
 
         napi_schedule(&ring->napi);
         return IRQ_HANDLED;
@@ -2173,14 +2282,20 @@ vxge_alarm_msix_handle(int irq, void *dev_id)
                 VXGE_HW_VPATH_MSIX_ACTIVE) + VXGE_ALARM_MSIX_ID;
 
         for (i = 0; i < vdev->no_of_vpath; i++) {
+                /* Reduce the chance of loosing alarm interrupts by masking
+                 * the vector. A pending bit will be set if an alarm is
+                 * generated and on unmask the interrupt will be fired.
+                 */
                 vxge_hw_vpath_msix_mask(vdev->vpaths[i].handle, msix_id);
+                vxge_hw_vpath_msix_clear(vdev->vpaths[i].handle, msix_id);
+                mmiowb();
 
                 status = vxge_hw_vpath_alarm_process(vdev->vpaths[i].handle,
                         vdev->exec_mode);
                 if (status == VXGE_HW_OK) {
-
                         vxge_hw_vpath_msix_unmask(vdev->vpaths[i].handle,
-                                        msix_id);
+                                                  msix_id);
+                        mmiowb();
                         continue;
                 }
                 vxge_debug_intr(VXGE_ERR,
@@ -2299,6 +2414,9 @@ static int vxge_enable_msix(struct vxgedev *vdev)
                         vpath->ring.rx_vector_no = (vpath->device_id *
                                                 VXGE_HW_VPATH_MSIX_ACTIVE) + 1;
 
+                        vpath->fifo.tx_vector_no = (vpath->device_id *
+                                                VXGE_HW_VPATH_MSIX_ACTIVE);
+
                         vxge_hw_vpath_msix_set(vpath->handle, tim_msix_id,
                                                VXGE_ALARM_MSIX_ID);
                 }
@@ -2474,8 +2592,9 @@ INTA_MODE:
                         "%s:vxge:INTA", vdev->ndev->name);
                 vxge_hw_device_set_intr_type(vdev->devh,
                         VXGE_HW_INTR_MODE_IRQLINE);
-                vxge_hw_vpath_tti_ci_set(vdev->devh,
-                        vdev->vpaths[0].device_id);
+
+                vxge_hw_vpath_tti_ci_set(vdev->vpaths[0].fifo.handle);
+
                 ret = request_irq((int) vdev->pdev->irq,
                         vxge_isr_napi,
                         IRQF_SHARED, vdev->desc[0], vdev);
@@ -2745,6 +2864,10 @@ static int vxge_open(struct net_device *dev)
         }
 
         netif_tx_start_all_queues(vdev->ndev);
+
+        /* configure CI */
+        vxge_config_ci_for_tti_rti(vdev);
+
         goto out0;
 
 out2:
@@ -3264,19 +3387,6 @@ static const struct net_device_ops vxge_netdev_ops = {
 #endif
 };
 
-static int __devinit vxge_device_revision(struct vxgedev *vdev)
-{
-        int ret;
-        u8 revision;
-
-        ret = pci_read_config_byte(vdev->pdev, PCI_REVISION_ID, &revision);
-        if (ret)
-                return -EIO;
-
-        vdev->titan1 = (revision == VXGE_HW_TITAN1_PCI_REVISION);
-        return 0;
-}
-
 static int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
                                           struct vxge_config *config,
                                           int high_dma, int no_of_vpath,
@@ -3316,10 +3426,7 @@ static int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
         memcpy(&vdev->config, config, sizeof(struct vxge_config));
         vdev->rx_csum = 1;      /* Enable Rx CSUM by default. */
         vdev->rx_hwts = 0;
-
-        ret = vxge_device_revision(vdev);
-        if (ret < 0)
-                goto _out1;
+        vdev->titan1 = (vdev->pdev->revision == VXGE_HW_TITAN1_PCI_REVISION);
 
         SET_NETDEV_DEV(ndev, &vdev->pdev->dev);
 
@@ -3348,7 +3455,7 @@ static int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
                 vxge_debug_init(VXGE_ERR,
                         "%s: vpath memory allocation failed",
                         vdev->ndev->name);
-                ret = -ENODEV;
+                ret = -ENOMEM;
                 goto _out1;
         }
 
@@ -3369,11 +3476,11 @@ static int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
         if (vdev->config.gro_enable)
                 ndev->features |= NETIF_F_GRO;
 
-        if (register_netdev(ndev)) {
+        ret = register_netdev(ndev);
+        if (ret) {
                 vxge_debug_init(vxge_hw_device_trace_level_get(hldev),
                         "%s: %s : device registration failed!",
                         ndev->name, __func__);
-                ret = -ENODEV;
                 goto _out2;
         }
 
@@ -3444,6 +3551,11 @@ static void vxge_device_unregister(struct __vxge_hw_device *hldev)
         /* in 2.6 will call stop() if device is up */
         unregister_netdev(dev);
 
+        kfree(vdev->vpaths);
+
+        /* we are safe to free it now */
+        free_netdev(dev);
+
         vxge_debug_init(vdev->level_trace, "%s: ethernet device unregistered",
                         buf);
         vxge_debug_entryexit(vdev->level_trace, "%s: %s:%d  Exiting...", buf,
@@ -3799,7 +3911,7 @@ static void __devinit vxge_device_config_init(
                 break;
 
         case MSI_X:
-                device_config->intr_mode = VXGE_HW_INTR_MODE_MSIX;
+                device_config->intr_mode = VXGE_HW_INTR_MODE_MSIX_ONE_SHOT;
                 break;
         }
 
@@ -4335,10 +4447,10 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                 goto _exit1;
         }
 
-        if (pci_request_region(pdev, 0, VXGE_DRIVER_NAME)) {
+        ret = pci_request_region(pdev, 0, VXGE_DRIVER_NAME);
+        if (ret) {
                 vxge_debug_init(VXGE_ERR,
                         "%s : request regions failed", __func__);
-                ret = -ENODEV;
                 goto _exit1;
         }
 
@@ -4446,7 +4558,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
                         if (!img[i].is_valid)
                                 break;
                         vxge_debug_init(VXGE_TRACE, "%s: EPROM %d, version "
-                                        "%d.%d.%d.%d\n", VXGE_DRIVER_NAME, i,
+                                        "%d.%d.%d.%d", VXGE_DRIVER_NAME, i,
                                         VXGE_EPROM_IMG_MAJOR(img[i].version),
                                         VXGE_EPROM_IMG_MINOR(img[i].version),
                                         VXGE_EPROM_IMG_FIX(img[i].version),
@@ -4643,8 +4755,9 @@ _exit6:
 _exit5:
         vxge_device_unregister(hldev);
 _exit4:
-        pci_disable_sriov(pdev);
+        pci_set_drvdata(pdev, NULL);
         vxge_hw_device_terminate(hldev);
+        pci_disable_sriov(pdev);
 _exit3:
         iounmap(attr.bar0);
 _exit2:
@@ -4655,7 +4768,7 @@ _exit0:
         kfree(ll_config);
         kfree(device_config);
         driver_config->config_dev_cnt--;
-        pci_set_drvdata(pdev, NULL);
+        driver_config->total_dev_cnt--;
         return ret;
 }
 
@@ -4668,45 +4781,34 @@ _exit0:
 static void __devexit vxge_remove(struct pci_dev *pdev)
 {
         struct __vxge_hw_device *hldev;
-        struct vxgedev *vdev = NULL;
-        struct net_device *dev;
-        int i = 0;
+        struct vxgedev *vdev;
+        int i;
 
         hldev = pci_get_drvdata(pdev);
-
         if (hldev == NULL)
                 return;
 
-        dev = hldev->ndev;
-        vdev = netdev_priv(dev);
+        vdev = netdev_priv(hldev->ndev);
 
         vxge_debug_entryexit(vdev->level_trace, "%s:%d", __func__, __LINE__);
-
         vxge_debug_init(vdev->level_trace, "%s : removing PCI device...",
                         __func__);
-        vxge_device_unregister(hldev);
 
-        for (i = 0; i < vdev->no_of_vpath; i++) {
+        for (i = 0; i < vdev->no_of_vpath; i++)
                 vxge_free_mac_add_list(&vdev->vpaths[i]);
-                vdev->vpaths[i].mcast_addr_cnt = 0;
-                vdev->vpaths[i].mac_addr_cnt = 0;
-        }
-
-        kfree(vdev->vpaths);
 
+        vxge_device_unregister(hldev);
+        pci_set_drvdata(pdev, NULL);
+        /* Do not call pci_disable_sriov here, as it will break child devices */
+        vxge_hw_device_terminate(hldev);
         iounmap(vdev->bar0);
-
-        /* we are safe to free it now */
-        free_netdev(dev);
+        pci_release_region(pdev, 0);
+        pci_disable_device(pdev);
+        driver_config->config_dev_cnt--;
+        driver_config->total_dev_cnt--;
 
         vxge_debug_init(vdev->level_trace, "%s:%d Device unregistered",
                         __func__, __LINE__);
-
-        vxge_hw_device_terminate(hldev);
-
-        pci_disable_device(pdev);
-        pci_release_region(pdev, 0);
-        pci_set_drvdata(pdev, NULL);
         vxge_debug_entryexit(vdev->level_trace, "%s:%d  Exiting...", __func__,
                              __LINE__);
 }
diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/vxge/vxge-main.h
index 5746fedc356..40474f0da57 100644
--- a/drivers/net/vxge/vxge-main.h
+++ b/drivers/net/vxge/vxge-main.h
@@ -59,11 +59,13 @@
 #define VXGE_TTI_LTIMER_VAL     1000
 #define VXGE_T1A_TTI_LTIMER_VAL 80
 #define VXGE_TTI_RTIMER_VAL     0
+#define VXGE_TTI_RTIMER_ADAPT_VAL       10
 #define VXGE_T1A_TTI_RTIMER_VAL 400
 #define VXGE_RTI_BTIMER_VAL     250
 #define VXGE_RTI_LTIMER_VAL     100
 #define VXGE_RTI_RTIMER_VAL     0
-#define VXGE_FIFO_INDICATE_MAX_PKTS VXGE_DEF_FIFO_LENGTH
+#define VXGE_RTI_RTIMER_ADAPT_VAL       15
+#define VXGE_FIFO_INDICATE_MAX_PKTS     VXGE_DEF_FIFO_LENGTH
 #define VXGE_ISR_POLLING_CNT    8
 #define VXGE_MAX_CONFIG_DEV     0xFF
 #define VXGE_EXEC_MODE_DISABLE  0
@@ -107,6 +109,14 @@
 #define RTI_T1A_RX_UFC_C        50
 #define RTI_T1A_RX_UFC_D        60
 
+/*
+ * The interrupt rate is maintained at 3k per second with the moderation
+ * parameters for most traffic but not all. This is the maximum interrupt
+ * count allowed per function with INTA or per vector in the case of
+ * MSI-X in a 10 millisecond time period. Enabled only for Titan 1A.
+ */
+#define VXGE_T1A_MAX_INTERRUPT_COUNT    100
+#define VXGE_T1A_MAX_TX_INTERRUPT_COUNT 200
 
 /* Milli secs timer period */
 #define VXGE_TIMER_DELAY                10000
@@ -247,6 +257,11 @@ struct vxge_fifo {
         int tx_steering_type;
         int indicate_max_pkts;
 
+        /* Adaptive interrupt moderation parameters used in T1A */
+        unsigned long interrupt_count;
+        unsigned long jiffies;
+
+        u32 tx_vector_no;
         /* Tx stats */
         struct vxge_fifo_stats stats;
 } ____cacheline_aligned;
@@ -271,6 +286,10 @@ struct vxge_ring {
          */
         int driver_id;
 
+        /* Adaptive interrupt moderation parameters used in T1A */
+        unsigned long interrupt_count;
+        unsigned long jiffies;
+
         /* copy of the flag indicating whether rx_csum is to be used */
         u32 rx_csum:1,
             rx_hwts:1;
@@ -286,7 +305,7 @@ struct vxge_ring {
 
         int vlan_tag_strip;
         struct vlan_group *vlgrp;
-        int rx_vector_no;
+        u32 rx_vector_no;
         enum vxge_hw_status last_status;
 
         /* Rx stats */
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/vxge/vxge-traffic.c
index 4c10d6c4075..8674f331311 100644
--- a/drivers/net/vxge/vxge-traffic.c
+++ b/drivers/net/vxge/vxge-traffic.c
@@ -218,6 +218,68 @@ exit:
         return status;
 }
 
+void vxge_hw_vpath_tti_ci_set(struct __vxge_hw_fifo *fifo)
+{
+        struct vxge_hw_vpath_reg __iomem *vp_reg;
+        struct vxge_hw_vp_config *config;
+        u64 val64;
+
+        if (fifo->config->enable != VXGE_HW_FIFO_ENABLE)
+                return;
+
+        vp_reg = fifo->vp_reg;
+        config = container_of(fifo->config, struct vxge_hw_vp_config, fifo);
+
+        if (config->tti.timer_ci_en != VXGE_HW_TIM_TIMER_CI_ENABLE) {
+                config->tti.timer_ci_en = VXGE_HW_TIM_TIMER_CI_ENABLE;
+                val64 = readq(&vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]);
+                val64 |= VXGE_HW_TIM_CFG1_INT_NUM_TIMER_CI;
+                fifo->tim_tti_cfg1_saved = val64;
+                writeq(val64, &vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]);
+        }
+}
+
+void vxge_hw_vpath_dynamic_rti_ci_set(struct __vxge_hw_ring *ring)
+{
+        u64 val64 = ring->tim_rti_cfg1_saved;
+
+        val64 |= VXGE_HW_TIM_CFG1_INT_NUM_TIMER_CI;
+        ring->tim_rti_cfg1_saved = val64;
+        writeq(val64, &ring->vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_RX]);
+}
+
+void vxge_hw_vpath_dynamic_tti_rtimer_set(struct __vxge_hw_fifo *fifo)
+{
+        u64 val64 = fifo->tim_tti_cfg3_saved;
+        u64 timer = (fifo->rtimer * 1000) / 272;
+
+        val64 &= ~VXGE_HW_TIM_CFG3_INT_NUM_RTIMER_VAL(0x3ffffff);
+        if (timer)
+                val64 |= VXGE_HW_TIM_CFG3_INT_NUM_RTIMER_VAL(timer) |
+                        VXGE_HW_TIM_CFG3_INT_NUM_RTIMER_EVENT_SF(5);
+
+        writeq(val64, &fifo->vp_reg->tim_cfg3_int_num[VXGE_HW_VPATH_INTR_TX]);
+        /* tti_cfg3_saved is not updated again because it is
+         * initialized at one place only - init time.
+         */
+}
+
+void vxge_hw_vpath_dynamic_rti_rtimer_set(struct __vxge_hw_ring *ring)
+{
+        u64 val64 = ring->tim_rti_cfg3_saved;
+        u64 timer = (ring->rtimer * 1000) / 272;
+
+        val64 &= ~VXGE_HW_TIM_CFG3_INT_NUM_RTIMER_VAL(0x3ffffff);
+        if (timer)
+                val64 |= VXGE_HW_TIM_CFG3_INT_NUM_RTIMER_VAL(timer) |
+                        VXGE_HW_TIM_CFG3_INT_NUM_RTIMER_EVENT_SF(4);
+
+        writeq(val64, &ring->vp_reg->tim_cfg3_int_num[VXGE_HW_VPATH_INTR_RX]);
+        /* rti_cfg3_saved is not updated again because it is
+         * initialized at one place only - init time.
+         */
+}
+
 /**
  * vxge_hw_channel_msix_mask - Mask MSIX Vector.
  * @channeh: Channel for rx or tx handle
@@ -254,6 +316,23 @@ vxge_hw_channel_msix_unmask(struct __vxge_hw_channel *channel, int msix_id)
 }
 
 /**
+ * vxge_hw_channel_msix_clear - Unmask the MSIX Vector.
+ * @channel: Channel for rx or tx handle
+ * @msix_id:  MSI ID
+ *
+ * The function unmasks the msix interrupt for the given msix_id
+ * if configured in MSIX oneshot mode
+ *
+ * Returns: 0
+ */
+void vxge_hw_channel_msix_clear(struct __vxge_hw_channel *channel, int msix_id)
+{
+        __vxge_hw_pio_mem_write32_upper(
+                (u32) vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
+                &channel->common_reg->clr_msix_one_shot_vec[msix_id % 4]);
+}
+
+/**
  * vxge_hw_device_set_intr_type - Updates the configuration
  *              with new interrupt type.
  * @hldev: HW device handle.
@@ -2191,19 +2270,14 @@ vxge_hw_vpath_msix_set(struct __vxge_hw_vpath_handle *vp, int *tim_msix_id,
         if (vpath->hldev->config.intr_mode ==
                                         VXGE_HW_INTR_MODE_MSIX_ONE_SHOT) {
                 __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(
+                                VXGE_HW_ONE_SHOT_VECT0_EN_ONE_SHOT_VECT0_EN,
+                                0, 32), &vp_reg->one_shot_vect0_en);
+                __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(
                                 VXGE_HW_ONE_SHOT_VECT1_EN_ONE_SHOT_VECT1_EN,
                                 0, 32), &vp_reg->one_shot_vect1_en);
-        }
-
-        if (vpath->hldev->config.intr_mode ==
-                VXGE_HW_INTR_MODE_MSIX_ONE_SHOT) {
                 __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(
                                 VXGE_HW_ONE_SHOT_VECT2_EN_ONE_SHOT_VECT2_EN,
                                 0, 32), &vp_reg->one_shot_vect2_en);
-
-                __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(
-                                VXGE_HW_ONE_SHOT_VECT3_EN_ONE_SHOT_VECT3_EN,
-                                0, 32), &vp_reg->one_shot_vect3_en);
         }
 }
 
@@ -2229,6 +2303,32 @@ vxge_hw_vpath_msix_mask(struct __vxge_hw_vpath_handle *vp, int msix_id)
 }
 
 /**
+ * vxge_hw_vpath_msix_clear - Clear MSIX Vector.
+ * @vp: Virtual Path handle.
+ * @msix_id:  MSI ID
+ *
+ * The function clears the msix interrupt for the given msix_id
+ *
+ * Returns: 0,
+ * Otherwise, VXGE_HW_ERR_WRONG_IRQ if the msix index is out of range
+ * status.
+ * See also:
+ */
+void vxge_hw_vpath_msix_clear(struct __vxge_hw_vpath_handle *vp, int msix_id)
+{
+        struct __vxge_hw_device *hldev = vp->vpath->hldev;
+
+        if ((hldev->config.intr_mode == VXGE_HW_INTR_MODE_MSIX_ONE_SHOT))
+                __vxge_hw_pio_mem_write32_upper(
+                        (u32) vxge_bVALn(vxge_mBIT((msix_id >> 2)), 0, 32),
+                        &hldev->common_reg->clr_msix_one_shot_vec[msix_id % 4]);
+        else
+                __vxge_hw_pio_mem_write32_upper(
+                        (u32) vxge_bVALn(vxge_mBIT((msix_id >> 2)), 0, 32),
+                        &hldev->common_reg->clear_msix_mask_vect[msix_id % 4]);
+}
+
+/**
  * vxge_hw_vpath_msix_unmask - Unmask the MSIX Vector.
  * @vp: Virtual Path handle.
  * @msix_id:  MSI ID
diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/vxge/vxge-traffic.h
index d48486d6afa..9d9dfda4c7a 100644
--- a/drivers/net/vxge/vxge-traffic.h
+++ b/drivers/net/vxge/vxge-traffic.h
@@ -2142,6 +2142,10 @@ void vxge_hw_device_clear_tx_rx(
  *  Virtual Paths
  */
 
+void vxge_hw_vpath_dynamic_rti_rtimer_set(struct __vxge_hw_ring *ring);
+
+void vxge_hw_vpath_dynamic_tti_rtimer_set(struct __vxge_hw_fifo *fifo);
+
 u32 vxge_hw_vpath_id(
         struct __vxge_hw_vpath_handle *vpath_handle);
 
@@ -2245,6 +2249,8 @@ void
 vxge_hw_vpath_msix_mask(struct __vxge_hw_vpath_handle *vpath_handle,
                         int msix_id);
 
+void vxge_hw_vpath_msix_clear(struct __vxge_hw_vpath_handle *vp, int msix_id);
+
 void vxge_hw_device_flush_io(struct __vxge_hw_device *devh);
 
 void
@@ -2270,6 +2276,9 @@ void
 vxge_hw_channel_msix_unmask(struct __vxge_hw_channel *channelh, int msix_id);
 
 void
+vxge_hw_channel_msix_clear(struct __vxge_hw_channel *channelh, int msix_id);
+
+void
 vxge_hw_channel_dtr_try_complete(struct __vxge_hw_channel *channel,
                                  void **dtrh);
 
@@ -2282,7 +2291,8 @@ vxge_hw_channel_dtr_free(struct __vxge_hw_channel *channel, void *dtrh);
 int
 vxge_hw_channel_dtr_count(struct __vxge_hw_channel *channel);
 
-void
-vxge_hw_vpath_tti_ci_set(struct __vxge_hw_device *hldev, u32 vp_id);
+void vxge_hw_vpath_tti_ci_set(struct __vxge_hw_fifo *fifo);
+
+void vxge_hw_vpath_dynamic_rti_ci_set(struct __vxge_hw_ring *ring);
 
 #endif
diff --git a/drivers/net/vxge/vxge-version.h b/drivers/net/vxge/vxge-version.h
index ad2f99b9bcf..581e21525e8 100644
--- a/drivers/net/vxge/vxge-version.h
+++ b/drivers/net/vxge/vxge-version.h
@@ -16,8 +16,8 @@
 
 #define VXGE_VERSION_MAJOR      "2"
 #define VXGE_VERSION_MINOR      "5"
-#define VXGE_VERSION_FIX        "1"
-#define VXGE_VERSION_BUILD      "22082"
+#define VXGE_VERSION_FIX        "2"
+#define VXGE_VERSION_BUILD      "22259"
 #define VXGE_VERSION_FOR        "k"
 
 #define VXGE_FW_VER(maj, min, bld) (((maj) << 16) + ((min) << 8) + (bld))
diff --git a/drivers/net/wan/lmc/Makefile b/drivers/net/wan/lmc/Makefile
index dabdcfed4ef..609710d64eb 100644
--- a/drivers/net/wan/lmc/Makefile
+++ b/drivers/net/wan/lmc/Makefile
@@ -14,4 +14,4 @@ lmc-objs := lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o
 # -DDEBUG \
 # -DLMC_PACKET_LOG
 
-EXTRA_CFLAGS += -I. $(DBGDEF)
+ccflags-y := -I. $(DBGDEF)
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index 515d9b8af01..1c65d1c3387 100644
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -131,9 +131,8 @@ static void cpc_tty_trace(pc300dev_t *dev, char* buf, int len, char rxtx);
 static void cpc_tty_signal_off(pc300dev_t *pc300dev, unsigned char);
 static void cpc_tty_signal_on(pc300dev_t *pc300dev, unsigned char);
 
-static int pc300_tiocmset(struct tty_struct *, struct file *,
-                          unsigned int, unsigned int);
-static int pc300_tiocmget(struct tty_struct *, struct file *);
+static int pc300_tiocmset(struct tty_struct *, unsigned int, unsigned int);
+static int pc300_tiocmget(struct tty_struct *);
 
 /* functions called by PC300 driver */
 void cpc_tty_init(pc300dev_t *dev);
@@ -543,7 +542,7 @@ static int cpc_tty_chars_in_buffer(struct tty_struct *tty)
         return 0;
 } 
 
-static int pc300_tiocmset(struct tty_struct *tty, struct file *file,
+static int pc300_tiocmset(struct tty_struct *tty,
                           unsigned int set, unsigned int clear)
 {
         st_cpc_tty_area    *cpc_tty; 
@@ -570,7 +569,7 @@ static int pc300_tiocmset(struct tty_struct *tty, struct file *file,
         return 0;
 }
 
-static int pc300_tiocmget(struct tty_struct *tty, struct file *file)
+static int pc300_tiocmget(struct tty_struct *tty)
 {
         unsigned int result;
         unsigned char status;
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 7aeb113cbb9..f354bd4e121 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -284,5 +284,6 @@ source "drivers/net/wireless/rtlwifi/Kconfig"
 source "drivers/net/wireless/wl1251/Kconfig"
 source "drivers/net/wireless/wl12xx/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
+source "drivers/net/wireless/mwifiex/Kconfig"
 
 endif # WLAN
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index ddd3fb6ba1d..7bba6a82b87 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -56,3 +56,5 @@ obj-$(CONFIG_WL12XX)	+= wl12xx/
 obj-$(CONFIG_WL12XX_PLATFORM_DATA)      += wl12xx/
 
 obj-$(CONFIG_IWM)       += iwmc3200wifi/
+
+obj-$(CONFIG_MWIFIEX)   += mwifiex/
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index a6c6a466000..6d7105b7e8f 100644
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -119,6 +119,7 @@ struct ath_ops {
         void (*write)(void *, u32 val, u32 reg_offset);
         void (*enable_write_buffer)(void *);
         void (*write_flush) (void *);
+        u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
 };
 
 struct ath_common;
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index ffcf44a4058..4361704fe0d 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -44,6 +44,34 @@ static const int m1ThreshExt_off = 127;
 static const int m2ThreshExt_off = 127;
 
 
+static void ar5008_rf_bank_setup(u32 *bank, struct ar5416IniArray *array,
+                                 int col)
+{
+        int i;
+
+        for (i = 0; i < array->ia_rows; i++)
+                bank[i] = INI_RA(array, i, col);
+}
+
+
+#define REG_WRITE_RF_ARRAY(iniarray, regData, regWr) \
+        ar5008_write_rf_array(ah, iniarray, regData, &(regWr))
+
+static void ar5008_write_rf_array(struct ath_hw *ah, struct ar5416IniArray *array,
+                                  u32 *data, unsigned int *writecnt)
+{
+        int r;
+
+        ENABLE_REGWRITE_BUFFER(ah);
+
+        for (r = 0; r < array->ia_rows; r++) {
+                REG_WRITE(ah, INI_RA(array, r, 0), data[r]);
+                DO_DELAY(*writecnt);
+        }
+
+        REGWRITE_BUFFER_FLUSH(ah);
+}
+
 /**
  * ar5008_hw_phy_modify_rx_buffer() - perform analog swizzling of parameters
  * @rfbuf:
@@ -530,16 +558,16 @@ static bool ar5008_hw_set_rf_regs(struct ath_hw *ah,
         eepMinorRev = ah->eep_ops->get_eeprom(ah, EEP_MINOR_REV);
 
         /* Setup Bank 0 Write */
-        RF_BANK_SETUP(ah->analogBank0Data, &ah->iniBank0, 1);
+        ar5008_rf_bank_setup(ah->analogBank0Data, &ah->iniBank0, 1);
 
         /* Setup Bank 1 Write */
-        RF_BANK_SETUP(ah->analogBank1Data, &ah->iniBank1, 1);
+        ar5008_rf_bank_setup(ah->analogBank1Data, &ah->iniBank1, 1);
 
         /* Setup Bank 2 Write */
-        RF_BANK_SETUP(ah->analogBank2Data, &ah->iniBank2, 1);
+        ar5008_rf_bank_setup(ah->analogBank2Data, &ah->iniBank2, 1);
 
         /* Setup Bank 6 Write */
-        RF_BANK_SETUP(ah->analogBank3Data, &ah->iniBank3,
+        ar5008_rf_bank_setup(ah->analogBank3Data, &ah->iniBank3,
                       modesIndex);
         {
                 int i;
@@ -569,7 +597,7 @@ static bool ar5008_hw_set_rf_regs(struct ath_hw *ah,
         }
 
         /* Setup Bank 7 Setup */
-        RF_BANK_SETUP(ah->analogBank7Data, &ah->iniBank7, 1);
+        ar5008_rf_bank_setup(ah->analogBank7Data, &ah->iniBank7, 1);
 
         /* Write Analog registers */
         REG_WRITE_RF_ARRAY(&ah->iniBank0, ah->analogBank0Data,
@@ -729,6 +757,7 @@ static int ar5008_hw_process_ini(struct ath_hw *ah,
                                  struct ath9k_channel *chan)
 {
         struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
+        struct ath_common *common = ath9k_hw_common(ah);
         int i, regWrites = 0;
         struct ieee80211_channel *channel = chan->chan;
         u32 modesIndex, freqIndex;
@@ -805,7 +834,8 @@ static int ar5008_hw_process_ini(struct ath_hw *ah,
                 REG_WRITE(ah, reg, val);
 
                 if (reg >= 0x7800 && reg < 0x78a0
-                    && ah->config.analog_shiftreg) {
+                    && ah->config.analog_shiftreg
+                    && (common->bus_ops->ath_bus_type != ATH_USB)) {
                         udelay(100);
                 }
 
@@ -835,7 +865,8 @@ static int ar5008_hw_process_ini(struct ath_hw *ah,
                 REG_WRITE(ah, reg, val);
 
                 if (reg >= 0x7800 && reg < 0x78a0
-                    && ah->config.analog_shiftreg) {
+                    && ah->config.analog_shiftreg
+                    && (common->bus_ops->ath_bus_type != ATH_USB)) {
                         udelay(100);
                 }
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index 76388c6d669..cb611b287b3 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@ -26,6 +26,27 @@ enum ar9002_cal_types {
         IQ_MISMATCH_CAL = BIT(2),
 };
 
+static bool ar9002_hw_is_cal_supported(struct ath_hw *ah,
+                                struct ath9k_channel *chan,
+                                enum ar9002_cal_types cal_type)
+{
+        bool supported = false;
+        switch (ah->supp_cals & cal_type) {
+        case IQ_MISMATCH_CAL:
+                /* Run IQ Mismatch for non-CCK only */
+                if (!IS_CHAN_B(chan))
+                        supported = true;
+                break;
+        case ADC_GAIN_CAL:
+        case ADC_DC_CAL:
+                /* Run ADC Gain Cal for non-CCK & non 2GHz-HT20 only */
+                if (!IS_CHAN_B(chan) &&
+                    !(IS_CHAN_2GHZ(chan) && IS_CHAN_HT20(chan)))
+                        supported = true;
+                break;
+        }
+        return supported;
+}
 
 static void ar9002_hw_setup_calibration(struct ath_hw *ah,
                                         struct ath9k_cal_list *currCal)
@@ -858,26 +879,32 @@ static bool ar9002_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan)
         if (AR_SREV_9100(ah) || AR_SREV_9160_10_OR_LATER(ah)) {
                 ah->supp_cals = IQ_MISMATCH_CAL;
 
-                if (AR_SREV_9160_10_OR_LATER(ah) &&
-                    !(IS_CHAN_2GHZ(chan) && IS_CHAN_HT20(chan))) {
+                if (AR_SREV_9160_10_OR_LATER(ah))
                         ah->supp_cals |= ADC_GAIN_CAL | ADC_DC_CAL;
 
+                if (AR_SREV_9287(ah))
+                        ah->supp_cals &= ~ADC_GAIN_CAL;
 
+                if (ar9002_hw_is_cal_supported(ah, chan, ADC_GAIN_CAL)) {
                         INIT_CAL(&ah->adcgain_caldata);
                         INSERT_CAL(ah, &ah->adcgain_caldata);
                         ath_dbg(common, ATH_DBG_CALIBRATE,
-                                "enabling ADC Gain Calibration.\n");
+                                        "enabling ADC Gain Calibration.\n");
+                }
 
+                if (ar9002_hw_is_cal_supported(ah, chan, ADC_DC_CAL)) {
                         INIT_CAL(&ah->adcdc_caldata);
                         INSERT_CAL(ah, &ah->adcdc_caldata);
                         ath_dbg(common, ATH_DBG_CALIBRATE,
-                                "enabling ADC DC Calibration.\n");
+                                        "enabling ADC DC Calibration.\n");
                 }
 
-                INIT_CAL(&ah->iq_caldata);
-                INSERT_CAL(ah, &ah->iq_caldata);
-                ath_dbg(common, ATH_DBG_CALIBRATE,
-                        "enabling IQ Calibration.\n");
+                if (ar9002_hw_is_cal_supported(ah, chan, IQ_MISMATCH_CAL)) {
+                        INIT_CAL(&ah->iq_caldata);
+                        INSERT_CAL(ah, &ah->iq_caldata);
+                        ath_dbg(common, ATH_DBG_CALIBRATE,
+                                        "enabling IQ Calibration.\n");
+                }
 
                 ah->cal_list_curr = ah->cal_list;
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
index 7f5de6e4448..3daf3df0248 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
@@ -88,66 +88,6 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah)
                                 ar9485_1_1_pcie_phy_clkreq_disable_L1,
                                 ARRAY_SIZE(ar9485_1_1_pcie_phy_clkreq_disable_L1),
                                 2);
-        } else if (AR_SREV_9485(ah)) {
-                /* mac */
-                INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
-                INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
-                                ar9485_1_0_mac_core,
-                                ARRAY_SIZE(ar9485_1_0_mac_core), 2);
-                INIT_INI_ARRAY(&ah->iniMac[ATH_INI_POST],
-                                ar9485_1_0_mac_postamble,
-                                ARRAY_SIZE(ar9485_1_0_mac_postamble), 5);
-
-                /* bb */
-                INIT_INI_ARRAY(&ah->iniBB[ATH_INI_PRE], ar9485_1_0,
-                                ARRAY_SIZE(ar9485_1_0), 2);
-                INIT_INI_ARRAY(&ah->iniBB[ATH_INI_CORE],
-                                ar9485_1_0_baseband_core,
-                                ARRAY_SIZE(ar9485_1_0_baseband_core), 2);
-                INIT_INI_ARRAY(&ah->iniBB[ATH_INI_POST],
-                                ar9485_1_0_baseband_postamble,
-                                ARRAY_SIZE(ar9485_1_0_baseband_postamble), 5);
-
-                /* radio */
-                INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_PRE], NULL, 0, 0);
-                INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_CORE],
-                                ar9485_1_0_radio_core,
-                                ARRAY_SIZE(ar9485_1_0_radio_core), 2);
-                INIT_INI_ARRAY(&ah->iniRadio[ATH_INI_POST],
-                                ar9485_1_0_radio_postamble,
-                                ARRAY_SIZE(ar9485_1_0_radio_postamble), 2);
-
-                /* soc */
-                INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_PRE],
-                                ar9485_1_0_soc_preamble,
-                                ARRAY_SIZE(ar9485_1_0_soc_preamble), 2);
-                INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_CORE], NULL, 0, 0);
-                INIT_INI_ARRAY(&ah->iniSOC[ATH_INI_POST], NULL, 0, 0);
-
-                /* rx/tx gain */
-                INIT_INI_ARRAY(&ah->iniModesRxGain,
-                                ar9485Common_rx_gain_1_0,
-                                ARRAY_SIZE(ar9485Common_rx_gain_1_0), 2);
-                INIT_INI_ARRAY(&ah->iniModesTxGain,
-                                ar9485Modes_lowest_ob_db_tx_gain_1_0,
-                                ARRAY_SIZE(ar9485Modes_lowest_ob_db_tx_gain_1_0),
-                                5);
-
-                /* Load PCIE SERDES settings from INI */
-
-                /* Awake Setting */
-
-                INIT_INI_ARRAY(&ah->iniPcieSerdes,
-                                ar9485_1_0_pcie_phy_pll_on_clkreq_disable_L1,
-                                ARRAY_SIZE(ar9485_1_0_pcie_phy_pll_on_clkreq_disable_L1),
-                                2);
-
-                /* Sleep Setting */
-
-                INIT_INI_ARRAY(&ah->iniPcieSerdesLowPower,
-                                ar9485_1_0_pcie_phy_pll_on_clkreq_disable_L1,
-                                ARRAY_SIZE(ar9485_1_0_pcie_phy_pll_on_clkreq_disable_L1),
-                                2);
         } else {
                 /* mac */
                 INIT_INI_ARRAY(&ah->iniMac[ATH_INI_PRE], NULL, 0, 0);
@@ -228,11 +168,6 @@ static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
                                        ar9485_modes_lowest_ob_db_tx_gain_1_1,
                                        ARRAY_SIZE(ar9485_modes_lowest_ob_db_tx_gain_1_1),
                                        5);
-                else if (AR_SREV_9485(ah))
-                        INIT_INI_ARRAY(&ah->iniModesTxGain,
-                                       ar9485Modes_lowest_ob_db_tx_gain_1_0,
-                                       ARRAY_SIZE(ar9485Modes_lowest_ob_db_tx_gain_1_0),
-                                       5);
                 else
                         INIT_INI_ARRAY(&ah->iniModesTxGain,
                                        ar9300Modes_lowest_ob_db_tx_gain_table_2p2,
@@ -245,11 +180,6 @@ static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
                                        ar9485Modes_high_ob_db_tx_gain_1_1,
                                        ARRAY_SIZE(ar9485Modes_high_ob_db_tx_gain_1_1),
                                        5);
-                else if (AR_SREV_9485(ah))
-                        INIT_INI_ARRAY(&ah->iniModesTxGain,
-                                       ar9485Modes_high_ob_db_tx_gain_1_0,
-                                       ARRAY_SIZE(ar9485Modes_high_ob_db_tx_gain_1_0),
-                                       5);
                 else
                         INIT_INI_ARRAY(&ah->iniModesTxGain,
                                        ar9300Modes_high_ob_db_tx_gain_table_2p2,
@@ -262,11 +192,6 @@ static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
                                        ar9485Modes_low_ob_db_tx_gain_1_1,
                                        ARRAY_SIZE(ar9485Modes_low_ob_db_tx_gain_1_1),
                                        5);
-                else if (AR_SREV_9485(ah))
-                        INIT_INI_ARRAY(&ah->iniModesTxGain,
-                                       ar9485Modes_low_ob_db_tx_gain_1_0,
-                                       ARRAY_SIZE(ar9485Modes_low_ob_db_tx_gain_1_0),
-                                       5);
                 else
                         INIT_INI_ARRAY(&ah->iniModesTxGain,
                                        ar9300Modes_low_ob_db_tx_gain_table_2p2,
@@ -279,11 +204,6 @@ static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
                                        ar9485Modes_high_power_tx_gain_1_1,
                                        ARRAY_SIZE(ar9485Modes_high_power_tx_gain_1_1),
                                        5);
-                else if (AR_SREV_9485(ah))
-                        INIT_INI_ARRAY(&ah->iniModesTxGain,
-                                       ar9485Modes_high_power_tx_gain_1_0,
-                                       ARRAY_SIZE(ar9485Modes_high_power_tx_gain_1_0),
-                                       5);
                 else
                         INIT_INI_ARRAY(&ah->iniModesTxGain,
                                        ar9300Modes_high_power_tx_gain_table_2p2,
@@ -303,11 +223,6 @@ static void ar9003_rx_gain_table_apply(struct ath_hw *ah)
                                        ar9485_common_rx_gain_1_1,
                                        ARRAY_SIZE(ar9485_common_rx_gain_1_1),
                                        2);
-                else if (AR_SREV_9485(ah))
-                        INIT_INI_ARRAY(&ah->iniModesRxGain,
-                                       ar9485Common_rx_gain_1_0,
-                                       ARRAY_SIZE(ar9485Common_rx_gain_1_0),
-                                       2);
                 else
                         INIT_INI_ARRAY(&ah->iniModesRxGain,
                                        ar9300Common_rx_gain_table_2p2,
@@ -320,11 +235,6 @@ static void ar9003_rx_gain_table_apply(struct ath_hw *ah)
                                        ar9485Common_wo_xlna_rx_gain_1_1,
                                        ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_1),
                                        2);
-                else if (AR_SREV_9485(ah))
-                        INIT_INI_ARRAY(&ah->iniModesRxGain,
-                                       ar9485Common_wo_xlna_rx_gain_1_0,
-                                       ARRAY_SIZE(ar9485Common_wo_xlna_rx_gain_1_0),
-                                       2);
                 else
                         INIT_INI_ARRAY(&ah->iniModesRxGain,
                                        ar9300Common_wo_xlna_rx_gain_table_2p2,
diff --git a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
index 71cc0a3a29f..f91f73e50d0 100644
--- a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
@@ -17,931 +17,6 @@
 #ifndef INITVALS_9485_H
 #define INITVALS_9485_H
 
-static const u32 ar9485Common_1_0[][2] = {
-        /*   Addr     allmodes */
-        {0x00007010, 0x00000022},
-        {0x00007020, 0x00000000},
-        {0x00007034, 0x00000002},
-        {0x00007038, 0x000004c2},
-};
-
-static const u32 ar9485_1_0_mac_postamble[][5] = {
-        /* Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20    */
-        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
-        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
-        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
-        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
-        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
-        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
-        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
-};
-
-static const u32 ar9485_1_0_pcie_phy_pll_on_clkreq_disable_L1[][2] = {
-        /*   Addr     allmodes */
-        {0x00018c00, 0x10212e5e},
-        {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0000580c},
-};
-
-static const u32 ar9485Common_wo_xlna_rx_gain_1_0[][2] = {
-        /*   Addr     allmodes */
-        {0x0000a000, 0x00010000},
-        {0x0000a004, 0x00030002},
-        {0x0000a008, 0x00050004},
-        {0x0000a00c, 0x00810080},
-        {0x0000a010, 0x01800082},
-        {0x0000a014, 0x01820181},
-        {0x0000a018, 0x01840183},
-        {0x0000a01c, 0x01880185},
-        {0x0000a020, 0x018a0189},
-        {0x0000a024, 0x02850284},
-        {0x0000a028, 0x02890288},
-        {0x0000a02c, 0x03850384},
-        {0x0000a030, 0x03890388},
-        {0x0000a034, 0x038b038a},
-        {0x0000a038, 0x038d038c},
-        {0x0000a03c, 0x03910390},
-        {0x0000a040, 0x03930392},
-        {0x0000a044, 0x03950394},
-        {0x0000a048, 0x00000396},
-        {0x0000a04c, 0x00000000},
-        {0x0000a050, 0x00000000},
-        {0x0000a054, 0x00000000},
-        {0x0000a058, 0x00000000},
-        {0x0000a05c, 0x00000000},
-        {0x0000a060, 0x00000000},
-        {0x0000a064, 0x00000000},
-        {0x0000a068, 0x00000000},
-        {0x0000a06c, 0x00000000},
-        {0x0000a070, 0x00000000},
-        {0x0000a074, 0x00000000},
-        {0x0000a078, 0x00000000},
-        {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x28282828},
-        {0x0000a084, 0x28282828},
-        {0x0000a088, 0x28282828},
-        {0x0000a08c, 0x28282828},
-        {0x0000a090, 0x28282828},
-        {0x0000a094, 0x21212128},
-        {0x0000a098, 0x171c1c1c},
-        {0x0000a09c, 0x02020212},
-        {0x0000a0a0, 0x00000202},
-        {0x0000a0a4, 0x00000000},
-        {0x0000a0a8, 0x00000000},
-        {0x0000a0ac, 0x00000000},
-        {0x0000a0b0, 0x00000000},
-        {0x0000a0b4, 0x00000000},
-        {0x0000a0b8, 0x00000000},
-        {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x001f0000},
-        {0x0000a0c4, 0x111f1100},
-        {0x0000a0c8, 0x111d111e},
-        {0x0000a0cc, 0x111b111c},
-        {0x0000a0d0, 0x22032204},
-        {0x0000a0d4, 0x22012202},
-        {0x0000a0d8, 0x221f2200},
-        {0x0000a0dc, 0x221d221e},
-        {0x0000a0e0, 0x33013302},
-        {0x0000a0e4, 0x331f3300},
-        {0x0000a0e8, 0x4402331e},
-        {0x0000a0ec, 0x44004401},
-        {0x0000a0f0, 0x441e441f},
-        {0x0000a0f4, 0x55015502},
-        {0x0000a0f8, 0x551f5500},
-        {0x0000a0fc, 0x6602551e},
-        {0x0000a100, 0x66006601},
-        {0x0000a104, 0x661e661f},
-        {0x0000a108, 0x7703661d},
-        {0x0000a10c, 0x77017702},
-        {0x0000a110, 0x00007700},
-        {0x0000a114, 0x00000000},
-        {0x0000a118, 0x00000000},
-        {0x0000a11c, 0x00000000},
-        {0x0000a120, 0x00000000},
-        {0x0000a124, 0x00000000},
-        {0x0000a128, 0x00000000},
-        {0x0000a12c, 0x00000000},
-        {0x0000a130, 0x00000000},
-        {0x0000a134, 0x00000000},
-        {0x0000a138, 0x00000000},
-        {0x0000a13c, 0x00000000},
-        {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x111f1100},
-        {0x0000a148, 0x111d111e},
-        {0x0000a14c, 0x111b111c},
-        {0x0000a150, 0x22032204},
-        {0x0000a154, 0x22012202},
-        {0x0000a158, 0x221f2200},
-        {0x0000a15c, 0x221d221e},
-        {0x0000a160, 0x33013302},
-        {0x0000a164, 0x331f3300},
-        {0x0000a168, 0x4402331e},
-        {0x0000a16c, 0x44004401},
-        {0x0000a170, 0x441e441f},
-        {0x0000a174, 0x55015502},
-        {0x0000a178, 0x551f5500},
-        {0x0000a17c, 0x6602551e},
-        {0x0000a180, 0x66006601},
-        {0x0000a184, 0x661e661f},
-        {0x0000a188, 0x7703661d},
-        {0x0000a18c, 0x77017702},
-        {0x0000a190, 0x00007700},
-        {0x0000a194, 0x00000000},
-        {0x0000a198, 0x00000000},
-        {0x0000a19c, 0x00000000},
-        {0x0000a1a0, 0x00000000},
-        {0x0000a1a4, 0x00000000},
-        {0x0000a1a8, 0x00000000},
-        {0x0000a1ac, 0x00000000},
-        {0x0000a1b0, 0x00000000},
-        {0x0000a1b4, 0x00000000},
-        {0x0000a1b8, 0x00000000},
-        {0x0000a1bc, 0x00000000},
-        {0x0000a1c0, 0x00000000},
-        {0x0000a1c4, 0x00000000},
-        {0x0000a1c8, 0x00000000},
-        {0x0000a1cc, 0x00000000},
-        {0x0000a1d0, 0x00000000},
-        {0x0000a1d4, 0x00000000},
-        {0x0000a1d8, 0x00000000},
-        {0x0000a1dc, 0x00000000},
-        {0x0000a1e0, 0x00000000},
-        {0x0000a1e4, 0x00000000},
-        {0x0000a1e8, 0x00000000},
-        {0x0000a1ec, 0x00000000},
-        {0x0000a1f0, 0x00000396},
-        {0x0000a1f4, 0x00000396},
-        {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000296},
-};
-
-static const u32 ar9485Modes_high_power_tx_gain_1_0[][5] = {
-        /*   Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20 */
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x21000603, 0x21000603},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x25000605, 0x25000605},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2a000a03, 0x2a000a03},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x2c000a04, 0x2c000a04},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x2e000a20, 0x2e000a20},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x34000e20, 0x34000e20},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x38000e22, 0x38000e22},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x3c000e24, 0x3c000e24},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x40000e26, 0x40000e26},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x43001640, 0x43001640},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x46001660, 0x46001660},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x49001861, 0x49001861},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x4c001a81, 0x4c001a81},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x4f001a83, 0x4f001a83},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x54001c85, 0x54001c85},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x58001ce5, 0x58001ce5},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5b001ce9, 0x5b001ce9},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x60001eeb, 0x60001eeb},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x00016044, 0x05b6b2db, 0x05b6b2db, 0x05b6b2db, 0x05b6b2db},
-};
-
-static const u32 ar9485_1_0[][2] = {
-        /*  Addr      allmodes */
-        {0x0000a580, 0x00000000},
-        {0x0000a584, 0x00000000},
-        {0x0000a588, 0x00000000},
-        {0x0000a58c, 0x00000000},
-        {0x0000a590, 0x00000000},
-        {0x0000a594, 0x00000000},
-        {0x0000a598, 0x00000000},
-        {0x0000a59c, 0x00000000},
-        {0x0000a5a0, 0x00000000},
-        {0x0000a5a4, 0x00000000},
-        {0x0000a5a8, 0x00000000},
-        {0x0000a5ac, 0x00000000},
-        {0x0000a5b0, 0x00000000},
-        {0x0000a5b4, 0x00000000},
-        {0x0000a5b8, 0x00000000},
-        {0x0000a5bc, 0x00000000},
-};
-
-static const u32 ar9485_1_0_radio_core[][2] = {
-        /*   Addr     allmodes */
-        {0x00016000, 0x36db6db6},
-        {0x00016004, 0x6db6db40},
-        {0x00016008, 0x73800000},
-        {0x0001600c, 0x00000000},
-        {0x00016040, 0x7f80fff8},
-        {0x00016048, 0x6c92426e},
-        {0x0001604c, 0x000f0278},
-        {0x00016050, 0x6db6db6c},
-        {0x00016054, 0x6db60000},
-        {0x00016080, 0x00080000},
-        {0x00016084, 0x0e48048c},
-        {0x00016088, 0x14214514},
-        {0x0001608c, 0x119f081e},
-        {0x00016090, 0x24926490},
-        {0x00016098, 0xd28b3330},
-        {0x000160a0, 0xc2108ffe},
-        {0x000160a4, 0x812fc370},
-        {0x000160a8, 0x423c8000},
-        {0x000160b4, 0x92480040},
-        {0x000160c0, 0x006db6db},
-        {0x000160c4, 0x0186db60},
-        {0x000160c8, 0x6db6db6c},
-        {0x000160cc, 0x6de6fbe0},
-        {0x000160d0, 0xf7dfcf3c},
-        {0x00016100, 0x04cb0001},
-        {0x00016104, 0xfff80015},
-        {0x00016108, 0x00080010},
-        {0x00016144, 0x01884080},
-        {0x00016148, 0x00008040},
-        {0x00016180, 0x08453333},
-        {0x00016184, 0x18e82f01},
-        {0x00016188, 0x00000000},
-        {0x0001618c, 0x00000000},
-        {0x00016240, 0x08400000},
-        {0x00016244, 0x1bf90f00},
-        {0x00016248, 0x00000000},
-        {0x0001624c, 0x00000000},
-        {0x00016280, 0x01000015},
-        {0x00016284, 0x00d30000},
-        {0x00016288, 0x00318000},
-        {0x0001628c, 0x50000000},
-        {0x00016290, 0x4b96210f},
-        {0x00016380, 0x00000000},
-        {0x00016384, 0x00000000},
-        {0x00016388, 0x00800700},
-        {0x0001638c, 0x00800700},
-        {0x00016390, 0x00800700},
-        {0x00016394, 0x00000000},
-        {0x00016398, 0x00000000},
-        {0x0001639c, 0x00000000},
-        {0x000163a0, 0x00000001},
-        {0x000163a4, 0x00000001},
-        {0x000163a8, 0x00000000},
-        {0x000163ac, 0x00000000},
-        {0x000163b0, 0x00000000},
-        {0x000163b4, 0x00000000},
-        {0x000163b8, 0x00000000},
-        {0x000163bc, 0x00000000},
-        {0x000163c0, 0x000000a0},
-        {0x000163c4, 0x000c0000},
-        {0x000163c8, 0x14021402},
-        {0x000163cc, 0x00001402},
-        {0x000163d0, 0x00000000},
-        {0x000163d4, 0x00000000},
-        {0x00016c40, 0x1319c178},
-        {0x00016c44, 0x10000000},
-};
-
-static const u32 ar9485Modes_lowest_ob_db_tx_gain_1_0[][5] = {
-        /*  Addr       5G_HT20     5G_HT40     2G_HT40     2G_HT20 */
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x21000603, 0x21000603},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x25000605, 0x25000605},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2a000a03, 0x2a000a03},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x2c000a04, 0x2c000a04},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x2e000a20, 0x2e000a20},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x34000e20, 0x34000e20},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x38000e22, 0x38000e22},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x3c000e24, 0x3c000e24},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x40000e26, 0x40000e26},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x43001640, 0x43001640},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x46001660, 0x46001660},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x49001861, 0x49001861},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x4c001a81, 0x4c001a81},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x4f001a83, 0x4f001a83},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x54001c85, 0x54001c85},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x58001ce5, 0x58001ce5},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5b001ce9, 0x5b001ce9},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x60001eeb, 0x60001eeb},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x00016044, 0x05b6b2db, 0x05b6b2db, 0x05b6b2db, 0x05b6b2db},
-};
-
-static const u32 ar9485_1_0_baseband_core[][2] = {
-        /* Addr      allmodes  */
-        {0x00009800, 0xafe68e30},
-        {0x00009804, 0xfd14e000},
-        {0x00009808, 0x9c0a8f6b},
-        {0x0000980c, 0x04800000},
-        {0x00009814, 0x9280c00a},
-        {0x00009818, 0x00000000},
-        {0x0000981c, 0x00020028},
-        {0x00009834, 0x5f3ca3de},
-        {0x00009838, 0x0108ecff},
-        {0x0000983c, 0x14750600},
-        {0x00009880, 0x201fff00},
-        {0x00009884, 0x00001042},
-        {0x000098a4, 0x00200400},
-        {0x000098b0, 0x52440bbe},
-        {0x000098bc, 0x00000002},
-        {0x000098d0, 0x004b6a8e},
-        {0x000098d4, 0x00000820},
-        {0x000098dc, 0x00000000},
-        {0x000098f0, 0x00000000},
-        {0x000098f4, 0x00000000},
-        {0x00009c04, 0x00000000},
-        {0x00009c08, 0x03200000},
-        {0x00009c0c, 0x00000000},
-        {0x00009c10, 0x00000000},
-        {0x00009c14, 0x00046384},
-        {0x00009c18, 0x05b6b440},
-        {0x00009c1c, 0x00b6b440},
-        {0x00009d00, 0xc080a333},
-        {0x00009d04, 0x40206c10},
-        {0x00009d08, 0x009c4060},
-        {0x00009d0c, 0x1883800a},
-        {0x00009d10, 0x01834061},
-        {0x00009d14, 0x00c00400},
-        {0x00009d18, 0x00000000},
-        {0x00009d1c, 0x00000000},
-        {0x00009e08, 0x0038233c},
-        {0x00009e24, 0x990bb515},
-        {0x00009e28, 0x0a6f0000},
-        {0x00009e30, 0x06336f77},
-        {0x00009e34, 0x6af6532f},
-        {0x00009e38, 0x0cc80c00},
-        {0x00009e40, 0x0d261820},
-        {0x00009e4c, 0x00001004},
-        {0x00009e50, 0x00ff03f1},
-        {0x00009fc0, 0x80be4788},
-        {0x00009fc4, 0x0001efb5},
-        {0x00009fcc, 0x40000014},
-        {0x0000a20c, 0x00000000},
-        {0x0000a210, 0x00000000},
-        {0x0000a220, 0x00000000},
-        {0x0000a224, 0x00000000},
-        {0x0000a228, 0x10002310},
-        {0x0000a23c, 0x00000000},
-        {0x0000a244, 0x0c000000},
-        {0x0000a2a0, 0x00000001},
-        {0x0000a2c0, 0x00000001},
-        {0x0000a2c8, 0x00000000},
-        {0x0000a2cc, 0x18c43433},
-        {0x0000a2d4, 0x00000000},
-        {0x0000a2dc, 0x00000000},
-        {0x0000a2e0, 0x00000000},
-        {0x0000a2e4, 0x00000000},
-        {0x0000a2e8, 0x00000000},
-        {0x0000a2ec, 0x00000000},
-        {0x0000a2f0, 0x00000000},
-        {0x0000a2f4, 0x00000000},
-        {0x0000a2f8, 0x00000000},
-        {0x0000a344, 0x00000000},
-        {0x0000a34c, 0x00000000},
-        {0x0000a350, 0x0000a000},
-        {0x0000a364, 0x00000000},
-        {0x0000a370, 0x00000000},
-        {0x0000a390, 0x00000001},
-        {0x0000a394, 0x00000444},
-        {0x0000a398, 0x001f0e0f},
-        {0x0000a39c, 0x0075393f},
-        {0x0000a3a0, 0xb79f6427},
-        {0x0000a3a4, 0x00000000},
-        {0x0000a3a8, 0xaaaaaaaa},
-        {0x0000a3ac, 0x3c466478},
-        {0x0000a3c0, 0x20202020},
-        {0x0000a3c4, 0x22222220},
-        {0x0000a3c8, 0x20200020},
-        {0x0000a3cc, 0x20202020},
-        {0x0000a3d0, 0x20202020},
-        {0x0000a3d4, 0x20202020},
-        {0x0000a3d8, 0x20202020},
-        {0x0000a3dc, 0x20202020},
-        {0x0000a3e0, 0x20202020},
-        {0x0000a3e4, 0x20202020},
-        {0x0000a3e8, 0x20202020},
-        {0x0000a3ec, 0x20202020},
-        {0x0000a3f0, 0x00000000},
-        {0x0000a3f4, 0x00000006},
-        {0x0000a3f8, 0x0cdbd380},
-        {0x0000a3fc, 0x000f0f01},
-        {0x0000a400, 0x8fa91f01},
-        {0x0000a404, 0x00000000},
-        {0x0000a408, 0x0e79e5c6},
-        {0x0000a40c, 0x00820820},
-        {0x0000a414, 0x1ce739ce},
-        {0x0000a418, 0x2d0011ce},
-        {0x0000a41c, 0x1ce739ce},
-        {0x0000a420, 0x000001ce},
-        {0x0000a424, 0x1ce739ce},
-        {0x0000a428, 0x000001ce},
-        {0x0000a42c, 0x1ce739ce},
-        {0x0000a430, 0x1ce739ce},
-        {0x0000a434, 0x00000000},
-        {0x0000a438, 0x00001801},
-        {0x0000a43c, 0x00000000},
-        {0x0000a440, 0x00000000},
-        {0x0000a444, 0x00000000},
-        {0x0000a448, 0x04000000},
-        {0x0000a44c, 0x00000001},
-        {0x0000a450, 0x00010000},
-        {0x0000a458, 0x00000000},
-        {0x0000a5c4, 0x3fad9d74},
-        {0x0000a5c8, 0x0048060a},
-        {0x0000a5cc, 0x00000637},
-        {0x0000a760, 0x03020100},
-        {0x0000a764, 0x09080504},
-        {0x0000a768, 0x0d0c0b0a},
-        {0x0000a76c, 0x13121110},
-        {0x0000a770, 0x31301514},
-        {0x0000a774, 0x35343332},
-        {0x0000a778, 0x00000036},
-        {0x0000a780, 0x00000838},
-        {0x0000a7c0, 0x00000000},
-        {0x0000a7c4, 0xfffffffc},
-        {0x0000a7c8, 0x00000000},
-        {0x0000a7cc, 0x00000000},
-        {0x0000a7d0, 0x00000000},
-        {0x0000a7d4, 0x00000004},
-        {0x0000a7dc, 0x00000001},
-};
-
-static const u32 ar9485Modes_high_ob_db_tx_gain_1_0[][5] = {
-        /* Addr        5G_HT20     5G_HT40     2G_HT40    2G_HT20  */
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x21000603, 0x21000603},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x25000605, 0x25000605},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2a000a03, 0x2a000a03},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x2c000a04, 0x2c000a04},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x2e000a20, 0x2e000a20},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x34000e20, 0x34000e20},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x38000e22, 0x38000e22},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x3c000e24, 0x3c000e24},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x40000e26, 0x40000e26},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x43001640, 0x43001640},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x46001660, 0x46001660},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x49001861, 0x49001861},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x4c001a81, 0x4c001a81},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x4f001a83, 0x4f001a83},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x54001c85, 0x54001c85},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x58001ce5, 0x58001ce5},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5b001ce9, 0x5b001ce9},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x60001eeb, 0x60001eeb},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x00016044, 0x05b6b2db, 0x05b6b2db, 0x05b6b2db, 0x05b6b2db},
-};
-
-static const u32 ar9485Common_rx_gain_1_0[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a000, 0x00010000},
-        {0x0000a004, 0x00030002},
-        {0x0000a008, 0x00050004},
-        {0x0000a00c, 0x00810080},
-        {0x0000a010, 0x01800082},
-        {0x0000a014, 0x01820181},
-        {0x0000a018, 0x01840183},
-        {0x0000a01c, 0x01880185},
-        {0x0000a020, 0x018a0189},
-        {0x0000a024, 0x02850284},
-        {0x0000a028, 0x02890288},
-        {0x0000a02c, 0x03850384},
-        {0x0000a030, 0x03890388},
-        {0x0000a034, 0x038b038a},
-        {0x0000a038, 0x038d038c},
-        {0x0000a03c, 0x03910390},
-        {0x0000a040, 0x03930392},
-        {0x0000a044, 0x03950394},
-        {0x0000a048, 0x00000396},
-        {0x0000a04c, 0x00000000},
-        {0x0000a050, 0x00000000},
-        {0x0000a054, 0x00000000},
-        {0x0000a058, 0x00000000},
-        {0x0000a05c, 0x00000000},
-        {0x0000a060, 0x00000000},
-        {0x0000a064, 0x00000000},
-        {0x0000a068, 0x00000000},
-        {0x0000a06c, 0x00000000},
-        {0x0000a070, 0x00000000},
-        {0x0000a074, 0x00000000},
-        {0x0000a078, 0x00000000},
-        {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x28282828},
-        {0x0000a084, 0x28282828},
-        {0x0000a088, 0x28282828},
-        {0x0000a08c, 0x28282828},
-        {0x0000a090, 0x28282828},
-        {0x0000a094, 0x21212128},
-        {0x0000a098, 0x171c1c1c},
-        {0x0000a09c, 0x02020212},
-        {0x0000a0a0, 0x00000202},
-        {0x0000a0a4, 0x00000000},
-        {0x0000a0a8, 0x00000000},
-        {0x0000a0ac, 0x00000000},
-        {0x0000a0b0, 0x00000000},
-        {0x0000a0b4, 0x00000000},
-        {0x0000a0b8, 0x00000000},
-        {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x001f0000},
-        {0x0000a0c4, 0x111f1100},
-        {0x0000a0c8, 0x111d111e},
-        {0x0000a0cc, 0x111b111c},
-        {0x0000a0d0, 0x22032204},
-        {0x0000a0d4, 0x22012202},
-        {0x0000a0d8, 0x221f2200},
-        {0x0000a0dc, 0x221d221e},
-        {0x0000a0e0, 0x33013302},
-        {0x0000a0e4, 0x331f3300},
-        {0x0000a0e8, 0x4402331e},
-        {0x0000a0ec, 0x44004401},
-        {0x0000a0f0, 0x441e441f},
-        {0x0000a0f4, 0x55015502},
-        {0x0000a0f8, 0x551f5500},
-        {0x0000a0fc, 0x6602551e},
-        {0x0000a100, 0x66006601},
-        {0x0000a104, 0x661e661f},
-        {0x0000a108, 0x7703661d},
-        {0x0000a10c, 0x77017702},
-        {0x0000a110, 0x00007700},
-        {0x0000a114, 0x00000000},
-        {0x0000a118, 0x00000000},
-        {0x0000a11c, 0x00000000},
-        {0x0000a120, 0x00000000},
-        {0x0000a124, 0x00000000},
-        {0x0000a128, 0x00000000},
-        {0x0000a12c, 0x00000000},
-        {0x0000a130, 0x00000000},
-        {0x0000a134, 0x00000000},
-        {0x0000a138, 0x00000000},
-        {0x0000a13c, 0x00000000},
-        {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x111f1100},
-        {0x0000a148, 0x111d111e},
-        {0x0000a14c, 0x111b111c},
-        {0x0000a150, 0x22032204},
-        {0x0000a154, 0x22012202},
-        {0x0000a158, 0x221f2200},
-        {0x0000a15c, 0x221d221e},
-        {0x0000a160, 0x33013302},
-        {0x0000a164, 0x331f3300},
-        {0x0000a168, 0x4402331e},
-        {0x0000a16c, 0x44004401},
-        {0x0000a170, 0x441e441f},
-        {0x0000a174, 0x55015502},
-        {0x0000a178, 0x551f5500},
-        {0x0000a17c, 0x6602551e},
-        {0x0000a180, 0x66006601},
-        {0x0000a184, 0x661e661f},
-        {0x0000a188, 0x7703661d},
-        {0x0000a18c, 0x77017702},
-        {0x0000a190, 0x00007700},
-        {0x0000a194, 0x00000000},
-        {0x0000a198, 0x00000000},
-        {0x0000a19c, 0x00000000},
-        {0x0000a1a0, 0x00000000},
-        {0x0000a1a4, 0x00000000},
-        {0x0000a1a8, 0x00000000},
-        {0x0000a1ac, 0x00000000},
-        {0x0000a1b0, 0x00000000},
-        {0x0000a1b4, 0x00000000},
-        {0x0000a1b8, 0x00000000},
-        {0x0000a1bc, 0x00000000},
-        {0x0000a1c0, 0x00000000},
-        {0x0000a1c4, 0x00000000},
-        {0x0000a1c8, 0x00000000},
-        {0x0000a1cc, 0x00000000},
-        {0x0000a1d0, 0x00000000},
-        {0x0000a1d4, 0x00000000},
-        {0x0000a1d8, 0x00000000},
-        {0x0000a1dc, 0x00000000},
-        {0x0000a1e0, 0x00000000},
-        {0x0000a1e4, 0x00000000},
-        {0x0000a1e8, 0x00000000},
-        {0x0000a1ec, 0x00000000},
-        {0x0000a1f0, 0x00000396},
-        {0x0000a1f4, 0x00000396},
-        {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000296},
-};
-
-static const u32 ar9485_1_0_pcie_phy_pll_on_clkreq_enable_L1[][2] = {
-        /*   Addr    allmodes  */
-        {0x00018c00, 0x10252e5e},
-        {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0000580c},
-};
-
-static const u32 ar9485_1_0_pcie_phy_clkreq_enable_L1[][2] = {
-        /*  Addr    allmodes   */
-        {0x00018c00, 0x10253e5e},
-        {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0000580c},
-};
-
-static const u32 ar9485_1_0_soc_preamble[][2] = {
-        /*   Addr     allmodes */
-        {0x00004090, 0x00aa10aa},
-        {0x000040a4, 0x00a0c9c9},
-        {0x00007048, 0x00000004},
-};
-
-static const u32 ar9485_fast_clock_1_0_baseband_postamble[][3] = {
-        /*   Addr      5G_HT20     5G_HT40 */
-        {0x00009e00, 0x03721821, 0x03721821},
-        {0x0000a230, 0x0000400b, 0x00004016},
-        {0x0000a254, 0x00000898, 0x00001130},
-};
-
-static const u32 ar9485_1_0_baseband_postamble[][5] = {
-        /* Addr        5G_HT20     5G_HT40     2G_HT40     2G_HT20 */
-        {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
-        {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
-        {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
-        {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
-        {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
-        {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
-        {0x00009c00, 0x00000044, 0x00000044, 0x00000044, 0x00000044},
-        {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0},
-        {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
-        {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
-        {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec80d2e, 0x7ec80d2e},
-        {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
-        {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
-        {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
-        {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
-        {0x00009e3c, 0xcf946220, 0xcf946220, 0xcf946222, 0xcf946222},
-        {0x00009e44, 0x02321e27, 0x02321e27, 0x02282324, 0x02282324},
-        {0x00009e48, 0x5030201a, 0x5030201a, 0x50302010, 0x50302010},
-        {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
-        {0x0000a204, 0x01303fc0, 0x01303fc4, 0x01303fc4, 0x01303fc0},
-        {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
-        {0x0000a230, 0x0000400a, 0x00004014, 0x00004016, 0x0000400b},
-        {0x0000a234, 0x10000fff, 0x10000fff, 0x10000fff, 0x10000fff},
-        {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
-        {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
-        {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
-        {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
-        {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
-        {0x0000a260, 0x3a021501, 0x3a021501, 0x3a021501, 0x3a021501},
-        {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
-        {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
-        {0x0000a284, 0x00000000, 0x00000000, 0x000002a0, 0x000002a0},
-        {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
-        {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071982},
-        {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
-        {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000be04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
-        {0x0000be18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-};
-
-static const u32 ar9485Modes_low_ob_db_tx_gain_1_0[][5] = {
-        /*  Addr      5G_HT20    5G_HT40     2G_HT40     2G_HT20   */
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x21000603, 0x21000603},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x25000605, 0x25000605},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2a000a03, 0x2a000a03},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x2c000a04, 0x2c000a04},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x2e000a20, 0x2e000a20},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x34000e20, 0x34000e20},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x38000e22, 0x38000e22},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x3c000e24, 0x3c000e24},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x40000e26, 0x40000e26},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x43001640, 0x43001640},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x46001660, 0x46001660},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x49001861, 0x49001861},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x4c001a81, 0x4c001a81},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x4f001a83, 0x4f001a83},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x54001c85, 0x54001c85},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x58001ce5, 0x58001ce5},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5b001ce9, 0x5b001ce9},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x60001eeb, 0x60001eeb},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x60001eeb, 0x60001eeb},
-        {0x00016044, 0x05b6b2db, 0x05b6b2db, 0x05b6b2db, 0x05b6b2db},
-};
-
-static const u32 ar9485_1_0_pcie_phy_clkreq_disable_L1[][2] = {
-        /*   Addr     allmodes */
-        {0x00018c00, 0x10213e5e},
-        {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0000580c},
-};
-
-static const u32 ar9485_1_0_radio_postamble[][2] = {
-        /*   Addr     allmodes */
-        {0x0001609c, 0x0b283f31},
-        {0x000160ac, 0x24611800},
-        {0x000160b0, 0x03284f3e},
-        {0x0001610c, 0x00170000},
-        {0x00016140, 0x10804008},
-};
-
-static const u32 ar9485_1_0_mac_core[][2] = {
-        /*  Addr      allmodes */
-        {0x00000008, 0x00000000},
-        {0x00000030, 0x00020085},
-        {0x00000034, 0x00000005},
-        {0x00000040, 0x00000000},
-        {0x00000044, 0x00000000},
-        {0x00000048, 0x00000008},
-        {0x0000004c, 0x00000010},
-        {0x00000050, 0x00000000},
-        {0x00001040, 0x002ffc0f},
-        {0x00001044, 0x002ffc0f},
-        {0x00001048, 0x002ffc0f},
-        {0x0000104c, 0x002ffc0f},
-        {0x00001050, 0x002ffc0f},
-        {0x00001054, 0x002ffc0f},
-        {0x00001058, 0x002ffc0f},
-        {0x0000105c, 0x002ffc0f},
-        {0x00001060, 0x002ffc0f},
-        {0x00001064, 0x002ffc0f},
-        {0x000010f0, 0x00000100},
-        {0x00001270, 0x00000000},
-        {0x000012b0, 0x00000000},
-        {0x000012f0, 0x00000000},
-        {0x0000143c, 0x00000000},
-        {0x0000147c, 0x00000000},
-        {0x00008000, 0x00000000},
-        {0x00008004, 0x00000000},
-        {0x00008008, 0x00000000},
-        {0x0000800c, 0x00000000},
-        {0x00008018, 0x00000000},
-        {0x00008020, 0x00000000},
-        {0x00008038, 0x00000000},
-        {0x0000803c, 0x00000000},
-        {0x00008040, 0x00000000},
-        {0x00008044, 0x00000000},
-        {0x00008048, 0x00000000},
-        {0x0000804c, 0xffffffff},
-        {0x00008054, 0x00000000},
-        {0x00008058, 0x00000000},
-        {0x0000805c, 0x000fc78f},
-        {0x00008060, 0x0000000f},
-        {0x00008064, 0x00000000},
-        {0x00008070, 0x00000310},
-        {0x00008074, 0x00000020},
-        {0x00008078, 0x00000000},
-        {0x0000809c, 0x0000000f},
-        {0x000080a0, 0x00000000},
-        {0x000080a4, 0x02ff0000},
-        {0x000080a8, 0x0e070605},
-        {0x000080ac, 0x0000000d},
-        {0x000080b0, 0x00000000},
-        {0x000080b4, 0x00000000},
-        {0x000080b8, 0x00000000},
-        {0x000080bc, 0x00000000},
-        {0x000080c0, 0x2a800000},
-        {0x000080c4, 0x06900168},
-        {0x000080c8, 0x13881c20},
-        {0x000080cc, 0x01f40000},
-        {0x000080d0, 0x00252500},
-        {0x000080d4, 0x00a00000},
-        {0x000080d8, 0x00400000},
-        {0x000080dc, 0x00000000},
-        {0x000080e0, 0xffffffff},
-        {0x000080e4, 0x0000ffff},
-        {0x000080e8, 0x3f3f3f3f},
-        {0x000080ec, 0x00000000},
-        {0x000080f0, 0x00000000},
-        {0x000080f4, 0x00000000},
-        {0x000080fc, 0x00020000},
-        {0x00008100, 0x00000000},
-        {0x00008108, 0x00000052},
-        {0x0000810c, 0x00000000},
-        {0x00008110, 0x00000000},
-        {0x00008114, 0x000007ff},
-        {0x00008118, 0x000000aa},
-        {0x0000811c, 0x00003210},
-        {0x00008124, 0x00000000},
-        {0x00008128, 0x00000000},
-        {0x0000812c, 0x00000000},
-        {0x00008130, 0x00000000},
-        {0x00008134, 0x00000000},
-        {0x00008138, 0x00000000},
-        {0x0000813c, 0x0000ffff},
-        {0x00008144, 0xffffffff},
-        {0x00008168, 0x00000000},
-        {0x0000816c, 0x00000000},
-        {0x00008170, 0x18486200},
-        {0x00008174, 0x33332210},
-        {0x00008178, 0x00000000},
-        {0x0000817c, 0x00020000},
-        {0x000081c0, 0x00000000},
-        {0x000081c4, 0x33332210},
-        {0x000081c8, 0x00000000},
-        {0x000081cc, 0x00000000},
-        {0x000081d4, 0x00000000},
-        {0x000081ec, 0x00000000},
-        {0x000081f0, 0x00000000},
-        {0x000081f4, 0x00000000},
-        {0x000081f8, 0x00000000},
-        {0x000081fc, 0x00000000},
-        {0x00008240, 0x00100000},
-        {0x00008244, 0x0010f400},
-        {0x00008248, 0x00000800},
-        {0x0000824c, 0x0001e800},
-        {0x00008250, 0x00000000},
-        {0x00008254, 0x00000000},
-        {0x00008258, 0x00000000},
-        {0x0000825c, 0x40000000},
-        {0x00008260, 0x00080922},
-        {0x00008264, 0x9ca00010},
-        {0x00008268, 0xffffffff},
-        {0x0000826c, 0x0000ffff},
-        {0x00008270, 0x00000000},
-        {0x00008274, 0x40000000},
-        {0x00008278, 0x003e4180},
-        {0x0000827c, 0x00000004},
-        {0x00008284, 0x0000002c},
-        {0x00008288, 0x0000002c},
-        {0x0000828c, 0x000000ff},
-        {0x00008294, 0x00000000},
-        {0x00008298, 0x00000000},
-        {0x0000829c, 0x00000000},
-        {0x00008300, 0x00000140},
-        {0x00008314, 0x00000000},
-        {0x0000831c, 0x0000010d},
-        {0x00008328, 0x00000000},
-        {0x0000832c, 0x00000007},
-        {0x00008330, 0x00000302},
-        {0x00008334, 0x00000700},
-        {0x00008338, 0x00ff0000},
-        {0x0000833c, 0x02400000},
-        {0x00008340, 0x000107ff},
-        {0x00008344, 0xa248105b},
-        {0x00008348, 0x008f0000},
-        {0x0000835c, 0x00000000},
-        {0x00008360, 0xffffffff},
-        {0x00008364, 0xffffffff},
-        {0x00008368, 0x00000000},
-        {0x00008370, 0x00000000},
-        {0x00008374, 0x000000ff},
-        {0x00008378, 0x00000000},
-        {0x0000837c, 0x00000000},
-        {0x00008380, 0xffffffff},
-        {0x00008384, 0xffffffff},
-        {0x00008390, 0xffffffff},
-        {0x00008394, 0xffffffff},
-        {0x00008398, 0x00000000},
-        {0x0000839c, 0x00000000},
-        {0x000083a0, 0x00000000},
-        {0x000083a4, 0x0000fa14},
-        {0x000083a8, 0x000f0c00},
-        {0x000083ac, 0x33332210},
-        {0x000083b0, 0x33332210},
-        {0x000083b4, 0x33332210},
-        {0x000083b8, 0x33332210},
-        {0x000083bc, 0x00000000},
-        {0x000083c0, 0x00000000},
-        {0x000083c4, 0x00000000},
-        {0x000083c8, 0x00000000},
-        {0x000083cc, 0x00000200},
-        {0x000083d0, 0x000301ff},
-};
-
 static const u32 ar9485_1_1_mac_core[][2] = {
         /*  Addr       allmodes */
         {0x00000008, 0x00000000},
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 099bd4183ad..7c91ba4dce4 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -362,7 +362,7 @@ struct ath_vif {
  * number of BSSIDs) if a given beacon does not go out even after waiting this
  * number of beacon intervals, the game's up.
  */
-#define BSTUCK_THRESH                   (9 * ATH_BCBUF)
+#define BSTUCK_THRESH                   9
 #define ATH_BCBUF                       4
 #define ATH_DEFAULT_BINTVAL             100 /* TU */
 #define ATH_DEFAULT_BMISS_LIMIT         10
@@ -386,7 +386,7 @@ struct ath_beacon {
         u32 beaconq;
         u32 bmisscnt;
         u32 ast_be_xmit;
-        u64 bc_tstamp;
+        u32 bc_tstamp;
         struct ieee80211_vif *bslot[ATH_BCBUF];
         int slottime;
         int slotupdate;
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 6d2a545fc35..74f33bc193f 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -57,8 +57,8 @@ int ath_beaconq_config(struct ath_softc *sc)
 
 /*
  *  Associates the beacon frame buffer with a transmit descriptor.  Will set
- *  up all required antenna switch parameters, rate codes, and channel flags.
- *  Beacons are always sent out at the lowest rate, and are not retried.
+ *  up rate codes, and channel flags. Beacons are always sent out at the
+ *  lowest rate, and are not retried.
 */
 static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp,
                              struct ath_buf *bf, int rateidx)
@@ -68,7 +68,7 @@ static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp,
         struct ath_common *common = ath9k_hw_common(ah);
         struct ath_desc *ds;
         struct ath9k_11n_rate_series series[4];
-        int flags, antenna, ctsrate = 0, ctsduration = 0;
+        int flags, ctsrate = 0, ctsduration = 0;
         struct ieee80211_supported_band *sband;
         u8 rate = 0;
 
@@ -76,12 +76,6 @@ static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp,
         flags = ATH9K_TXDESC_NOACK;
 
         ds->ds_link = 0;
-        /*
-         * Switch antenna every beacon.
-         * Should only switch every beacon period, not for every SWBA
-         * XXX assumes two antennae
-         */
-        antenna = ((sc->beacon.ast_be_xmit / sc->nbcnvifs) & 1 ? 2 : 1);
 
         sband = &sc->sbands[common->hw->conf.channel->band];
         rate = sband->bitrates[rateidx].hw_value;
@@ -278,7 +272,7 @@ int ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_vif *vif)
                 return -ENOMEM;
 
         tstamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;
-        sc->beacon.bc_tstamp = le64_to_cpu(tstamp);
+        sc->beacon.bc_tstamp = (u32) le64_to_cpu(tstamp);
         /* Calculate a TSF adjustment factor required for staggered beacons. */
         if (avp->av_bslot > 0) {
                 u64 tsfadjust;
@@ -294,8 +288,8 @@ int ath_beacon_alloc(struct ath_softc *sc, struct ieee80211_vif *vif)
                  * adjustment. Other slots are adjusted to get the timestamp
                  * close to the TBTT for the BSS.
                  */
-                tsfadjust = intval * avp->av_bslot / ATH_BCBUF;
-                avp->tsf_adjust = cpu_to_le64(TU_TO_USEC(tsfadjust));
+                tsfadjust = TU_TO_USEC(intval * avp->av_bslot) / ATH_BCBUF;
+                avp->tsf_adjust = cpu_to_le64(tsfadjust);
 
                 ath_dbg(common, ATH_DBG_BEACON,
                         "stagger beacons, bslot %d intval %u tsfadjust %llu\n",
@@ -369,12 +363,13 @@ void ath_beacon_tasklet(unsigned long data)
         if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0) {
                 sc->beacon.bmisscnt++;
 
-                if (sc->beacon.bmisscnt < BSTUCK_THRESH) {
+                if (sc->beacon.bmisscnt < BSTUCK_THRESH * sc->nbcnvifs) {
                         ath_dbg(common, ATH_DBG_BSTUCK,
                                 "missed %u consecutive beacons\n",
                                 sc->beacon.bmisscnt);
                         ath9k_hw_stop_dma_queue(ah, sc->beacon.beaconq);
-                        ath9k_hw_bstuck_nfcal(ah);
+                        if (sc->beacon.bmisscnt > 3)
+                                ath9k_hw_bstuck_nfcal(ah);
                 } else if (sc->beacon.bmisscnt >= BSTUCK_THRESH) {
                         ath_dbg(common, ATH_DBG_BSTUCK,
                                 "beacon is officially stuck\n");
@@ -385,13 +380,6 @@ void ath_beacon_tasklet(unsigned long data)
                 return;
         }
 
-        if (sc->beacon.bmisscnt != 0) {
-                ath_dbg(common, ATH_DBG_BSTUCK,
-                        "resume beacon xmit after %u misses\n",
-                        sc->beacon.bmisscnt);
-                sc->beacon.bmisscnt = 0;
-        }
-
         /*
          * Generate beacon frames. we are sending frames
          * staggered so calculate the slot for this frame based
@@ -401,8 +389,9 @@ void ath_beacon_tasklet(unsigned long data)
         intval = cur_conf->beacon_interval ? : ATH_DEFAULT_BINTVAL;
 
         tsf = ath9k_hw_gettsf64(ah);
-        tsftu = TSF_TO_TU(tsf>>32, tsf);
-        slot = ((tsftu % intval) * ATH_BCBUF) / intval;
+        tsf += TU_TO_USEC(ah->config.sw_beacon_response_time);
+        tsftu = TSF_TO_TU((tsf * ATH_BCBUF) >>32, tsf * ATH_BCBUF);
+        slot = (tsftu % (intval * ATH_BCBUF)) / intval;
         /*
          * Reverse the slot order to get slot 0 on the TBTT offset that does
          * not require TSF adjustment and other slots adding
@@ -415,7 +404,7 @@ void ath_beacon_tasklet(unsigned long data)
 
         ath_dbg(common, ATH_DBG_BEACON,
                 "slot %d [tsf %llu tsftu %u intval %u] vif %p\n",
-                slot, tsf, tsftu, intval, vif);
+                slot, tsf, tsftu / ATH_BCBUF, intval, vif);
 
         bfaddr = 0;
         if (vif) {
@@ -424,6 +413,13 @@ void ath_beacon_tasklet(unsigned long data)
                         bfaddr = bf->bf_daddr;
                         bc = 1;
                 }
+
+                if (sc->beacon.bmisscnt != 0) {
+                        ath_dbg(common, ATH_DBG_BSTUCK,
+                                "resume beacon xmit after %u misses\n",
+                                sc->beacon.bmisscnt);
+                        sc->beacon.bmisscnt = 0;
+                }
         }
 
         /*
@@ -463,13 +459,17 @@ static void ath9k_beacon_init(struct ath_softc *sc,
                               u32 next_beacon,
                               u32 beacon_period)
 {
-        if (beacon_period & ATH9K_BEACON_RESET_TSF)
+        if (sc->sc_flags & SC_OP_TSF_RESET) {
                 ath9k_ps_wakeup(sc);
+                ath9k_hw_reset_tsf(sc->sc_ah);
+        }
 
         ath9k_hw_beaconinit(sc->sc_ah, next_beacon, beacon_period);
 
-        if (beacon_period & ATH9K_BEACON_RESET_TSF)
+        if (sc->sc_flags & SC_OP_TSF_RESET) {
                 ath9k_ps_restore(sc);
+                sc->sc_flags &= ~SC_OP_TSF_RESET;
+        }
 }
 
 /*
@@ -484,18 +484,14 @@ static void ath_beacon_config_ap(struct ath_softc *sc,
         u32 nexttbtt, intval;
 
         /* NB: the beacon interval is kept internally in TU's */
-        intval = conf->beacon_interval & ATH9K_BEACON_PERIOD;
+        intval = TU_TO_USEC(conf->beacon_interval & ATH9K_BEACON_PERIOD);
         intval /= ATH_BCBUF;    /* for staggered beacons */
         nexttbtt = intval;
 
-        if (sc->sc_flags & SC_OP_TSF_RESET)
-                intval |= ATH9K_BEACON_RESET_TSF;
-
         /*
          * In AP mode we enable the beacon timers and SWBA interrupts to
          * prepare beacon frames.
          */
-        intval |= ATH9K_BEACON_ENA;
         ah->imask |= ATH9K_INT_SWBA;
         ath_beaconq_config(sc);
 
@@ -505,11 +501,6 @@ static void ath_beacon_config_ap(struct ath_softc *sc,
         ath9k_beacon_init(sc, nexttbtt, intval);
         sc->beacon.bmisscnt = 0;
         ath9k_hw_set_interrupts(ah, ah->imask);
-
-        /* Clear the reset TSF flag, so that subsequent beacon updation
-           will not reset the HW TSF. */
-
-        sc->sc_flags &= ~SC_OP_TSF_RESET;
 }
 
 /*
@@ -643,25 +634,20 @@ static void ath_beacon_config_adhoc(struct ath_softc *sc,
 {
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
-        u64 tsf;
-        u32 tsftu, intval, nexttbtt;
-
-        intval = conf->beacon_interval & ATH9K_BEACON_PERIOD;
-
-
-        /* Pull nexttbtt forward to reflect the current TSF */
-
-        nexttbtt = TSF_TO_TU(sc->beacon.bc_tstamp >> 32, sc->beacon.bc_tstamp);
-        if (nexttbtt == 0)
-                nexttbtt = intval;
-        else if (intval)
-                nexttbtt = roundup(nexttbtt, intval);
-
-        tsf = ath9k_hw_gettsf64(ah);
-        tsftu = TSF_TO_TU((u32)(tsf>>32), (u32)tsf) + FUDGE;
-        do {
-                nexttbtt += intval;
-        } while (nexttbtt < tsftu);
+        u32 tsf, delta, intval, nexttbtt;
+
+        tsf = ath9k_hw_gettsf32(ah) + TU_TO_USEC(FUDGE);
+        intval = TU_TO_USEC(conf->beacon_interval & ATH9K_BEACON_PERIOD);
+
+        if (!sc->beacon.bc_tstamp)
+                nexttbtt = tsf + intval;
+        else {
+                if (tsf > sc->beacon.bc_tstamp)
+                        delta = (tsf - sc->beacon.bc_tstamp);
+                else
+                        delta = (tsf + 1 + (~0U - sc->beacon.bc_tstamp));
+                nexttbtt = tsf + roundup(delta, intval);
+        }
 
         ath_dbg(common, ATH_DBG_BEACON,
                 "IBSS nexttbtt %u intval %u (%u)\n",
@@ -672,7 +658,6 @@ static void ath_beacon_config_adhoc(struct ath_softc *sc,
          * if we need to manually prepare beacon frames.  Otherwise we use a
          * self-linked tx descriptor and let the hardware deal with things.
          */
-        intval |= ATH9K_BEACON_ENA;
         ah->imask |= ATH9K_INT_SWBA;
 
         ath_beaconq_config(sc);
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 8df5a92a20f..a762cadb3ab 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -1088,67 +1088,43 @@ int ath9k_init_debug(struct ath_hw *ah)
                 return -ENOMEM;
 
 #ifdef CONFIG_ATH_DEBUG
-        if (!debugfs_create_file("debug", S_IRUSR | S_IWUSR,
-                        sc->debug.debugfs_phy, sc, &fops_debug))
-                goto err;
+        debugfs_create_file("debug", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
+                            sc, &fops_debug);
 #endif
-
-        if (!debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy,
-                        sc, &fops_dma))
-                goto err;
-
-        if (!debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy,
-                        sc, &fops_interrupt))
-                goto err;
-
-        if (!debugfs_create_file("wiphy", S_IRUSR | S_IWUSR,
-                        sc->debug.debugfs_phy, sc, &fops_wiphy))
-                goto err;
-
-        if (!debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy,
-                        sc, &fops_xmit))
-                goto err;
-
-        if (!debugfs_create_file("stations", S_IRUSR, sc->debug.debugfs_phy,
-                        sc, &fops_stations))
-                goto err;
-
-        if (!debugfs_create_file("misc", S_IRUSR, sc->debug.debugfs_phy,
-                        sc, &fops_misc))
-                goto err;
-
-        if (!debugfs_create_file("recv", S_IRUSR, sc->debug.debugfs_phy,
-                        sc, &fops_recv))
-                goto err;
-
-        if (!debugfs_create_file("rx_chainmask", S_IRUSR | S_IWUSR,
-                        sc->debug.debugfs_phy, sc, &fops_rx_chainmask))
-                goto err;
-
-        if (!debugfs_create_file("tx_chainmask", S_IRUSR | S_IWUSR,
-                        sc->debug.debugfs_phy, sc, &fops_tx_chainmask))
-                goto err;
-
-        if (!debugfs_create_file("regidx", S_IRUSR | S_IWUSR,
-                        sc->debug.debugfs_phy, sc, &fops_regidx))
-                goto err;
-
-        if (!debugfs_create_file("regval", S_IRUSR | S_IWUSR,
-                        sc->debug.debugfs_phy, sc, &fops_regval))
-                goto err;
-
-        if (!debugfs_create_bool("ignore_extcca", S_IRUSR | S_IWUSR,
-                        sc->debug.debugfs_phy, &ah->config.cwm_ignore_extcca))
-                goto err;
-
-        if (!debugfs_create_file("regdump", S_IRUSR, sc->debug.debugfs_phy,
-                        sc, &fops_regdump))
-                goto err;
+        debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
+                            &fops_dma);
+        debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,
+                            &fops_interrupt);
+        debugfs_create_file("wiphy", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
+                            sc, &fops_wiphy);
+        debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy, sc,
+                            &fops_xmit);
+        debugfs_create_file("stations", S_IRUSR, sc->debug.debugfs_phy, sc,
+                            &fops_stations);
+        debugfs_create_file("misc", S_IRUSR, sc->debug.debugfs_phy, sc,
+                            &fops_misc);
+        debugfs_create_file("recv", S_IRUSR, sc->debug.debugfs_phy, sc,
+                            &fops_recv);
+        debugfs_create_file("rx_chainmask", S_IRUSR | S_IWUSR,
+                            sc->debug.debugfs_phy, sc, &fops_rx_chainmask);
+        debugfs_create_file("tx_chainmask", S_IRUSR | S_IWUSR,
+                            sc->debug.debugfs_phy, sc, &fops_tx_chainmask);
+        debugfs_create_file("regidx", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
+                            sc, &fops_regidx);
+        debugfs_create_file("regval", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
+                            sc, &fops_regval);
+        debugfs_create_bool("ignore_extcca", S_IRUSR | S_IWUSR,
+                            sc->debug.debugfs_phy,
+                            &ah->config.cwm_ignore_extcca);
+        debugfs_create_file("regdump", S_IRUSR, sc->debug.debugfs_phy, sc,
+                            &fops_regdump);
+
+        debugfs_create_u32("gpio_mask", S_IRUSR | S_IWUSR,
+                           sc->debug.debugfs_phy, &sc->sc_ah->gpio_mask);
+
+        debugfs_create_u32("gpio_val", S_IRUSR | S_IWUSR,
+                           sc->debug.debugfs_phy, &sc->sc_ah->gpio_val);
 
         sc->debug.regidx = 0;
         return 0;
-err:
-        debugfs_remove_recursive(sc->debug.debugfs_phy);
-        sc->debug.debugfs_phy = NULL;
-        return -ENOMEM;
 }
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
index 8cd8333cc08..2f0712ea49a 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
@@ -392,6 +392,8 @@ static void ath9k_hw_set_ar9287_power_cal_table(struct ath_hw *ah,
                                                            numXpdGain);
                         }
 
+                        ENABLE_REGWRITE_BUFFER(ah);
+
                         if (i == 0) {
                                 if (!ath9k_hw_ar9287_get_eeprom(ah,
                                                         EEP_OL_PWRCTRL)) {
@@ -442,6 +444,7 @@ static void ath9k_hw_set_ar9287_power_cal_table(struct ath_hw *ah,
                                         regOffset += 4;
                                 }
                         }
+                        REGWRITE_BUFFER_FLUSH(ah);
                 }
         }
 
@@ -757,6 +760,8 @@ static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah,
                         ratesArray[i] -= AR9287_PWR_TABLE_OFFSET_DB * 2;
         }
 
+        ENABLE_REGWRITE_BUFFER(ah);
+
         /* OFDM power per rate */
         REG_WRITE(ah, AR_PHY_POWER_TX_RATE1,
                   ATH9K_POW_SM(ratesArray[rate18mb], 24)
@@ -840,6 +845,7 @@ static void ath9k_hw_ar9287_set_txpower(struct ath_hw *ah,
                           | ATH9K_POW_SM(ratesArray[rateDupOfdm], 8)
                           | ATH9K_POW_SM(ratesArray[rateDupCck], 0));
         }
+        REGWRITE_BUFFER_FLUSH(ah);
 }
 
 static void ath9k_hw_ar9287_set_addac(struct ath_hw *ah,
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index fccd87df730..995949ddd63 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -799,6 +799,8 @@ static void ath9k_hw_set_def_power_cal_table(struct ath_hw *ah,
                                                            pwr_table_offset,
                                                            &diff);
 
+                        ENABLE_REGWRITE_BUFFER(ah);
+
                         if ((i == 0) || AR_SREV_5416_20_OR_LATER(ah)) {
                                 if (OLC_FOR_AR9280_20_LATER) {
                                         REG_WRITE(ah,
@@ -847,6 +849,7 @@ static void ath9k_hw_set_def_power_cal_table(struct ath_hw *ah,
 
                                 regOffset += 4;
                         }
+                        REGWRITE_BUFFER_FLUSH(ah);
                 }
         }
 
@@ -1205,6 +1208,8 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah,
                 }
         }
 
+        ENABLE_REGWRITE_BUFFER(ah);
+
         REG_WRITE(ah, AR_PHY_POWER_TX_RATE1,
                   ATH9K_POW_SM(ratesArray[rate18mb], 24)
                   | ATH9K_POW_SM(ratesArray[rate12mb], 16)
@@ -1291,6 +1296,8 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah,
         REG_WRITE(ah, AR_PHY_POWER_TX_SUB,
                   ATH9K_POW_SM(pModal->pwrDecreaseFor3Chain, 6)
                   | ATH9K_POW_SM(pModal->pwrDecreaseFor2Chain, 0));
+
+        REGWRITE_BUFFER_FLUSH(ah);
 }
 
 static u16 ath9k_hw_def_get_spur_channel(struct ath_hw *ah, u16 i, bool is2GHz)
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index 0fb8f8ac275..44a0a886124 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -41,12 +41,14 @@ void ath_init_leds(struct ath_softc *sc)
 {
         int ret;
 
-        if (AR_SREV_9287(sc->sc_ah))
-                sc->sc_ah->led_pin = ATH_LED_PIN_9287;
-        else if (AR_SREV_9485(sc->sc_ah))
-                sc->sc_ah->led_pin = ATH_LED_PIN_9485;
-        else
-                sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
+        if (sc->sc_ah->led_pin < 0) {
+                if (AR_SREV_9287(sc->sc_ah))
+                        sc->sc_ah->led_pin = ATH_LED_PIN_9287;
+                else if (AR_SREV_9485(sc->sc_ah))
+                        sc->sc_ah->led_pin = ATH_LED_PIN_9485;
+                else
+                        sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
+        }
 
         /* Configure gpio 1 for output */
         ath9k_hw_cfg_output(sc->sc_ah, sc->sc_ah->led_pin,
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 7dc20489f2e..f1b8af64569 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -222,8 +222,9 @@ static int __hif_usb_tx(struct hif_device_usb *hif_dev)
         struct tx_buf *tx_buf = NULL;
         struct sk_buff *nskb = NULL;
         int ret = 0, i;
-        u16 *hdr, tx_skb_cnt = 0;
+        u16 tx_skb_cnt = 0;
         u8 *buf;
+        __le16 *hdr;
 
         if (hif_dev->tx.tx_skb_cnt == 0)
                 return 0;
@@ -248,9 +249,9 @@ static int __hif_usb_tx(struct hif_device_usb *hif_dev)
 
                 buf = tx_buf->buf;
                 buf += tx_buf->offset;
-                hdr = (u16 *)buf;
-                *hdr++ = nskb->len;
-                *hdr++ = ATH_USB_TX_STREAM_MODE_TAG;
+                hdr = (__le16 *)buf;
+                *hdr++ = cpu_to_le16(nskb->len);
+                *hdr++ = cpu_to_le16(ATH_USB_TX_STREAM_MODE_TAG);
                 buf += 4;
                 memcpy(buf, nskb->data, nskb->len);
                 tx_buf->len = nskb->len + 4;
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index 753a245c5ad..ec47be94b74 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -328,7 +328,7 @@ struct ath9k_debug {
 #endif /* CONFIG_ATH9K_HTC_DEBUGFS */
 
 #define ATH_LED_PIN_DEF             1
-#define ATH_LED_PIN_9287            8
+#define ATH_LED_PIN_9287            10
 #define ATH_LED_PIN_9271            15
 #define ATH_LED_PIN_7010            12
 #define ATH_LED_ON_DURATION_IDLE    350 /* in msecs */
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
index 8d1d8792436..8f56158e588 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
@@ -155,7 +155,7 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv,
         nexttbtt = intval;
 
         if (priv->op_flags & OP_TSF_RESET) {
-                intval |= ATH9K_BEACON_RESET_TSF;
+                ath9k_hw_reset_tsf(priv->ah);
                 priv->op_flags &= ~OP_TSF_RESET;
         } else {
                 /*
@@ -168,8 +168,6 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv,
                 } while (nexttbtt < tsftu);
         }
 
-        intval |= ATH9K_BEACON_ENA;
-
         if (priv->op_flags & OP_ENABLE_BEACON)
                 imask |= ATH9K_INT_SWBA;
 
@@ -178,7 +176,7 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv,
                 bss_conf->beacon_interval, nexttbtt, imask);
 
         WMI_CMD(WMI_DISABLE_INTR_CMDID);
-        ath9k_hw_beaconinit(priv->ah, nexttbtt, intval);
+        ath9k_hw_beaconinit(priv->ah, TU_TO_USEC(nexttbtt), TU_TO_USEC(intval));
         priv->bmiss_cnt = 0;
         htc_imask = cpu_to_be32(imask);
         WMI_CMD_BUF(WMI_ENABLE_INTR_CMDID, &htc_imask);
@@ -207,7 +205,6 @@ static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv,
                 nexttbtt += intval;
         } while (nexttbtt < tsftu);
 
-        intval |= ATH9K_BEACON_ENA;
         if (priv->op_flags & OP_ENABLE_BEACON)
                 imask |= ATH9K_INT_SWBA;
 
@@ -216,7 +213,7 @@ static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv,
                 bss_conf->beacon_interval, nexttbtt, imask);
 
         WMI_CMD(WMI_DISABLE_INTR_CMDID);
-        ath9k_hw_beaconinit(priv->ah, nexttbtt, intval);
+        ath9k_hw_beaconinit(priv->ah, TU_TO_USEC(nexttbtt), TU_TO_USEC(intval));
         priv->bmiss_cnt = 0;
         htc_imask = cpu_to_be32(imask);
         WMI_CMD_BUF(WMI_ENABLE_INTR_CMDID, &htc_imask);
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index fc67c937e17..8303b34bdc9 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -430,13 +430,16 @@ static void ath9k_regwrite_flush(void *hw_priv)
         mutex_unlock(&priv->wmi->multi_write_mutex);
 }
 
-static const struct ath_ops ath9k_common_ops = {
-        .read = ath9k_regread,
-        .multi_read = ath9k_multi_regread,
-        .write = ath9k_regwrite,
-        .enable_write_buffer = ath9k_enable_regwrite_buffer,
-        .write_flush = ath9k_regwrite_flush,
-};
+static u32 ath9k_reg_rmw(void *hw_priv, u32 reg_offset, u32 set, u32 clr)
+{
+        u32 val;
+
+        val = ath9k_regread(hw_priv, reg_offset);
+        val &= ~clr;
+        val |= set;
+        ath9k_regwrite(hw_priv, val, reg_offset);
+        return val;
+}
 
 static void ath_usb_read_cachesize(struct ath_common *common, int *csz)
 {
@@ -561,13 +564,7 @@ static void ath9k_init_crypto(struct ath9k_htc_priv *priv)
         int i = 0;
 
         /* Get the hardware key cache size. */
-        common->keymax = priv->ah->caps.keycache_size;
-        if (common->keymax > ATH_KEYMAX) {
-                ath_dbg(common, ATH_DBG_ANY,
-                        "Warning, using only %u entries in %u key cache\n",
-                        ATH_KEYMAX, common->keymax);
-                common->keymax = ATH_KEYMAX;
-        }
+        common->keymax = AR_KEYTABLE_SIZE;
 
         if (priv->ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA)
                 common->crypt_caps |= ATH_CRYPT_CAP_MIC_COMBINED;
@@ -658,10 +655,16 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv,
         ah->hw_version.subsysid = 0; /* FIXME */
         ah->hw_version.usbdev = drv_info;
         ah->ah_flags |= AH_USE_EEPROM;
+        ah->reg_ops.read = ath9k_regread;
+        ah->reg_ops.multi_read = ath9k_multi_regread;
+        ah->reg_ops.write = ath9k_regwrite;
+        ah->reg_ops.enable_write_buffer = ath9k_enable_regwrite_buffer;
+        ah->reg_ops.write_flush = ath9k_regwrite_flush;
+        ah->reg_ops.rmw = ath9k_reg_rmw;
         priv->ah = ah;
 
         common = ath9k_hw_common(ah);
-        common->ops = &ath9k_common_ops;
+        common->ops = &ah->reg_ops;
         common->bus_ops = &ath9k_usb_bus_ops;
         common->ah = ah;
         common->hw = priv->hw;
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 338b07502f1..298f4d6cbdb 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -130,6 +130,20 @@ bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout)
 }
 EXPORT_SYMBOL(ath9k_hw_wait);
 
+void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array,
+                          int column, unsigned int *writecnt)
+{
+        int r;
+
+        ENABLE_REGWRITE_BUFFER(ah);
+        for (r = 0; r < array->ia_rows; r++) {
+                REG_WRITE(ah, INI_RA(array, r, 0),
+                          INI_RA(array, r, column));
+                DO_DELAY(*writecnt);
+        }
+        REGWRITE_BUFFER_FLUSH(ah);
+}
+
 u32 ath9k_hw_reverse_bits(u32 val, u32 n)
 {
         u32 retval;
@@ -364,11 +378,6 @@ static void ath9k_hw_init_config(struct ath_hw *ah)
                 ah->config.spurchans[i][1] = AR_NO_SPUR;
         }
 
-        if (ah->hw_version.devid != AR2427_DEVID_PCIE)
-                ah->config.ht_enable = 1;
-        else
-                ah->config.ht_enable = 0;
-
         /* PAPRD needs some more work to be enabled */
         ah->config.paprd_disable = 1;
 
@@ -410,6 +419,8 @@ static void ath9k_hw_init_defaults(struct ath_hw *ah)
         ah->sta_id1_defaults =
                 AR_STA_ID1_CRPT_MIC_ENABLE |
                 AR_STA_ID1_MCAST_KSRCH;
+        if (AR_SREV_9100(ah))
+                ah->sta_id1_defaults |= AR_STA_ID1_AR9100_BA_FIX;
         ah->enable_32kHz_clock = DONT_USE_32KHZ;
         ah->slottime = 20;
         ah->globaltxtimeout = (u32) -1;
@@ -673,14 +684,14 @@ static void ath9k_hw_init_qos(struct ath_hw *ah)
 
 unsigned long ar9003_get_pll_sqsum_dvc(struct ath_hw *ah)
 {
-                REG_WRITE(ah, PLL3, (REG_READ(ah, PLL3) & ~(PLL3_DO_MEAS_MASK)));
-                udelay(100);
-                REG_WRITE(ah, PLL3, (REG_READ(ah, PLL3) | PLL3_DO_MEAS_MASK));
+        REG_CLR_BIT(ah, PLL3, PLL3_DO_MEAS_MASK);
+        udelay(100);
+        REG_SET_BIT(ah, PLL3, PLL3_DO_MEAS_MASK);
 
-                while ((REG_READ(ah, PLL4) & PLL4_MEAS_DONE) == 0)
-                        udelay(100);
+        while ((REG_READ(ah, PLL4) & PLL4_MEAS_DONE) == 0)
+                udelay(100);
 
-                return (REG_READ(ah, PLL3) & SQSUM_DVC_MASK) >> 3;
+        return (REG_READ(ah, PLL3) & SQSUM_DVC_MASK) >> 3;
 }
 EXPORT_SYMBOL(ar9003_get_pll_sqsum_dvc);
 
@@ -830,8 +841,7 @@ void ath9k_hw_init_global_settings(struct ath_hw *ah)
                 ah->misc_mode);
 
         if (ah->misc_mode != 0)
-                REG_WRITE(ah, AR_PCU_MISC,
-                          REG_READ(ah, AR_PCU_MISC) | ah->misc_mode);
+                REG_SET_BIT(ah, AR_PCU_MISC, ah->misc_mode);
 
         if (conf->channel && conf->channel->band == IEEE80211_BAND_5GHZ)
                 sifstime = 16;
@@ -899,23 +909,19 @@ u32 ath9k_regd_get_ctl(struct ath_regulatory *reg, struct ath9k_channel *chan)
 static inline void ath9k_hw_set_dma(struct ath_hw *ah)
 {
         struct ath_common *common = ath9k_hw_common(ah);
-        u32 regval;
 
         ENABLE_REGWRITE_BUFFER(ah);
 
         /*
          * set AHB_MODE not to do cacheline prefetches
         */
-        if (!AR_SREV_9300_20_OR_LATER(ah)) {
-                regval = REG_READ(ah, AR_AHB_MODE);
-                REG_WRITE(ah, AR_AHB_MODE, regval | AR_AHB_PREFETCH_RD_EN);
-        }
+        if (!AR_SREV_9300_20_OR_LATER(ah))
+                REG_SET_BIT(ah, AR_AHB_MODE, AR_AHB_PREFETCH_RD_EN);
 
         /*
          * let mac dma reads be in 128 byte chunks
          */
-        regval = REG_READ(ah, AR_TXCFG) & ~AR_TXCFG_DMASZ_MASK;
-        REG_WRITE(ah, AR_TXCFG, regval | AR_TXCFG_DMASZ_128B);
+        REG_RMW(ah, AR_TXCFG, AR_TXCFG_DMASZ_128B, AR_TXCFG_DMASZ_MASK);
 
         REGWRITE_BUFFER_FLUSH(ah);
 
@@ -932,8 +938,7 @@ static inline void ath9k_hw_set_dma(struct ath_hw *ah)
         /*
          * let mac dma writes be in 128 byte chunks
          */
-        regval = REG_READ(ah, AR_RXCFG) & ~AR_RXCFG_DMASZ_MASK;
-        REG_WRITE(ah, AR_RXCFG, regval | AR_RXCFG_DMASZ_128B);
+        REG_RMW(ah, AR_RXCFG, AR_RXCFG_DMASZ_128B, AR_RXCFG_DMASZ_MASK);
 
         /*
          * Setup receive FIFO threshold to hold off TX activities
@@ -972,30 +977,27 @@ static inline void ath9k_hw_set_dma(struct ath_hw *ah)
 
 static void ath9k_hw_set_operating_mode(struct ath_hw *ah, int opmode)
 {
-        u32 val;
+        u32 mask = AR_STA_ID1_STA_AP | AR_STA_ID1_ADHOC;
+        u32 set = AR_STA_ID1_KSRCH_MODE;
 
-        val = REG_READ(ah, AR_STA_ID1);
-        val &= ~(AR_STA_ID1_STA_AP | AR_STA_ID1_ADHOC);
         switch (opmode) {
-        case NL80211_IFTYPE_AP:
-                REG_WRITE(ah, AR_STA_ID1, val | AR_STA_ID1_STA_AP
-                          | AR_STA_ID1_KSRCH_MODE);
-                REG_CLR_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);
-                break;
         case NL80211_IFTYPE_ADHOC:
         case NL80211_IFTYPE_MESH_POINT:
-                REG_WRITE(ah, AR_STA_ID1, val | AR_STA_ID1_ADHOC
-                          | AR_STA_ID1_KSRCH_MODE);
+                set |= AR_STA_ID1_ADHOC;
                 REG_SET_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);
                 break;
+        case NL80211_IFTYPE_AP:
+                set |= AR_STA_ID1_STA_AP;
+                /* fall through */
         case NL80211_IFTYPE_STATION:
-                REG_WRITE(ah, AR_STA_ID1, val | AR_STA_ID1_KSRCH_MODE);
+                REG_CLR_BIT(ah, AR_CFG, AR_CFG_AP_ADHOC_INDICATION);
                 break;
         default:
-                if (ah->is_monitoring)
-                        REG_WRITE(ah, AR_STA_ID1, val | AR_STA_ID1_KSRCH_MODE);
+                if (!ah->is_monitoring)
+                        set = 0;
                 break;
         }
+        REG_RMW(ah, AR_STA_ID1, set, mask);
 }
 
 void ath9k_hw_get_delta_slope_vals(struct ath_hw *ah, u32 coef_scaled,
@@ -1021,10 +1023,8 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)
         u32 tmpReg;
 
         if (AR_SREV_9100(ah)) {
-                u32 val = REG_READ(ah, AR_RTC_DERIVED_CLK);
-                val &= ~AR_RTC_DERIVED_CLK_PERIOD;
-                val |= SM(1, AR_RTC_DERIVED_CLK_PERIOD);
-                REG_WRITE(ah, AR_RTC_DERIVED_CLK, val);
+                REG_RMW_FIELD(ah, AR_RTC_DERIVED_CLK,
+                              AR_RTC_DERIVED_CLK_PERIOD, 1);
                 (void)REG_READ(ah, AR_RTC_DERIVED_CLK);
         }
 
@@ -1212,6 +1212,20 @@ static bool ath9k_hw_channel_change(struct ath_hw *ah,
         return true;
 }
 
+static void ath9k_hw_apply_gpio_override(struct ath_hw *ah)
+{
+        u32 gpio_mask = ah->gpio_mask;
+        int i;
+
+        for (i = 0; gpio_mask; i++, gpio_mask >>= 1) {
+                if (!(gpio_mask & 1))
+                        continue;
+
+                ath9k_hw_cfg_output(ah, i, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+                ath9k_hw_set_gpio(ah, i, !!(ah->gpio_val & BIT(i)));
+        }
+}
+
 bool ath9k_hw_check_alive(struct ath_hw *ah)
 {
         int count = 50;
@@ -1418,7 +1432,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         REGWRITE_BUFFER_FLUSH(ah);
 
         ah->intr_txqs = 0;
-        for (i = 0; i < ah->caps.total_queues; i++)
+        for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)
                 ath9k_hw_resettxqueue(ah, i);
 
         ath9k_hw_init_interrupt_masks(ah, ah->opmode);
@@ -1435,8 +1449,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                 ar9002_hw_enable_wep_aggregation(ah);
         }
 
-        REG_WRITE(ah, AR_STA_ID1,
-                  REG_READ(ah, AR_STA_ID1) | AR_STA_ID1_PRESERVE_SEQNUM);
+        REG_SET_BIT(ah, AR_STA_ID1, AR_STA_ID1_PRESERVE_SEQNUM);
 
         ath9k_hw_set_dma(ah);
 
@@ -1500,6 +1513,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         if (AR_SREV_9300_20_OR_LATER(ah))
                 ar9003_hw_bb_watchdog_config(ah);
 
+        ath9k_hw_apply_gpio_override(ah);
+
         return 0;
 }
 EXPORT_SYMBOL(ath9k_hw_reset);
@@ -1679,21 +1694,15 @@ void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period)
         case NL80211_IFTYPE_MESH_POINT:
                 REG_SET_BIT(ah, AR_TXCFG,
                             AR_TXCFG_ADHOC_BEACON_ATIM_TX_POLICY);
-                REG_WRITE(ah, AR_NEXT_NDP_TIMER,
-                          TU_TO_USEC(next_beacon +
-                                     (ah->atim_window ? ah->
-                                      atim_window : 1)));
+                REG_WRITE(ah, AR_NEXT_NDP_TIMER, next_beacon +
+                          TU_TO_USEC(ah->atim_window ? ah->atim_window : 1));
                 flags |= AR_NDP_TIMER_EN;
         case NL80211_IFTYPE_AP:
-                REG_WRITE(ah, AR_NEXT_TBTT_TIMER, TU_TO_USEC(next_beacon));
-                REG_WRITE(ah, AR_NEXT_DMA_BEACON_ALERT,
-                          TU_TO_USEC(next_beacon -
-                                     ah->config.
-                                     dma_beacon_response_time));
-                REG_WRITE(ah, AR_NEXT_SWBA,
-                          TU_TO_USEC(next_beacon -
-                                     ah->config.
-                                     sw_beacon_response_time));
+                REG_WRITE(ah, AR_NEXT_TBTT_TIMER, next_beacon);
+                REG_WRITE(ah, AR_NEXT_DMA_BEACON_ALERT, next_beacon -
+                          TU_TO_USEC(ah->config.dma_beacon_response_time));
+                REG_WRITE(ah, AR_NEXT_SWBA, next_beacon -
+                          TU_TO_USEC(ah->config.sw_beacon_response_time));
                 flags |=
                         AR_TBTT_TIMER_EN | AR_DBA_TIMER_EN | AR_SWBA_TIMER_EN;
                 break;
@@ -1705,18 +1714,13 @@ void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period)
                 break;
         }
 
-        REG_WRITE(ah, AR_BEACON_PERIOD, TU_TO_USEC(beacon_period));
-        REG_WRITE(ah, AR_DMA_BEACON_PERIOD, TU_TO_USEC(beacon_period));
-        REG_WRITE(ah, AR_SWBA_PERIOD, TU_TO_USEC(beacon_period));
-        REG_WRITE(ah, AR_NDP_PERIOD, TU_TO_USEC(beacon_period));
+        REG_WRITE(ah, AR_BEACON_PERIOD, beacon_period);
+        REG_WRITE(ah, AR_DMA_BEACON_PERIOD, beacon_period);
+        REG_WRITE(ah, AR_SWBA_PERIOD, beacon_period);
+        REG_WRITE(ah, AR_NDP_PERIOD, beacon_period);
 
         REGWRITE_BUFFER_FLUSH(ah);
 
-        beacon_period &= ~ATH9K_BEACON_ENA;
-        if (beacon_period & ATH9K_BEACON_RESET_TSF) {
-                ath9k_hw_reset_tsf(ah);
-        }
-
         REG_SET_BIT(ah, AR_TIMER_MODE, flags);
 }
 EXPORT_SYMBOL(ath9k_hw_beaconinit);
@@ -1851,6 +1855,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
             !(AR_SREV_9271(ah)))
                 /* CB71: GPIO 0 is pulled down to indicate 3 rx chains */
                 pCap->rx_chainmask = ath9k_hw_gpio_get(ah, 0) ? 0x5 : 0x7;
+        else if (AR_SREV_9100(ah))
+                pCap->rx_chainmask = 0x7;
         else
                 /* Use rx_chainmask from EEPROM. */
                 pCap->rx_chainmask = ah->eep_ops->get_eeprom(ah, EEP_RX_MASK);
@@ -1869,28 +1875,11 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
 
         common->crypt_caps |= ATH_CRYPT_CAP_CIPHER_AESCCM;
 
-        if (ah->config.ht_enable)
+        if (ah->hw_version.devid != AR2427_DEVID_PCIE)
                 pCap->hw_caps |= ATH9K_HW_CAP_HT;
         else
                 pCap->hw_caps &= ~ATH9K_HW_CAP_HT;
 
-        if (capField & AR_EEPROM_EEPCAP_MAXQCU)
-                pCap->total_queues =
-                        MS(capField, AR_EEPROM_EEPCAP_MAXQCU);
-        else
-                pCap->total_queues = ATH9K_NUM_TX_QUEUES;
-
-        if (capField & AR_EEPROM_EEPCAP_KC_ENTRIES)
-                pCap->keycache_size =
-                        1 << MS(capField, AR_EEPROM_EEPCAP_KC_ENTRIES);
-        else
-                pCap->keycache_size = AR_KEYTABLE_SIZE;
-
-        if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
-                pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD >> 1;
-        else
-                pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD;
-
         if (AR_SREV_9271(ah))
                 pCap->num_gpio_pins = AR9271_NUM_GPIO;
         else if (AR_DEVID_7010(ah))
@@ -1909,8 +1898,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
                 pCap->rts_aggr_limit = (8 * 1024);
         }
 
-        pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM;
-
 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
         ah->rfsilent = ah->eep_ops->get_eeprom(ah, EEP_RF_SILENT);
         if (ah->rfsilent & EEP_RFSILENT_ENABLED) {
@@ -1932,23 +1919,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
         else
                 pCap->hw_caps |= ATH9K_HW_CAP_4KB_SPLITTRANS;
 
-        if (regulatory->current_rd_ext & (1 << REG_EXT_JAPAN_MIDBAND)) {
-                pCap->reg_cap =
-                        AR_EEPROM_EEREGCAP_EN_KK_NEW_11A |
-                        AR_EEPROM_EEREGCAP_EN_KK_U1_EVEN |
-                        AR_EEPROM_EEREGCAP_EN_KK_U2 |
-                        AR_EEPROM_EEREGCAP_EN_KK_MIDBAND;
-        } else {
-                pCap->reg_cap =
-                        AR_EEPROM_EEREGCAP_EN_KK_NEW_11A |
-                        AR_EEPROM_EEREGCAP_EN_KK_U1_EVEN;
-        }
-
-        /* Advertise midband for AR5416 with FCC midband set in eeprom */
-        if (regulatory->current_rd_ext & (1 << REG_EXT_FCC_MIDBAND) &&
-            AR_SREV_5416(ah))
-                pCap->reg_cap |= AR_EEPROM_EEREGCAP_EN_FCC_MIDBAND;
-
         if (AR_SREV_9280_20_OR_LATER(ah) && common->btcoex_enabled) {
                 btcoex_hw->btactive_gpio = ATH_BTACTIVE_GPIO;
                 btcoex_hw->wlanactive_gpio = ATH_WLANACTIVE_GPIO;
@@ -2195,11 +2165,9 @@ void ath9k_hw_setrxfilter(struct ath_hw *ah, u32 bits)
         REG_WRITE(ah, AR_PHY_ERR, phybits);
 
         if (phybits)
-                REG_WRITE(ah, AR_RXCFG,
-                          REG_READ(ah, AR_RXCFG) | AR_RXCFG_ZLFDMA);
+                REG_SET_BIT(ah, AR_RXCFG, AR_RXCFG_ZLFDMA);
         else
-                REG_WRITE(ah, AR_RXCFG,
-                          REG_READ(ah, AR_RXCFG) & ~AR_RXCFG_ZLFDMA);
+                REG_CLR_BIT(ah, AR_RXCFG, AR_RXCFG_ZLFDMA);
 
         REGWRITE_BUFFER_FLUSH(ah);
 }
@@ -2375,10 +2343,11 @@ static u32 rightmost_index(struct ath_gen_timer_table *timer_table, u32 *mask)
         return timer_table->gen_timer_index[b];
 }
 
-static u32 ath9k_hw_gettsf32(struct ath_hw *ah)
+u32 ath9k_hw_gettsf32(struct ath_hw *ah)
 {
         return REG_READ(ah, AR_TSF_L32);
 }
+EXPORT_SYMBOL(ath9k_hw_gettsf32);
 
 struct ath_gen_timer *ath_gen_timer_alloc(struct ath_hw *ah,
                                           void (*trigger)(void *),
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 6650fd48415..4cc320bdf0a 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -65,53 +65,49 @@
 
 /* Register read/write primitives */
 #define REG_WRITE(_ah, _reg, _val) \
-        ath9k_hw_common(_ah)->ops->write((_ah), (_val), (_reg))
+        (_ah)->reg_ops.write((_ah), (_val), (_reg))
 
 #define REG_READ(_ah, _reg) \
-        ath9k_hw_common(_ah)->ops->read((_ah), (_reg))
+        (_ah)->reg_ops.read((_ah), (_reg))
 
 #define REG_READ_MULTI(_ah, _addr, _val, _cnt)          \
-        ath9k_hw_common(_ah)->ops->multi_read((_ah), (_addr), (_val), (_cnt))
+        (_ah)->reg_ops.multi_read((_ah), (_addr), (_val), (_cnt))
+
+#define REG_RMW(_ah, _reg, _set, _clr) \
+        (_ah)->reg_ops.rmw((_ah), (_reg), (_set), (_clr))
 
 #define ENABLE_REGWRITE_BUFFER(_ah)                                     \
         do {                                                            \
-                if (ath9k_hw_common(_ah)->ops->enable_write_buffer)     \
-                        ath9k_hw_common(_ah)->ops->enable_write_buffer((_ah)); \
+                if ((_ah)->reg_ops.enable_write_buffer) \
+                        (_ah)->reg_ops.enable_write_buffer((_ah)); \
         } while (0)
 
 #define REGWRITE_BUFFER_FLUSH(_ah)                                      \
         do {                                                            \
-                if (ath9k_hw_common(_ah)->ops->write_flush)             \
-                        ath9k_hw_common(_ah)->ops->write_flush((_ah));  \
+                if ((_ah)->reg_ops.write_flush)         \
+                        (_ah)->reg_ops.write_flush((_ah));      \
         } while (0)
 
 #define SM(_v, _f)  (((_v) << _f##_S) & _f)
 #define MS(_v, _f)  (((_v) & _f) >> _f##_S)
-#define REG_RMW(_a, _r, _set, _clr)    \
-        REG_WRITE(_a, _r, (REG_READ(_a, _r) & ~(_clr)) | (_set))
 #define REG_RMW_FIELD(_a, _r, _f, _v) \
-        REG_WRITE(_a, _r, \
-        (REG_READ(_a, _r) & ~_f) | (((_v) << _f##_S) & _f))
+        REG_RMW(_a, _r, (((_v) << _f##_S) & _f), (_f))
 #define REG_READ_FIELD(_a, _r, _f) \
         (((REG_READ(_a, _r) & _f) >> _f##_S))
 #define REG_SET_BIT(_a, _r, _f) \
-        REG_WRITE(_a, _r, REG_READ(_a, _r) | (_f))
+        REG_RMW(_a, _r, (_f), 0)
 #define REG_CLR_BIT(_a, _r, _f) \
-        REG_WRITE(_a, _r, REG_READ(_a, _r) & ~(_f))
+        REG_RMW(_a, _r, 0, (_f))
 
-#define DO_DELAY(x) do {                        \
-                if ((++(x) % 64) == 0)          \
-                        udelay(1);              \
+#define DO_DELAY(x) do {                                        \
+                if (((++(x) % 64) == 0) &&                      \
+                    (ath9k_hw_common(ah)->bus_ops->ath_bus_type \
+                        != ATH_USB))                            \
+                        udelay(1);                              \
         } while (0)
 
-#define REG_WRITE_ARRAY(iniarray, column, regWr) do {                   \
-                int r;                                                  \
-                for (r = 0; r < ((iniarray)->ia_rows); r++) {           \
-                        REG_WRITE(ah, INI_RA((iniarray), (r), 0),       \
-                                  INI_RA((iniarray), r, (column)));     \
-                        DO_DELAY(regWr);                                \
-                }                                                       \
-        } while (0)
+#define REG_WRITE_ARRAY(iniarray, column, regWr) \
+        ath9k_hw_write_array(ah, iniarray, column, &(regWr))
 
 #define AR_GPIO_OUTPUT_MUX_AS_OUTPUT             0
 #define AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED 1
@@ -178,7 +174,6 @@ enum ath9k_hw_caps {
         ATH9K_HW_CAP_HT                         = BIT(0),
         ATH9K_HW_CAP_RFSILENT                   = BIT(1),
         ATH9K_HW_CAP_CST                        = BIT(2),
-        ATH9K_HW_CAP_ENHANCEDPM                 = BIT(3),
         ATH9K_HW_CAP_AUTOSLEEP                  = BIT(4),
         ATH9K_HW_CAP_4KB_SPLITTRANS             = BIT(5),
         ATH9K_HW_CAP_EDMA                       = BIT(6),
@@ -195,8 +190,6 @@ enum ath9k_hw_caps {
 
 struct ath9k_hw_capabilities {
         u32 hw_caps; /* ATH9K_HW_CAP_* from ath9k_hw_caps */
-        u16 total_queues;
-        u16 keycache_size;
         u16 low_5ghz_chan, high_5ghz_chan;
         u16 low_2ghz_chan, high_2ghz_chan;
         u16 rts_aggr_limit;
@@ -204,8 +197,6 @@ struct ath9k_hw_capabilities {
         u8 rx_chainmask;
         u8 max_txchains;
         u8 max_rxchains;
-        u16 tx_triglevel_max;
-        u16 reg_cap;
         u8 num_gpio_pins;
         u8 rx_hp_qdepth;
         u8 rx_lp_qdepth;
@@ -227,7 +218,6 @@ struct ath9k_ops_config {
         u8 pcie_clock_req;
         u32 pcie_waen;
         u8 analog_shiftreg;
-        u8 ht_enable;
         u8 paprd_disable;
         u32 ofdm_trig_low;
         u32 ofdm_trig_high;
@@ -412,8 +402,6 @@ struct ath9k_beacon_state {
         u32 bs_nextdtim;
         u32 bs_intval;
 #define ATH9K_BEACON_PERIOD       0x0000ffff
-#define ATH9K_BEACON_ENA          0x00800000
-#define ATH9K_BEACON_RESET_TSF    0x01000000
 #define ATH9K_TSFOOR_THRESHOLD    0x00004240 /* 16k us */
         u32 bs_dtimperiod;
         u16 bs_cfpperiod;
@@ -655,6 +643,8 @@ struct ath_nf_limits {
 #define AH_UNPLUGGED    0x2 /* The card has been physically removed. */
 
 struct ath_hw {
+        struct ath_ops reg_ops;
+
         struct ieee80211_hw *hw;
         struct ath_common common;
         struct ath9k_hw_version hw_version;
@@ -794,7 +784,9 @@ struct ath_hw {
         u32 originalGain[22];
         int initPDADC;
         int PDADCdelta;
-        u8 led_pin;
+        int led_pin;
+        u32 gpio_mask;
+        u32 gpio_val;
 
         struct ar5416IniArray iniModes;
         struct ar5416IniArray iniCommon;
@@ -907,6 +899,8 @@ void ath9k_hw_antdiv_comb_conf_set(struct ath_hw *ah,
 
 /* General Operation */
 bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout);
+void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array,
+                          int column, unsigned int *writecnt);
 u32 ath9k_hw_reverse_bits(u32 val, u32 n);
 bool ath9k_get_channel_edges(struct ath_hw *ah, u16 flags, u16 *low, u16 *high);
 u16 ath9k_hw_computetxtime(struct ath_hw *ah,
@@ -924,6 +918,7 @@ void ath9k_hw_setopmode(struct ath_hw *ah);
 void ath9k_hw_setmcastfilter(struct ath_hw *ah, u32 filter0, u32 filter1);
 void ath9k_hw_setbssidmask(struct ath_hw *ah);
 void ath9k_hw_write_associd(struct ath_hw *ah);
+u32 ath9k_hw_gettsf32(struct ath_hw *ah);
 u64 ath9k_hw_gettsf64(struct ath_hw *ah);
 void ath9k_hw_settsf64(struct ath_hw *ah, u64 tsf64);
 void ath9k_hw_reset_tsf(struct ath_hw *ah);
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 79aec983279..1ac8318d82a 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -15,6 +15,7 @@
  */
 
 #include <linux/slab.h>
+#include <linux/ath9k_platform.h>
 
 #include "ath9k.h"
 
@@ -195,10 +196,27 @@ static unsigned int ath9k_ioread32(void *hw_priv, u32 reg_offset)
         return val;
 }
 
-static const struct ath_ops ath9k_common_ops = {
-        .read = ath9k_ioread32,
-        .write = ath9k_iowrite32,
-};
+static unsigned int ath9k_reg_rmw(void *hw_priv, u32 reg_offset, u32 set, u32 clr)
+{
+        struct ath_hw *ah = (struct ath_hw *) hw_priv;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath_softc *sc = (struct ath_softc *) common->priv;
+        unsigned long uninitialized_var(flags);
+        u32 val;
+
+        if (ah->config.serialize_regmode == SER_REG_MODE_ON)
+                spin_lock_irqsave(&sc->sc_serial_rw, flags);
+
+        val = ioread32(sc->mem + reg_offset);
+        val &= ~clr;
+        val |= set;
+        iowrite32(val, sc->mem + reg_offset);
+
+        if (ah->config.serialize_regmode == SER_REG_MODE_ON)
+                spin_unlock_irqrestore(&sc->sc_serial_rw, flags);
+
+        return val;
+}
 
 /**************************/
 /*     Initialization     */
@@ -389,13 +407,7 @@ void ath9k_init_crypto(struct ath_softc *sc)
         int i = 0;
 
         /* Get the hardware key cache size. */
-        common->keymax = sc->sc_ah->caps.keycache_size;
-        if (common->keymax > ATH_KEYMAX) {
-                ath_dbg(common, ATH_DBG_ANY,
-                        "Warning, using only %u entries in %u key cache\n",
-                        ATH_KEYMAX, common->keymax);
-                common->keymax = ATH_KEYMAX;
-        }
+        common->keymax = AR_KEYTABLE_SIZE;
 
         /*
          * Reset the key cache since some parts do not
@@ -537,6 +549,7 @@ static void ath9k_init_misc(struct ath_softc *sc)
 static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid,
                             const struct ath_bus_ops *bus_ops)
 {
+        struct ath9k_platform_data *pdata = sc->dev->platform_data;
         struct ath_hw *ah = NULL;
         struct ath_common *common;
         int ret = 0, i;
@@ -549,13 +562,22 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid,
         ah->hw = sc->hw;
         ah->hw_version.devid = devid;
         ah->hw_version.subsysid = subsysid;
+        ah->reg_ops.read = ath9k_ioread32;
+        ah->reg_ops.write = ath9k_iowrite32;
+        ah->reg_ops.rmw = ath9k_reg_rmw;
         sc->sc_ah = ah;
 
-        if (!sc->dev->platform_data)
+        if (!pdata) {
                 ah->ah_flags |= AH_USE_EEPROM;
+                sc->sc_ah->led_pin = -1;
+        } else {
+                sc->sc_ah->gpio_mask = pdata->gpio_mask;
+                sc->sc_ah->gpio_val = pdata->gpio_val;
+                sc->sc_ah->led_pin = pdata->led_pin;
+        }
 
         common = ath9k_hw_common(ah);
-        common->ops = &ath9k_common_ops;
+        common->ops = &ah->reg_ops;
         common->bus_ops = bus_ops;
         common->ah = ah;
         common->hw = sc->hw;
@@ -587,6 +609,9 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid,
         if (ret)
                 goto err_hw;
 
+        if (pdata && pdata->macaddr)
+                memcpy(common->macaddr, pdata->macaddr, ETH_ALEN);
+
         ret = ath9k_init_queues(sc);
         if (ret)
                 goto err_queues;
@@ -679,6 +704,8 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
         if (AR_SREV_5416(sc->sc_ah))
                 hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
 
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+
         hw->queues = 4;
         hw->max_rates = 4;
         hw->channel_change_time = 5000;
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index cb5d81426d5..05efcfbeead 100644
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -209,15 +209,8 @@ bool ath9k_hw_set_txq_props(struct ath_hw *ah, int q,
 {
         u32 cw;
         struct ath_common *common = ath9k_hw_common(ah);
-        struct ath9k_hw_capabilities *pCap = &ah->caps;
         struct ath9k_tx_queue_info *qi;
 
-        if (q >= pCap->total_queues) {
-                ath_dbg(common, ATH_DBG_QUEUE,
-                        "Set TXQ properties, invalid queue: %u\n", q);
-                return false;
-        }
-
         qi = &ah->txq[q];
         if (qi->tqi_type == ATH9K_TX_QUEUE_INACTIVE) {
                 ath_dbg(common, ATH_DBG_QUEUE,
@@ -280,15 +273,8 @@ bool ath9k_hw_get_txq_props(struct ath_hw *ah, int q,
                             struct ath9k_tx_queue_info *qinfo)
 {
         struct ath_common *common = ath9k_hw_common(ah);
-        struct ath9k_hw_capabilities *pCap = &ah->caps;
         struct ath9k_tx_queue_info *qi;
 
-        if (q >= pCap->total_queues) {
-                ath_dbg(common, ATH_DBG_QUEUE,
-                        "Get TXQ properties, invalid queue: %u\n", q);
-                return false;
-        }
-
         qi = &ah->txq[q];
         if (qi->tqi_type == ATH9K_TX_QUEUE_INACTIVE) {
                 ath_dbg(common, ATH_DBG_QUEUE,
@@ -320,28 +306,27 @@ int ath9k_hw_setuptxqueue(struct ath_hw *ah, enum ath9k_tx_queue type,
 {
         struct ath_common *common = ath9k_hw_common(ah);
         struct ath9k_tx_queue_info *qi;
-        struct ath9k_hw_capabilities *pCap = &ah->caps;
         int q;
 
         switch (type) {
         case ATH9K_TX_QUEUE_BEACON:
-                q = pCap->total_queues - 1;
+                q = ATH9K_NUM_TX_QUEUES - 1;
                 break;
         case ATH9K_TX_QUEUE_CAB:
-                q = pCap->total_queues - 2;
+                q = ATH9K_NUM_TX_QUEUES - 2;
                 break;
         case ATH9K_TX_QUEUE_PSPOLL:
                 q = 1;
                 break;
         case ATH9K_TX_QUEUE_UAPSD:
-                q = pCap->total_queues - 3;
+                q = ATH9K_NUM_TX_QUEUES - 3;
                 break;
         case ATH9K_TX_QUEUE_DATA:
-                for (q = 0; q < pCap->total_queues; q++)
+                for (q = 0; q < ATH9K_NUM_TX_QUEUES; q++)
                         if (ah->txq[q].tqi_type ==
                             ATH9K_TX_QUEUE_INACTIVE)
                                 break;
-                if (q == pCap->total_queues) {
+                if (q == ATH9K_NUM_TX_QUEUES) {
                         ath_err(common, "No available TX queue\n");
                         return -1;
                 }
@@ -382,15 +367,9 @@ EXPORT_SYMBOL(ath9k_hw_setuptxqueue);
 
 bool ath9k_hw_releasetxqueue(struct ath_hw *ah, u32 q)
 {
-        struct ath9k_hw_capabilities *pCap = &ah->caps;
         struct ath_common *common = ath9k_hw_common(ah);
         struct ath9k_tx_queue_info *qi;
 
-        if (q >= pCap->total_queues) {
-                ath_dbg(common, ATH_DBG_QUEUE,
-                        "Release TXQ, invalid queue: %u\n", q);
-                return false;
-        }
         qi = &ah->txq[q];
         if (qi->tqi_type == ATH9K_TX_QUEUE_INACTIVE) {
                 ath_dbg(common, ATH_DBG_QUEUE,
@@ -414,18 +393,11 @@ EXPORT_SYMBOL(ath9k_hw_releasetxqueue);
 
 bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q)
 {
-        struct ath9k_hw_capabilities *pCap = &ah->caps;
         struct ath_common *common = ath9k_hw_common(ah);
         struct ath9k_channel *chan = ah->curchan;
         struct ath9k_tx_queue_info *qi;
         u32 cwMin, chanCwMin, value;
 
-        if (q >= pCap->total_queues) {
-                ath_dbg(common, ATH_DBG_QUEUE,
-                        "Reset TXQ, invalid queue: %u\n", q);
-                return false;
-        }
-
         qi = &ah->txq[q];
         if (qi->tqi_type == ATH9K_TX_QUEUE_INACTIVE) {
                 ath_dbg(common, ATH_DBG_QUEUE,
@@ -465,10 +437,9 @@ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q)
                 REG_WRITE(ah, AR_QCBRCFG(q),
                           SM(qi->tqi_cbrPeriod, AR_Q_CBRCFG_INTERVAL) |
                           SM(qi->tqi_cbrOverflowLimit, AR_Q_CBRCFG_OVF_THRESH));
-                REG_WRITE(ah, AR_QMISC(q),
-                          REG_READ(ah, AR_QMISC(q)) | AR_Q_MISC_FSP_CBR |
-                          (qi->tqi_cbrOverflowLimit ?
-                           AR_Q_MISC_CBR_EXP_CNTR_LIMIT_EN : 0));
+                REG_SET_BIT(ah, AR_QMISC(q), AR_Q_MISC_FSP_CBR |
+                            (qi->tqi_cbrOverflowLimit ?
+                             AR_Q_MISC_CBR_EXP_CNTR_LIMIT_EN : 0));
         }
         if (qi->tqi_readyTime && (qi->tqi_type != ATH9K_TX_QUEUE_CAB)) {
                 REG_WRITE(ah, AR_QRDYTIMECFG(q),
@@ -481,40 +452,31 @@ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q)
                   (qi->tqi_burstTime ? AR_D_CHNTIME_EN : 0));
 
         if (qi->tqi_burstTime
-            && (qi->tqi_qflags & TXQ_FLAG_RDYTIME_EXP_POLICY_ENABLE)) {
-                REG_WRITE(ah, AR_QMISC(q),
-                          REG_READ(ah, AR_QMISC(q)) |
-                          AR_Q_MISC_RDYTIME_EXP_POLICY);
-
-        }
+            && (qi->tqi_qflags & TXQ_FLAG_RDYTIME_EXP_POLICY_ENABLE))
+                REG_SET_BIT(ah, AR_QMISC(q), AR_Q_MISC_RDYTIME_EXP_POLICY);
 
-        if (qi->tqi_qflags & TXQ_FLAG_BACKOFF_DISABLE) {
-                REG_WRITE(ah, AR_DMISC(q),
-                          REG_READ(ah, AR_DMISC(q)) |
-                          AR_D_MISC_POST_FR_BKOFF_DIS);
-        }
+        if (qi->tqi_qflags & TXQ_FLAG_BACKOFF_DISABLE)
+                REG_SET_BIT(ah, AR_DMISC(q), AR_D_MISC_POST_FR_BKOFF_DIS);
 
         REGWRITE_BUFFER_FLUSH(ah);
 
-        if (qi->tqi_qflags & TXQ_FLAG_FRAG_BURST_BACKOFF_ENABLE) {
-                REG_WRITE(ah, AR_DMISC(q),
-                          REG_READ(ah, AR_DMISC(q)) |
-                          AR_D_MISC_FRAG_BKOFF_EN);
-        }
+        if (qi->tqi_qflags & TXQ_FLAG_FRAG_BURST_BACKOFF_ENABLE)
+                REG_SET_BIT(ah, AR_DMISC(q), AR_D_MISC_FRAG_BKOFF_EN);
+
         switch (qi->tqi_type) {
         case ATH9K_TX_QUEUE_BEACON:
                 ENABLE_REGWRITE_BUFFER(ah);
 
-                REG_WRITE(ah, AR_QMISC(q), REG_READ(ah, AR_QMISC(q))
-                          | AR_Q_MISC_FSP_DBA_GATED
-                          | AR_Q_MISC_BEACON_USE
-                          | AR_Q_MISC_CBR_INCR_DIS1);
+                REG_SET_BIT(ah, AR_QMISC(q),
+                            AR_Q_MISC_FSP_DBA_GATED
+                            | AR_Q_MISC_BEACON_USE
+                            | AR_Q_MISC_CBR_INCR_DIS1);
 
-                REG_WRITE(ah, AR_DMISC(q), REG_READ(ah, AR_DMISC(q))
-                          | (AR_D_MISC_ARB_LOCKOUT_CNTRL_GLOBAL <<
+                REG_SET_BIT(ah, AR_DMISC(q),
+                            (AR_D_MISC_ARB_LOCKOUT_CNTRL_GLOBAL <<
                              AR_D_MISC_ARB_LOCKOUT_CNTRL_S)
-                          | AR_D_MISC_BEACON_USE
-                          | AR_D_MISC_POST_FR_BKOFF_DIS);
+                            | AR_D_MISC_BEACON_USE
+                            | AR_D_MISC_POST_FR_BKOFF_DIS);
 
                 REGWRITE_BUFFER_FLUSH(ah);
 
@@ -533,41 +495,38 @@ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q)
         case ATH9K_TX_QUEUE_CAB:
                 ENABLE_REGWRITE_BUFFER(ah);
 
-                REG_WRITE(ah, AR_QMISC(q), REG_READ(ah, AR_QMISC(q))
-                          | AR_Q_MISC_FSP_DBA_GATED
-                          | AR_Q_MISC_CBR_INCR_DIS1
-                          | AR_Q_MISC_CBR_INCR_DIS0);
+                REG_SET_BIT(ah, AR_QMISC(q),
+                            AR_Q_MISC_FSP_DBA_GATED
+                            | AR_Q_MISC_CBR_INCR_DIS1
+                            | AR_Q_MISC_CBR_INCR_DIS0);
                 value = (qi->tqi_readyTime -
                          (ah->config.sw_beacon_response_time -
                           ah->config.dma_beacon_response_time) -
                          ah->config.additional_swba_backoff) * 1024;
                 REG_WRITE(ah, AR_QRDYTIMECFG(q),
                           value | AR_Q_RDYTIMECFG_EN);
-                REG_WRITE(ah, AR_DMISC(q), REG_READ(ah, AR_DMISC(q))
-                          | (AR_D_MISC_ARB_LOCKOUT_CNTRL_GLOBAL <<
+                REG_SET_BIT(ah, AR_DMISC(q),
+                            (AR_D_MISC_ARB_LOCKOUT_CNTRL_GLOBAL <<
                              AR_D_MISC_ARB_LOCKOUT_CNTRL_S));
 
                 REGWRITE_BUFFER_FLUSH(ah);
 
                 break;
         case ATH9K_TX_QUEUE_PSPOLL:
-                REG_WRITE(ah, AR_QMISC(q),
-                          REG_READ(ah, AR_QMISC(q)) | AR_Q_MISC_CBR_INCR_DIS1);
+                REG_SET_BIT(ah, AR_QMISC(q), AR_Q_MISC_CBR_INCR_DIS1);
                 break;
         case ATH9K_TX_QUEUE_UAPSD:
-                REG_WRITE(ah, AR_DMISC(q), REG_READ(ah, AR_DMISC(q)) |
-                          AR_D_MISC_POST_FR_BKOFF_DIS);
+                REG_SET_BIT(ah, AR_DMISC(q), AR_D_MISC_POST_FR_BKOFF_DIS);
                 break;
         default:
                 break;
         }
 
         if (qi->tqi_intFlags & ATH9K_TXQ_USE_LOCKOUT_BKOFF_DIS) {
-                REG_WRITE(ah, AR_DMISC(q),
-                          REG_READ(ah, AR_DMISC(q)) |
-                          SM(AR_D_MISC_ARB_LOCKOUT_CNTRL_GLOBAL,
-                             AR_D_MISC_ARB_LOCKOUT_CNTRL) |
-                          AR_D_MISC_POST_FR_BKOFF_DIS);
+                REG_SET_BIT(ah, AR_DMISC(q),
+                            SM(AR_D_MISC_ARB_LOCKOUT_CNTRL_GLOBAL,
+                               AR_D_MISC_ARB_LOCKOUT_CNTRL) |
+                            AR_D_MISC_POST_FR_BKOFF_DIS);
         }
 
         if (AR_SREV_9300_20_OR_LATER(ah))
@@ -866,7 +825,7 @@ void ath9k_hw_set_interrupts(struct ath_hw *ah, enum ath9k_int ints)
         struct ath_common *common = ath9k_hw_common(ah);
 
         if (!(ints & ATH9K_INT_GLOBAL))
-                ath9k_hw_enable_interrupts(ah);
+                ath9k_hw_disable_interrupts(ah);
 
         ath_dbg(common, ATH_DBG_INTERRUPT, "0x%x => 0x%x\n", omask, ints);
 
@@ -944,7 +903,8 @@ void ath9k_hw_set_interrupts(struct ath_hw *ah, enum ath9k_int ints)
                         REG_CLR_BIT(ah, AR_IMR_S5, AR_IMR_S5_TIM_TIMER);
         }
 
-        ath9k_hw_enable_interrupts(ah);
+        if (ints & ATH9K_INT_GLOBAL)
+                ath9k_hw_enable_interrupts(ah);
 
         return;
 }
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 115f162c617..3c5de73dcb4 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1845,6 +1845,20 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
         if (ath9k_modparam_nohwcrypt)
                 return -ENOSPC;
 
+        if (vif->type == NL80211_IFTYPE_ADHOC &&
+            (key->cipher == WLAN_CIPHER_SUITE_TKIP ||
+             key->cipher == WLAN_CIPHER_SUITE_CCMP) &&
+            !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
+                /*
+                 * For now, disable hw crypto for the RSN IBSS group keys. This
+                 * could be optimized in the future to use a modified key cache
+                 * design to support per-STA RX GTK, but until that gets
+                 * implemented, use of software crypto for group addressed
+                 * frames is a acceptable to allow RSN IBSS to be used.
+                 */
+                return -EOPNOTSUPP;
+        }
+
         mutex_lock(&sc->mutex);
         ath9k_ps_wakeup(sc);
         ath_dbg(common, ATH_DBG_CONFIG, "Set HW Key\n");
@@ -2160,6 +2174,8 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop)
         if (!ath_drain_all_txq(sc, false))
                 ath_reset(sc, false);
 
+        ieee80211_wake_queues(hw);
+
 out:
         ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0);
         mutex_unlock(&sc->mutex);
diff --git a/drivers/net/wireless/ath/ath9k/phy.h b/drivers/net/wireless/ath/ath9k/phy.h
index 5e3d7496986..f50e2c29f71 100644
--- a/drivers/net/wireless/ath/ath9k/phy.h
+++ b/drivers/net/wireless/ath/ath9k/phy.h
@@ -38,25 +38,11 @@
 #define AR_PHY_CLC_Q0        0x0000ffd0
 #define AR_PHY_CLC_Q0_S      5
 
-#define REG_WRITE_RF_ARRAY(iniarray, regData, regWr) do {               \
-                int r;                                                  \
-                for (r = 0; r < ((iniarray)->ia_rows); r++) {           \
-                        REG_WRITE(ah, INI_RA((iniarray), r, 0), (regData)[r]); \
-                        DO_DELAY(regWr);                                \
-                }                                                       \
-        } while (0)
-
 #define ANTSWAP_AB 0x0001
 #define REDUCE_CHAIN_0 0x00000050
 #define REDUCE_CHAIN_1 0x00000051
 #define AR_PHY_CHIP_ID 0x9818
 
-#define RF_BANK_SETUP(_bank, _iniarray, _col) do {                      \
-                int i;                                                  \
-                for (i = 0; i < (_iniarray)->ia_rows; i++)              \
-                        (_bank)[i] = INI_RA((_iniarray), i, _col);;     \
-        } while (0)
-
 #define AR_PHY_TIMING11_SPUR_FREQ_SD            0x3FF00000
 #define AR_PHY_TIMING11_SPUR_FREQ_SD_S          20
 
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 960d717ca7c..a3241cd089b 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -1328,7 +1328,7 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband,
 
         hdr = (struct ieee80211_hdr *)skb->data;
         fc = hdr->frame_control;
-        for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
+        for (i = 0; i < sc->hw->max_rates; i++) {
                 struct ieee80211_tx_rate *rate = &tx_info->status.rates[i];
                 if (!rate->count)
                         break;
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index 8fa8acfde62..693d543937b 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -1396,6 +1396,7 @@ enum {
 #define AR_STA_ID1_PCF             0x00100000
 #define AR_STA_ID1_USE_DEFANT      0x00200000
 #define AR_STA_ID1_DEFANT_UPDATE   0x00400000
+#define AR_STA_ID1_AR9100_BA_FIX   0x00400000
 #define AR_STA_ID1_RTS_USE_DEF     0x00800000
 #define AR_STA_ID1_ACKCTS_6MB      0x01000000
 #define AR_STA_ID1_BASE_RATE_11B   0x02000000
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index ef22096d40c..5943bdc4c8f 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1725,8 +1725,8 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
         u8 tidno;
 
         spin_lock_bh(&txctl->txq->axq_lock);
-
-        if (ieee80211_is_data_qos(hdr->frame_control) && txctl->an) {
+        if ((sc->sc_flags & SC_OP_TXAGGR) && txctl->an &&
+                ieee80211_is_data_qos(hdr->frame_control)) {
                 tidno = ieee80211_get_qos_ctl(hdr)[0] &
                         IEEE80211_QOS_CTL_TID_MASK;
                 tid = ATH_AN_2_TID(txctl->an, tidno);
@@ -1980,7 +1980,7 @@ static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,
                 if (ieee80211_is_data(hdr->frame_control) &&
                     (ts->ts_flags & (ATH9K_TX_DATA_UNDERRUN |
                                      ATH9K_TX_DELIM_UNDERRUN)) &&
-                    ah->tx_trig_level >= sc->sc_ah->caps.tx_triglevel_max)
+                    ah->tx_trig_level >= sc->sc_ah->config.max_txtrig_level)
                         tx_info->status.rates[tx_rateindex].count =
                                 hw->max_rate_tries;
         }
@@ -2144,33 +2144,6 @@ static void ath_tx_complete_poll_work(struct work_struct *work)
                                 } else {
                                         txq->axq_tx_inprogress = true;
                                 }
-                        } else {
-                                /* If the queue has pending buffers, then it
-                                 * should be doing tx work (and have axq_depth).
-                                 * Shouldn't get to this state I think..but
-                                 * we do.
-                                 */
-                                if (!(sc->sc_flags & (SC_OP_OFFCHANNEL)) &&
-                                    (txq->pending_frames > 0 ||
-                                     !list_empty(&txq->axq_acq) ||
-                                     txq->stopped)) {
-                                        ath_err(ath9k_hw_common(sc->sc_ah),
-                                                "txq: %p axq_qnum: %u,"
-                                                " mac80211_qnum: %i"
-                                                " axq_link: %p"
-                                                " pending frames: %i"
-                                                " axq_acq empty: %i"
-                                                " stopped: %i"
-                                                " axq_depth: 0  Attempting to"
-                                                " restart tx logic.\n",
-                                                txq, txq->axq_qnum,
-                                                txq->mac80211_qnum,
-                                                txq->axq_link,
-                                                txq->pending_frames,
-                                                list_empty(&txq->axq_acq),
-                                                txq->stopped);
-                                        ath_txq_schedule(sc, txq);
-                                }
                         }
                         spin_unlock_bh(&txq->axq_lock);
                 }
diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c
index 537732e5964..f82c400be28 100644
--- a/drivers/net/wireless/ath/carl9170/usb.c
+++ b/drivers/net/wireless/ath/carl9170/usb.c
@@ -118,6 +118,8 @@ static struct usb_device_id carl9170_usb_ids[] = {
         { USB_DEVICE(0x057c, 0x8402) },
         /* Qwest/Actiontec 802AIN Wireless N USB Network Adapter */
         { USB_DEVICE(0x1668, 0x1200) },
+        /* Airlive X.USB a/b/g/n */
+        { USB_DEVICE(0x1b75, 0x9170) },
 
         /* terminate */
         {}
diff --git a/drivers/net/wireless/ath/key.c b/drivers/net/wireless/ath/key.c
index 37b8e115375..0d4f39cbdca 100644
--- a/drivers/net/wireless/ath/key.c
+++ b/drivers/net/wireless/ath/key.c
@@ -23,6 +23,14 @@
 
 #define REG_READ                        (common->ops->read)
 #define REG_WRITE(_ah, _reg, _val)      (common->ops->write)(_ah, _val, _reg)
+#define ENABLE_REGWRITE_BUFFER(_ah)                     \
+        if (common->ops->enable_write_buffer)           \
+                common->ops->enable_write_buffer((_ah));
+
+#define REGWRITE_BUFFER_FLUSH(_ah)                      \
+        if (common->ops->write_flush)                   \
+                common->ops->write_flush((_ah));
+
 
 #define IEEE80211_WEP_NKID      4       /* number of key ids */
 
@@ -42,6 +50,8 @@ bool ath_hw_keyreset(struct ath_common *common, u16 entry)
 
         keyType = REG_READ(ah, AR_KEYTABLE_TYPE(entry));
 
+        ENABLE_REGWRITE_BUFFER(ah);
+
         REG_WRITE(ah, AR_KEYTABLE_KEY0(entry), 0);
         REG_WRITE(ah, AR_KEYTABLE_KEY1(entry), 0);
         REG_WRITE(ah, AR_KEYTABLE_KEY2(entry), 0);
@@ -66,6 +76,8 @@ bool ath_hw_keyreset(struct ath_common *common, u16 entry)
 
         }
 
+        REGWRITE_BUFFER_FLUSH(ah);
+
         return true;
 }
 EXPORT_SYMBOL(ath_hw_keyreset);
@@ -104,9 +116,13 @@ static bool ath_hw_keysetmac(struct ath_common *common,
         } else {
                 macLo = macHi = 0;
         }
+        ENABLE_REGWRITE_BUFFER(ah);
+
         REG_WRITE(ah, AR_KEYTABLE_MAC0(entry), macLo);
         REG_WRITE(ah, AR_KEYTABLE_MAC1(entry), macHi | unicast_flag);
 
+        REGWRITE_BUFFER_FLUSH(ah);
+
         return true;
 }
 
@@ -223,6 +239,8 @@ static bool ath_hw_set_keycache_entry(struct ath_common *common, u16 entry,
                         mic3 = get_unaligned_le16(k->kv_txmic + 0) & 0xffff;
                         mic4 = get_unaligned_le32(k->kv_txmic + 4);
 
+                        ENABLE_REGWRITE_BUFFER(ah);
+
                         /* Write RX[31:0] and TX[31:16] */
                         REG_WRITE(ah, AR_KEYTABLE_KEY0(micentry), mic0);
                         REG_WRITE(ah, AR_KEYTABLE_KEY1(micentry), mic1);
@@ -236,6 +254,8 @@ static bool ath_hw_set_keycache_entry(struct ath_common *common, u16 entry,
                         REG_WRITE(ah, AR_KEYTABLE_TYPE(micentry),
                                   AR_KEYTABLE_TYPE_CLR);
 
+                        REGWRITE_BUFFER_FLUSH(ah);
+
                 } else {
                         /*
                          * TKIP uses four key cache entries (two for group
@@ -258,6 +278,8 @@ static bool ath_hw_set_keycache_entry(struct ath_common *common, u16 entry,
                         mic0 = get_unaligned_le32(k->kv_mic + 0);
                         mic2 = get_unaligned_le32(k->kv_mic + 4);
 
+                        ENABLE_REGWRITE_BUFFER(ah);
+
                         /* Write MIC key[31:0] */
                         REG_WRITE(ah, AR_KEYTABLE_KEY0(micentry), mic0);
                         REG_WRITE(ah, AR_KEYTABLE_KEY1(micentry), 0);
@@ -270,8 +292,12 @@ static bool ath_hw_set_keycache_entry(struct ath_common *common, u16 entry,
                         REG_WRITE(ah, AR_KEYTABLE_KEY4(micentry), 0);
                         REG_WRITE(ah, AR_KEYTABLE_TYPE(micentry),
                                   AR_KEYTABLE_TYPE_CLR);
+
+                        REGWRITE_BUFFER_FLUSH(ah);
                 }
 
+                ENABLE_REGWRITE_BUFFER(ah);
+
                 /* MAC address registers are reserved for the MIC entry */
                 REG_WRITE(ah, AR_KEYTABLE_MAC0(micentry), 0);
                 REG_WRITE(ah, AR_KEYTABLE_MAC1(micentry), 0);
@@ -283,7 +309,11 @@ static bool ath_hw_set_keycache_entry(struct ath_common *common, u16 entry,
                  */
                 REG_WRITE(ah, AR_KEYTABLE_KEY0(entry), key0);
                 REG_WRITE(ah, AR_KEYTABLE_KEY1(entry), key1);
+
+                REGWRITE_BUFFER_FLUSH(ah);
         } else {
+                ENABLE_REGWRITE_BUFFER(ah);
+
                 /* Write key[47:0] */
                 REG_WRITE(ah, AR_KEYTABLE_KEY0(entry), key0);
                 REG_WRITE(ah, AR_KEYTABLE_KEY1(entry), key1);
@@ -296,6 +326,8 @@ static bool ath_hw_set_keycache_entry(struct ath_common *common, u16 entry,
                 REG_WRITE(ah, AR_KEYTABLE_KEY4(entry), key4);
                 REG_WRITE(ah, AR_KEYTABLE_TYPE(entry), keyType);
 
+                REGWRITE_BUFFER_FLUSH(ah);
+
                 /* Write MAC address for the entry */
                 (void) ath_hw_keysetmac(common, entry, mac);
         }
diff --git a/drivers/net/wireless/hostap/hostap_config.h b/drivers/net/wireless/hostap/hostap_config.h
index 30acd39d76a..2c8f71f0ed4 100644
--- a/drivers/net/wireless/hostap/hostap_config.h
+++ b/drivers/net/wireless/hostap/hostap_config.h
@@ -30,9 +30,9 @@
 
 /* Following defines can be used to remove unneeded parts of the driver, e.g.,
  * to limit the size of the kernel module. Definitions can be added here in
- * hostap_config.h or they can be added to make command with EXTRA_CFLAGS,
+ * hostap_config.h or they can be added to make command with ccflags-y,
  * e.g.,
- * 'make pccard EXTRA_CFLAGS="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"'
+ * 'make pccard ccflags-y="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"'
  */
 
 /* Do not include debug messages into the driver */
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index da60faee74f..4b97f918daf 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -706,11 +706,10 @@ static void schedule_reset(struct ipw2100_priv *priv)
                 netif_stop_queue(priv->net_dev);
                 priv->status |= STATUS_RESET_PENDING;
                 if (priv->reset_backoff)
-                        queue_delayed_work(priv->workqueue, &priv->reset_work,
-                                           priv->reset_backoff * HZ);
+                        schedule_delayed_work(&priv->reset_work,
+                                              priv->reset_backoff * HZ);
                 else
-                        queue_delayed_work(priv->workqueue, &priv->reset_work,
-                                           0);
+                        schedule_delayed_work(&priv->reset_work, 0);
 
                 if (priv->reset_backoff < MAX_RESET_BACKOFF)
                         priv->reset_backoff++;
@@ -1474,7 +1473,7 @@ static int ipw2100_enable_adapter(struct ipw2100_priv *priv)
 
         if (priv->stop_hang_check) {
                 priv->stop_hang_check = 0;
-                queue_delayed_work(priv->workqueue, &priv->hang_check, HZ / 2);
+                schedule_delayed_work(&priv->hang_check, HZ / 2);
         }
 
       fail_up:
@@ -1808,8 +1807,8 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
 
                 if (priv->stop_rf_kill) {
                         priv->stop_rf_kill = 0;
-                        queue_delayed_work(priv->workqueue, &priv->rf_kill,
-                                           round_jiffies_relative(HZ));
+                        schedule_delayed_work(&priv->rf_kill,
+                                              round_jiffies_relative(HZ));
                 }
 
                 deferred = 1;
@@ -2086,7 +2085,7 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
         priv->status |= STATUS_ASSOCIATING;
         priv->connect_start = get_seconds();
 
-        queue_delayed_work(priv->workqueue, &priv->wx_event_work, HZ / 10);
+        schedule_delayed_work(&priv->wx_event_work, HZ / 10);
 }
 
 static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid,
@@ -2166,9 +2165,9 @@ static void isr_indicate_association_lost(struct ipw2100_priv *priv, u32 status)
                 return;
 
         if (priv->status & STATUS_SECURITY_UPDATED)
-                queue_delayed_work(priv->workqueue, &priv->security_work, 0);
+                schedule_delayed_work(&priv->security_work, 0);
 
-        queue_delayed_work(priv->workqueue, &priv->wx_event_work, 0);
+        schedule_delayed_work(&priv->wx_event_work, 0);
 }
 
 static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status)
@@ -2183,8 +2182,7 @@ static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status)
         /* Make sure the RF Kill check timer is running */
         priv->stop_rf_kill = 0;
         cancel_delayed_work(&priv->rf_kill);
-        queue_delayed_work(priv->workqueue, &priv->rf_kill,
-                           round_jiffies_relative(HZ));
+        schedule_delayed_work(&priv->rf_kill, round_jiffies_relative(HZ));
 }
 
 static void send_scan_event(void *data)
@@ -2219,13 +2217,12 @@ static void isr_scan_complete(struct ipw2100_priv *priv, u32 status)
         /* Only userspace-requested scan completion events go out immediately */
         if (!priv->user_requested_scan) {
                 if (!delayed_work_pending(&priv->scan_event_later))
-                        queue_delayed_work(priv->workqueue,
-                                        &priv->scan_event_later,
-                                        round_jiffies_relative(msecs_to_jiffies(4000)));
+                        schedule_delayed_work(&priv->scan_event_later,
+                                              round_jiffies_relative(msecs_to_jiffies(4000)));
         } else {
                 priv->user_requested_scan = 0;
                 cancel_delayed_work(&priv->scan_event_later);
-                queue_work(priv->workqueue, &priv->scan_event_now);
+                schedule_work(&priv->scan_event_now);
         }
 }
 
@@ -4329,8 +4326,8 @@ static int ipw_radio_kill_sw(struct ipw2100_priv *priv, int disable_radio)
                         /* Make sure the RF_KILL check timer is running */
                         priv->stop_rf_kill = 0;
                         cancel_delayed_work(&priv->rf_kill);
-                        queue_delayed_work(priv->workqueue, &priv->rf_kill,
-                                           round_jiffies_relative(HZ));
+                        schedule_delayed_work(&priv->rf_kill,
+                                              round_jiffies_relative(HZ));
                 } else
                         schedule_reset(priv);
         }
@@ -4461,20 +4458,17 @@ static void bd_queue_initialize(struct ipw2100_priv *priv,
         IPW_DEBUG_INFO("exit\n");
 }
 
-static void ipw2100_kill_workqueue(struct ipw2100_priv *priv)
+static void ipw2100_kill_works(struct ipw2100_priv *priv)
 {
-        if (priv->workqueue) {
-                priv->stop_rf_kill = 1;
-                priv->stop_hang_check = 1;
-                cancel_delayed_work(&priv->reset_work);
-                cancel_delayed_work(&priv->security_work);
-                cancel_delayed_work(&priv->wx_event_work);
-                cancel_delayed_work(&priv->hang_check);
-                cancel_delayed_work(&priv->rf_kill);
-                cancel_delayed_work(&priv->scan_event_later);
-                destroy_workqueue(priv->workqueue);
-                priv->workqueue = NULL;
-        }
+        priv->stop_rf_kill = 1;
+        priv->stop_hang_check = 1;
+        cancel_delayed_work_sync(&priv->reset_work);
+        cancel_delayed_work_sync(&priv->security_work);
+        cancel_delayed_work_sync(&priv->wx_event_work);
+        cancel_delayed_work_sync(&priv->hang_check);
+        cancel_delayed_work_sync(&priv->rf_kill);
+        cancel_work_sync(&priv->scan_event_now);
+        cancel_delayed_work_sync(&priv->scan_event_later);
 }
 
 static int ipw2100_tx_allocate(struct ipw2100_priv *priv)
@@ -6046,7 +6040,7 @@ static void ipw2100_hang_check(struct work_struct *work)
         priv->last_rtc = rtc;
 
         if (!priv->stop_hang_check)
-                queue_delayed_work(priv->workqueue, &priv->hang_check, HZ / 2);
+                schedule_delayed_work(&priv->hang_check, HZ / 2);
 
         spin_unlock_irqrestore(&priv->low_lock, flags);
 }
@@ -6062,8 +6056,8 @@ static void ipw2100_rf_kill(struct work_struct *work)
         if (rf_kill_active(priv)) {
                 IPW_DEBUG_RF_KILL("RF Kill active, rescheduling GPIO check\n");
                 if (!priv->stop_rf_kill)
-                        queue_delayed_work(priv->workqueue, &priv->rf_kill,
-                                           round_jiffies_relative(HZ));
+                        schedule_delayed_work(&priv->rf_kill,
+                                              round_jiffies_relative(HZ));
                 goto exit_unlock;
         }
 
@@ -6209,8 +6203,6 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
         INIT_LIST_HEAD(&priv->fw_pend_list);
         INIT_STAT(&priv->fw_pend_stat);
 
-        priv->workqueue = create_workqueue(DRV_NAME);
-
         INIT_DELAYED_WORK(&priv->reset_work, ipw2100_reset_adapter);
         INIT_DELAYED_WORK(&priv->security_work, ipw2100_security_work);
         INIT_DELAYED_WORK(&priv->wx_event_work, ipw2100_wx_event_work);
@@ -6410,7 +6402,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
                 if (dev->irq)
                         free_irq(dev->irq, priv);
 
-                ipw2100_kill_workqueue(priv);
+                ipw2100_kill_works(priv);
 
                 /* These are safe to call even if they weren't allocated */
                 ipw2100_queues_free(priv);
@@ -6460,9 +6452,7 @@ static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
                  * first, then close() will crash. */
                 unregister_netdev(dev);
 
-                /* ipw2100_down will ensure that there is no more pending work
-                 * in the workqueue's, so we can safely remove them now. */
-                ipw2100_kill_workqueue(priv);
+                ipw2100_kill_works(priv);
 
                 ipw2100_queues_free(priv);
 
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/ipw2x00/ipw2100.h
index 838002b4881..99cba968aa5 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.h
+++ b/drivers/net/wireless/ipw2x00/ipw2100.h
@@ -580,7 +580,6 @@ struct ipw2100_priv {
 
         struct tasklet_struct irq_tasklet;
 
-        struct workqueue_struct *workqueue;
         struct delayed_work reset_work;
         struct delayed_work security_work;
         struct delayed_work wx_event_work;
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index ae438ed80c2..160881f234c 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -894,9 +894,8 @@ static void ipw_led_link_on(struct ipw_priv *priv)
 
                 /* If we aren't associated, schedule turning the LED off */
                 if (!(priv->status & STATUS_ASSOCIATED))
-                        queue_delayed_work(priv->workqueue,
-                                           &priv->led_link_off,
-                                           LD_TIME_LINK_ON);
+                        schedule_delayed_work(&priv->led_link_off,
+                                              LD_TIME_LINK_ON);
         }
 
         spin_unlock_irqrestore(&priv->lock, flags);
@@ -939,8 +938,8 @@ static void ipw_led_link_off(struct ipw_priv *priv)
                  * turning the LED on (blink while unassociated) */
                 if (!(priv->status & STATUS_RF_KILL_MASK) &&
                     !(priv->status & STATUS_ASSOCIATED))
-                        queue_delayed_work(priv->workqueue, &priv->led_link_on,
-                                           LD_TIME_LINK_OFF);
+                        schedule_delayed_work(&priv->led_link_on,
+                                              LD_TIME_LINK_OFF);
 
         }
 
@@ -980,13 +979,11 @@ static void __ipw_led_activity_on(struct ipw_priv *priv)
                 priv->status |= STATUS_LED_ACT_ON;
 
                 cancel_delayed_work(&priv->led_act_off);
-                queue_delayed_work(priv->workqueue, &priv->led_act_off,
-                                   LD_TIME_ACT_ON);
+                schedule_delayed_work(&priv->led_act_off, LD_TIME_ACT_ON);
         } else {
                 /* Reschedule LED off for full time period */
                 cancel_delayed_work(&priv->led_act_off);
-                queue_delayed_work(priv->workqueue, &priv->led_act_off,
-                                   LD_TIME_ACT_ON);
+                schedule_delayed_work(&priv->led_act_off, LD_TIME_ACT_ON);
         }
 }
 
@@ -1795,13 +1792,11 @@ static int ipw_radio_kill_sw(struct ipw_priv *priv, int disable_radio)
         if (disable_radio) {
                 priv->status |= STATUS_RF_KILL_SW;
 
-                if (priv->workqueue) {
-                        cancel_delayed_work(&priv->request_scan);
-                        cancel_delayed_work(&priv->request_direct_scan);
-                        cancel_delayed_work(&priv->request_passive_scan);
-                        cancel_delayed_work(&priv->scan_event);
-                }
-                queue_work(priv->workqueue, &priv->down);
+                cancel_delayed_work(&priv->request_scan);
+                cancel_delayed_work(&priv->request_direct_scan);
+                cancel_delayed_work(&priv->request_passive_scan);
+                cancel_delayed_work(&priv->scan_event);
+                schedule_work(&priv->down);
         } else {
                 priv->status &= ~STATUS_RF_KILL_SW;
                 if (rf_kill_active(priv)) {
@@ -1809,10 +1804,10 @@ static int ipw_radio_kill_sw(struct ipw_priv *priv, int disable_radio)
                                           "disabled by HW switch\n");
                         /* Make sure the RF_KILL check timer is running */
                         cancel_delayed_work(&priv->rf_kill);
-                        queue_delayed_work(priv->workqueue, &priv->rf_kill,
-                                           round_jiffies_relative(2 * HZ));
+                        schedule_delayed_work(&priv->rf_kill,
+                                              round_jiffies_relative(2 * HZ));
                 } else
-                        queue_work(priv->workqueue, &priv->up);
+                        schedule_work(&priv->up);
         }
 
         return 1;
@@ -2063,7 +2058,7 @@ static void ipw_irq_tasklet(struct ipw_priv *priv)
                 cancel_delayed_work(&priv->request_passive_scan);
                 cancel_delayed_work(&priv->scan_event);
                 schedule_work(&priv->link_down);
-                queue_delayed_work(priv->workqueue, &priv->rf_kill, 2 * HZ);
+                schedule_delayed_work(&priv->rf_kill, 2 * HZ);
                 handled |= IPW_INTA_BIT_RF_KILL_DONE;
         }
 
@@ -2103,7 +2098,7 @@ static void ipw_irq_tasklet(struct ipw_priv *priv)
                 priv->status &= ~STATUS_HCMD_ACTIVE;
                 wake_up_interruptible(&priv->wait_command_queue);
 
-                queue_work(priv->workqueue, &priv->adapter_restart);
+                schedule_work(&priv->adapter_restart);
                 handled |= IPW_INTA_BIT_FATAL_ERROR;
         }
 
@@ -2323,11 +2318,6 @@ static int ipw_send_adapter_address(struct ipw_priv *priv, u8 * mac)
         return ipw_send_cmd_pdu(priv, IPW_CMD_ADAPTER_ADDRESS, ETH_ALEN, mac);
 }
 
-/*
- * NOTE: This must be executed from our workqueue as it results in udelay
- * being called which may corrupt the keyboard if executed on default
- * workqueue
- */
 static void ipw_adapter_restart(void *adapter)
 {
         struct ipw_priv *priv = adapter;
@@ -2368,13 +2358,13 @@ static void ipw_scan_check(void *data)
                 IPW_DEBUG_SCAN("Scan completion watchdog resetting "
                                "adapter after (%dms).\n",
                                jiffies_to_msecs(IPW_SCAN_CHECK_WATCHDOG));
-                queue_work(priv->workqueue, &priv->adapter_restart);
+                schedule_work(&priv->adapter_restart);
         } else if (priv->status & STATUS_SCANNING) {
                 IPW_DEBUG_SCAN("Scan completion watchdog aborting scan "
                                "after (%dms).\n",
                                jiffies_to_msecs(IPW_SCAN_CHECK_WATCHDOG));
                 ipw_abort_scan(priv);
-                queue_delayed_work(priv->workqueue, &priv->scan_check, HZ);
+                schedule_delayed_work(&priv->scan_check, HZ);
         }
 }
 
@@ -3943,7 +3933,7 @@ static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
 
         if (priv->status & STATUS_ASSOCIATING) {
                 IPW_DEBUG_ASSOC("Disassociating while associating.\n");
-                queue_work(priv->workqueue, &priv->disassociate);
+                schedule_work(&priv->disassociate);
                 return;
         }
 
@@ -4360,8 +4350,7 @@ static void ipw_gather_stats(struct ipw_priv *priv)
 
         priv->quality = quality;
 
-        queue_delayed_work(priv->workqueue, &priv->gather_stats,
-                           IPW_STATS_INTERVAL);
+        schedule_delayed_work(&priv->gather_stats, IPW_STATS_INTERVAL);
 }
 
 static void ipw_bg_gather_stats(struct work_struct *work)
@@ -4396,10 +4385,10 @@ static void ipw_handle_missed_beacon(struct ipw_priv *priv,
                         IPW_DEBUG(IPW_DL_INFO | IPW_DL_NOTIF |
                                   IPW_DL_STATE,
                                   "Aborting scan with missed beacon.\n");
-                        queue_work(priv->workqueue, &priv->abort_scan);
+                        schedule_work(&priv->abort_scan);
                 }
 
-                queue_work(priv->workqueue, &priv->disassociate);
+                schedule_work(&priv->disassociate);
                 return;
         }
 
@@ -4425,8 +4414,7 @@ static void ipw_handle_missed_beacon(struct ipw_priv *priv,
                 if (!(priv->status & STATUS_ROAMING)) {
                         priv->status |= STATUS_ROAMING;
                         if (!(priv->status & STATUS_SCANNING))
-                                queue_delayed_work(priv->workqueue,
-                                                   &priv->request_scan, 0);
+                                schedule_delayed_work(&priv->request_scan, 0);
                 }
                 return;
         }
@@ -4439,7 +4427,7 @@ static void ipw_handle_missed_beacon(struct ipw_priv *priv,
                  * channels..) */
                 IPW_DEBUG(IPW_DL_INFO | IPW_DL_NOTIF | IPW_DL_STATE,
                           "Aborting scan with missed beacon.\n");
-                queue_work(priv->workqueue, &priv->abort_scan);
+                schedule_work(&priv->abort_scan);
         }
 
         IPW_DEBUG_NOTIF("Missed beacon: %d\n", missed_count);
@@ -4462,8 +4450,8 @@ static void handle_scan_event(struct ipw_priv *priv)
         /* Only userspace-requested scan completion events go out immediately */
         if (!priv->user_requested_scan) {
                 if (!delayed_work_pending(&priv->scan_event))
-                        queue_delayed_work(priv->workqueue, &priv->scan_event,
-                                         round_jiffies_relative(msecs_to_jiffies(4000)));
+                        schedule_delayed_work(&priv->scan_event,
+                                              round_jiffies_relative(msecs_to_jiffies(4000)));
         } else {
                 union iwreq_data wrqu;
 
@@ -4516,20 +4504,17 @@ static void ipw_rx_notification(struct ipw_priv *priv,
 
                                                 IPW_DEBUG_ASSOC
                                                     ("queueing adhoc check\n");
-                                                queue_delayed_work(priv->
-                                                                   workqueue,
-                                                                   &priv->
-                                                                   adhoc_check,
-                                                                   le16_to_cpu(priv->
-                                                                   assoc_request.
-                                                                   beacon_interval));
+                                                schedule_delayed_work(
+                                                        &priv->adhoc_check,
+                                                        le16_to_cpu(priv->
+                                                        assoc_request.
+                                                        beacon_interval));
                                                 break;
                                         }
 
                                         priv->status &= ~STATUS_ASSOCIATING;
                                         priv->status |= STATUS_ASSOCIATED;
-                                        queue_work(priv->workqueue,
-                                                   &priv->system_config);
+                                        schedule_work(&priv->system_config);
 
 #ifdef CONFIG_IPW2200_QOS
 #define IPW_GET_PACKET_STYPE(x) WLAN_FC_GET_STYPE( \
@@ -4792,43 +4777,37 @@ static void ipw_rx_notification(struct ipw_priv *priv,
 #ifdef CONFIG_IPW2200_MONITOR
                         if (priv->ieee->iw_mode == IW_MODE_MONITOR) {
                                 priv->status |= STATUS_SCAN_FORCED;
-                                queue_delayed_work(priv->workqueue,
-                                                   &priv->request_scan, 0);
+                                schedule_delayed_work(&priv->request_scan, 0);
                                 break;
                         }
                         priv->status &= ~STATUS_SCAN_FORCED;
 #endif                          /* CONFIG_IPW2200_MONITOR */
 
                         /* Do queued direct scans first */
-                        if (priv->status & STATUS_DIRECT_SCAN_PENDING) {
-                                queue_delayed_work(priv->workqueue,
-                                                   &priv->request_direct_scan, 0);
-                        }
+                        if (priv->status & STATUS_DIRECT_SCAN_PENDING)
+                                schedule_delayed_work(&priv->request_direct_scan, 0);
 
                         if (!(priv->status & (STATUS_ASSOCIATED |
                                               STATUS_ASSOCIATING |
                                               STATUS_ROAMING |
                                               STATUS_DISASSOCIATING)))
-                                queue_work(priv->workqueue, &priv->associate);
+                                schedule_work(&priv->associate);
                         else if (priv->status & STATUS_ROAMING) {
                                 if (x->status == SCAN_COMPLETED_STATUS_COMPLETE)
                                         /* If a scan completed and we are in roam mode, then
                                          * the scan that completed was the one requested as a
                                          * result of entering roam... so, schedule the
                                          * roam work */
-                                        queue_work(priv->workqueue,
-                                                   &priv->roam);
+                                        schedule_work(&priv->roam);
                                 else
                                         /* Don't schedule if we aborted the scan */
                                         priv->status &= ~STATUS_ROAMING;
                         } else if (priv->status & STATUS_SCAN_PENDING)
-                                queue_delayed_work(priv->workqueue,
-                                                   &priv->request_scan, 0);
+                                schedule_delayed_work(&priv->request_scan, 0);
                         else if (priv->config & CFG_BACKGROUND_SCAN
                                  && priv->status & STATUS_ASSOCIATED)
-                                queue_delayed_work(priv->workqueue,
-                                                   &priv->request_scan,
-                                                   round_jiffies_relative(HZ));
+                                schedule_delayed_work(&priv->request_scan,
+                                                      round_jiffies_relative(HZ));
 
                         /* Send an empty event to user space.
                          * We don't send the received data on the event because
@@ -5192,7 +5171,7 @@ static void ipw_rx_queue_restock(struct ipw_priv *priv)
         /* If the pre-allocated buffer pool is dropping low, schedule to
          * refill it */
         if (rxq->free_count <= RX_LOW_WATERMARK)
-                queue_work(priv->workqueue, &priv->rx_replenish);
+                schedule_work(&priv->rx_replenish);
 
         /* If we've added more space for the firmware to place data, tell it */
         if (write != rxq->write)
@@ -6133,8 +6112,8 @@ static void ipw_adhoc_check(void *data)
                 return;
         }
 
-        queue_delayed_work(priv->workqueue, &priv->adhoc_check,
-                           le16_to_cpu(priv->assoc_request.beacon_interval));
+        schedule_delayed_work(&priv->adhoc_check,
+                              le16_to_cpu(priv->assoc_request.beacon_interval));
 }
 
 static void ipw_bg_adhoc_check(struct work_struct *work)
@@ -6523,8 +6502,7 @@ send_request:
         } else
                 priv->status &= ~STATUS_SCAN_PENDING;
 
-        queue_delayed_work(priv->workqueue, &priv->scan_check,
-                           IPW_SCAN_CHECK_WATCHDOG);
+        schedule_delayed_work(&priv->scan_check, IPW_SCAN_CHECK_WATCHDOG);
 done:
         mutex_unlock(&priv->mutex);
         return err;
@@ -6994,8 +6972,7 @@ static int ipw_qos_handle_probe_response(struct ipw_priv *priv,
                                     !memcmp(network->ssid,
                                             priv->assoc_network->ssid,
                                             network->ssid_len)) {
-                                        queue_work(priv->workqueue,
-                                                   &priv->merge_networks);
+                                        schedule_work(&priv->merge_networks);
                                 }
         }
 
@@ -7663,7 +7640,7 @@ static int ipw_associate(void *data)
         if (priv->status & STATUS_DISASSOCIATING) {
                 IPW_DEBUG_ASSOC("Not attempting association (in "
                                 "disassociating)\n ");
-                queue_work(priv->workqueue, &priv->associate);
+                schedule_work(&priv->associate);
                 return 0;
         }
 
@@ -7731,12 +7708,10 @@ static int ipw_associate(void *data)
 
                 if (!(priv->status & STATUS_SCANNING)) {
                         if (!(priv->config & CFG_SPEED_SCAN))
-                                queue_delayed_work(priv->workqueue,
-                                                   &priv->request_scan,
-                                                   SCAN_INTERVAL);
+                                schedule_delayed_work(&priv->request_scan,
+                                                      SCAN_INTERVAL);
                         else
-                                queue_delayed_work(priv->workqueue,
-                                                   &priv->request_scan, 0);
+                                schedule_delayed_work(&priv->request_scan, 0);
                 }
 
                 return 0;
@@ -8899,7 +8874,7 @@ static int ipw_wx_set_mode(struct net_device *dev,
 
         priv->ieee->iw_mode = wrqu->mode;
 
-        queue_work(priv->workqueue, &priv->adapter_restart);
+        schedule_work(&priv->adapter_restart);
         mutex_unlock(&priv->mutex);
         return err;
 }
@@ -9598,7 +9573,7 @@ static int ipw_wx_set_scan(struct net_device *dev,
 
         IPW_DEBUG_WX("Start scan\n");
 
-        queue_delayed_work(priv->workqueue, work, 0);
+        schedule_delayed_work(work, 0);
 
         return 0;
 }
@@ -9937,7 +9912,7 @@ static int ipw_wx_set_monitor(struct net_device *dev,
 #else
                         priv->net_dev->type = ARPHRD_IEEE80211;
 #endif
-                        queue_work(priv->workqueue, &priv->adapter_restart);
+                        schedule_work(&priv->adapter_restart);
                 }
 
                 ipw_set_channel(priv, parms[1]);
@@ -9947,7 +9922,7 @@ static int ipw_wx_set_monitor(struct net_device *dev,
                         return 0;
                 }
                 priv->net_dev->type = ARPHRD_ETHER;
-                queue_work(priv->workqueue, &priv->adapter_restart);
+                schedule_work(&priv->adapter_restart);
         }
         mutex_unlock(&priv->mutex);
         return 0;
@@ -9961,7 +9936,7 @@ static int ipw_wx_reset(struct net_device *dev,
 {
         struct ipw_priv *priv = libipw_priv(dev);
         IPW_DEBUG_WX("RESET\n");
-        queue_work(priv->workqueue, &priv->adapter_restart);
+        schedule_work(&priv->adapter_restart);
         return 0;
 }
 
@@ -10551,7 +10526,7 @@ static int ipw_net_set_mac_address(struct net_device *dev, void *p)
         memcpy(priv->mac_addr, addr->sa_data, ETH_ALEN);
         printk(KERN_INFO "%s: Setting MAC to %pM\n",
                priv->net_dev->name, priv->mac_addr);
-        queue_work(priv->workqueue, &priv->adapter_restart);
+        schedule_work(&priv->adapter_restart);
         mutex_unlock(&priv->mutex);
         return 0;
 }
@@ -10684,9 +10659,7 @@ static void ipw_rf_kill(void *adapter)
 
         if (rf_kill_active(priv)) {
                 IPW_DEBUG_RF_KILL("RF Kill active, rescheduling GPIO check\n");
-                if (priv->workqueue)
-                        queue_delayed_work(priv->workqueue,
-                                           &priv->rf_kill, 2 * HZ);
+                schedule_delayed_work(&priv->rf_kill, 2 * HZ);
                 goto exit_unlock;
         }
 
@@ -10697,7 +10670,7 @@ static void ipw_rf_kill(void *adapter)
                                   "device\n");
 
                 /* we can not do an adapter restart while inside an irq lock */
-                queue_work(priv->workqueue, &priv->adapter_restart);
+                schedule_work(&priv->adapter_restart);
         } else
                 IPW_DEBUG_RF_KILL("HW RF Kill deactivated.  SW RF Kill still "
                                   "enabled\n");
@@ -10735,7 +10708,7 @@ static void ipw_link_up(struct ipw_priv *priv)
         notify_wx_assoc_event(priv);
 
         if (priv->config & CFG_BACKGROUND_SCAN)
-                queue_delayed_work(priv->workqueue, &priv->request_scan, HZ);
+                schedule_delayed_work(&priv->request_scan, HZ);
 }
 
 static void ipw_bg_link_up(struct work_struct *work)
@@ -10764,7 +10737,7 @@ static void ipw_link_down(struct ipw_priv *priv)
 
         if (!(priv->status & STATUS_EXIT_PENDING)) {
                 /* Queue up another scan... */
-                queue_delayed_work(priv->workqueue, &priv->request_scan, 0);
+                schedule_delayed_work(&priv->request_scan, 0);
         } else
                 cancel_delayed_work(&priv->scan_event);
 }
@@ -10782,7 +10755,6 @@ static int __devinit ipw_setup_deferred_work(struct ipw_priv *priv)
 {
         int ret = 0;
 
-        priv->workqueue = create_workqueue(DRV_NAME);
         init_waitqueue_head(&priv->wait_command_queue);
         init_waitqueue_head(&priv->wait_state);
 
@@ -11339,8 +11311,7 @@ static int ipw_up(struct ipw_priv *priv)
                         IPW_WARNING("Radio Frequency Kill Switch is On:\n"
                                     "Kill switch must be turned off for "
                                     "wireless networking to work.\n");
-                        queue_delayed_work(priv->workqueue, &priv->rf_kill,
-                                           2 * HZ);
+                        schedule_delayed_work(&priv->rf_kill, 2 * HZ);
                         return 0;
                 }
 
@@ -11350,8 +11321,7 @@ static int ipw_up(struct ipw_priv *priv)
 
                         /* If configure to try and auto-associate, kick
                          * off a scan. */
-                        queue_delayed_work(priv->workqueue,
-                                           &priv->request_scan, 0);
+                        schedule_delayed_work(&priv->request_scan, 0);
 
                         return 0;
                 }
@@ -11817,7 +11787,7 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
         err = request_irq(pdev->irq, ipw_isr, IRQF_SHARED, DRV_NAME, priv);
         if (err) {
                 IPW_ERROR("Error allocating IRQ %d\n", pdev->irq);
-                goto out_destroy_workqueue;
+                goto out_iounmap;
         }
 
         SET_NETDEV_DEV(net_dev, &pdev->dev);
@@ -11885,9 +11855,6 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
         sysfs_remove_group(&pdev->dev.kobj, &ipw_attribute_group);
       out_release_irq:
         free_irq(pdev->irq, priv);
-      out_destroy_workqueue:
-        destroy_workqueue(priv->workqueue);
-        priv->workqueue = NULL;
       out_iounmap:
         iounmap(priv->hw_base);
       out_pci_release_regions:
@@ -11930,18 +11897,31 @@ static void __devexit ipw_pci_remove(struct pci_dev *pdev)
                 kfree(priv->cmdlog);
                 priv->cmdlog = NULL;
         }
-        /* ipw_down will ensure that there is no more pending work
-         * in the workqueue's, so we can safely remove them now. */
-        cancel_delayed_work(&priv->adhoc_check);
-        cancel_delayed_work(&priv->gather_stats);
-        cancel_delayed_work(&priv->request_scan);
-        cancel_delayed_work(&priv->request_direct_scan);
-        cancel_delayed_work(&priv->request_passive_scan);
-        cancel_delayed_work(&priv->scan_event);
-        cancel_delayed_work(&priv->rf_kill);
-        cancel_delayed_work(&priv->scan_check);
-        destroy_workqueue(priv->workqueue);
-        priv->workqueue = NULL;
+
+        /* make sure all works are inactive */
+        cancel_delayed_work_sync(&priv->adhoc_check);
+        cancel_work_sync(&priv->associate);
+        cancel_work_sync(&priv->disassociate);
+        cancel_work_sync(&priv->system_config);
+        cancel_work_sync(&priv->rx_replenish);
+        cancel_work_sync(&priv->adapter_restart);
+        cancel_delayed_work_sync(&priv->rf_kill);
+        cancel_work_sync(&priv->up);
+        cancel_work_sync(&priv->down);
+        cancel_delayed_work_sync(&priv->request_scan);
+        cancel_delayed_work_sync(&priv->request_direct_scan);
+        cancel_delayed_work_sync(&priv->request_passive_scan);
+        cancel_delayed_work_sync(&priv->scan_event);
+        cancel_delayed_work_sync(&priv->gather_stats);
+        cancel_work_sync(&priv->abort_scan);
+        cancel_work_sync(&priv->roam);
+        cancel_delayed_work_sync(&priv->scan_check);
+        cancel_work_sync(&priv->link_up);
+        cancel_work_sync(&priv->link_down);
+        cancel_delayed_work_sync(&priv->led_link_on);
+        cancel_delayed_work_sync(&priv->led_link_off);
+        cancel_delayed_work_sync(&priv->led_act_off);
+        cancel_work_sync(&priv->merge_networks);
 
         /* Free MAC hash list for ADHOC */
         for (i = 0; i < IPW_IBSS_MAC_HASH_SIZE; i++) {
@@ -12029,7 +12009,7 @@ static int ipw_pci_resume(struct pci_dev *pdev)
         priv->suspend_time = get_seconds() - priv->suspend_at;
 
         /* Bring the device back up */
-        queue_work(priv->workqueue, &priv->up);
+        schedule_work(&priv->up);
 
         return 0;
 }
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.h b/drivers/net/wireless/ipw2x00/ipw2200.h
index d9e1d9bad58..91795b5a93c 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.h
+++ b/drivers/net/wireless/ipw2x00/ipw2200.h
@@ -1299,8 +1299,6 @@ struct ipw_priv {
         u8 direct_scan_ssid[IW_ESSID_MAX_SIZE];
         u8 direct_scan_ssid_len;
 
-        struct workqueue_struct *workqueue;
-
         struct delayed_work adhoc_check;
         struct work_struct associate;
         struct work_struct disassociate;
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945.c b/drivers/net/wireless/iwlegacy/iwl-3945.c
index 8359594839e..d096dc28204 100644
--- a/drivers/net/wireless/iwlegacy/iwl-3945.c
+++ b/drivers/net/wireless/iwlegacy/iwl-3945.c
@@ -897,13 +897,11 @@ static void iwl3945_nic_config(struct iwl_priv *priv)
 {
         struct iwl3945_eeprom *eeprom = (struct iwl3945_eeprom *)priv->eeprom;
         unsigned long flags;
-        u8 rev_id = 0;
+        u8 rev_id = priv->pci_dev->revision;
 
         spin_lock_irqsave(&priv->lock, flags);
 
         /* Determine HW type */
-        pci_read_config_byte(priv->pci_dev, PCI_REVISION_ID, &rev_id);
-
         IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", rev_id);
 
         if (rev_id & PCI_CFG_REV_ID_BIT_RTP)
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index 9631d8fa802..2601b552c6f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -49,7 +49,7 @@
 #include "iwl-agn-debugfs.h"
 
 /* Highest firmware API version supported */
-#define IWL1000_UCODE_API_MAX 3
+#define IWL1000_UCODE_API_MAX 5
 #define IWL100_UCODE_API_MAX 5
 
 /* Lowest firmware API version supported */
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 4064490e3b9..8cab3571047 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -51,7 +51,7 @@
 #include "iwl-agn-debugfs.h"
 
 /* Highest firmware API version supported */
-#define IWL5000_UCODE_API_MAX 2
+#define IWL5000_UCODE_API_MAX 5
 #define IWL5150_UCODE_API_MAX 2
 
 /* Lowest firmware API version supported */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 8163a0efdc8..3a02bea4632 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -2264,7 +2264,7 @@ signed long iwlagn_wait_notification(struct iwl_priv *priv,
         int ret;
 
         ret = wait_event_timeout(priv->_agn.notif_waitq,
-                                 &wait_entry->triggered,
+                                 wait_entry->triggered,
                                  timeout);
 
         spin_lock_bh(&priv->_agn.notif_wait_lock);
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 39a05e32c34..28ac0d44555 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2343,7 +2343,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv);
 static void __iwl_down(struct iwl_priv *priv)
 {
         unsigned long flags;
-        int exit_pending = test_bit(STATUS_EXIT_PENDING, &priv->status);
+        int exit_pending;
 
         IWL_DEBUG_INFO(priv, DRV_NAME " is going down\n");
 
@@ -2815,14 +2815,17 @@ static int iwl_mac_offchannel_tx_cancel_wait(struct ieee80211_hw *hw)
 
         mutex_lock(&priv->mutex);
 
-        if (!priv->_agn.offchan_tx_skb)
-                return -EINVAL;
+        if (!priv->_agn.offchan_tx_skb) {
+                ret = -EINVAL;
+                goto unlock;
+        }
 
         priv->_agn.offchan_tx_skb = NULL;
 
         ret = iwl_scan_cancel_timeout(priv, 200);
         if (ret)
                 ret = -EIO;
+unlock:
         mutex_unlock(&priv->mutex);
 
         return ret;
@@ -3714,7 +3717,7 @@ static void iwl_hw_detect(struct iwl_priv *priv)
 {
         priv->hw_rev = _iwl_read32(priv, CSR_HW_REV);
         priv->hw_wa_rev = _iwl_read32(priv, CSR_HW_REV_WA_REG);
-        pci_read_config_byte(priv->pci_dev, PCI_REVISION_ID, &priv->rev_id);
+        priv->rev_id = priv->pci_dev->revision;
         IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", priv->rev_id);
 }
 
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index f6c2cd665f4..078ef43d957 100644
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -57,6 +57,7 @@ struct if_spi_card {
         /* Handles all SPI communication (except for FW load) */
         struct workqueue_struct         *workqueue;
         struct work_struct              packet_work;
+        struct work_struct              resume_work;
 
         u8                              cmd_buffer[IF_SPI_CMD_BUF_SIZE];
 
@@ -68,6 +69,9 @@ struct if_spi_card {
 
         /* Protects cmd_packet_list and data_packet_list */
         spinlock_t                      buffer_lock;
+
+        /* True is card suspended */
+        u8                              suspended;
 };
 
 static void free_if_spi_card(struct if_spi_card *card)
@@ -1057,6 +1061,28 @@ out:
         return err;
 }
 
+static void if_spi_resume_worker(struct work_struct *work)
+{
+        struct if_spi_card *card;
+
+        card = container_of(work, struct if_spi_card, resume_work);
+
+        if (card->suspended) {
+                if (card->pdata->setup)
+                        card->pdata->setup(card->spi);
+
+                /* Init card ... */
+                if_spi_init_card(card);
+
+                enable_irq(card->spi->irq);
+
+                /* And resume it ... */
+                lbs_resume(card->priv);
+
+                card->suspended = 0;
+        }
+}
+
 static int __devinit if_spi_probe(struct spi_device *spi)
 {
         struct if_spi_card *card;
@@ -1107,6 +1133,7 @@ static int __devinit if_spi_probe(struct spi_device *spi)
                 goto free_card;
         }
         card->priv = priv;
+        priv->setup_fw_on_resume = 1;
         priv->card = card;
         priv->hw_host_to_card = if_spi_host_to_card;
         priv->enter_deep_sleep = NULL;
@@ -1117,6 +1144,7 @@ static int __devinit if_spi_probe(struct spi_device *spi)
         /* Initialize interrupt handling stuff. */
         card->workqueue = create_workqueue("libertas_spi");
         INIT_WORK(&card->packet_work, if_spi_host_to_card_worker);
+        INIT_WORK(&card->resume_work, if_spi_resume_worker);
 
         err = request_irq(spi->irq, if_spi_host_interrupt,
                         IRQF_TRIGGER_FALLING, "libertas_spi", card);
@@ -1161,6 +1189,8 @@ static int __devexit libertas_spi_remove(struct spi_device *spi)
         lbs_deb_spi("libertas_spi_remove\n");
         lbs_deb_enter(LBS_DEB_SPI);
 
+        cancel_work_sync(&card->resume_work);
+
         lbs_stop_card(priv);
         lbs_remove_card(priv); /* will call free_netdev */
 
@@ -1174,6 +1204,40 @@ static int __devexit libertas_spi_remove(struct spi_device *spi)
         return 0;
 }
 
+static int if_spi_suspend(struct device *dev)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        struct if_spi_card *card = spi_get_drvdata(spi);
+
+        if (!card->suspended) {
+                lbs_suspend(card->priv);
+                flush_workqueue(card->workqueue);
+                disable_irq(spi->irq);
+
+                if (card->pdata->teardown)
+                        card->pdata->teardown(spi);
+                card->suspended = 1;
+        }
+
+        return 0;
+}
+
+static int if_spi_resume(struct device *dev)
+{
+        struct spi_device *spi = to_spi_device(dev);
+        struct if_spi_card *card = spi_get_drvdata(spi);
+
+        /* Schedule delayed work */
+        schedule_work(&card->resume_work);
+
+        return 0;
+}
+
+static const struct dev_pm_ops if_spi_pm_ops = {
+        .suspend        = if_spi_suspend,
+        .resume         = if_spi_resume,
+};
+
 static struct spi_driver libertas_spi_driver = {
         .probe  = if_spi_probe,
         .remove = __devexit_p(libertas_spi_remove),
@@ -1181,6 +1245,7 @@ static struct spi_driver libertas_spi_driver = {
                 .name   = "libertas_spi",
                 .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
+                .pm     = &if_spi_pm_ops,
         },
 };
 
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c
new file mode 100644
index 00000000000..0e04a21be0a
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/11n.c
@@ -0,0 +1,922 @@
+/*
+ * Marvell Wireless LAN device driver: 802.11n
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+#include "11n.h"
+
+/*
+ * Fills HT capability information field, AMPDU Parameters field, HT extended
+ * capability field, and supported MCS set fields.
+ *
+ * Only the following HT capability information fields are used, all other
+ * fields are always turned off.
+ *
+ *  Bit 1 : Supported channel width (0: 20MHz, 1: Both 20 and 40 MHz)
+ *  Bit 4 : Greenfield support (0: Not supported, 1: Supported)
+ *  Bit 5 : Short GI for 20 MHz support (0: Not supported, 1: Supported)
+ *  Bit 6 : Short GI for 40 MHz support (0: Not supported, 1: Supported)
+ *  Bit 7 : Tx STBC (0: Not supported, 1: Supported)
+ *  Bit 8-9 : Rx STBC (0: Not supported, X: Support for up to X spatial streams)
+ *  Bit 10 : Delayed BA support (0: Not supported, 1: Supported)
+ *  Bit 11 : Maximum AMSDU length (0: 3839 octets, 1: 7935 octets)
+ *  Bit 14 : 40-Mhz intolerant support (0: Not supported, 1: Supported)
+ *
+ *  In addition, the following AMPDU Parameters are set -
+ *      - Maximum AMPDU length exponent (set to 3)
+ *      - Minimum AMPDU start spacing (set to 0 - No restrictions)
+ *
+ *  MCS is set for 1x1, with MSC32 for infra mode or ad-hoc mode with 40 MHz
+ *  support.
+ *
+ *  RD responder bit to set to clear in the extended capability header.
+ */
+void
+mwifiex_fill_cap_info(struct mwifiex_private *priv,
+                      struct mwifiex_ie_types_htcap *ht_cap)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        u8 *mcs;
+        int rx_mcs_supp;
+        uint16_t ht_cap_info = le16_to_cpu(ht_cap->ht_cap.cap_info);
+        uint16_t ht_ext_cap = le16_to_cpu(ht_cap->ht_cap.extended_ht_cap_info);
+
+        if (ISSUPP_CHANWIDTH40(adapter->hw_dot_11n_dev_cap) &&
+            ISSUPP_CHANWIDTH40(adapter->usr_dot_11n_dev_cap))
+                SETHT_SUPPCHANWIDTH(ht_cap_info);
+        else
+                RESETHT_SUPPCHANWIDTH(ht_cap_info);
+
+        if (ISSUPP_GREENFIELD(adapter->hw_dot_11n_dev_cap) &&
+            ISSUPP_GREENFIELD(adapter->usr_dot_11n_dev_cap))
+                SETHT_GREENFIELD(ht_cap_info);
+        else
+                RESETHT_GREENFIELD(ht_cap_info);
+
+        if (ISSUPP_SHORTGI20(adapter->hw_dot_11n_dev_cap) &&
+            ISSUPP_SHORTGI20(adapter->usr_dot_11n_dev_cap))
+                SETHT_SHORTGI20(ht_cap_info);
+        else
+                RESETHT_SHORTGI20(ht_cap_info);
+
+        if (ISSUPP_SHORTGI40(adapter->hw_dot_11n_dev_cap) &&
+            ISSUPP_SHORTGI40(adapter->usr_dot_11n_dev_cap))
+                SETHT_SHORTGI40(ht_cap_info);
+        else
+                RESETHT_SHORTGI40(ht_cap_info);
+
+        /* No user config for RX STBC yet */
+        if (ISSUPP_RXSTBC(adapter->hw_dot_11n_dev_cap)
+            && ISSUPP_RXSTBC(adapter->usr_dot_11n_dev_cap))
+                SETHT_RXSTBC(ht_cap_info, 1);
+        else
+                RESETHT_RXSTBC(ht_cap_info);
+
+        /* No user config for TX STBC yet */
+        if (ISSUPP_TXSTBC(adapter->hw_dot_11n_dev_cap))
+                SETHT_TXSTBC(ht_cap_info);
+        else
+                RESETHT_TXSTBC(ht_cap_info);
+
+        /* No user config for Delayed BACK yet */
+        if (GET_DELAYEDBACK(adapter->hw_dot_11n_dev_cap))
+                SETHT_DELAYEDBACK(ht_cap_info);
+        else
+                RESETHT_DELAYEDBACK(ht_cap_info);
+
+        if (ISENABLED_40MHZ_INTOLARENT(adapter->usr_dot_11n_dev_cap))
+                SETHT_40MHZ_INTOLARANT(ht_cap_info);
+        else
+                RESETHT_40MHZ_INTOLARANT(ht_cap_info);
+
+        SETAMPDU_SIZE(ht_cap->ht_cap.ampdu_params_info, AMPDU_FACTOR_64K);
+        SETAMPDU_SPACING(ht_cap->ht_cap.ampdu_params_info, 0);
+
+        /* Need change to support 8k AMSDU receive */
+        RESETHT_MAXAMSDU(ht_cap_info);
+
+        rx_mcs_supp = GET_RXMCSSUPP(adapter->hw_dev_mcs_support);
+
+        mcs = (u8 *)&ht_cap->ht_cap.mcs;
+
+        /* Set MCS for 1x1 */
+        memset(mcs, 0xff, rx_mcs_supp);
+
+        /* Clear all the other values */
+        memset(&mcs[rx_mcs_supp], 0,
+                        sizeof(struct ieee80211_mcs_info) - rx_mcs_supp);
+
+        if (priv->bss_mode == MWIFIEX_BSS_MODE_INFRA ||
+            (ISSUPP_CHANWIDTH40(adapter->hw_dot_11n_dev_cap) &&
+             ISSUPP_CHANWIDTH40(adapter->usr_dot_11n_dev_cap)))
+                /* Set MCS32 for infra mode or ad-hoc mode with 40MHz support */
+                SETHT_MCS32(ht_cap->ht_cap.mcs.rx_mask);
+
+        /* Clear RD responder bit */
+        RESETHT_EXTCAP_RDG(ht_ext_cap);
+
+        ht_cap->ht_cap.cap_info = cpu_to_le16(ht_cap_info);
+        ht_cap->ht_cap.extended_ht_cap_info = cpu_to_le16(ht_ext_cap);
+}
+
+/*
+ * Shows HT capability information fields.
+ *
+ * The following HT capability information fields are supported.
+ *      - Maximum AMSDU length (3839 bytes or 7935 bytes)
+ *      - Beam forming support
+ *      - Greenfield preamble support
+ *      - AMPDU support
+ *      - MIMO Power Save support
+ *      - Rx STBC support
+ *      - Tx STBC support
+ *      - Short GI for 20 MHz support
+ *      - Short GI for 40 MHz support
+ *      - LDPC coded packets receive support
+ *      - Number of delayed BA streams
+ *      - Number of immediate BA streams
+ *      - 10 MHz channel width support
+ *      - 20 MHz channel width support
+ *      - 40 MHz channel width support
+ *      - Presence of Tx antenna A/B/C/D
+ *      - Presence of Rx antenna A/B/C/D
+ */
+void
+mwifiex_show_dot_11n_dev_cap(struct mwifiex_adapter *adapter, u32 cap)
+{
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: Max MSDU len = %s octets\n",
+               (ISSUPP_MAXAMSDU(cap) ? "7935" : "3839"));
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: Beam forming %s\n",
+               (ISSUPP_BEAMFORMING(cap) ? "supported" : "not supported"));
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: Greenfield preamble %s\n",
+               (ISSUPP_GREENFIELD(cap) ? "supported" : "not supported"));
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: AMPDU %s\n",
+               (ISSUPP_AMPDU(cap) ? "supported" : "not supported"));
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: MIMO Power Save %s\n",
+               (ISSUPP_MIMOPS(cap) ? "supported" : "not supported"));
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: Rx STBC %s\n",
+               (ISSUPP_RXSTBC(cap) ? "supported" : "not supported"));
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: Tx STBC %s\n",
+               (ISSUPP_TXSTBC(cap) ? "supported" : "not supported"));
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: Short GI for 40 Mhz %s\n",
+               (ISSUPP_SHORTGI40(cap) ? "supported" : "not supported"));
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: Short GI for 20 Mhz %s\n",
+               (ISSUPP_SHORTGI20(cap) ? "supported" : "not supported"));
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: LDPC coded packet receive %s\n",
+               (ISSUPP_RXLDPC(cap) ? "supported" : "not supported"));
+        dev_dbg(adapter->dev,
+                "info: GET_HW_SPEC: Number of Delayed Block Ack streams = %d\n",
+               GET_DELAYEDBACK(cap));
+        dev_dbg(adapter->dev,
+                "info: GET_HW_SPEC: Number of Immediate Block Ack streams = %d\n",
+               GET_IMMEDIATEBACK(cap));
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: 40 Mhz channel width %s\n",
+               (ISSUPP_CHANWIDTH40(cap) ? "supported" : "not supported"));
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: 20 Mhz channel width %s\n",
+               (ISSUPP_CHANWIDTH20(cap) ? "supported" : "not supported"));
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: 10 Mhz channel width %s\n",
+               (ISSUPP_CHANWIDTH10(cap) ? "supported" : "not supported"));
+
+        if (ISSUPP_RXANTENNAA(cap))
+                dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Rx antennea A\n");
+
+        if (ISSUPP_RXANTENNAB(cap))
+                dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Rx antennea B\n");
+
+        if (ISSUPP_RXANTENNAC(cap))
+                dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Rx antennea C\n");
+
+        if (ISSUPP_RXANTENNAD(cap))
+                dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Rx antennea D\n");
+
+        if (ISSUPP_TXANTENNAA(cap))
+                dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Tx antennea A\n");
+
+        if (ISSUPP_TXANTENNAB(cap))
+                dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Tx antennea B\n");
+
+        if (ISSUPP_TXANTENNAC(cap))
+                dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Tx antennea C\n");
+
+        if (ISSUPP_TXANTENNAD(cap))
+                dev_dbg(adapter->dev, "info: GET_HW_SPEC: Prescence of Tx antennea D\n");
+
+        return;
+}
+
+/*
+ * Shows HT MCS support field.
+ */
+void
+mwifiex_show_dev_mcs_support(struct mwifiex_adapter *adapter, u8 support)
+{
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: MCSs for %dx%d MIMO\n",
+               GET_RXMCSSUPP(support), GET_TXMCSSUPP(support));
+        return;
+}
+
+/*
+ * This function returns the pointer to an entry in BA Stream
+ * table which matches the requested BA status.
+ */
+static struct mwifiex_tx_ba_stream_tbl *
+mwifiex_11n_get_tx_ba_stream_status(struct mwifiex_private *priv,
+                                  enum mwifiex_ba_status ba_status)
+{
+        struct mwifiex_tx_ba_stream_tbl *tx_ba_tsr_tbl;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->tx_ba_stream_tbl_lock, flags);
+        list_for_each_entry(tx_ba_tsr_tbl, &priv->tx_ba_stream_tbl_ptr, list) {
+                if (tx_ba_tsr_tbl->ba_status == ba_status) {
+                        spin_unlock_irqrestore(&priv->tx_ba_stream_tbl_lock,
+                                               flags);
+                        return tx_ba_tsr_tbl;
+                }
+        }
+        spin_unlock_irqrestore(&priv->tx_ba_stream_tbl_lock, flags);
+        return NULL;
+}
+
+/*
+ * This function handles the command response of delete a block
+ * ack request.
+ *
+ * The function checks the response success status and takes action
+ * accordingly (send an add BA request in case of success, or recreate
+ * the deleted stream in case of failure, if the add BA was also
+ * initiated by us).
+ */
+int mwifiex_ret_11n_delba(struct mwifiex_private *priv,
+                          struct host_cmd_ds_command *resp)
+{
+        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;
+        uint16_t del_ba_param_set = le16_to_cpu(del_ba->del_ba_param_set);
+
+        tid = del_ba_param_set >> DELBA_TID_POS;
+        if (del_ba->del_result == BA_RESULT_SUCCESS) {
+                mwifiex_11n_delete_ba_stream_tbl(priv, tid,
+                                del_ba->peer_mac_addr, TYPE_DELBA_SENT,
+                                INITIATOR_BIT(del_ba_param_set));
+
+                tx_ba_tbl = mwifiex_11n_get_tx_ba_stream_status(priv,
+                                                BA_STREAM_SETUP_INPROGRESS);
+                if (tx_ba_tbl)
+                        mwifiex_send_addba(priv, tx_ba_tbl->tid,
+                                           tx_ba_tbl->ra);
+        } else { /*
+                  * In case of failure, recreate the deleted stream in case
+                  * we initiated the ADDBA
+                  */
+                if (INITIATOR_BIT(del_ba_param_set)) {
+                        mwifiex_11n_create_tx_ba_stream_tbl(priv,
+                                        del_ba->peer_mac_addr, tid,
+                                        BA_STREAM_SETUP_INPROGRESS);
+
+                        tx_ba_tbl = mwifiex_11n_get_tx_ba_stream_status(priv,
+                                        BA_STREAM_SETUP_INPROGRESS);
+                        if (tx_ba_tbl)
+                                mwifiex_11n_delete_ba_stream_tbl(priv,
+                                                tx_ba_tbl->tid, tx_ba_tbl->ra,
+                                                TYPE_DELBA_SENT, true);
+                }
+        }
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of add a block
+ * ack request.
+ *
+ * Handling includes changing the header fields to CPU formats, checking
+ * the response success status and taking actions accordingly (delete the
+ * BA stream table in case of failure).
+ */
+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 mwifiex_tx_ba_stream_tbl *tx_ba_tbl;
+
+        add_ba_rsp->ssn = cpu_to_le16((le16_to_cpu(add_ba_rsp->ssn))
+                        & SSN_MASK);
+
+        tid = (le16_to_cpu(add_ba_rsp->block_ack_param_set)
+                & IEEE80211_ADDBA_PARAM_TID_MASK)
+                >> BLOCKACKPARAM_TID_POS;
+        if (le16_to_cpu(add_ba_rsp->status_code) == BA_RESULT_SUCCESS) {
+                tx_ba_tbl = mwifiex_11n_get_tx_ba_stream_tbl(priv, tid,
+                                                add_ba_rsp->peer_mac_addr);
+                if (tx_ba_tbl) {
+                        dev_dbg(priv->adapter->dev, "info: BA stream complete\n");
+                        tx_ba_tbl->ba_status = BA_STREAM_SETUP_COMPLETE;
+                } else {
+                        dev_err(priv->adapter->dev, "BA stream not created\n");
+                }
+        } else {
+                mwifiex_11n_delete_ba_stream_tbl(priv, tid,
+                                                add_ba_rsp->peer_mac_addr,
+                                                TYPE_DELBA_SENT, true);
+                if (add_ba_rsp->add_rsp_result != BA_RESULT_TIMEOUT)
+                        priv->aggr_prio_tbl[tid].ampdu_ap =
+                                BA_STREAM_NOT_ALLOWED;
+        }
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of 11n configuration request.
+ *
+ * Handling includes changing the header fields into CPU format.
+ */
+int mwifiex_ret_11n_cfg(struct mwifiex_private *priv,
+                        struct host_cmd_ds_command *resp,
+                        void *data_buf)
+{
+        struct mwifiex_ds_11n_tx_cfg *tx_cfg = NULL;
+        struct host_cmd_ds_11n_cfg *htcfg = &resp->params.htcfg;
+
+        if (data_buf) {
+                tx_cfg = (struct mwifiex_ds_11n_tx_cfg *) data_buf;
+                tx_cfg->tx_htcap = le16_to_cpu(htcfg->ht_tx_cap);
+                tx_cfg->tx_htinfo = le16_to_cpu(htcfg->ht_tx_info);
+        }
+        return 0;
+}
+
+/*
+ * This function prepares command of reconfigure Tx buffer.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting Tx buffer size (for SET only)
+ *      - Ensuring correct endian-ness
+ */
+int mwifiex_cmd_recfg_tx_buf(struct mwifiex_private *priv,
+                             struct host_cmd_ds_command *cmd, int cmd_action,
+                             void *data_buf)
+{
+        struct host_cmd_ds_txbuf_cfg *tx_buf = &cmd->params.tx_buf;
+        u16 action = (u16) cmd_action;
+        u16 buf_size = *((u16 *) data_buf);
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_RECONFIGURE_TX_BUFF);
+        cmd->size =
+                cpu_to_le16(sizeof(struct host_cmd_ds_txbuf_cfg) + S_DS_GEN);
+        tx_buf->action = cpu_to_le16(action);
+        switch (action) {
+        case HostCmd_ACT_GEN_SET:
+                dev_dbg(priv->adapter->dev, "cmd: set tx_buf=%d\n", buf_size);
+                tx_buf->buff_size = cpu_to_le16(buf_size);
+                break;
+        case HostCmd_ACT_GEN_GET:
+        default:
+                tx_buf->buff_size = 0;
+                break;
+        }
+        return 0;
+}
+
+/*
+ * This function prepares command of AMSDU aggregation control.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting AMSDU control parameters (for SET only)
+ *      - Ensuring correct endian-ness
+ */
+int mwifiex_cmd_amsdu_aggr_ctrl(struct mwifiex_private *priv,
+                                struct host_cmd_ds_command *cmd,
+                                int cmd_action, void *data_buf)
+{
+        struct host_cmd_ds_amsdu_aggr_ctrl *amsdu_ctrl =
+                &cmd->params.amsdu_aggr_ctrl;
+        u16 action = (u16) cmd_action;
+        struct mwifiex_ds_11n_amsdu_aggr_ctrl *aa_ctrl =
+                (struct mwifiex_ds_11n_amsdu_aggr_ctrl *) data_buf;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_AMSDU_AGGR_CTRL);
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_amsdu_aggr_ctrl)
+                                + S_DS_GEN);
+        amsdu_ctrl->action = cpu_to_le16(action);
+        switch (action) {
+        case HostCmd_ACT_GEN_SET:
+                amsdu_ctrl->enable = cpu_to_le16(aa_ctrl->enable);
+                amsdu_ctrl->curr_buf_size = 0;
+                break;
+        case HostCmd_ACT_GEN_GET:
+        default:
+                amsdu_ctrl->curr_buf_size = 0;
+                break;
+        }
+        return 0;
+}
+
+/*
+ * This function handles the command response of AMSDU aggregation
+ * control request.
+ *
+ * Handling includes changing the header fields into CPU format.
+ */
+int mwifiex_ret_amsdu_aggr_ctrl(struct mwifiex_private *priv,
+                                struct host_cmd_ds_command *resp,
+                                void *data_buf)
+{
+        struct mwifiex_ds_11n_amsdu_aggr_ctrl *amsdu_aggr_ctrl = NULL;
+        struct host_cmd_ds_amsdu_aggr_ctrl *amsdu_ctrl =
+                &resp->params.amsdu_aggr_ctrl;
+
+        if (data_buf) {
+                amsdu_aggr_ctrl =
+                        (struct mwifiex_ds_11n_amsdu_aggr_ctrl *) data_buf;
+                amsdu_aggr_ctrl->enable = le16_to_cpu(amsdu_ctrl->enable);
+                amsdu_aggr_ctrl->curr_buf_size =
+                        le16_to_cpu(amsdu_ctrl->curr_buf_size);
+        }
+        return 0;
+}
+
+/*
+ * This function prepares 11n configuration command.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting HT Tx capability and HT Tx information fields
+ *      - Ensuring correct endian-ness
+ */
+int mwifiex_cmd_11n_cfg(struct mwifiex_private *priv,
+                        struct host_cmd_ds_command *cmd,
+                        u16 cmd_action, void *data_buf)
+{
+        struct host_cmd_ds_11n_cfg *htcfg = &cmd->params.htcfg;
+        struct mwifiex_ds_11n_tx_cfg *txcfg =
+                (struct mwifiex_ds_11n_tx_cfg *) data_buf;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_11N_CFG);
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_11n_cfg) + S_DS_GEN);
+        htcfg->action = cpu_to_le16(cmd_action);
+        htcfg->ht_tx_cap = cpu_to_le16(txcfg->tx_htcap);
+        htcfg->ht_tx_info = cpu_to_le16(txcfg->tx_htinfo);
+        return 0;
+}
+
+/*
+ * This function appends an 11n TLV to a buffer.
+ *
+ * Buffer allocation is responsibility of the calling
+ * function. No size validation is made here.
+ *
+ * The function fills up the following sections, if applicable -
+ *      - HT capability IE
+ *      - HT information IE (with channel list)
+ *      - 20/40 BSS Coexistence IE
+ *      - HT Extended Capabilities IE
+ */
+int
+mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
+                           struct mwifiex_bssdescriptor *bss_desc,
+                           u8 **buffer)
+{
+        struct mwifiex_ie_types_htcap *ht_cap;
+        struct mwifiex_ie_types_htinfo *ht_info;
+        struct mwifiex_ie_types_chan_list_param_set *chan_list;
+        struct mwifiex_ie_types_2040bssco *bss_co_2040;
+        struct mwifiex_ie_types_extcap *ext_cap;
+        int ret_len = 0;
+
+        if (!buffer || !*buffer)
+                return ret_len;
+
+        if (bss_desc->bcn_ht_cap) {
+                ht_cap = (struct mwifiex_ie_types_htcap *) *buffer;
+                memset(ht_cap, 0, sizeof(struct mwifiex_ie_types_htcap));
+                ht_cap->header.type = cpu_to_le16(WLAN_EID_HT_CAPABILITY);
+                ht_cap->header.len =
+                                cpu_to_le16(sizeof(struct ieee80211_ht_cap));
+                memcpy((u8 *) ht_cap + sizeof(struct mwifiex_ie_types_header),
+                       (u8 *) bss_desc->bcn_ht_cap +
+                       sizeof(struct ieee_types_header),
+                       le16_to_cpu(ht_cap->header.len));
+
+                mwifiex_fill_cap_info(priv, ht_cap);
+
+                *buffer += sizeof(struct mwifiex_ie_types_htcap);
+                ret_len += sizeof(struct mwifiex_ie_types_htcap);
+        }
+
+        if (bss_desc->bcn_ht_info) {
+                if (priv->bss_mode == MWIFIEX_BSS_MODE_IBSS) {
+                        ht_info = (struct mwifiex_ie_types_htinfo *) *buffer;
+                        memset(ht_info, 0,
+                               sizeof(struct mwifiex_ie_types_htinfo));
+                        ht_info->header.type =
+                                        cpu_to_le16(WLAN_EID_HT_INFORMATION);
+                        ht_info->header.len =
+                                cpu_to_le16(sizeof(struct ieee80211_ht_info));
+
+                        memcpy((u8 *) ht_info +
+                               sizeof(struct mwifiex_ie_types_header),
+                               (u8 *) bss_desc->bcn_ht_info +
+                               sizeof(struct ieee_types_header),
+                               le16_to_cpu(ht_info->header.len));
+
+                        if (!ISSUPP_CHANWIDTH40
+                            (priv->adapter->hw_dot_11n_dev_cap)
+                            || !ISSUPP_CHANWIDTH40(priv->adapter->
+                                                   usr_dot_11n_dev_cap))
+                                RESET_CHANWIDTH40(ht_info->ht_info.ht_param);
+
+                        *buffer += sizeof(struct mwifiex_ie_types_htinfo);
+                        ret_len += sizeof(struct mwifiex_ie_types_htinfo);
+                }
+
+                chan_list =
+                        (struct mwifiex_ie_types_chan_list_param_set *) *buffer;
+                memset(chan_list, 0,
+                       sizeof(struct mwifiex_ie_types_chan_list_param_set));
+                chan_list->header.type = cpu_to_le16(TLV_TYPE_CHANLIST);
+                chan_list->header.len = cpu_to_le16(
+                        sizeof(struct mwifiex_ie_types_chan_list_param_set) -
+                        sizeof(struct mwifiex_ie_types_header));
+                chan_list->chan_scan_param[0].chan_number =
+                        bss_desc->bcn_ht_info->control_chan;
+                chan_list->chan_scan_param[0].radio_type =
+                        mwifiex_band_to_radio_type((u8) bss_desc->bss_band);
+
+                if ((ISSUPP_CHANWIDTH40(priv->adapter->hw_dot_11n_dev_cap) &&
+                     ISSUPP_CHANWIDTH40(priv->adapter->usr_dot_11n_dev_cap))
+                    && ISALLOWED_CHANWIDTH40(bss_desc->bcn_ht_info->ht_param))
+                        SET_SECONDARYCHAN(chan_list->chan_scan_param[0].
+                                          radio_type,
+                                          GET_SECONDARYCHAN(bss_desc->
+                                          bcn_ht_info->ht_param));
+
+                *buffer += sizeof(struct mwifiex_ie_types_chan_list_param_set);
+                ret_len += sizeof(struct mwifiex_ie_types_chan_list_param_set);
+        }
+
+        if (bss_desc->bcn_bss_co_2040) {
+                bss_co_2040 = (struct mwifiex_ie_types_2040bssco *) *buffer;
+                memset(bss_co_2040, 0,
+                       sizeof(struct mwifiex_ie_types_2040bssco));
+                bss_co_2040->header.type = cpu_to_le16(WLAN_EID_BSS_COEX_2040);
+                bss_co_2040->header.len =
+                       cpu_to_le16(sizeof(bss_co_2040->bss_co_2040));
+
+                memcpy((u8 *) bss_co_2040 +
+                       sizeof(struct mwifiex_ie_types_header),
+                       (u8 *) bss_desc->bcn_bss_co_2040 +
+                       sizeof(struct ieee_types_header),
+                       le16_to_cpu(bss_co_2040->header.len));
+
+                *buffer += sizeof(struct mwifiex_ie_types_2040bssco);
+                ret_len += sizeof(struct mwifiex_ie_types_2040bssco);
+        }
+
+        if (bss_desc->bcn_ext_cap) {
+                ext_cap = (struct mwifiex_ie_types_extcap *) *buffer;
+                memset(ext_cap, 0, sizeof(struct mwifiex_ie_types_extcap));
+                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),
+                       le16_to_cpu(ext_cap->header.len));
+
+                *buffer += sizeof(struct mwifiex_ie_types_extcap);
+                ret_len += sizeof(struct mwifiex_ie_types_extcap);
+        }
+
+        return ret_len;
+}
+
+/*
+ * This function reconfigures the Tx buffer size in firmware.
+ *
+ * This function prepares a firmware command and issues it, if
+ * the current Tx buffer size is different from the one requested.
+ * Maximum configurable Tx buffer size is limited by the HT capability
+ * field value.
+ */
+void
+mwifiex_cfg_tx_buf(struct mwifiex_private *priv,
+                   struct mwifiex_bssdescriptor *bss_desc)
+{
+        u16 max_amsdu = MWIFIEX_TX_DATA_BUF_SIZE_2K;
+        u16 tx_buf = 0;
+        u16 curr_tx_buf_size = 0;
+
+        if (bss_desc->bcn_ht_cap) {
+                if (GETHT_MAXAMSDU(le16_to_cpu(bss_desc->bcn_ht_cap->cap_info)))
+                        max_amsdu = MWIFIEX_TX_DATA_BUF_SIZE_8K;
+                else
+                        max_amsdu = MWIFIEX_TX_DATA_BUF_SIZE_4K;
+        }
+
+        tx_buf = min(priv->adapter->max_tx_buf_size, max_amsdu);
+
+        dev_dbg(priv->adapter->dev, "info: max_amsdu=%d, max_tx_buf=%d\n",
+                        max_amsdu, priv->adapter->max_tx_buf_size);
+
+        if (priv->adapter->curr_tx_buf_size <= MWIFIEX_TX_DATA_BUF_SIZE_2K)
+                curr_tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;
+        else if (priv->adapter->curr_tx_buf_size <= MWIFIEX_TX_DATA_BUF_SIZE_4K)
+                curr_tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K;
+        else if (priv->adapter->curr_tx_buf_size <= MWIFIEX_TX_DATA_BUF_SIZE_8K)
+                curr_tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_8K;
+        if (curr_tx_buf_size != tx_buf)
+                mwifiex_prepare_cmd(priv, HostCmd_CMD_RECONFIGURE_TX_BUFF,
+                        HostCmd_ACT_GEN_SET, 0,
+                        NULL, &tx_buf);
+
+        return;
+}
+
+/*
+ * This function checks if the given pointer is valid entry of
+ * Tx BA Stream table.
+ */
+static int mwifiex_is_tx_ba_stream_ptr_valid(struct mwifiex_private *priv,
+                                struct mwifiex_tx_ba_stream_tbl *tx_tbl_ptr)
+{
+        struct mwifiex_tx_ba_stream_tbl *tx_ba_tsr_tbl;
+
+        list_for_each_entry(tx_ba_tsr_tbl, &priv->tx_ba_stream_tbl_ptr, list) {
+                if (tx_ba_tsr_tbl == tx_tbl_ptr)
+                        return true;
+        }
+
+        return false;
+}
+
+/*
+ * This function deletes the given entry in Tx BA Stream table.
+ *
+ * The function also performs a validity check on the supplied
+ * pointer before trying to delete.
+ */
+void mwifiex_11n_delete_tx_ba_stream_tbl_entry(struct mwifiex_private *priv,
+                                struct mwifiex_tx_ba_stream_tbl *tx_ba_tsr_tbl)
+{
+        if (!tx_ba_tsr_tbl &&
+                        mwifiex_is_tx_ba_stream_ptr_valid(priv, tx_ba_tsr_tbl))
+                return;
+
+        dev_dbg(priv->adapter->dev, "info: tx_ba_tsr_tbl %p\n", tx_ba_tsr_tbl);
+
+        list_del(&tx_ba_tsr_tbl->list);
+
+        kfree(tx_ba_tsr_tbl);
+
+        return;
+}
+
+/*
+ * This function deletes all the entries in Tx BA Stream table.
+ */
+void mwifiex_11n_delete_all_tx_ba_stream_tbl(struct mwifiex_private *priv)
+{
+        int i;
+        struct mwifiex_tx_ba_stream_tbl *del_tbl_ptr, *tmp_node;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->tx_ba_stream_tbl_lock, flags);
+        list_for_each_entry_safe(del_tbl_ptr, tmp_node,
+                                 &priv->tx_ba_stream_tbl_ptr, list)
+                mwifiex_11n_delete_tx_ba_stream_tbl_entry(priv, del_tbl_ptr);
+        spin_unlock_irqrestore(&priv->tx_ba_stream_tbl_lock, flags);
+
+        INIT_LIST_HEAD(&priv->tx_ba_stream_tbl_ptr);
+
+        for (i = 0; i < MAX_NUM_TID; ++i)
+                priv->aggr_prio_tbl[i].ampdu_ap =
+                        priv->aggr_prio_tbl[i].ampdu_user;
+}
+
+/*
+ * This function returns the pointer to an entry in BA Stream
+ * table which matches the given RA/TID pair.
+ */
+struct mwifiex_tx_ba_stream_tbl *
+mwifiex_11n_get_tx_ba_stream_tbl(struct mwifiex_private *priv,
+                                 int tid, u8 *ra)
+{
+        struct mwifiex_tx_ba_stream_tbl *tx_ba_tsr_tbl;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->tx_ba_stream_tbl_lock, flags);
+        list_for_each_entry(tx_ba_tsr_tbl, &priv->tx_ba_stream_tbl_ptr, list) {
+                if ((!memcmp(tx_ba_tsr_tbl->ra, ra, ETH_ALEN))
+                    && (tx_ba_tsr_tbl->tid == tid)) {
+                        spin_unlock_irqrestore(&priv->tx_ba_stream_tbl_lock,
+                                               flags);
+                        return tx_ba_tsr_tbl;
+                }
+        }
+        spin_unlock_irqrestore(&priv->tx_ba_stream_tbl_lock, flags);
+        return NULL;
+}
+
+/*
+ * This function creates an entry in Tx BA stream table for the
+ * given RA/TID pair.
+ */
+void mwifiex_11n_create_tx_ba_stream_tbl(struct mwifiex_private *priv,
+                                         u8 *ra, int tid,
+                                         enum mwifiex_ba_status ba_status)
+{
+        struct mwifiex_tx_ba_stream_tbl *new_node;
+        unsigned long flags;
+
+        if (!mwifiex_11n_get_tx_ba_stream_tbl(priv, tid, ra)) {
+                new_node = kzalloc(sizeof(struct mwifiex_tx_ba_stream_tbl),
+                                   GFP_ATOMIC);
+                if (!new_node) {
+                        dev_err(priv->adapter->dev,
+                                "%s: failed to alloc new_node\n", __func__);
+                        return;
+                }
+
+                INIT_LIST_HEAD(&new_node->list);
+
+                new_node->tid = tid;
+                new_node->ba_status = ba_status;
+                memcpy(new_node->ra, ra, ETH_ALEN);
+
+                spin_lock_irqsave(&priv->tx_ba_stream_tbl_lock, flags);
+                list_add_tail(&new_node->list, &priv->tx_ba_stream_tbl_ptr);
+                spin_unlock_irqrestore(&priv->tx_ba_stream_tbl_lock, flags);
+        }
+
+        return;
+}
+
+/*
+ * This function sends an add BA request to the given TID/RA pair.
+ */
+int mwifiex_send_addba(struct mwifiex_private *priv, int tid, u8 *peer_mac)
+{
+        struct host_cmd_ds_11n_addba_req add_ba_req;
+        static u8 dialog_tok;
+        int ret;
+
+        dev_dbg(priv->adapter->dev, "cmd: %s: tid %d\n", __func__, tid);
+
+        add_ba_req.block_ack_param_set = cpu_to_le16(
+                (u16) ((tid << BLOCKACKPARAM_TID_POS) |
+                         (priv->add_ba_param.
+                          tx_win_size << BLOCKACKPARAM_WINSIZE_POS) |
+                         IMMEDIATE_BLOCK_ACK));
+        add_ba_req.block_ack_tmo = cpu_to_le16((u16)priv->add_ba_param.timeout);
+
+        ++dialog_tok;
+
+        if (dialog_tok == 0)
+                dialog_tok = 1;
+
+        add_ba_req.dialog_token = dialog_tok;
+        memcpy(&add_ba_req.peer_mac_addr, peer_mac, ETH_ALEN);
+
+        /* We don't wait for the response of this command */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_11N_ADDBA_REQ,
+                                  0, 0, NULL, &add_ba_req);
+
+        return ret;
+}
+
+/*
+ * This function sends a delete BA request to the given TID/RA pair.
+ */
+int mwifiex_send_delba(struct mwifiex_private *priv, int tid, u8 *peer_mac,
+                       int initiator)
+{
+        struct host_cmd_ds_11n_delba delba;
+        int ret;
+        uint16_t del_ba_param_set;
+
+        memset(&delba, 0, sizeof(delba));
+        delba.del_ba_param_set = cpu_to_le16(tid << DELBA_TID_POS);
+
+        del_ba_param_set = le16_to_cpu(delba.del_ba_param_set);
+        if (initiator)
+                del_ba_param_set |= IEEE80211_DELBA_PARAM_INITIATOR_MASK;
+        else
+                del_ba_param_set &= ~IEEE80211_DELBA_PARAM_INITIATOR_MASK;
+
+        memcpy(&delba.peer_mac_addr, peer_mac, ETH_ALEN);
+
+        /* We don't wait for the response of this command */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_11N_DELBA,
+                                  HostCmd_ACT_GEN_SET, 0, NULL, &delba);
+
+        return ret;
+}
+
+/*
+ * This function handles the command response of a delete BA request.
+ */
+void mwifiex_11n_delete_ba_stream(struct mwifiex_private *priv, u8 *del_ba)
+{
+        struct host_cmd_ds_11n_delba *cmd_del_ba =
+                (struct host_cmd_ds_11n_delba *) del_ba;
+        uint16_t del_ba_param_set = le16_to_cpu(cmd_del_ba->del_ba_param_set);
+        int tid;
+
+        tid = del_ba_param_set >> DELBA_TID_POS;
+
+        mwifiex_11n_delete_ba_stream_tbl(priv, tid, cmd_del_ba->peer_mac_addr,
+                                         TYPE_DELBA_RECEIVE,
+                                         INITIATOR_BIT(del_ba_param_set));
+}
+
+/*
+ * This function retrieves the Rx reordering table.
+ */
+int mwifiex_get_rx_reorder_tbl(struct mwifiex_private *priv,
+                               struct mwifiex_ds_rx_reorder_tbl *buf)
+{
+        int i;
+        struct mwifiex_ds_rx_reorder_tbl *rx_reo_tbl = buf;
+        struct mwifiex_rx_reorder_tbl *rx_reorder_tbl_ptr;
+        int count = 0;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->rx_reorder_tbl_lock, flags);
+        list_for_each_entry(rx_reorder_tbl_ptr, &priv->rx_reorder_tbl_ptr,
+                            list) {
+                rx_reo_tbl->tid = (u16) rx_reorder_tbl_ptr->tid;
+                memcpy(rx_reo_tbl->ta, rx_reorder_tbl_ptr->ta, ETH_ALEN);
+                rx_reo_tbl->start_win = rx_reorder_tbl_ptr->start_win;
+                rx_reo_tbl->win_size = rx_reorder_tbl_ptr->win_size;
+                for (i = 0; i < rx_reorder_tbl_ptr->win_size; ++i) {
+                        if (rx_reorder_tbl_ptr->rx_reorder_ptr[i])
+                                rx_reo_tbl->buffer[i] = true;
+                        else
+                                rx_reo_tbl->buffer[i] = false;
+                }
+                rx_reo_tbl++;
+                count++;
+
+                if (count >= MWIFIEX_MAX_RX_BASTREAM_SUPPORTED)
+                        break;
+        }
+        spin_unlock_irqrestore(&priv->rx_reorder_tbl_lock, flags);
+
+        return count;
+}
+
+/*
+ * This function retrieves the Tx BA stream table.
+ */
+int mwifiex_get_tx_ba_stream_tbl(struct mwifiex_private *priv,
+                                 struct mwifiex_ds_tx_ba_stream_tbl *buf)
+{
+        struct mwifiex_tx_ba_stream_tbl *tx_ba_tsr_tbl;
+        struct mwifiex_ds_tx_ba_stream_tbl *rx_reo_tbl = buf;
+        int count = 0;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->tx_ba_stream_tbl_lock, flags);
+        list_for_each_entry(tx_ba_tsr_tbl, &priv->tx_ba_stream_tbl_ptr, list) {
+                rx_reo_tbl->tid = (u16) tx_ba_tsr_tbl->tid;
+                dev_dbg(priv->adapter->dev, "data: %s tid=%d\n",
+                                                __func__, rx_reo_tbl->tid);
+                memcpy(rx_reo_tbl->ra, tx_ba_tsr_tbl->ra, ETH_ALEN);
+                rx_reo_tbl++;
+                count++;
+                if (count >= MWIFIEX_MAX_TX_BASTREAM_SUPPORTED)
+                        break;
+        }
+        spin_unlock_irqrestore(&priv->tx_ba_stream_tbl_lock, flags);
+
+        return count;
+}
diff --git a/drivers/net/wireless/mwifiex/11n.h b/drivers/net/wireless/mwifiex/11n.h
new file mode 100644
index 00000000000..769a27f2b2c
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/11n.h
@@ -0,0 +1,178 @@
+/*
+ * Marvell Wireless LAN device driver: 802.11n
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#ifndef _MWIFIEX_11N_H_
+#define _MWIFIEX_11N_H_
+
+#include "11n_aggr.h"
+#include "11n_rxreorder.h"
+#include "wmm.h"
+
+void mwifiex_show_dot_11n_dev_cap(struct mwifiex_adapter *adapter, u32 cap);
+void mwifiex_show_dev_mcs_support(struct mwifiex_adapter *adapter, u8 support);
+int mwifiex_ret_11n_delba(struct mwifiex_private *priv,
+                          struct host_cmd_ds_command *resp);
+int mwifiex_ret_11n_addba_req(struct mwifiex_private *priv,
+                              struct host_cmd_ds_command *resp);
+int mwifiex_ret_11n_cfg(struct mwifiex_private *priv,
+                        struct host_cmd_ds_command *resp,
+                        void *data_buf);
+int mwifiex_cmd_11n_cfg(struct mwifiex_private *priv,
+                        struct host_cmd_ds_command *cmd,
+                        u16 cmd_action, void *data_buf);
+
+int mwifiex_cmd_11n_cfg(struct mwifiex_private *priv,
+                        struct host_cmd_ds_command *cmd,
+                        u16 cmd_action, void *data_buf);
+
+int mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
+                               struct mwifiex_bssdescriptor *bss_desc,
+                               u8 **buffer);
+void mwifiex_cfg_tx_buf(struct mwifiex_private *priv,
+                        struct mwifiex_bssdescriptor *bss_desc);
+void mwifiex_fill_cap_info(struct mwifiex_private *,
+                           struct mwifiex_ie_types_htcap *);
+int mwifiex_set_get_11n_htcap_cfg(struct mwifiex_private *priv,
+                                  u16 action, int *htcap_cfg);
+void mwifiex_11n_delete_tx_ba_stream_tbl_entry(struct mwifiex_private *priv,
+                                             struct mwifiex_tx_ba_stream_tbl
+                                             *tx_tbl);
+void mwifiex_11n_delete_all_tx_ba_stream_tbl(struct mwifiex_private *priv);
+struct mwifiex_tx_ba_stream_tbl *mwifiex_11n_get_tx_ba_stream_tbl(struct
+                                                             mwifiex_private
+                                                             *priv, int tid,
+                                                             u8 *ra);
+void mwifiex_11n_create_tx_ba_stream_tbl(struct mwifiex_private *priv, u8 *ra,
+                                       int tid,
+                                       enum mwifiex_ba_status ba_status);
+int mwifiex_send_addba(struct mwifiex_private *priv, int tid, u8 *peer_mac);
+int mwifiex_send_delba(struct mwifiex_private *priv, int tid, u8 *peer_mac,
+                       int initiator);
+void mwifiex_11n_delete_ba_stream(struct mwifiex_private *priv, u8 *del_ba);
+int mwifiex_get_rx_reorder_tbl(struct mwifiex_private *priv,
+                              struct mwifiex_ds_rx_reorder_tbl *buf);
+int mwifiex_get_tx_ba_stream_tbl(struct mwifiex_private *priv,
+                               struct mwifiex_ds_tx_ba_stream_tbl *buf);
+int mwifiex_ret_amsdu_aggr_ctrl(struct mwifiex_private *priv,
+                                struct host_cmd_ds_command
+                                *resp,
+                                void *data_buf);
+int mwifiex_cmd_recfg_tx_buf(struct mwifiex_private *priv,
+                             struct host_cmd_ds_command *cmd,
+                             int cmd_action, void *data_buf);
+int mwifiex_cmd_amsdu_aggr_ctrl(struct mwifiex_private *priv,
+                                struct host_cmd_ds_command *cmd,
+                                int cmd_action,
+                                void *data_buf);
+
+/*
+ * This function checks whether AMPDU is allowed or not for a particular TID.
+ */
+static inline u8
+mwifiex_is_ampdu_allowed(struct mwifiex_private *priv,
+                         struct mwifiex_ra_list_tbl *ptr, int tid)
+{
+        return ((priv->aggr_prio_tbl[tid].ampdu_ap != BA_STREAM_NOT_ALLOWED)
+                ? true : false);
+}
+
+/*
+ * This function checks whether AMSDU is allowed or not for a particular TID.
+ */
+static inline u8
+mwifiex_is_amsdu_allowed(struct mwifiex_private *priv,
+                         struct mwifiex_ra_list_tbl *ptr, int tid)
+{
+        return (((priv->aggr_prio_tbl[tid].amsdu != BA_STREAM_NOT_ALLOWED)
+                        && ((priv->is_data_rate_auto)
+                        || !((priv->bitmap_rates[2]) & 0x03)))
+                ? true : false);
+}
+
+/*
+ * This function checks whether a BA stream is available or not.
+ */
+static inline u8
+mwifiex_is_ba_stream_avail(struct mwifiex_private *priv)
+{
+        struct mwifiex_private *pmpriv = NULL;
+        u8 i = 0;
+        u32 ba_stream_num = 0;
+
+        for (i = 0; i < priv->adapter->priv_num; i++) {
+                pmpriv = priv->adapter->priv[i];
+                if (pmpriv)
+                        ba_stream_num +=
+                                mwifiex_wmm_list_len(priv->adapter,
+                                                     (struct list_head
+                                                      *) &pmpriv->
+                                                     tx_ba_stream_tbl_ptr);
+        }
+
+        return ((ba_stream_num <
+                 MWIFIEX_MAX_TX_BASTREAM_SUPPORTED) ? true : false);
+}
+
+/*
+ * This function finds the correct Tx BA stream to delete.
+ *
+ * Upon successfully locating, both the TID and the RA are returned.
+ */
+static inline u8
+mwifiex_find_stream_to_delete(struct mwifiex_private *priv,
+                              struct mwifiex_ra_list_tbl *ptr, int ptr_tid,
+                              int *ptid, u8 *ra)
+{
+        int tid;
+        u8 ret = false;
+        struct mwifiex_tx_ba_stream_tbl *tx_tbl;
+        unsigned long flags;
+
+        tid = priv->aggr_prio_tbl[ptr_tid].ampdu_user;
+
+        spin_lock_irqsave(&priv->tx_ba_stream_tbl_lock, flags);
+        list_for_each_entry(tx_tbl, &priv->tx_ba_stream_tbl_ptr, list) {
+                if (tid > priv->aggr_prio_tbl[tx_tbl->tid].ampdu_user) {
+                        tid = priv->aggr_prio_tbl[tx_tbl->tid].ampdu_user;
+                        *ptid = tx_tbl->tid;
+                        memcpy(ra, tx_tbl->ra, ETH_ALEN);
+                        ret = true;
+                }
+        }
+        spin_unlock_irqrestore(&priv->tx_ba_stream_tbl_lock, flags);
+
+        return ret;
+}
+
+/*
+ * This function checks whether BA stream is set up or not.
+ */
+static inline int
+mwifiex_is_ba_stream_setup(struct mwifiex_private *priv,
+                          struct mwifiex_ra_list_tbl *ptr, int tid)
+{
+        struct mwifiex_tx_ba_stream_tbl *tx_tbl;
+
+        tx_tbl = mwifiex_11n_get_tx_ba_stream_tbl(priv, tid, ptr->ra);
+        if (tx_tbl && IS_BASTREAM_SETUP(tx_tbl))
+                return true;
+
+        return false;
+}
+#endif /* !_MWIFIEX_11N_H_ */
diff --git a/drivers/net/wireless/mwifiex/11n_aggr.c b/drivers/net/wireless/mwifiex/11n_aggr.c
new file mode 100644
index 00000000000..c2abced6695
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/11n_aggr.c
@@ -0,0 +1,423 @@
+/*
+ * Marvell Wireless LAN device driver: 802.11n Aggregation
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+#include "11n.h"
+#include "11n_aggr.h"
+
+/*
+ * Creates an AMSDU subframe for aggregation into one AMSDU packet.
+ *
+ * The resultant AMSDU subframe format is -
+ *
+ * +---- ~ -----+---- ~ ------+---- ~ -----+----- ~ -----+---- ~ -----+
+ * |     DA     |     SA      |   Length   | SNAP header |   MSDU     |
+ * | data[0..5] | data[6..11] |            |             | data[14..] |
+ * +---- ~ -----+---- ~ ------+---- ~ -----+----- ~ -----+---- ~ -----+
+ * <--6-bytes--> <--6-bytes--> <--2-bytes--><--8-bytes--> <--n-bytes-->
+ *
+ * This function also computes the amount of padding required to make the
+ * buffer length multiple of 4 bytes.
+ *
+ * Data => |DA|SA|SNAP-TYPE|........    .|
+ * MSDU => |DA|SA|Length|SNAP|......   ..|
+ */
+static int
+mwifiex_11n_form_amsdu_pkt(struct mwifiex_adapter *adapter,
+                           struct sk_buff *skb_aggr,
+                           struct sk_buff *skb_src, int *pad)
+
+{
+        int dt_offset;
+        struct rfc_1042_hdr snap = {
+                0xaa,           /* LLC DSAP */
+                0xaa,           /* LLC SSAP */
+                0x03,           /* LLC CTRL */
+                {0x00, 0x00, 0x00},     /* SNAP OUI */
+                0x0000          /* SNAP type */
+                        /*
+                         * This field will be overwritten
+                         * later with ethertype
+                         */
+        };
+        struct tx_packet_hdr *tx_header = NULL;
+
+        skb_put(skb_aggr, sizeof(*tx_header));
+
+        tx_header = (struct tx_packet_hdr *) skb_aggr->data;
+
+        /* Copy DA and SA */
+        dt_offset = 2 * ETH_ALEN;
+        memcpy(&tx_header->eth803_hdr, skb_src->data, dt_offset);
+
+        /* Copy SNAP header */
+        snap.snap_type = *(u16 *) ((u8 *)skb_src->data + dt_offset);
+        dt_offset += sizeof(u16);
+
+        memcpy(&tx_header->rfc1042_hdr, &snap, sizeof(struct rfc_1042_hdr));
+
+        skb_pull(skb_src, dt_offset);
+
+        /* Update Length field */
+        tx_header->eth803_hdr.h_proto = htons(skb_src->len + LLC_SNAP_LEN);
+
+        /* Add payload */
+        skb_put(skb_aggr, skb_src->len);
+        memcpy(skb_aggr->data + sizeof(*tx_header), skb_src->data,
+                                                        skb_src->len);
+        *pad = (((skb_src->len + LLC_SNAP_LEN) & 3)) ? (4 - (((skb_src->len +
+                                                      LLC_SNAP_LEN)) & 3)) : 0;
+        skb_put(skb_aggr, *pad);
+
+        return skb_aggr->len + *pad;
+}
+
+/*
+ * Adds TxPD to AMSDU header.
+ *
+ * Each AMSDU packet will contain one TxPD at the beginning,
+ * followed by multiple AMSDU subframes.
+ */
+static void
+mwifiex_11n_form_amsdu_txpd(struct mwifiex_private *priv,
+                            struct sk_buff *skb)
+{
+        struct txpd *local_tx_pd;
+
+        skb_push(skb, sizeof(*local_tx_pd));
+
+        local_tx_pd = (struct txpd *) skb->data;
+        memset(local_tx_pd, 0, sizeof(struct txpd));
+
+        /* Original priority has been overwritten */
+        local_tx_pd->priority = (u8) skb->priority;
+        local_tx_pd->pkt_delay_2ms =
+                mwifiex_wmm_compute_drv_pkt_delay(priv, skb);
+        local_tx_pd->bss_num = priv->bss_num;
+        local_tx_pd->bss_type = priv->bss_type;
+        /* Always zero as the data is followed by struct txpd */
+        local_tx_pd->tx_pkt_offset = cpu_to_le16(sizeof(struct txpd));
+        local_tx_pd->tx_pkt_type = cpu_to_le16(PKT_TYPE_AMSDU);
+        local_tx_pd->tx_pkt_length = cpu_to_le16(skb->len -
+                        sizeof(*local_tx_pd));
+
+        if (local_tx_pd->tx_control == 0)
+                /* TxCtrl set by user or default */
+                local_tx_pd->tx_control = cpu_to_le32(priv->pkt_tx_ctrl);
+
+        if ((GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) &&
+                (priv->adapter->pps_uapsd_mode)) {
+                if (true == mwifiex_check_last_packet_indication(priv)) {
+                        priv->adapter->tx_lock_flag = true;
+                        local_tx_pd->flags =
+                                MWIFIEX_TxPD_POWER_MGMT_LAST_PACKET;
+                }
+        }
+}
+
+/*
+ * Counts the number of subframes in an aggregate packet.
+ *
+ * This function parses an aggregate packet buffer, looking for
+ * subframes and counting the number of such subframe found. The
+ * function automatically skips the DA/SA fields at the beginning
+ * of each subframe and padding at the end.
+ */
+static int
+mwifiex_11n_get_num_aggr_pkts(u8 *data, int total_pkt_len)
+{
+        int pkt_count = 0, pkt_len, pad;
+
+        while (total_pkt_len > 0) {
+                /* Length will be in network format, change it to host */
+                pkt_len = ntohs((*(__be16 *)(data + 2 * ETH_ALEN)));
+                pad = (((pkt_len + sizeof(struct ethhdr)) & 3)) ?
+                        (4 - ((pkt_len + sizeof(struct ethhdr)) & 3)) : 0;
+                data += pkt_len + pad + sizeof(struct ethhdr);
+                total_pkt_len -= pkt_len + pad + sizeof(struct ethhdr);
+                ++pkt_count;
+        }
+
+        return pkt_count;
+}
+
+/*
+ * De-aggregate received packets.
+ *
+ * This function parses the received aggregate buffer, extracts each subframe,
+ * strips off the SNAP header from them and sends the data portion for further
+ * processing.
+ *
+ * Each subframe body is copied onto a separate buffer, which are freed by
+ * upper layer after processing. The function also performs sanity tests on
+ * the received buffer.
+ */
+int mwifiex_11n_deaggregate_pkt(struct mwifiex_private *priv,
+                                struct sk_buff *skb)
+{
+        u16 pkt_len;
+        int total_pkt_len;
+        u8 *data;
+        int pad;
+        struct mwifiex_rxinfo *rx_info = MWIFIEX_SKB_RXCB(skb);
+        struct rxpd *local_rx_pd = (struct rxpd *) skb->data;
+        struct sk_buff *skb_daggr;
+        struct mwifiex_rxinfo *rx_info_daggr = NULL;
+        int ret = -1;
+        struct rx_packet_hdr *rx_pkt_hdr;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        u8 rfc1042_eth_hdr[ETH_ALEN] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00};
+
+        data = (u8 *) (local_rx_pd + local_rx_pd->rx_pkt_offset);
+        total_pkt_len = local_rx_pd->rx_pkt_length;
+
+        /* Sanity test */
+        if (total_pkt_len > MWIFIEX_RX_DATA_BUF_SIZE) {
+                dev_err(adapter->dev, "total pkt len greater than buffer"
+                       " size %d\n", total_pkt_len);
+                return -1;
+        }
+
+        rx_info->use_count = mwifiex_11n_get_num_aggr_pkts(data, total_pkt_len);
+
+        while (total_pkt_len > 0) {
+                rx_pkt_hdr = (struct rx_packet_hdr *) data;
+                /* Length will be in network format, change it to host */
+                pkt_len = ntohs((*(__be16 *) (data + 2 * ETH_ALEN)));
+                if (pkt_len > total_pkt_len) {
+                        dev_err(adapter->dev, "pkt_len %d > total_pkt_len %d\n",
+                               total_pkt_len, pkt_len);
+                        break;
+                }
+
+                pad = (((pkt_len + sizeof(struct ethhdr)) & 3)) ?
+                        (4 - ((pkt_len + sizeof(struct ethhdr)) & 3)) : 0;
+
+                total_pkt_len -= pkt_len + pad + sizeof(struct ethhdr);
+
+                if (memcmp(&rx_pkt_hdr->rfc1042_hdr,
+                           rfc1042_eth_hdr, sizeof(rfc1042_eth_hdr)) == 0) {
+                        memmove(data + LLC_SNAP_LEN, data, 2 * ETH_ALEN);
+                        data += LLC_SNAP_LEN;
+                        pkt_len += sizeof(struct ethhdr) - LLC_SNAP_LEN;
+                } else {
+                        *(u16 *) (data + 2 * ETH_ALEN) = (u16) 0;
+                        pkt_len += sizeof(struct ethhdr);
+                }
+
+                skb_daggr = dev_alloc_skb(pkt_len);
+                if (!skb_daggr) {
+                        dev_err(adapter->dev, "%s: failed to alloc skb_daggr\n",
+                               __func__);
+                        return -1;
+                }
+                rx_info_daggr = MWIFIEX_SKB_RXCB(skb_daggr);
+
+                rx_info_daggr->bss_index = rx_info->bss_index;
+                skb_daggr->tstamp = skb->tstamp;
+                rx_info_daggr->parent = skb;
+                skb_daggr->priority = skb->priority;
+                skb_put(skb_daggr, pkt_len);
+                memcpy(skb_daggr->data, data, pkt_len);
+
+                ret = mwifiex_recv_packet(adapter, skb_daggr);
+
+                switch (ret) {
+                case -EINPROGRESS:
+                        break;
+                case -1:
+                        dev_err(adapter->dev, "deaggr: host_to_card failed\n");
+                case 0:
+                        mwifiex_recv_packet_complete(adapter, skb_daggr, ret);
+                        break;
+                default:
+                        break;
+                }
+
+                data += pkt_len + pad;
+        }
+
+        return ret;
+}
+
+/*
+ * Create aggregated packet.
+ *
+ * This function creates an aggregated MSDU packet, by combining buffers
+ * from the RA list. Each individual buffer is encapsulated as an AMSDU
+ * subframe and all such subframes are concatenated together to form the
+ * AMSDU packet.
+ *
+ * A TxPD is also added to the front of the resultant AMSDU packets for
+ * transmission. The resultant packets format is -
+ *
+ * +---- ~ ----+------ ~ ------+------ ~ ------+-..-+------ ~ ------+
+ * |    TxPD   |AMSDU sub-frame|AMSDU sub-frame| .. |AMSDU sub-frame|
+ * |           |       1       |       2       | .. |       n       |
+ * +---- ~ ----+------ ~ ------+------ ~ ------+ .. +------ ~ ------+
+ */
+int
+mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
+                          struct mwifiex_ra_list_tbl *pra_list, int headroom,
+                          int ptrindex, unsigned long ra_list_flags)
+                          __releases(&priv->wmm.ra_list_spinlock)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct sk_buff *skb_aggr, *skb_src;
+        struct mwifiex_txinfo *tx_info_aggr, *tx_info_src;
+        int pad = 0;
+        int ret = 0;
+        struct mwifiex_tx_param tx_param;
+        struct txpd *ptx_pd = NULL;
+
+        if (skb_queue_empty(&pra_list->skb_head)) {
+                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                       ra_list_flags);
+                return 0;
+        }
+        skb_src = skb_peek(&pra_list->skb_head);
+        tx_info_src = MWIFIEX_SKB_TXCB(skb_src);
+        skb_aggr = dev_alloc_skb(adapter->tx_buf_size);
+        if (!skb_aggr) {
+                dev_err(adapter->dev, "%s: alloc skb_aggr\n", __func__);
+                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                       ra_list_flags);
+                return -1;
+        }
+        skb_reserve(skb_aggr, headroom + sizeof(struct txpd));
+        tx_info_aggr =  MWIFIEX_SKB_TXCB(skb_aggr);
+
+        tx_info_aggr->bss_index = tx_info_src->bss_index;
+        skb_aggr->priority = skb_src->priority;
+
+        while (skb_src && ((skb_headroom(skb_aggr) + skb_src->len
+                                        + LLC_SNAP_LEN)
+                                <= adapter->tx_buf_size)) {
+
+                if (!skb_queue_empty(&pra_list->skb_head))
+                        skb_src = skb_dequeue(&pra_list->skb_head);
+                else
+                        skb_src = NULL;
+
+                pra_list->total_pkts_size -= skb_src->len;
+
+                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                       ra_list_flags);
+                mwifiex_11n_form_amsdu_pkt(adapter, skb_aggr, skb_src, &pad);
+
+                mwifiex_write_data_complete(adapter, skb_src, 0);
+
+                spin_lock_irqsave(&priv->wmm.ra_list_spinlock, ra_list_flags);
+
+                if (!mwifiex_is_ralist_valid(priv, pra_list, ptrindex)) {
+                        spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                               ra_list_flags);
+                        return -1;
+                }
+
+                if (!skb_queue_empty(&pra_list->skb_head))
+                        skb_src = skb_peek(&pra_list->skb_head);
+                else
+                        skb_src = NULL;
+        }
+
+        spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, ra_list_flags);
+
+        /* Last AMSDU packet does not need padding */
+        skb_trim(skb_aggr, skb_aggr->len - pad);
+
+        /* Form AMSDU */
+        mwifiex_11n_form_amsdu_txpd(priv, skb_aggr);
+        if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA)
+                ptx_pd = (struct txpd *)skb_aggr->data;
+
+        skb_push(skb_aggr, headroom);
+
+        tx_param.next_pkt_len = ((pra_list->total_pkts_size) ?
+                                 (((pra_list->total_pkts_size) >
+                                   adapter->tx_buf_size) ? adapter->
+                                  tx_buf_size : pra_list->total_pkts_size +
+                                  LLC_SNAP_LEN + sizeof(struct txpd)) : 0);
+        ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA,
+                                             skb_aggr->data,
+                                             skb_aggr->len, &tx_param);
+        switch (ret) {
+        case -EBUSY:
+                spin_lock_irqsave(&priv->wmm.ra_list_spinlock, ra_list_flags);
+                if (!mwifiex_is_ralist_valid(priv, pra_list, ptrindex)) {
+                        spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                               ra_list_flags);
+                        mwifiex_write_data_complete(adapter, skb_aggr, -1);
+                        return -1;
+                }
+                if ((GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) &&
+                        (adapter->pps_uapsd_mode) &&
+                        (adapter->tx_lock_flag)) {
+                                priv->adapter->tx_lock_flag = false;
+                                ptx_pd->flags = 0;
+                }
+
+                skb_queue_tail(&pra_list->skb_head, skb_aggr);
+
+                pra_list->total_pkts_size += skb_aggr->len;
+
+                tx_info_aggr->flags |= MWIFIEX_BUF_FLAG_REQUEUED_PKT;
+                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                       ra_list_flags);
+                dev_dbg(adapter->dev, "data: -EBUSY is returned\n");
+                break;
+        case -1:
+                adapter->data_sent = false;
+                dev_err(adapter->dev, "%s: host_to_card failed: %#x\n",
+                                                __func__, ret);
+                adapter->dbg.num_tx_host_to_card_failure++;
+                mwifiex_write_data_complete(adapter, skb_aggr, ret);
+                return 0;
+        case -EINPROGRESS:
+                adapter->data_sent = false;
+                break;
+        case 0:
+                mwifiex_write_data_complete(adapter, skb_aggr, ret);
+                break;
+        default:
+                break;
+        }
+        if (ret != -EBUSY) {
+                spin_lock_irqsave(&priv->wmm.ra_list_spinlock, ra_list_flags);
+                if (mwifiex_is_ralist_valid(priv, pra_list, ptrindex)) {
+                        priv->wmm.packets_out[ptrindex]++;
+                        priv->wmm.tid_tbl_ptr[ptrindex].ra_list_curr = pra_list;
+                }
+                /* Now bss_prio_cur pointer points to next node */
+                adapter->bss_prio_tbl[priv->bss_priority].bss_prio_cur =
+                        list_first_entry(
+                                &adapter->bss_prio_tbl[priv->bss_priority]
+                                .bss_prio_cur->list,
+                                struct mwifiex_bss_prio_node, list);
+                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                       ra_list_flags);
+        }
+
+        return 0;
+}
diff --git a/drivers/net/wireless/mwifiex/11n_aggr.h b/drivers/net/wireless/mwifiex/11n_aggr.h
new file mode 100644
index 00000000000..9c6dca7ab02
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/11n_aggr.h
@@ -0,0 +1,32 @@
+/*
+ * Marvell Wireless LAN device driver: 802.11n Aggregation
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#ifndef _MWIFIEX_11N_AGGR_H_
+#define _MWIFIEX_11N_AGGR_H_
+
+#define PKT_TYPE_AMSDU  0xE6
+
+int mwifiex_11n_deaggregate_pkt(struct mwifiex_private *priv,
+                                struct sk_buff *skb);
+int mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
+                              struct mwifiex_ra_list_tbl *ptr, int headroom,
+                              int ptr_index, unsigned long flags)
+                              __releases(&priv->wmm.ra_list_spinlock);
+
+#endif /* !_MWIFIEX_11N_AGGR_H_ */
diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.c b/drivers/net/wireless/mwifiex/11n_rxreorder.c
new file mode 100644
index 00000000000..8e94e620e6f
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/11n_rxreorder.c
@@ -0,0 +1,637 @@
+/*
+ * Marvell Wireless LAN device driver: 802.11n RX Re-ordering
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+#include "11n.h"
+#include "11n_rxreorder.h"
+
+/*
+ * This function processes a received packet and forwards
+ * it to the kernel/upper layer.
+ */
+static int mwifiex_11n_dispatch_pkt(struct mwifiex_private *priv, void *payload)
+{
+        int ret = 0;
+        struct mwifiex_adapter *adapter = priv->adapter;
+
+        ret = mwifiex_process_rx_packet(adapter, (struct sk_buff *) payload);
+        return ret;
+}
+
+/*
+ * This function dispatches all packets in the Rx reorder table.
+ *
+ * There could be holes in the buffer, which are skipped by the function.
+ * Since the buffer is linear, the function uses rotation to simulate
+ * circular buffer.
+ */
+static int
+mwifiex_11n_dispatch_pkt_until_start_win(struct mwifiex_private *priv,
+                                         struct mwifiex_rx_reorder_tbl
+                                         *rx_reor_tbl_ptr, int start_win)
+{
+        int no_pkt_to_send, i, xchg;
+        void *rx_tmp_ptr = NULL;
+        unsigned long flags;
+
+        no_pkt_to_send = (start_win > rx_reor_tbl_ptr->start_win) ?
+                min((start_win - rx_reor_tbl_ptr->start_win),
+                    rx_reor_tbl_ptr->win_size) : rx_reor_tbl_ptr->win_size;
+
+        for (i = 0; i < no_pkt_to_send; ++i) {
+                spin_lock_irqsave(&priv->rx_pkt_lock, flags);
+                rx_tmp_ptr = NULL;
+                if (rx_reor_tbl_ptr->rx_reorder_ptr[i]) {
+                        rx_tmp_ptr = rx_reor_tbl_ptr->rx_reorder_ptr[i];
+                        rx_reor_tbl_ptr->rx_reorder_ptr[i] = NULL;
+                }
+                spin_unlock_irqrestore(&priv->rx_pkt_lock, flags);
+                if (rx_tmp_ptr)
+                        mwifiex_11n_dispatch_pkt(priv, rx_tmp_ptr);
+        }
+
+        spin_lock_irqsave(&priv->rx_pkt_lock, flags);
+        /*
+         * We don't have a circular buffer, hence use rotation to simulate
+         * circular buffer
+         */
+        xchg = rx_reor_tbl_ptr->win_size - no_pkt_to_send;
+        for (i = 0; i < xchg; ++i) {
+                rx_reor_tbl_ptr->rx_reorder_ptr[i] =
+                        rx_reor_tbl_ptr->rx_reorder_ptr[no_pkt_to_send + i];
+                rx_reor_tbl_ptr->rx_reorder_ptr[no_pkt_to_send + i] = NULL;
+        }
+
+        rx_reor_tbl_ptr->start_win = start_win;
+        spin_unlock_irqrestore(&priv->rx_pkt_lock, flags);
+
+        return 0;
+}
+
+/*
+ * This function dispatches all packets in the Rx reorder table until
+ * a hole is found.
+ *
+ * The start window is adjusted automatically when a hole is located.
+ * Since the buffer is linear, the function uses rotation to simulate
+ * circular buffer.
+ */
+static int
+mwifiex_11n_scan_and_dispatch(struct mwifiex_private *priv,
+                              struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr)
+{
+        int i, j, xchg;
+        void *rx_tmp_ptr = NULL;
+        unsigned long flags;
+
+        for (i = 0; i < rx_reor_tbl_ptr->win_size; ++i) {
+                spin_lock_irqsave(&priv->rx_pkt_lock, flags);
+                if (!rx_reor_tbl_ptr->rx_reorder_ptr[i]) {
+                        spin_unlock_irqrestore(&priv->rx_pkt_lock, flags);
+                        break;
+                }
+                rx_tmp_ptr = rx_reor_tbl_ptr->rx_reorder_ptr[i];
+                rx_reor_tbl_ptr->rx_reorder_ptr[i] = NULL;
+                spin_unlock_irqrestore(&priv->rx_pkt_lock, flags);
+                mwifiex_11n_dispatch_pkt(priv, rx_tmp_ptr);
+        }
+
+        spin_lock_irqsave(&priv->rx_pkt_lock, flags);
+        /*
+         * We don't have a circular buffer, hence use rotation to simulate
+         * circular buffer
+         */
+        if (i > 0) {
+                xchg = rx_reor_tbl_ptr->win_size - i;
+                for (j = 0; j < xchg; ++j) {
+                        rx_reor_tbl_ptr->rx_reorder_ptr[j] =
+                                rx_reor_tbl_ptr->rx_reorder_ptr[i + j];
+                        rx_reor_tbl_ptr->rx_reorder_ptr[i + j] = NULL;
+                }
+        }
+        rx_reor_tbl_ptr->start_win = (rx_reor_tbl_ptr->start_win + i)
+                &(MAX_TID_VALUE - 1);
+        spin_unlock_irqrestore(&priv->rx_pkt_lock, flags);
+        return 0;
+}
+
+/*
+ * This function deletes the Rx reorder table and frees the memory.
+ *
+ * The function stops the associated timer and dispatches all the
+ * pending packets in the Rx reorder table before deletion.
+ */
+static void
+mwifiex_11n_delete_rx_reorder_tbl_entry(struct mwifiex_private *priv,
+                                       struct mwifiex_rx_reorder_tbl
+                                       *rx_reor_tbl_ptr)
+{
+        unsigned long flags;
+
+        if (!rx_reor_tbl_ptr)
+                return;
+
+        mwifiex_11n_dispatch_pkt_until_start_win(priv, rx_reor_tbl_ptr,
+                                                 (rx_reor_tbl_ptr->start_win +
+                                                  rx_reor_tbl_ptr->win_size)
+                                                 &(MAX_TID_VALUE - 1));
+
+        del_timer(&rx_reor_tbl_ptr->timer_context.timer);
+
+        spin_lock_irqsave(&priv->rx_reorder_tbl_lock, flags);
+        list_del(&rx_reor_tbl_ptr->list);
+        spin_unlock_irqrestore(&priv->rx_reorder_tbl_lock, flags);
+
+        kfree(rx_reor_tbl_ptr->rx_reorder_ptr);
+        kfree(rx_reor_tbl_ptr);
+}
+
+/*
+ * This function returns the pointer to an entry in Rx reordering
+ * table which matches the given TA/TID pair.
+ */
+static struct mwifiex_rx_reorder_tbl *
+mwifiex_11n_get_rx_reorder_tbl(struct mwifiex_private *priv, int tid, u8 *ta)
+{
+        struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->rx_reorder_tbl_lock, flags);
+        list_for_each_entry(rx_reor_tbl_ptr, &priv->rx_reorder_tbl_ptr, list) {
+                if ((!memcmp(rx_reor_tbl_ptr->ta, ta, ETH_ALEN))
+                    && (rx_reor_tbl_ptr->tid == tid)) {
+                        spin_unlock_irqrestore(&priv->rx_reorder_tbl_lock,
+                                               flags);
+                        return rx_reor_tbl_ptr;
+                }
+        }
+        spin_unlock_irqrestore(&priv->rx_reorder_tbl_lock, flags);
+
+        return NULL;
+}
+
+/*
+ * This function finds the last sequence number used in the packets
+ * buffered in Rx reordering table.
+ */
+static int
+mwifiex_11n_find_last_seq_num(struct mwifiex_rx_reorder_tbl *rx_reorder_tbl_ptr)
+{
+        int i;
+
+        for (i = (rx_reorder_tbl_ptr->win_size - 1); i >= 0; --i)
+                if (rx_reorder_tbl_ptr->rx_reorder_ptr[i])
+                        return i;
+
+        return -1;
+}
+
+/*
+ * This function flushes all the packets in Rx reordering table.
+ *
+ * The function checks if any packets are currently buffered in the
+ * table or not. In case there are packets available, it dispatches
+ * them and then dumps the Rx reordering table.
+ */
+static void
+mwifiex_flush_data(unsigned long context)
+{
+        struct reorder_tmr_cnxt *reorder_cnxt =
+                (struct reorder_tmr_cnxt *) context;
+        int start_win;
+
+        start_win = mwifiex_11n_find_last_seq_num(reorder_cnxt->ptr);
+        if (start_win >= 0) {
+                dev_dbg(reorder_cnxt->priv->adapter->dev,
+                                "info: flush data %d\n", start_win);
+                mwifiex_11n_dispatch_pkt_until_start_win(reorder_cnxt->priv,
+                                reorder_cnxt->ptr,
+                                ((reorder_cnxt->ptr->start_win +
+                                  start_win + 1) & (MAX_TID_VALUE - 1)));
+        }
+}
+
+/*
+ * This function creates an entry in Rx reordering table for the
+ * given TA/TID.
+ *
+ * The function also initializes the entry with sequence number, window
+ * size as well as initializes the timer.
+ *
+ * If the received TA/TID pair is already present, all the packets are
+ * dispatched and the window size is moved until the SSN.
+ */
+static void
+mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta,
+                                 int tid, int win_size, int seq_num)
+{
+        int i;
+        struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr, *new_node;
+        u16 last_seq = 0;
+        unsigned long flags;
+
+        /*
+         * If we get a TID, ta pair which is already present dispatch all the
+         * the packets and move the window size until the ssn
+         */
+        rx_reor_tbl_ptr = mwifiex_11n_get_rx_reorder_tbl(priv, tid, ta);
+        if (rx_reor_tbl_ptr) {
+                mwifiex_11n_dispatch_pkt_until_start_win(priv, rx_reor_tbl_ptr,
+                                                         seq_num);
+                return;
+        }
+        /* if !rx_reor_tbl_ptr then create one */
+        new_node = kzalloc(sizeof(struct mwifiex_rx_reorder_tbl), GFP_KERNEL);
+        if (!new_node) {
+                dev_err(priv->adapter->dev, "%s: failed to alloc new_node\n",
+                       __func__);
+                return;
+        }
+
+        INIT_LIST_HEAD(&new_node->list);
+        new_node->tid = tid;
+        memcpy(new_node->ta, ta, ETH_ALEN);
+        new_node->start_win = seq_num;
+        if (mwifiex_queuing_ra_based(priv))
+                /* TODO for adhoc */
+                dev_dbg(priv->adapter->dev,
+                        "info: ADHOC:last_seq=%d start_win=%d\n",
+                        last_seq, new_node->start_win);
+        else
+                last_seq = priv->rx_seq[tid];
+
+        if (last_seq >= new_node->start_win)
+                new_node->start_win = last_seq + 1;
+
+        new_node->win_size = win_size;
+
+        new_node->rx_reorder_ptr = kzalloc(sizeof(void *) * win_size,
+                                        GFP_KERNEL);
+        if (!new_node->rx_reorder_ptr) {
+                kfree((u8 *) new_node);
+                dev_err(priv->adapter->dev,
+                        "%s: failed to alloc reorder_ptr\n", __func__);
+                return;
+        }
+
+        new_node->timer_context.ptr = new_node;
+        new_node->timer_context.priv = priv;
+
+        init_timer(&new_node->timer_context.timer);
+        new_node->timer_context.timer.function = mwifiex_flush_data;
+        new_node->timer_context.timer.data =
+                        (unsigned long) &new_node->timer_context;
+
+        for (i = 0; i < win_size; ++i)
+                new_node->rx_reorder_ptr[i] = NULL;
+
+        spin_lock_irqsave(&priv->rx_reorder_tbl_lock, flags);
+        list_add_tail(&new_node->list, &priv->rx_reorder_tbl_ptr);
+        spin_unlock_irqrestore(&priv->rx_reorder_tbl_lock, flags);
+
+        return;
+}
+
+/*
+ * This function prepares command for adding a BA request.
+ *
+ * Preparation includes -
+ *      - Setting command ID and proper size
+ *      - Setting add BA request buffer
+ *      - Ensuring correct endian-ness
+ */
+int mwifiex_cmd_11n_addba_req(struct mwifiex_private *priv,
+                              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;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_11N_ADDBA_REQ);
+        cmd->size = cpu_to_le16(sizeof(*add_ba_req) + S_DS_GEN);
+        memcpy(add_ba_req, data_buf, sizeof(*add_ba_req));
+
+        return 0;
+}
+
+/*
+ * This function prepares command for adding a BA response.
+ *
+ * Preparation includes -
+ *      - Setting command ID and proper size
+ *      - Setting add BA response buffer
+ *      - Ensuring correct endian-ness
+ */
+int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv,
+                                  struct host_cmd_ds_command *cmd,
+                                  void *data_buf)
+{
+        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_req *cmd_addba_req =
+                (struct host_cmd_ds_11n_addba_req *) data_buf;
+        u8 tid = 0;
+        int win_size = 0;
+        uint16_t block_ack_param_set;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_11N_ADDBA_RSP);
+        cmd->size = cpu_to_le16(sizeof(*add_ba_rsp) + S_DS_GEN);
+
+        memcpy(add_ba_rsp->peer_mac_addr, cmd_addba_req->peer_mac_addr,
+               ETH_ALEN);
+        add_ba_rsp->dialog_token = cmd_addba_req->dialog_token;
+        add_ba_rsp->block_ack_tmo = cmd_addba_req->block_ack_tmo;
+        add_ba_rsp->ssn = cmd_addba_req->ssn;
+
+        block_ack_param_set = le16_to_cpu(cmd_addba_req->block_ack_param_set);
+        tid = (block_ack_param_set & IEEE80211_ADDBA_PARAM_TID_MASK)
+                >> BLOCKACKPARAM_TID_POS;
+        add_ba_rsp->status_code = cpu_to_le16(ADDBA_RSP_STATUS_ACCEPT);
+        block_ack_param_set &= ~IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK;
+        /* We donot support AMSDU inside AMPDU, hence reset the bit */
+        block_ack_param_set &= ~BLOCKACKPARAM_AMSDU_SUPP_MASK;
+        block_ack_param_set |= (priv->add_ba_param.rx_win_size <<
+                                             BLOCKACKPARAM_WINSIZE_POS);
+        add_ba_rsp->block_ack_param_set = cpu_to_le16(block_ack_param_set);
+        win_size = (le16_to_cpu(add_ba_rsp->block_ack_param_set)
+                                        & IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK)
+                                        >> BLOCKACKPARAM_WINSIZE_POS;
+        cmd_addba_req->block_ack_param_set = cpu_to_le16(block_ack_param_set);
+
+        mwifiex_11n_create_rx_reorder_tbl(priv, cmd_addba_req->peer_mac_addr,
+                            tid, win_size, le16_to_cpu(cmd_addba_req->ssn));
+        return 0;
+}
+
+/*
+ * This function prepares command for deleting a BA request.
+ *
+ * Preparation includes -
+ *      - Setting command ID and proper size
+ *      - Setting del BA request buffer
+ *      - Ensuring correct endian-ness
+ */
+int mwifiex_cmd_11n_delba(struct mwifiex_private *priv,
+                          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;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_11N_DELBA);
+        cmd->size = cpu_to_le16(sizeof(*del_ba) + S_DS_GEN);
+        memcpy(del_ba, data_buf, sizeof(*del_ba));
+
+        return 0;
+}
+
+/*
+ * This function identifies if Rx reordering is needed for a received packet.
+ *
+ * In case reordering is required, the function will do the reordering
+ * before sending it to kernel.
+ *
+ * The Rx reorder table is checked first with the received TID/TA pair. If
+ * not found, the received packet is dispatched immediately. But if found,
+ * the packet is reordered and all the packets in the updated Rx reordering
+ * table is dispatched until a hole is found.
+ *
+ * For sequence number less than the starting window, the packet is dropped.
+ */
+int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv,
+                                u16 seq_num, u16 tid,
+                                u8 *ta, u8 pkt_type, void *payload)
+{
+        struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr;
+        int start_win, end_win, win_size;
+        int ret = 0;
+        u16 pkt_index = 0;
+
+        rx_reor_tbl_ptr =
+                mwifiex_11n_get_rx_reorder_tbl((struct mwifiex_private *) priv,
+                                                tid, ta);
+        if (!rx_reor_tbl_ptr) {
+                if (pkt_type != PKT_TYPE_BAR)
+                        mwifiex_11n_dispatch_pkt(priv, payload);
+                return 0;
+        }
+        start_win = rx_reor_tbl_ptr->start_win;
+        win_size = rx_reor_tbl_ptr->win_size;
+        end_win = ((start_win + win_size) - 1) & (MAX_TID_VALUE - 1);
+        del_timer(&rx_reor_tbl_ptr->timer_context.timer);
+        mod_timer(&rx_reor_tbl_ptr->timer_context.timer, jiffies
+                        + (MIN_FLUSH_TIMER_MS * win_size * HZ) / 1000);
+
+        /*
+         * If seq_num is less then starting win then ignore and drop the
+         * packet
+         */
+        if ((start_win + TWOPOW11) > (MAX_TID_VALUE - 1)) {/* Wrap */
+                if (seq_num >= ((start_win + (TWOPOW11)) & (MAX_TID_VALUE - 1))
+                                && (seq_num < start_win))
+                        return -1;
+        } else if ((seq_num < start_win)
+                        || (seq_num > (start_win + (TWOPOW11)))) {
+                return -1;
+        }
+
+        /*
+         * If this packet is a BAR we adjust seq_num as
+         * WinStart = seq_num
+         */
+        if (pkt_type == PKT_TYPE_BAR)
+                seq_num = ((seq_num + win_size) - 1) & (MAX_TID_VALUE - 1);
+
+        if (((end_win < start_win)
+             && (seq_num < (TWOPOW11 - (MAX_TID_VALUE - start_win)))
+             && (seq_num > end_win)) || ((end_win > start_win)
+             && ((seq_num > end_win) || (seq_num < start_win)))) {
+                end_win = seq_num;
+                if (((seq_num - win_size) + 1) >= 0)
+                        start_win = (end_win - win_size) + 1;
+                else
+                        start_win = (MAX_TID_VALUE - (win_size - seq_num)) + 1;
+                ret = mwifiex_11n_dispatch_pkt_until_start_win(priv,
+                                                rx_reor_tbl_ptr, start_win);
+
+                if (ret)
+                        return ret;
+        }
+
+        if (pkt_type != PKT_TYPE_BAR) {
+                if (seq_num >= start_win)
+                        pkt_index = seq_num - start_win;
+                else
+                        pkt_index = (seq_num+MAX_TID_VALUE) - start_win;
+
+                if (rx_reor_tbl_ptr->rx_reorder_ptr[pkt_index])
+                        return -1;
+
+                rx_reor_tbl_ptr->rx_reorder_ptr[pkt_index] = payload;
+        }
+
+        /*
+         * Dispatch all packets sequentially from start_win until a
+         * hole is found and adjust the start_win appropriately
+         */
+        ret = mwifiex_11n_scan_and_dispatch(priv, rx_reor_tbl_ptr);
+
+        return ret;
+}
+
+/*
+ * This function deletes an entry for a given TID/TA pair.
+ *
+ * The TID/TA are taken from del BA event body.
+ */
+void
+mwifiex_11n_delete_ba_stream_tbl(struct mwifiex_private *priv, int tid,
+                                u8 *peer_mac, u8 type, int initiator)
+{
+        struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr;
+        struct mwifiex_tx_ba_stream_tbl *ptx_tbl;
+        u8 cleanup_rx_reorder_tbl;
+        unsigned long flags;
+
+        if (type == TYPE_DELBA_RECEIVE)
+                cleanup_rx_reorder_tbl = (initiator) ? true : false;
+        else
+                cleanup_rx_reorder_tbl = (initiator) ? false : true;
+
+        dev_dbg(priv->adapter->dev, "event: DELBA: %pM tid=%d, "
+               "initiator=%d\n", peer_mac, tid, initiator);
+
+        if (cleanup_rx_reorder_tbl) {
+                rx_reor_tbl_ptr = mwifiex_11n_get_rx_reorder_tbl(priv, tid,
+                                                                 peer_mac);
+                if (!rx_reor_tbl_ptr) {
+                        dev_dbg(priv->adapter->dev,
+                                        "event: TID, TA not found in table\n");
+                        return;
+                }
+                mwifiex_11n_delete_rx_reorder_tbl_entry(priv, rx_reor_tbl_ptr);
+        } else {
+                ptx_tbl = mwifiex_11n_get_tx_ba_stream_tbl(priv, tid, peer_mac);
+                if (!ptx_tbl) {
+                        dev_dbg(priv->adapter->dev,
+                                        "event: TID, RA not found in table\n");
+                        return;
+                }
+
+                spin_lock_irqsave(&priv->tx_ba_stream_tbl_lock, flags);
+                mwifiex_11n_delete_tx_ba_stream_tbl_entry(priv, ptx_tbl);
+                spin_unlock_irqrestore(&priv->tx_ba_stream_tbl_lock, flags);
+        }
+}
+
+/*
+ * This function handles the command response of an add BA response.
+ *
+ * Handling includes changing the header fields into CPU format and
+ * creating the stream, provided the add BA is accepted.
+ */
+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;
+        int tid, win_size;
+        struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr = NULL;
+        uint16_t block_ack_param_set;
+
+        block_ack_param_set = le16_to_cpu(add_ba_rsp->block_ack_param_set);
+
+        tid = (block_ack_param_set & IEEE80211_ADDBA_PARAM_TID_MASK)
+                >> BLOCKACKPARAM_TID_POS;
+        /*
+         * Check if we had rejected the ADDBA, if yes then do not create
+         * the stream
+         */
+        if (le16_to_cpu(add_ba_rsp->status_code) == BA_RESULT_SUCCESS) {
+                win_size = (block_ack_param_set &
+                        IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK)
+                        >> BLOCKACKPARAM_WINSIZE_POS;
+
+                dev_dbg(priv->adapter->dev, "cmd: ADDBA RSP: %pM"
+                       " tid=%d ssn=%d win_size=%d\n",
+                       add_ba_rsp->peer_mac_addr,
+                       tid, add_ba_rsp->ssn, win_size);
+        } else {
+                dev_err(priv->adapter->dev, "ADDBA RSP: failed %pM tid=%d)\n",
+                                        add_ba_rsp->peer_mac_addr, tid);
+
+                rx_reor_tbl_ptr = mwifiex_11n_get_rx_reorder_tbl(priv,
+                                        tid, add_ba_rsp->peer_mac_addr);
+                if (rx_reor_tbl_ptr)
+                        mwifiex_11n_delete_rx_reorder_tbl_entry(priv,
+                                rx_reor_tbl_ptr);
+        }
+
+        return 0;
+}
+
+/*
+ * This function handles BA stream timeout event by preparing and sending
+ * a command to the firmware.
+ */
+void mwifiex_11n_ba_stream_timeout(struct mwifiex_private *priv,
+                                   struct host_cmd_ds_11n_batimeout *event)
+{
+        struct host_cmd_ds_11n_delba delba;
+
+        memset(&delba, 0, sizeof(struct host_cmd_ds_11n_delba));
+        memcpy(delba.peer_mac_addr, event->peer_mac_addr, ETH_ALEN);
+
+        delba.del_ba_param_set |=
+                cpu_to_le16((u16) event->tid << DELBA_TID_POS);
+        delba.del_ba_param_set |= cpu_to_le16(
+                (u16) event->origninator << DELBA_INITIATOR_POS);
+        delba.reason_code = cpu_to_le16(WLAN_REASON_QSTA_TIMEOUT);
+        mwifiex_prepare_cmd(priv, HostCmd_CMD_11N_DELBA, 0, 0, NULL, &delba);
+
+        return;
+}
+
+/*
+ * This function cleans up the Rx reorder table by deleting all the entries
+ * and re-initializing.
+ */
+void mwifiex_11n_cleanup_reorder_tbl(struct mwifiex_private *priv)
+{
+        struct mwifiex_rx_reorder_tbl *del_tbl_ptr, *tmp_node;
+        unsigned long flags;
+
+        spin_lock_irqsave(&priv->rx_reorder_tbl_lock, flags);
+        list_for_each_entry_safe(del_tbl_ptr, tmp_node,
+                                 &priv->rx_reorder_tbl_ptr, list) {
+                spin_unlock_irqrestore(&priv->rx_reorder_tbl_lock, flags);
+                mwifiex_11n_delete_rx_reorder_tbl_entry(priv, del_tbl_ptr);
+                spin_lock_irqsave(&priv->rx_reorder_tbl_lock, flags);
+        }
+        spin_unlock_irqrestore(&priv->rx_reorder_tbl_lock, flags);
+
+        INIT_LIST_HEAD(&priv->rx_reorder_tbl_ptr);
+        memset(priv->rx_seq, 0, sizeof(priv->rx_seq));
+}
diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.h b/drivers/net/wireless/mwifiex/11n_rxreorder.h
new file mode 100644
index 00000000000..42f56903574
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/11n_rxreorder.h
@@ -0,0 +1,67 @@
+/*
+ * Marvell Wireless LAN device driver: 802.11n RX Re-ordering
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#ifndef _MWIFIEX_11N_RXREORDER_H_
+#define _MWIFIEX_11N_RXREORDER_H_
+
+#define MIN_FLUSH_TIMER_MS              50
+
+#define PKT_TYPE_BAR 0xE7
+#define MAX_TID_VALUE                   (2 << 11)
+#define TWOPOW11                        (2 << 10)
+
+#define BLOCKACKPARAM_TID_POS           2
+#define BLOCKACKPARAM_AMSDU_SUPP_MASK   0x1
+#define BLOCKACKPARAM_WINSIZE_POS       6
+#define DELBA_TID_POS                   12
+#define DELBA_INITIATOR_POS             11
+#define TYPE_DELBA_SENT                 1
+#define TYPE_DELBA_RECEIVE              2
+#define IMMEDIATE_BLOCK_ACK             0x2
+
+#define ADDBA_RSP_STATUS_ACCEPT 0
+
+int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *,
+                               u16 seqNum,
+                               u16 tid, u8 *ta,
+                               u8 pkttype, void *payload);
+void mwifiex_11n_delete_ba_stream_tbl(struct mwifiex_private *priv, int Tid,
+                                     u8 *PeerMACAddr, u8 type,
+                                     int initiator);
+void mwifiex_11n_ba_stream_timeout(struct mwifiex_private *priv,
+                                   struct host_cmd_ds_11n_batimeout *event);
+int mwifiex_ret_11n_addba_resp(struct mwifiex_private *priv,
+                               struct host_cmd_ds_command
+                               *resp);
+int mwifiex_cmd_11n_delba(struct mwifiex_private *priv,
+                          struct host_cmd_ds_command *cmd,
+                          void *data_buf);
+int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv,
+                                  struct host_cmd_ds_command
+                                  *cmd, void *data_buf);
+int mwifiex_cmd_11n_addba_req(struct mwifiex_private *priv,
+                              struct host_cmd_ds_command *cmd,
+                              void *data_buf);
+void mwifiex_11n_cleanup_reorder_tbl(struct mwifiex_private *priv);
+struct mwifiex_rx_reorder_tbl *mwifiex_11n_get_rxreorder_tbl(struct
+                                                           mwifiex_private
+                                                           *priv, int tid,
+                                                           u8 *ta);
+
+#endif /* _MWIFIEX_11N_RXREORDER_H_ */
diff --git a/drivers/net/wireless/mwifiex/Kconfig b/drivers/net/wireless/mwifiex/Kconfig
new file mode 100644
index 00000000000..86962920cef
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/Kconfig
@@ -0,0 +1,21 @@
+config MWIFIEX
+        tristate "Marvell WiFi-Ex Driver"
+        depends on CFG80211
+        select LIB80211
+        ---help---
+          This adds support for wireless adapters based on Marvell
+          802.11n chipsets.
+
+          If you choose to build it as a module, it will be called
+          mwifiex.
+
+config MWIFIEX_SDIO
+        tristate "Marvell WiFi-Ex Driver for SD8787"
+        depends on MWIFIEX && MMC
+        select FW_LOADER
+        ---help---
+          This adds support for wireless adapters based on Marvell
+          8787 chipset with SDIO interface.
+
+          If you choose to build it as a module, it will be called
+          mwifiex_sdio.
diff --git a/drivers/net/wireless/mwifiex/Makefile b/drivers/net/wireless/mwifiex/Makefile
new file mode 100644
index 00000000000..42cb733ea33
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/Makefile
@@ -0,0 +1,41 @@
+#
+# Copyright (C) 2011, Marvell International Ltd.
+#
+# This software file (the "File") is distributed by Marvell International
+# Ltd. under the terms of the GNU General Public License Version 2, June 1991
+# (the "License").  You may use, redistribute and/or modify this File in
+# accordance with the terms and conditions of the License, a copy of which
+# is available by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+# worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+# ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+# this warranty disclaimer.
+
+
+mwifiex-y += main.o
+mwifiex-y += init.o
+mwifiex-y += cfp.o
+mwifiex-y += cmdevt.o
+mwifiex-y += util.o
+mwifiex-y += txrx.o
+mwifiex-y += wmm.o
+mwifiex-y += 11n.o
+mwifiex-y += 11n_aggr.o
+mwifiex-y += 11n_rxreorder.o
+mwifiex-y += scan.o
+mwifiex-y += join.o
+mwifiex-y += sta_ioctl.o
+mwifiex-y += sta_cmd.o
+mwifiex-y += sta_cmdresp.o
+mwifiex-y += sta_event.o
+mwifiex-y += sta_tx.o
+mwifiex-y += sta_rx.o
+mwifiex-y += cfg80211.o
+mwifiex-$(CONFIG_DEBUG_FS) += debugfs.o
+obj-$(CONFIG_MWIFIEX) += mwifiex.o
+
+mwifiex_sdio-y += sdio.o
+obj-$(CONFIG_MWIFIEX_SDIO) += mwifiex_sdio.o
diff --git a/drivers/net/wireless/mwifiex/README b/drivers/net/wireless/mwifiex/README
new file mode 100644
index 00000000000..338377f7093
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/README
@@ -0,0 +1,204 @@
+# Copyright (C) 2011, Marvell International Ltd.
+#
+# This software file (the "File") is distributed by Marvell International
+# Ltd. under the terms of the GNU General Public License Version 2, June 1991
+# (the "License").  You may use, redistribute and/or modify this File in
+# accordance with the terms and conditions of the License, a copy of which
+# is available by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+# worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+# ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+# this warranty disclaimer.
+
+
+===============================================================================
+                        U S E R  M A N U A L
+
+1) FOR DRIVER INSTALL
+
+        a) Copy sd8787.bin to /lib/firmware/mrvl/ directory,
+           create the directory if it doesn't exist.
+        b) Install WLAN driver,
+                insmod mwifiex.ko
+        c) Uninstall WLAN driver,
+                ifconfig mlanX down
+                rmmod mwifiex
+
+
+2) FOR DRIVER CONFIGURATION AND INFO
+        The configurations can be done either using the 'iw' user space
+        utility or debugfs.
+
+        a) 'iw' utility commands
+
+        Following are some useful iw commands:-
+
+iw dev mlan0 scan
+
+        This command will trigger a scan.
+        The command will then display the scan table entries
+
+iw dev mlan0 connect -w <SSID> [<freq in MHz>] [<bssid>] [key 0:abcde d:1123456789a]
+        The above command can be used to connect to an AP with a particular SSID.
+        Ap's operating frequency can be specified or even the bssid. If the AP is using
+        WEP encryption, wep keys can be specified in the command.
+        Note: Every time before connecting to an AP scan command (iw dev mlan0 scan) should be used by user.
+
+iw dev mlan0 disconnect
+        This command will be used to disconnect from an AP.
+
+
+iw dev mlan0 ibss join <SSID> <freq in MHz> [fixed-freq] [fixed-bssid] [key 0:abcde]
+        The command will be used to join or create an ibss. Optionally, operating frequency,
+        bssid and the security related parameters can be specified while joining/creating
+        and ibss.
+
+iw dev mlan0 ibss leave
+        The command will be used to leave an ibss network.
+
+iw dev mlan0 link
+        The command will be used to get the connection status. The command will return parameters
+        such as SSID, operating frequency, rx/tx packets, signal strength, tx bitrate.
+
+        Apart from the iw utility all standard configurations using the 'iwconfig' utility are also supported.
+
+        b) Debugfs interface
+
+        The debugfs interface can be used for configurations and for getting
+        some useful information from the driver.
+        The section below explains the configurations that can be
+        done.
+
+        Mount debugfs to /debugfs mount point:
+
+                mkdir /debugfs
+                mount -t debugfs debugfs /debugfs
+
+        The information is provided in /debugfs/mwifiex/mlanX/:
+
+iw reg set <country code>
+        The command will be used to change the regulatory domain.
+
+iw reg get
+        The command will be used to get current regulatory domain.
+
+info
+        This command is used to get driver info.
+
+        Usage:
+                cat info
+
+        driver_name = "mwifiex"
+        driver_version = <driver_name, driver_version, (firmware_version)>
+        interface_name = "mlanX"
+        bss_mode = "Ad-hoc" | "Managed" | "Auto" | "Unknown"
+        media_state = "Disconnected" | "Connected"
+        mac_address = <6-byte adapter MAC address>
+        multicase_count = <multicast address count>
+        essid = <current SSID>
+        bssid = <current BSSID>
+        channel = <current channel>
+        region_code = <current region code>
+        multicasr_address[n] = <multicast address>
+        num_tx_bytes = <number of bytes sent to device>
+        num_rx_bytes = <number of bytes received from device and sent to kernel>
+        num_tx_pkts = <number of packets sent to device>
+        num_rx_pkts = <number of packets received from device and sent to kernel>
+        num_tx_pkts_dropped = <number of Tx packets dropped by driver>
+        num_rx_pkts_dropped = <number of Rx packets dropped by driver>
+        num_tx_pkts_err = <number of Tx packets failed to send to device>
+        num_rx_pkts_err = <number of Rx packets failed to receive from device>
+        carrier "on" | "off"
+        tx queue "stopped" | "started"
+
+        The following debug info are provided in /debugfs/mwifiex/mlanX/debug:
+
+        int_counter = <interrupt count, cleared when interrupt handled>
+        wmm_ac_vo = <number of packets sent to device from WMM AcVo queue>
+        wmm_ac_vi = <number of packets sent to device from WMM AcVi queue>
+        wmm_ac_be = <number of packets sent to device from WMM AcBE queue>
+        wmm_ac_bk = <number of packets sent to device from WMM AcBK queue>
+        max_tx_buf_size = <maximum Tx buffer size>
+        tx_buf_size = <current Tx buffer size>
+        curr_tx_buf_size = <current Tx buffer size>
+        ps_mode = <0/1, CAM mode/PS mode>
+        ps_state = <0/1/2/3, full power state/awake state/pre-sleep state/sleep state>
+        is_deep_sleep = <0/1, not deep sleep state/deep sleep state>
+        wakeup_dev_req = <0/1, wakeup device not required/required>
+        wakeup_tries = <wakeup device count, cleared when device awake>
+        hs_configured = <0/1, host sleep not configured/configured>
+        hs_activated = <0/1, extended host sleep not activated/activated>
+        num_tx_timeout = <number of Tx timeout>
+        num_cmd_timeout = <number of timeout commands>
+        timeout_cmd_id = <command id of the last timeout command>
+        timeout_cmd_act = <command action of the last timeout command>
+        last_cmd_id = <command id of the last several commands sent to device>
+        last_cmd_act = <command action of the last several commands sent to device>
+        last_cmd_index = <0 based last command index>
+        last_cmd_resp_id = <command id of the last several command responses received from device>
+        last_cmd_resp_index = <0 based last command response index>
+        last_event = <event id of the last several events received from device>
+        last_event_index = <0 based last event index>
+        num_cmd_h2c_fail = <number of commands failed to send to device>
+        num_cmd_sleep_cfm_fail = <number of sleep confirm failed to send to device>
+        num_tx_h2c_fail = <number of data packets failed to send to device>
+        num_evt_deauth = <number of deauthenticated events received from device>
+        num_evt_disassoc = <number of disassociated events received from device>
+        num_evt_link_lost = <number of link lost events received from device>
+        num_cmd_deauth = <number of deauthenticate commands sent to device>
+        num_cmd_assoc_ok = <number of associate commands with success return>
+        num_cmd_assoc_fail = <number of associate commands with failure return>
+        cmd_sent = <0/1, send command resources available/sending command to device>
+        data_sent = <0/1, send data resources available/sending data to device>
+        mp_rd_bitmap = <SDIO multi-port read bitmap>
+        mp_wr_bitmap = <SDIO multi-port write bitmap>
+        cmd_resp_received = <0/1, no cmd response to process/response received and yet to process>
+        event_received = <0/1, no event to process/event received and yet to process>
+        ioctl_pending = <number of ioctl pending>
+        tx_pending = <number of Tx packet pending>
+        rx_pending = <number of Rx packet pending>
+
+
+3) FOR DRIVER CONFIGURATION
+
+regrdwr
+        This command is used to read/write the adapter register.
+
+        Usage:
+                echo " <type> <offset> [value]" > regrdwr
+                cat regrdwr
+
+        where the parameters are,
+                <type>:     1:MAC/SOC, 2:BBP, 3:RF, 4:PMIC, 5:CAU
+                <offset>:   offset of register
+                [value]:    value to be written
+
+        Examples:
+                echo "1 0xa060" > regrdwr           : Read the MAC register
+                echo "1 0xa060 0x12" > regrdwr      : Write the MAC register
+                echo "1 0xa794 0x80000000" > regrdwr
+                                                    : Write 0x80000000 to MAC register
+rdeeprom
+        This command is used to read the EEPROM contents of the card.
+
+        Usage:
+                echo "<offset> <length>" > rdeeprom
+                cat rdeeprom
+
+        where the parameters are,
+                <offset>:   multiples of 4
+                <length>:   4-20, multiples of 4
+
+        Example:
+                echo "0 20" > rdeeprom      : Read 20 bytes of EEPROM data from offset 0
+
+getlog
+        This command is used to get the statistics available in the station.
+        Usage:
+
+        cat getlog
+
+===============================================================================
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
new file mode 100644
index 00000000000..80f367f27ef
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -0,0 +1,1517 @@
+/*
+ * Marvell Wireless LAN device driver: CFG80211
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "cfg80211.h"
+#include "main.h"
+
+/*
+ * This function maps the nl802.11 channel type into driver channel type.
+ *
+ * The mapping is as follows -
+ *      NL80211_CHAN_NO_HT     -> NO_SEC_CHANNEL
+ *      NL80211_CHAN_HT20      -> NO_SEC_CHANNEL
+ *      NL80211_CHAN_HT40PLUS  -> SEC_CHANNEL_ABOVE
+ *      NL80211_CHAN_HT40MINUS -> SEC_CHANNEL_BELOW
+ *      Others                 -> NO_SEC_CHANNEL
+ */
+static int
+mwifiex_cfg80211_channel_type_to_mwifiex_channels(enum nl80211_channel_type
+                                                  channel_type)
+{
+        int channel;
+        switch (channel_type) {
+        case NL80211_CHAN_NO_HT:
+        case NL80211_CHAN_HT20:
+                channel = NO_SEC_CHANNEL;
+                break;
+        case NL80211_CHAN_HT40PLUS:
+                channel = SEC_CHANNEL_ABOVE;
+                break;
+        case NL80211_CHAN_HT40MINUS:
+                channel = SEC_CHANNEL_BELOW;
+                break;
+        default:
+                channel = NO_SEC_CHANNEL;
+        }
+        return channel;
+}
+
+/*
+ * This function maps the driver channel type into nl802.11 channel type.
+ *
+ * The mapping is as follows -
+ *      NO_SEC_CHANNEL      -> NL80211_CHAN_HT20
+ *      SEC_CHANNEL_ABOVE   -> NL80211_CHAN_HT40PLUS
+ *      SEC_CHANNEL_BELOW   -> NL80211_CHAN_HT40MINUS
+ *      Others              -> NL80211_CHAN_HT20
+ */
+static enum nl80211_channel_type
+mwifiex_channels_to_cfg80211_channel_type(int channel_type)
+{
+        int channel;
+        switch (channel_type) {
+        case NO_SEC_CHANNEL:
+                channel = NL80211_CHAN_HT20;
+                break;
+        case SEC_CHANNEL_ABOVE:
+                channel = NL80211_CHAN_HT40PLUS;
+                break;
+        case SEC_CHANNEL_BELOW:
+                channel = NL80211_CHAN_HT40MINUS;
+                break;
+        default:
+                channel = NL80211_CHAN_HT20;
+        }
+        return channel;
+}
+
+/*
+ * This function checks whether WEP is set.
+ */
+static int
+mwifiex_is_alg_wep(u32 cipher)
+{
+        int alg = 0;
+
+        switch (cipher) {
+        case MWIFIEX_ENCRYPTION_MODE_WEP40:
+        case MWIFIEX_ENCRYPTION_MODE_WEP104:
+                alg = 1;
+                break;
+        default:
+                alg = 0;
+                break;
+        }
+        return alg;
+}
+
+/*
+ * This function maps the given cipher type into driver specific type.
+ *
+ * It also sets a flag to indicate whether WPA is enabled or not.
+ *
+ * The mapping table is -
+ *      Input cipher                Driver cipher type              WPA enabled?
+ *      ------------                ------------------              ------------
+ *      IW_AUTH_CIPHER_NONE         MWIFIEX_ENCRYPTION_MODE_NONE    No
+ *      WLAN_CIPHER_SUITE_WEP40     MWIFIEX_ENCRYPTION_MODE_WEP40   No
+ *      WLAN_CIPHER_SUITE_WEP104    MWIFIEX_ENCRYPTION_MODE_WEP104  No
+ *      WLAN_CIPHER_SUITE_TKIP      MWIFIEX_ENCRYPTION_MODE_TKIP    Yes
+ *      WLAN_CIPHER_SUITE_CCMP      MWIFIEX_ENCRYPTION_MODE_CCMP    Yes
+ *      Others                      -1                              No
+ */
+static int
+mwifiex_get_mwifiex_cipher(u32 cipher, int *wpa_enabled)
+{
+        int encrypt_mode;
+
+        if (wpa_enabled)
+                *wpa_enabled = 0;
+        switch (cipher) {
+        case IW_AUTH_CIPHER_NONE:
+                encrypt_mode = MWIFIEX_ENCRYPTION_MODE_NONE;
+                break;
+        case WLAN_CIPHER_SUITE_WEP40:
+                encrypt_mode = MWIFIEX_ENCRYPTION_MODE_WEP40;
+                break;
+        case WLAN_CIPHER_SUITE_WEP104:
+                encrypt_mode = MWIFIEX_ENCRYPTION_MODE_WEP104;
+                break;
+        case WLAN_CIPHER_SUITE_TKIP:
+                encrypt_mode = MWIFIEX_ENCRYPTION_MODE_TKIP;
+                if (wpa_enabled)
+                        *wpa_enabled = 1;
+                break;
+        case WLAN_CIPHER_SUITE_CCMP:
+                encrypt_mode = MWIFIEX_ENCRYPTION_MODE_CCMP;
+                if (wpa_enabled)
+                        *wpa_enabled = 1;
+                break;
+        default:
+                encrypt_mode = -1;
+        }
+
+        return encrypt_mode;
+}
+
+/*
+ * This function retrieves the private structure from kernel wiphy structure.
+ */
+static void *mwifiex_cfg80211_get_priv(struct wiphy *wiphy)
+{
+        return (void *) (*(unsigned long *) wiphy_priv(wiphy));
+}
+
+/*
+ * CFG802.11 operation handler to delete a network key.
+ */
+static int
+mwifiex_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev,
+                         u8 key_index, bool pairwise, const u8 *mac_addr)
+{
+        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        int ret = 0;
+
+        ret = mwifiex_set_encode(priv, NULL, 0, key_index, 1);
+        if (ret) {
+                wiphy_err(wiphy, "deleting the crypto keys\n");
+                return -EFAULT;
+        }
+
+        wiphy_dbg(wiphy, "info: crypto keys deleted\n");
+        return 0;
+}
+
+/*
+ * CFG802.11 operation handler to set Tx power.
+ */
+static int
+mwifiex_cfg80211_set_tx_power(struct wiphy *wiphy,
+                              enum nl80211_tx_power_setting type,
+                              int dbm)
+{
+        int ret = 0;
+        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+
+        ret = mwifiex_set_tx_power(priv, type, dbm);
+
+        return ret;
+}
+
+/*
+ * CFG802.11 operation handler to set Power Save option.
+ *
+ * The timeout value, if provided, is currently ignored.
+ */
+static int
+mwifiex_cfg80211_set_power_mgmt(struct wiphy *wiphy,
+                                struct net_device *dev,
+                                bool enabled, int timeout)
+{
+        int ret = 0;
+        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+
+        if (timeout)
+                wiphy_dbg(wiphy,
+                        "info: ignoring the timeout value"
+                        " for IEEE power save\n");
+
+        ret = mwifiex_drv_set_power(priv, enabled);
+
+        return ret;
+}
+
+/*
+ * CFG802.11 operation handler to set the default network key.
+ */
+static int
+mwifiex_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *netdev,
+                                 u8 key_index, bool unicast,
+                                 bool multicast)
+{
+        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        int ret;
+
+        ret = mwifiex_set_encode(priv, NULL, 0, key_index, 0);
+
+        wiphy_dbg(wiphy, "info: set default Tx key index\n");
+
+        if (ret)
+                return -EFAULT;
+
+        return 0;
+}
+
+/*
+ * CFG802.11 operation handler to add a network key.
+ */
+static int
+mwifiex_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev,
+                         u8 key_index, bool pairwise, const u8 *mac_addr,
+                         struct key_params *params)
+{
+        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        int ret = 0;
+        int encrypt_mode;
+
+        encrypt_mode = mwifiex_get_mwifiex_cipher(params->cipher, NULL);
+
+        if (encrypt_mode != -1)
+                ret = mwifiex_set_encode(priv, params->key, params->key_len,
+                                                key_index, 0);
+
+        wiphy_dbg(wiphy, "info: crypto keys added\n");
+
+        if (ret)
+                return -EFAULT;
+
+        return 0;
+}
+
+/*
+ * This function sends domain information to the firmware.
+ *
+ * The following information are passed to the firmware -
+ *      - Country codes
+ *      - Sub bands (first channel, number of channels, maximum Tx power)
+ */
+static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy)
+{
+        u8 no_of_triplet = 0;
+        struct ieee80211_country_ie_triplet *t;
+        u8 no_of_parsed_chan = 0;
+        u8 first_chan = 0, next_chan = 0, max_pwr = 0;
+        u8 i, flag = 0;
+        enum ieee80211_band band;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *ch;
+        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct mwifiex_802_11d_domain_reg *domain_info = &adapter->domain_reg;
+        int ret = 0;
+
+        /* Set country code */
+        domain_info->country_code[0] = priv->country_code[0];
+        domain_info->country_code[1] = priv->country_code[1];
+        domain_info->country_code[2] = ' ';
+
+        band = mwifiex_band_to_radio_type(adapter->config_bands);
+        if (!wiphy->bands[band]) {
+                wiphy_err(wiphy, "11D: setting domain info in FW\n");
+                return -1;
+        }
+
+        sband = wiphy->bands[band];
+
+        for (i = 0; i < sband->n_channels ; i++) {
+                ch = &sband->channels[i];
+                if (ch->flags & IEEE80211_CHAN_DISABLED)
+                        continue;
+
+                if (!flag) {
+                        flag = 1;
+                        first_chan = (u32) ch->hw_value;
+                        next_chan = first_chan;
+                        max_pwr = ch->max_power;
+                        no_of_parsed_chan = 1;
+                        continue;
+                }
+
+                if (ch->hw_value == next_chan + 1 &&
+                                ch->max_power == max_pwr) {
+                        next_chan++;
+                        no_of_parsed_chan++;
+                } else {
+                        t = &domain_info->triplet[no_of_triplet];
+                        t->chans.first_channel = first_chan;
+                        t->chans.num_channels = no_of_parsed_chan;
+                        t->chans.max_power = max_pwr;
+                        no_of_triplet++;
+                        first_chan = (u32) ch->hw_value;
+                        next_chan = first_chan;
+                        max_pwr = ch->max_power;
+                        no_of_parsed_chan = 1;
+                }
+        }
+
+        if (flag) {
+                t = &domain_info->triplet[no_of_triplet];
+                t->chans.first_channel = first_chan;
+                t->chans.num_channels = no_of_parsed_chan;
+                t->chans.max_power = max_pwr;
+                no_of_triplet++;
+        }
+
+        domain_info->no_of_triplet = no_of_triplet;
+        /* Send cmd to FW to set domain info */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11D_DOMAIN_INFO,
+                                  HostCmd_ACT_GEN_SET, 0, NULL, NULL);
+        if (ret)
+                wiphy_err(wiphy, "11D: setting domain info in FW\n");
+
+        return ret;
+}
+
+/*
+ * CFG802.11 regulatory domain callback function.
+ *
+ * This function is called when the regulatory domain is changed due to the
+ * following reasons -
+ *      - Set by driver
+ *      - Set by system core
+ *      - Set by user
+ *      - Set bt Country IE
+ */
+static int mwifiex_reg_notifier(struct wiphy *wiphy,
+                struct regulatory_request *request)
+{
+        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+
+        wiphy_dbg(wiphy, "info: cfg80211 regulatory domain callback for domain"
+                        " %c%c\n", request->alpha2[0], request->alpha2[1]);
+
+        memcpy(priv->country_code, request->alpha2, sizeof(request->alpha2));
+
+        switch (request->initiator) {
+        case NL80211_REGDOM_SET_BY_DRIVER:
+        case NL80211_REGDOM_SET_BY_CORE:
+        case NL80211_REGDOM_SET_BY_USER:
+                break;
+                /* Todo: apply driver specific changes in channel flags based
+                   on the request initiator if necessary. */
+        case NL80211_REGDOM_SET_BY_COUNTRY_IE:
+                break;
+        }
+        mwifiex_send_domain_info_cmd_fw(wiphy);
+
+        return 0;
+}
+
+/*
+ * This function sets the RF channel.
+ *
+ * This function creates multiple IOCTL requests, populates them accordingly
+ * and issues them to set the band/channel and frequency.
+ */
+static int
+mwifiex_set_rf_channel(struct mwifiex_private *priv,
+                       struct ieee80211_channel *chan,
+                       enum nl80211_channel_type channel_type)
+{
+        struct mwifiex_chan_freq_power cfp;
+        int ret = 0;
+        int status = 0;
+        struct mwifiex_ds_band_cfg band_cfg;
+        int mode;
+        u8 wait_option = MWIFIEX_IOCTL_WAIT;
+        u32 config_bands = 0;
+        struct wiphy *wiphy = priv->wdev->wiphy;
+
+        mode = mwifiex_drv_get_mode(priv, wait_option);
+
+        if (chan) {
+                memset(&band_cfg, 0, sizeof(band_cfg));
+                /* Set appropriate bands */
+                if (chan->band == IEEE80211_BAND_2GHZ)
+                        config_bands = BAND_B | BAND_G | BAND_GN;
+                else
+                        config_bands = BAND_AN | BAND_A;
+                if (mode == MWIFIEX_BSS_MODE_INFRA
+                    || mode == MWIFIEX_BSS_MODE_AUTO) {
+                        band_cfg.config_bands = config_bands;
+                } else if (mode == MWIFIEX_BSS_MODE_IBSS) {
+                        band_cfg.config_bands = config_bands;
+                        band_cfg.adhoc_start_band = config_bands;
+                }
+                /* Set channel offset */
+                band_cfg.sec_chan_offset =
+                        mwifiex_cfg80211_channel_type_to_mwifiex_channels
+                        (channel_type);
+                status = mwifiex_radio_ioctl_band_cfg(priv, HostCmd_ACT_GEN_SET,
+                                                      &band_cfg);
+
+                if (status)
+                        return -EFAULT;
+                mwifiex_send_domain_info_cmd_fw(wiphy);
+        }
+
+        wiphy_dbg(wiphy, "info: setting band %d, channel offset %d and "
+                "mode %d\n", config_bands, band_cfg.sec_chan_offset, mode);
+        if (!chan)
+                return ret;
+
+        memset(&cfp, 0, sizeof(cfp));
+        cfp.freq = chan->center_freq;
+        /* Convert frequency to channel */
+        cfp.channel = ieee80211_frequency_to_channel(chan->center_freq);
+
+        status = mwifiex_bss_ioctl_channel(priv, HostCmd_ACT_GEN_SET, &cfp);
+        if (status)
+                return -EFAULT;
+
+        ret = mwifiex_drv_change_adhoc_chan(priv, cfp.channel);
+
+        return ret;
+}
+
+/*
+ * CFG802.11 operation handler to set channel.
+ *
+ * This function can only be used when station is not connected.
+ */
+static int
+mwifiex_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev,
+                             struct ieee80211_channel *chan,
+                             enum nl80211_channel_type channel_type)
+{
+        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+
+        if (priv->media_connected) {
+                wiphy_err(wiphy, "This setting is valid only when station "
+                                "is not connected\n");
+                return -EINVAL;
+        }
+
+        return mwifiex_set_rf_channel(priv, chan, channel_type);
+}
+
+/*
+ * This function sets the fragmentation threshold.
+ *
+ * This function creates an IOCTL request, populates it accordingly
+ * and issues an IOCTL.
+ *
+ * The fragmentation threshold value must lies between MWIFIEX_FRAG_MIN_VALUE
+ * and MWIFIEX_FRAG_MAX_VALUE.
+ */
+static int
+mwifiex_set_frag(struct mwifiex_private *priv, u32 frag_thr)
+{
+        int ret = 0;
+        int status = 0;
+        struct mwifiex_wait_queue *wait = NULL;
+        u8 wait_option = MWIFIEX_IOCTL_WAIT;
+
+        if (frag_thr < MWIFIEX_FRAG_MIN_VALUE
+            || frag_thr > MWIFIEX_FRAG_MAX_VALUE)
+                return -EINVAL;
+
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        status = mwifiex_snmp_mib_ioctl(priv, wait, FRAG_THRESH_I,
+                                        HostCmd_ACT_GEN_SET, &frag_thr);
+
+        if (mwifiex_request_ioctl(priv, wait, status, wait_option))
+                ret = -EFAULT;
+
+        kfree(wait);
+        return ret;
+}
+
+/*
+ * This function sets the RTS threshold.
+ *
+ * This function creates an IOCTL request, populates it accordingly
+ * and issues an IOCTL.
+ */
+static int
+mwifiex_set_rts(struct mwifiex_private *priv, u32 rts_thr)
+{
+        int ret = 0;
+        struct mwifiex_wait_queue *wait = NULL;
+        int status = 0;
+        u8 wait_option = MWIFIEX_IOCTL_WAIT;
+
+        if (rts_thr < MWIFIEX_RTS_MIN_VALUE || rts_thr > MWIFIEX_RTS_MAX_VALUE)
+                rts_thr = MWIFIEX_RTS_MAX_VALUE;
+
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        status = mwifiex_snmp_mib_ioctl(priv, wait, RTS_THRESH_I,
+                                        HostCmd_ACT_GEN_SET, &rts_thr);
+
+        if (mwifiex_request_ioctl(priv, wait, status, wait_option))
+                ret = -EFAULT;
+
+        kfree(wait);
+        return ret;
+}
+
+/*
+ * CFG802.11 operation handler to set wiphy parameters.
+ *
+ * This function can be used to set the RTS threshold and the
+ * Fragmentation threshold of the driver.
+ */
+static int
+mwifiex_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
+{
+        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+
+        int ret = 0;
+
+        if (changed & WIPHY_PARAM_RTS_THRESHOLD)
+                ret = mwifiex_set_rts(priv, wiphy->rts_threshold);
+
+        if (changed & WIPHY_PARAM_FRAG_THRESHOLD)
+                ret = mwifiex_set_frag(priv, wiphy->frag_threshold);
+
+        return ret;
+}
+
+/*
+ * CFG802.11 operation handler to change interface type.
+ *
+ * This function creates an IOCTL request, populates it accordingly
+ * and issues an IOCTL.
+ *
+ * The function also maps the CFG802.11 mode type into driver mode type.
+ *      NL80211_IFTYPE_ADHOC        -> MWIFIEX_BSS_MODE_IBSS
+ *      NL80211_IFTYPE_STATION      -> MWIFIEX_BSS_MODE_INFRA
+ *      NL80211_IFTYPE_UNSPECIFIED  -> MWIFIEX_BSS_MODE_AUTO
+ */
+static int
+mwifiex_cfg80211_change_virtual_intf(struct wiphy *wiphy,
+                                     struct net_device *dev,
+                                     enum nl80211_iftype type, u32 *flags,
+                                     struct vif_params *params)
+{
+        int ret = 0;
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+        int mode = -1;
+        struct mwifiex_wait_queue *wait = NULL;
+        int status = 0;
+
+        wait = mwifiex_alloc_fill_wait_queue(priv, MWIFIEX_IOCTL_WAIT);
+        if (!wait)
+                return -ENOMEM;
+
+        switch (type) {
+        case NL80211_IFTYPE_ADHOC:
+                mode = MWIFIEX_BSS_MODE_IBSS;
+                dev->ieee80211_ptr->iftype = NL80211_IFTYPE_ADHOC;
+                wiphy_dbg(wiphy, "info: setting interface type to adhoc\n");
+                break;
+        case NL80211_IFTYPE_STATION:
+                mode = MWIFIEX_BSS_MODE_INFRA;
+                dev->ieee80211_ptr->iftype = NL80211_IFTYPE_STATION;
+                wiphy_dbg(wiphy, "info: Setting interface type to managed\n");
+                break;
+        case NL80211_IFTYPE_UNSPECIFIED:
+                mode = MWIFIEX_BSS_MODE_AUTO;
+                dev->ieee80211_ptr->iftype = NL80211_IFTYPE_STATION;
+                wiphy_dbg(wiphy, "info: setting interface type to auto\n");
+                break;
+        default:
+                ret = -EINVAL;
+        }
+        if (ret)
+                goto done;
+        status = mwifiex_bss_ioctl_mode(priv, wait, HostCmd_ACT_GEN_SET, &mode);
+
+        if (mwifiex_request_ioctl(priv, wait, status, MWIFIEX_IOCTL_WAIT))
+                ret = -EFAULT;
+
+done:
+        kfree(wait);
+        return ret;
+}
+
+/*
+ * This function dumps the station information on a buffer.
+ *
+ * The following information are shown -
+ *      - Total bytes transmitted
+ *      - Total bytes received
+ *      - Total packets transmitted
+ *      - Total packets received
+ *      - Signal quality level
+ *      - Transmission rate
+ */
+static int
+mwifiex_dump_station_info(struct mwifiex_private *priv,
+                          struct station_info *sinfo)
+{
+        struct mwifiex_ds_get_signal signal;
+        struct mwifiex_rate_cfg rate;
+        int ret = 0;
+
+        sinfo->filled = STATION_INFO_RX_BYTES | STATION_INFO_TX_BYTES |
+                STATION_INFO_RX_PACKETS |
+                STATION_INFO_TX_PACKETS
+                | STATION_INFO_SIGNAL | STATION_INFO_TX_BITRATE;
+
+        /* Get signal information from the firmware */
+        memset(&signal, 0, sizeof(struct mwifiex_ds_get_signal));
+        if (mwifiex_get_signal_info(priv, MWIFIEX_IOCTL_WAIT, &signal)) {
+                dev_err(priv->adapter->dev, "getting signal information\n");
+                ret = -EFAULT;
+        }
+
+        if (mwifiex_drv_get_data_rate(priv, &rate)) {
+                dev_err(priv->adapter->dev, "getting data rate\n");
+                ret = -EFAULT;
+        }
+
+        sinfo->rx_bytes = priv->stats.rx_bytes;
+        sinfo->tx_bytes = priv->stats.tx_bytes;
+        sinfo->rx_packets = priv->stats.rx_packets;
+        sinfo->tx_packets = priv->stats.tx_packets;
+        sinfo->signal = priv->w_stats.qual.level;
+        sinfo->txrate.legacy = rate.rate;
+
+        return ret;
+}
+
+/*
+ * CFG802.11 operation handler to get station information.
+ *
+ * This function only works in connected mode, and dumps the
+ * requested station information, if available.
+ */
+static int
+mwifiex_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
+                             u8 *mac, struct station_info *sinfo)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+        int ret = 0;
+
+        mwifiex_dump_station_info(priv, sinfo);
+
+        if (!priv->media_connected)
+                return -ENOENT;
+        if (memcmp(mac, priv->cfg_bssid, ETH_ALEN))
+                return -ENOENT;
+
+
+        ret = mwifiex_dump_station_info(priv, sinfo);
+
+        return ret;
+}
+
+/* Supported rates to be advertised to the cfg80211 */
+
+static struct ieee80211_rate mwifiex_rates[] = {
+        {.bitrate = 10, .hw_value = 2, },
+        {.bitrate = 20, .hw_value = 4, },
+        {.bitrate = 55, .hw_value = 11, },
+        {.bitrate = 110, .hw_value = 22, },
+        {.bitrate = 220, .hw_value = 44, },
+        {.bitrate = 60, .hw_value = 12, },
+        {.bitrate = 90, .hw_value = 18, },
+        {.bitrate = 120, .hw_value = 24, },
+        {.bitrate = 180, .hw_value = 36, },
+        {.bitrate = 240, .hw_value = 48, },
+        {.bitrate = 360, .hw_value = 72, },
+        {.bitrate = 480, .hw_value = 96, },
+        {.bitrate = 540, .hw_value = 108, },
+        {.bitrate = 720, .hw_value = 144, },
+};
+
+/* Channel definitions to be advertised to cfg80211 */
+
+static struct ieee80211_channel mwifiex_channels_2ghz[] = {
+        {.center_freq = 2412, .hw_value = 1, },
+        {.center_freq = 2417, .hw_value = 2, },
+        {.center_freq = 2422, .hw_value = 3, },
+        {.center_freq = 2427, .hw_value = 4, },
+        {.center_freq = 2432, .hw_value = 5, },
+        {.center_freq = 2437, .hw_value = 6, },
+        {.center_freq = 2442, .hw_value = 7, },
+        {.center_freq = 2447, .hw_value = 8, },
+        {.center_freq = 2452, .hw_value = 9, },
+        {.center_freq = 2457, .hw_value = 10, },
+        {.center_freq = 2462, .hw_value = 11, },
+        {.center_freq = 2467, .hw_value = 12, },
+        {.center_freq = 2472, .hw_value = 13, },
+        {.center_freq = 2484, .hw_value = 14, },
+};
+
+static struct ieee80211_supported_band mwifiex_band_2ghz = {
+        .channels = mwifiex_channels_2ghz,
+        .n_channels = ARRAY_SIZE(mwifiex_channels_2ghz),
+        .bitrates = mwifiex_rates,
+        .n_bitrates = 14,
+};
+
+static struct ieee80211_channel mwifiex_channels_5ghz[] = {
+        {.center_freq = 5040, .hw_value = 8, },
+        {.center_freq = 5060, .hw_value = 12, },
+        {.center_freq = 5080, .hw_value = 16, },
+        {.center_freq = 5170, .hw_value = 34, },
+        {.center_freq = 5190, .hw_value = 38, },
+        {.center_freq = 5210, .hw_value = 42, },
+        {.center_freq = 5230, .hw_value = 46, },
+        {.center_freq = 5180, .hw_value = 36, },
+        {.center_freq = 5200, .hw_value = 40, },
+        {.center_freq = 5220, .hw_value = 44, },
+        {.center_freq = 5240, .hw_value = 48, },
+        {.center_freq = 5260, .hw_value = 52, },
+        {.center_freq = 5280, .hw_value = 56, },
+        {.center_freq = 5300, .hw_value = 60, },
+        {.center_freq = 5320, .hw_value = 64, },
+        {.center_freq = 5500, .hw_value = 100, },
+        {.center_freq = 5520, .hw_value = 104, },
+        {.center_freq = 5540, .hw_value = 108, },
+        {.center_freq = 5560, .hw_value = 112, },
+        {.center_freq = 5580, .hw_value = 116, },
+        {.center_freq = 5600, .hw_value = 120, },
+        {.center_freq = 5620, .hw_value = 124, },
+        {.center_freq = 5640, .hw_value = 128, },
+        {.center_freq = 5660, .hw_value = 132, },
+        {.center_freq = 5680, .hw_value = 136, },
+        {.center_freq = 5700, .hw_value = 140, },
+        {.center_freq = 5745, .hw_value = 149, },
+        {.center_freq = 5765, .hw_value = 153, },
+        {.center_freq = 5785, .hw_value = 157, },
+        {.center_freq = 5805, .hw_value = 161, },
+        {.center_freq = 5825, .hw_value = 165, },
+};
+
+static struct ieee80211_supported_band mwifiex_band_5ghz = {
+        .channels = mwifiex_channels_5ghz,
+        .n_channels = ARRAY_SIZE(mwifiex_channels_5ghz),
+        .bitrates = mwifiex_rates - 4,
+        .n_bitrates = ARRAY_SIZE(mwifiex_rates) + 4,
+};
+
+
+/* Supported crypto cipher suits to be advertised to cfg80211 */
+
+static const u32 mwifiex_cipher_suites[] = {
+        WLAN_CIPHER_SUITE_WEP40,
+        WLAN_CIPHER_SUITE_WEP104,
+        WLAN_CIPHER_SUITE_TKIP,
+        WLAN_CIPHER_SUITE_CCMP,
+};
+
+/*
+ * CFG802.11 operation handler for disconnection request.
+ *
+ * This function does not work when there is already a disconnection
+ * procedure going on.
+ */
+static int
+mwifiex_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
+                            u16 reason_code)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+
+        if (priv->disconnect)
+                return -EBUSY;
+
+        priv->disconnect = 1;
+        if (mwifiex_disconnect(priv, MWIFIEX_IOCTL_WAIT, NULL))
+                return -EFAULT;
+
+        wiphy_dbg(wiphy, "info: successfully disconnected from %pM:"
+                " reason code %d\n", priv->cfg_bssid, reason_code);
+
+        queue_work(priv->workqueue, &priv->cfg_workqueue);
+
+        return 0;
+}
+
+/*
+ * This function informs the CFG802.11 subsystem of a new IBSS.
+ *
+ * The following information are sent to the CFG802.11 subsystem
+ * to register the new IBSS. If we do not register the new IBSS,
+ * a kernel panic will result.
+ *      - SSID
+ *      - SSID length
+ *      - BSSID
+ *      - Channel
+ */
+static int mwifiex_cfg80211_inform_ibss_bss(struct mwifiex_private *priv)
+{
+        int ret = 0;
+        struct ieee80211_channel *chan;
+        struct mwifiex_bss_info bss_info;
+        int ie_len = 0;
+        u8 ie_buf[IEEE80211_MAX_SSID_LEN + sizeof(struct ieee_types_header)];
+
+        ret = mwifiex_get_bss_info(priv, &bss_info);
+        if (ret)
+                return ret;
+
+        ie_buf[0] = WLAN_EID_SSID;
+        ie_buf[1] = bss_info.ssid.ssid_len;
+
+        memcpy(&ie_buf[sizeof(struct ieee_types_header)],
+                        &bss_info.ssid.ssid,
+                        bss_info.ssid.ssid_len);
+        ie_len = ie_buf[1] + sizeof(struct ieee_types_header);
+
+        chan = __ieee80211_get_channel(priv->wdev->wiphy,
+                        ieee80211_channel_to_frequency(bss_info.bss_chan,
+                                                priv->curr_bss_params.band));
+
+        cfg80211_inform_bss(priv->wdev->wiphy, chan,
+                bss_info.bssid, 0, WLAN_CAPABILITY_IBSS,
+                0, ie_buf, ie_len, 0, GFP_KERNEL);
+        memcpy(priv->cfg_bssid, bss_info.bssid, ETH_ALEN);
+
+        return ret;
+}
+
+/*
+ * This function informs the CFG802.11 subsystem of a new BSS connection.
+ *
+ * The following information are sent to the CFG802.11 subsystem
+ * to register the new BSS connection. If we do not register the new BSS,
+ * a kernel panic will result.
+ *      - MAC address
+ *      - Capabilities
+ *      - Beacon period
+ *      - RSSI value
+ *      - Channel
+ *      - Supported rates IE
+ *      - Extended capabilities IE
+ *      - DS parameter set IE
+ *      - HT Capability IE
+ *      - Vendor Specific IE (221)
+ *      - WPA IE
+ *      - RSN IE
+ */
+static int mwifiex_inform_bss_from_scan_result(struct mwifiex_private *priv,
+                                               struct mwifiex_802_11_ssid *ssid)
+{
+        struct mwifiex_scan_resp scan_resp;
+        struct mwifiex_bssdescriptor *scan_table;
+        int i, j;
+        struct ieee80211_channel *chan;
+        u8 *ie, *tmp, *ie_buf;
+        u32 ie_len;
+        u64 ts = 0;
+        u8 *beacon;
+        int beacon_size;
+        u8 element_id, element_len;
+
+        memset(&scan_resp, 0, sizeof(scan_resp));
+        if (mwifiex_get_scan_table(priv, MWIFIEX_IOCTL_WAIT, &scan_resp))
+                return -EFAULT;
+
+#define MAX_IE_BUF      2048
+        ie_buf = kzalloc(MAX_IE_BUF, GFP_KERNEL);
+        if (!ie_buf) {
+                dev_err(priv->adapter->dev, "%s: failed to alloc ie_buf\n",
+                                                __func__);
+                return -ENOMEM;
+        }
+
+        scan_table = (struct mwifiex_bssdescriptor *) scan_resp.scan_table;
+        for (i = 0; i < scan_resp.num_in_scan_table; i++) {
+                if (ssid) {
+                        /* Inform specific BSS only */
+                        if (memcmp(ssid->ssid, scan_table[i].ssid.ssid,
+                                           ssid->ssid_len))
+                                continue;
+                }
+                memset(ie_buf, 0, MAX_IE_BUF);
+                ie_buf[0] = WLAN_EID_SSID;
+                ie_buf[1] = scan_table[i].ssid.ssid_len;
+                memcpy(&ie_buf[sizeof(struct ieee_types_header)],
+                       scan_table[i].ssid.ssid, ie_buf[1]);
+
+                ie = ie_buf + ie_buf[1] + sizeof(struct ieee_types_header);
+                ie_len = ie_buf[1] + sizeof(struct ieee_types_header);
+
+                ie[0] = WLAN_EID_SUPP_RATES;
+
+                for (j = 0; j < sizeof(scan_table[i].supported_rates); j++) {
+                        if (!scan_table[i].supported_rates[j])
+                                break;
+                        else
+                                ie[j + sizeof(struct ieee_types_header)] =
+                                        scan_table[i].supported_rates[j];
+                }
+
+                ie[1] = j;
+                ie_len += ie[1] + sizeof(struct ieee_types_header);
+
+                beacon = scan_table[i].beacon_buf;
+                beacon_size = scan_table[i].beacon_buf_size;
+
+                /* Skip time stamp, beacon interval and capability */
+
+                if (beacon) {
+                        beacon += sizeof(scan_table[i].beacon_period)
+                                + sizeof(scan_table[i].time_stamp) +
+                                +sizeof(scan_table[i].cap_info_bitmap);
+
+                        beacon_size -= sizeof(scan_table[i].beacon_period)
+                                + sizeof(scan_table[i].time_stamp)
+                                + sizeof(scan_table[i].cap_info_bitmap);
+                }
+
+                while (beacon_size >= sizeof(struct ieee_types_header)) {
+                        ie = ie_buf + ie_len;
+                        element_id = *beacon;
+                        element_len = *(beacon + 1);
+                        if (beacon_size < (int) element_len +
+                            sizeof(struct ieee_types_header)) {
+                                dev_err(priv->adapter->dev, "%s: in processing"
+                                        " IE, bytes left < IE length\n",
+                                        __func__);
+                                break;
+                        }
+                        switch (element_id) {
+                        case WLAN_EID_EXT_CAPABILITY:
+                        case WLAN_EID_DS_PARAMS:
+                        case WLAN_EID_HT_CAPABILITY:
+                        case WLAN_EID_VENDOR_SPECIFIC:
+                        case WLAN_EID_RSN:
+                        case WLAN_EID_BSS_AC_ACCESS_DELAY:
+                                ie[0] = element_id;
+                                ie[1] = element_len;
+                                tmp = (u8 *) beacon;
+                                memcpy(&ie[sizeof(struct ieee_types_header)],
+                                       tmp + sizeof(struct ieee_types_header),
+                                       element_len);
+                                ie_len += ie[1] +
+                                        sizeof(struct ieee_types_header);
+                                break;
+                        default:
+                                break;
+                        }
+                        beacon += element_len +
+                                        sizeof(struct ieee_types_header);
+                        beacon_size -= element_len +
+                                        sizeof(struct ieee_types_header);
+                }
+                chan = ieee80211_get_channel(priv->wdev->wiphy,
+                                                scan_table[i].freq);
+                cfg80211_inform_bss(priv->wdev->wiphy, chan,
+                                        scan_table[i].mac_address,
+                                        ts, scan_table[i].cap_info_bitmap,
+                                        scan_table[i].beacon_period,
+                                        ie_buf, ie_len,
+                                        scan_table[i].rssi, GFP_KERNEL);
+        }
+
+        kfree(ie_buf);
+        return 0;
+}
+
+/*
+ * This function connects with a BSS.
+ *
+ * This function handles both Infra and Ad-Hoc modes. It also performs
+ * validity checking on the provided parameters, disconnects from the
+ * current BSS (if any), sets up the association/scan parameters,
+ * including security settings, and performs specific SSID scan before
+ * trying to connect.
+ *
+ * For Infra mode, the function returns failure if the specified SSID
+ * is not found in scan table. However, for Ad-Hoc mode, it can create
+ * the IBSS if it does not exist. On successful completion in either case,
+ * the function notifies the CFG802.11 subsystem of the new BSS connection,
+ * otherwise the kernel will panic.
+ */
+static int
+mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
+                       u8 *bssid, int mode, struct ieee80211_channel *channel,
+                       struct cfg80211_connect_params *sme, bool privacy)
+{
+        struct mwifiex_802_11_ssid req_ssid;
+        struct mwifiex_ssid_bssid ssid_bssid;
+        int ret = 0;
+        int auth_type = 0, pairwise_encrypt_mode = 0, wpa_enabled = 0;
+        int group_encrypt_mode = 0;
+        int alg_is_wep = 0;
+
+        memset(&req_ssid, 0, sizeof(struct mwifiex_802_11_ssid));
+        memset(&ssid_bssid, 0, sizeof(struct mwifiex_ssid_bssid));
+
+        req_ssid.ssid_len = ssid_len;
+        if (ssid_len > IEEE80211_MAX_SSID_LEN) {
+                dev_err(priv->adapter->dev, "invalid SSID - aborting\n");
+                return -EINVAL;
+        }
+
+        memcpy(req_ssid.ssid, ssid, ssid_len);
+        if (!req_ssid.ssid_len || req_ssid.ssid[0] < 0x20) {
+                dev_err(priv->adapter->dev, "invalid SSID - aborting\n");
+                return -EINVAL;
+        }
+
+        /* disconnect before try to associate */
+        mwifiex_disconnect(priv, MWIFIEX_IOCTL_WAIT, NULL);
+
+        if (channel)
+                ret = mwifiex_set_rf_channel(priv, channel,
+                                mwifiex_channels_to_cfg80211_channel_type
+                                (priv->adapter->chan_offset));
+
+        ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);  /* Disable keys */
+
+        if (mode == MWIFIEX_BSS_MODE_IBSS) {
+                /* "privacy" is set only for ad-hoc mode */
+                if (privacy) {
+                        /*
+                         * Keep MWIFIEX_ENCRYPTION_MODE_WEP104 for now so that
+                         * the firmware can find a matching network from the
+                         * scan. The cfg80211 does not give us the encryption
+                         * mode at this stage so just setting it to WEP here.
+                         */
+                        wpa_enabled = 0;
+                        auth_type = MWIFIEX_AUTH_MODE_OPEN;
+                        ret = mwifiex_set_auth(priv,
+                                                MWIFIEX_ENCRYPTION_MODE_WEP104,
+                                                auth_type, wpa_enabled);
+                }
+
+                goto done;
+        }
+
+        /* Now handle infra mode. "sme" is valid for infra mode only */
+        if (sme->auth_type == NL80211_AUTHTYPE_AUTOMATIC
+                        || sme->auth_type == NL80211_AUTHTYPE_OPEN_SYSTEM)
+                auth_type = MWIFIEX_AUTH_MODE_OPEN;
+        else if (sme->auth_type == NL80211_AUTHTYPE_SHARED_KEY)
+                auth_type = MWIFIEX_AUTH_MODE_SHARED;
+
+        if (sme->crypto.n_ciphers_pairwise) {
+                pairwise_encrypt_mode = mwifiex_get_mwifiex_cipher(sme->crypto.
+                                        ciphers_pairwise[0], &wpa_enabled);
+                ret = mwifiex_set_auth(priv, pairwise_encrypt_mode, auth_type,
+                                                                wpa_enabled);
+        }
+
+        if (sme->crypto.cipher_group) {
+                group_encrypt_mode = mwifiex_get_mwifiex_cipher(sme->crypto.
+                                                   cipher_group, &wpa_enabled);
+                ret = mwifiex_set_auth(priv, group_encrypt_mode, auth_type,
+                                                                wpa_enabled);
+        }
+        if (sme->ie)
+                ret = mwifiex_set_gen_ie(priv, sme->ie, sme->ie_len);
+
+        if (sme->key) {
+                alg_is_wep = mwifiex_is_alg_wep(pairwise_encrypt_mode)
+                        | mwifiex_is_alg_wep(group_encrypt_mode);
+                if (alg_is_wep) {
+                        dev_dbg(priv->adapter->dev,
+                                "info: setting wep encryption"
+                                " with key len %d\n", sme->key_len);
+                        ret = mwifiex_set_encode(priv, sme->key, sme->key_len,
+                                                        sme->key_idx, 0);
+                }
+        }
+done:
+        /* Do specific SSID scanning */
+        if (mwifiex_request_scan(priv, MWIFIEX_IOCTL_WAIT, &req_ssid)) {
+                dev_err(priv->adapter->dev, "scan error\n");
+                return -EFAULT;
+        }
+
+
+        memcpy(&ssid_bssid.ssid, &req_ssid, sizeof(struct mwifiex_802_11_ssid));
+
+        if (mode != MWIFIEX_BSS_MODE_IBSS) {
+                if (mwifiex_find_best_bss(priv, MWIFIEX_IOCTL_WAIT,
+                                          &ssid_bssid))
+                        return -EFAULT;
+                /* Inform the BSS information to kernel, otherwise
+                 * kernel will give a panic after successful assoc */
+                if (mwifiex_inform_bss_from_scan_result(priv, &req_ssid))
+                        return -EFAULT;
+        }
+
+        dev_dbg(priv->adapter->dev, "info: trying to associate to %s and bssid %pM\n",
+               (char *) req_ssid.ssid, ssid_bssid.bssid);
+
+        memcpy(&priv->cfg_bssid, ssid_bssid.bssid, 6);
+
+        /* Connect to BSS by ESSID */
+        memset(&ssid_bssid.bssid, 0, ETH_ALEN);
+
+        if (mwifiex_bss_start(priv, MWIFIEX_IOCTL_WAIT, &ssid_bssid))
+                return -EFAULT;
+
+        if (mode == MWIFIEX_BSS_MODE_IBSS) {
+                /* Inform the BSS information to kernel, otherwise
+                 * kernel will give a panic after successful assoc */
+                if (mwifiex_cfg80211_inform_ibss_bss(priv))
+                        return -EFAULT;
+        }
+
+        return ret;
+}
+
+/*
+ * CFG802.11 operation handler for association request.
+ *
+ * This function does not work when the current mode is set to Ad-Hoc, or
+ * when there is already an association procedure going on. The given BSS
+ * information is used to associate.
+ */
+static int
+mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
+                         struct cfg80211_connect_params *sme)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+        int ret = 0;
+        int mode = 0;
+
+        if (priv->assoc_request)
+                return -EBUSY;
+
+        mode = mwifiex_drv_get_mode(priv, MWIFIEX_IOCTL_WAIT);
+
+        if (mode == MWIFIEX_BSS_MODE_IBSS) {
+                wiphy_err(wiphy, "received infra assoc request "
+                                "when station is in ibss mode\n");
+                goto done;
+        }
+
+        priv->assoc_request = 1;
+
+        wiphy_dbg(wiphy, "info: Trying to associate to %s and bssid %pM\n",
+               (char *) sme->ssid, sme->bssid);
+
+        ret = mwifiex_cfg80211_assoc(priv, sme->ssid_len, sme->ssid, sme->bssid,
+                                     mode, sme->channel, sme, 0);
+
+done:
+        priv->assoc_result = ret;
+        queue_work(priv->workqueue, &priv->cfg_workqueue);
+        return ret;
+}
+
+/*
+ * CFG802.11 operation handler to join an IBSS.
+ *
+ * This function does not work in any mode other than Ad-Hoc, or if
+ * a join operation is already in progress.
+ */
+static int
+mwifiex_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
+                           struct cfg80211_ibss_params *params)
+{
+        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+        int ret = 0;
+        int mode = 0;
+
+        if (priv->ibss_join_request)
+                return -EBUSY;
+
+        mode = mwifiex_drv_get_mode(priv, MWIFIEX_IOCTL_WAIT);
+        if (mode != MWIFIEX_BSS_MODE_IBSS) {
+                wiphy_err(wiphy, "request to join ibss received "
+                                "when station is not in ibss mode\n");
+                goto done;
+        }
+
+        priv->ibss_join_request = 1;
+
+        wiphy_dbg(wiphy, "info: trying to join to %s and bssid %pM\n",
+               (char *) params->ssid, params->bssid);
+
+        ret = mwifiex_cfg80211_assoc(priv, params->ssid_len, params->ssid,
+                                     params->bssid, mode, params->channel, NULL,
+                                     params->privacy);
+done:
+        priv->ibss_join_result = ret;
+        queue_work(priv->workqueue, &priv->cfg_workqueue);
+        return ret;
+}
+
+/*
+ * CFG802.11 operation handler to leave an IBSS.
+ *
+ * This function does not work if a leave operation is
+ * already in progress.
+ */
+static int
+mwifiex_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
+{
+        struct mwifiex_private *priv = mwifiex_cfg80211_get_priv(wiphy);
+
+        if (priv->disconnect)
+                return -EBUSY;
+
+        priv->disconnect = 1;
+
+        wiphy_dbg(wiphy, "info: disconnecting from essid %pM\n",
+                        priv->cfg_bssid);
+        if (mwifiex_disconnect(priv, MWIFIEX_IOCTL_WAIT, NULL))
+                return -EFAULT;
+
+        queue_work(priv->workqueue, &priv->cfg_workqueue);
+
+        return 0;
+}
+
+/*
+ * CFG802.11 operation handler for scan request.
+ *
+ * This function issues a scan request to the firmware based upon
+ * the user specified scan configuration. On successfull completion,
+ * it also informs the results.
+ */
+static int
+mwifiex_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev,
+                      struct cfg80211_scan_request *request)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+
+        wiphy_dbg(wiphy, "info: received scan request on %s\n", dev->name);
+
+        if (priv->scan_request && priv->scan_request != request)
+                return -EBUSY;
+
+        priv->scan_request = request;
+
+        queue_work(priv->workqueue, &priv->cfg_workqueue);
+        return 0;
+}
+
+/*
+ * This function sets up the CFG802.11 specific HT capability fields
+ * with default values.
+ *
+ * The following default values are set -
+ *      - HT Supported = True
+ *      - Maximum AMPDU length factor = 0x3
+ *      - Minimum AMPDU spacing = 0x6
+ *      - HT Capabilities map = IEEE80211_HT_CAP_SUP_WIDTH_20_40 (0x0002)
+ *      - MCS information, Rx mask = 0xff
+ *      - MCD information, Tx parameters = IEEE80211_HT_MCS_TX_DEFINED (0x01)
+ */
+static void
+mwifiex_setup_ht_caps(struct ieee80211_sta_ht_cap *ht_info,
+                      struct mwifiex_private *priv)
+{
+        int rx_mcs_supp;
+        struct ieee80211_mcs_info mcs_set;
+        u8 *mcs = (u8 *)&mcs_set;
+        struct mwifiex_adapter *adapter = priv->adapter;
+
+        ht_info->ht_supported = true;
+        ht_info->ampdu_factor = 0x3;
+        ht_info->ampdu_density = 0x6;
+
+        memset(&ht_info->mcs, 0, sizeof(ht_info->mcs));
+        ht_info->cap = IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+
+        rx_mcs_supp = GET_RXMCSSUPP(priv->adapter->hw_dev_mcs_support);
+        /* Set MCS for 1x1 */
+        memset(mcs, 0xff, rx_mcs_supp);
+        /* Clear all the other values */
+        memset(&mcs[rx_mcs_supp], 0,
+                        sizeof(struct ieee80211_mcs_info) - rx_mcs_supp);
+        if (priv->bss_mode == MWIFIEX_BSS_MODE_INFRA ||
+                        (ISSUPP_CHANWIDTH40(adapter->hw_dot_11n_dev_cap) &&
+                         ISSUPP_CHANWIDTH40(adapter->usr_dot_11n_dev_cap)))
+                /* Set MCS32 for infra mode or ad-hoc mode with 40MHz support */
+                SETHT_MCS32(mcs_set.rx_mask);
+
+        memcpy((u8 *) &ht_info->mcs, mcs, sizeof(struct ieee80211_mcs_info));
+
+        ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
+}
+
+/* station cfg80211 operations */
+static struct cfg80211_ops mwifiex_cfg80211_ops = {
+        .change_virtual_intf = mwifiex_cfg80211_change_virtual_intf,
+        .scan = mwifiex_cfg80211_scan,
+        .connect = mwifiex_cfg80211_connect,
+        .disconnect = mwifiex_cfg80211_disconnect,
+        .get_station = mwifiex_cfg80211_get_station,
+        .set_wiphy_params = mwifiex_cfg80211_set_wiphy_params,
+        .set_channel = mwifiex_cfg80211_set_channel,
+        .join_ibss = mwifiex_cfg80211_join_ibss,
+        .leave_ibss = mwifiex_cfg80211_leave_ibss,
+        .add_key = mwifiex_cfg80211_add_key,
+        .del_key = mwifiex_cfg80211_del_key,
+        .set_default_key = mwifiex_cfg80211_set_default_key,
+        .set_power_mgmt = mwifiex_cfg80211_set_power_mgmt,
+        .set_tx_power = mwifiex_cfg80211_set_tx_power,
+};
+
+/*
+ * This function registers the device with CFG802.11 subsystem.
+ *
+ * The function creates the wireless device/wiphy, populates it with
+ * default parameters and handler function pointers, and finally
+ * registers the device.
+ */
+int mwifiex_register_cfg80211(struct net_device *dev, u8 *mac,
+                              struct mwifiex_private *priv)
+{
+        int ret = 0;
+        void *wdev_priv = NULL;
+        struct wireless_dev *wdev;
+
+        wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);
+        if (!wdev) {
+                dev_err(priv->adapter->dev, "%s: allocating wireless device\n",
+                                                __func__);
+                return -ENOMEM;
+        }
+        wdev->wiphy =
+                wiphy_new(&mwifiex_cfg80211_ops,
+                          sizeof(struct mwifiex_private *));
+        if (!wdev->wiphy)
+                return -ENOMEM;
+        wdev->iftype = NL80211_IFTYPE_STATION;
+        wdev->wiphy->max_scan_ssids = 10;
+        wdev->wiphy->interface_modes =
+                BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
+        wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &mwifiex_band_2ghz;
+        wdev->wiphy->bands[IEEE80211_BAND_5GHZ] = &mwifiex_band_5ghz;
+
+        /* Initialize cipher suits */
+        wdev->wiphy->cipher_suites = mwifiex_cipher_suites;
+        wdev->wiphy->n_cipher_suites = ARRAY_SIZE(mwifiex_cipher_suites);
+
+        /* Initialize parameters for 2GHz band */
+
+        mwifiex_setup_ht_caps(&wdev->wiphy->bands[IEEE80211_BAND_2GHZ]->ht_cap,
+                                                                        priv);
+        mwifiex_setup_ht_caps(&wdev->wiphy->bands[IEEE80211_BAND_5GHZ]->ht_cap,
+                                                                        priv);
+
+        memcpy(wdev->wiphy->perm_addr, mac, 6);
+        wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
+
+        /* We are using custom domains */
+        wdev->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
+
+        wdev->wiphy->reg_notifier = mwifiex_reg_notifier;
+
+        /* Set struct mwifiex_private pointer in wiphy_priv */
+        wdev_priv = wiphy_priv(wdev->wiphy);
+
+        *(unsigned long *) wdev_priv = (unsigned long) priv;
+
+        ret = wiphy_register(wdev->wiphy);
+        if (ret < 0) {
+                dev_err(priv->adapter->dev, "%s: registering cfg80211 device\n",
+                                                __func__);
+                wiphy_free(wdev->wiphy);
+                return ret;
+        } else {
+                dev_dbg(priv->adapter->dev,
+                                "info: successfully registered wiphy device\n");
+        }
+
+        dev_net_set(dev, wiphy_net(wdev->wiphy));
+        dev->ieee80211_ptr = wdev;
+        memcpy(dev->dev_addr, wdev->wiphy->perm_addr, 6);
+        memcpy(dev->perm_addr, wdev->wiphy->perm_addr, 6);
+        SET_NETDEV_DEV(dev, wiphy_dev(wdev->wiphy));
+        priv->wdev = wdev;
+
+        dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
+        dev->watchdog_timeo = MWIFIEX_DEFAULT_WATCHDOG_TIMEOUT;
+        dev->hard_header_len += MWIFIEX_MIN_DATA_HEADER_LEN;
+
+        return ret;
+}
+
+/*
+ * This function handles the result of different pending network operations.
+ *
+ * The following operations are handled and CFG802.11 subsystem is
+ * notified accordingly -
+ *      - Scan request completion
+ *      - Association request completion
+ *      - IBSS join request completion
+ *      - Disconnect request completion
+ */
+void
+mwifiex_cfg80211_results(struct work_struct *work)
+{
+        struct mwifiex_private *priv =
+                container_of(work, struct mwifiex_private, cfg_workqueue);
+        struct mwifiex_user_scan_cfg *scan_req;
+        int ret = 0, i;
+        struct ieee80211_channel *chan;
+
+        if (priv->scan_request) {
+                scan_req = kzalloc(sizeof(struct mwifiex_user_scan_cfg),
+                                   GFP_KERNEL);
+                if (!scan_req) {
+                        dev_err(priv->adapter->dev, "failed to alloc "
+                                                    "scan_req\n");
+                        return;
+                }
+                for (i = 0; i < priv->scan_request->n_ssids; i++) {
+                        memcpy(scan_req->ssid_list[i].ssid,
+                                        priv->scan_request->ssids[i].ssid,
+                                        priv->scan_request->ssids[i].ssid_len);
+                        scan_req->ssid_list[i].max_len =
+                                        priv->scan_request->ssids[i].ssid_len;
+                }
+                for (i = 0; i < priv->scan_request->n_channels; i++) {
+                        chan = priv->scan_request->channels[i];
+                        scan_req->chan_list[i].chan_number = chan->hw_value;
+                        scan_req->chan_list[i].radio_type = chan->band;
+                        if (chan->flags & IEEE80211_CHAN_DISABLED)
+                                scan_req->chan_list[i].scan_type =
+                                        MWIFIEX_SCAN_TYPE_PASSIVE;
+                        else
+                                scan_req->chan_list[i].scan_type =
+                                        MWIFIEX_SCAN_TYPE_ACTIVE;
+                        scan_req->chan_list[i].scan_time = 0;
+                }
+                if (mwifiex_set_user_scan_ioctl(priv, scan_req)) {
+                        ret = -EFAULT;
+                        goto done;
+                }
+                if (mwifiex_inform_bss_from_scan_result(priv, NULL))
+                        ret = -EFAULT;
+done:
+                priv->scan_result_status = ret;
+                dev_dbg(priv->adapter->dev, "info: %s: sending scan results\n",
+                                                        __func__);
+                cfg80211_scan_done(priv->scan_request,
+                                (priv->scan_result_status < 0));
+                priv->scan_request = NULL;
+                kfree(scan_req);
+        }
+
+        if (priv->assoc_request) {
+                if (!priv->assoc_result) {
+                        cfg80211_connect_result(priv->netdev, priv->cfg_bssid,
+                                                NULL, 0, NULL, 0,
+                                                WLAN_STATUS_SUCCESS,
+                                                GFP_KERNEL);
+                        dev_dbg(priv->adapter->dev,
+                                "info: associated to bssid %pM successfully\n",
+                               priv->cfg_bssid);
+                } else {
+                        dev_dbg(priv->adapter->dev,
+                                "info: association to bssid %pM failed\n",
+                               priv->cfg_bssid);
+                        memset(priv->cfg_bssid, 0, ETH_ALEN);
+                }
+                priv->assoc_request = 0;
+                priv->assoc_result = 0;
+        }
+
+        if (priv->ibss_join_request) {
+                if (!priv->ibss_join_result) {
+                        cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid,
+                                             GFP_KERNEL);
+                        dev_dbg(priv->adapter->dev,
+                                "info: joined/created adhoc network with bssid"
+                                        " %pM successfully\n", priv->cfg_bssid);
+                } else {
+                        dev_dbg(priv->adapter->dev,
+                                "info: failed creating/joining adhoc network\n");
+                }
+                priv->ibss_join_request = 0;
+                priv->ibss_join_result = 0;
+        }
+
+        if (priv->disconnect) {
+                memset(priv->cfg_bssid, 0, ETH_ALEN);
+                priv->disconnect = 0;
+        }
+
+        return;
+}
diff --git a/drivers/net/wireless/mwifiex/cfg80211.h b/drivers/net/wireless/mwifiex/cfg80211.h
new file mode 100644
index 00000000000..c4db8f36aa1
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/cfg80211.h
@@ -0,0 +1,31 @@
+/*
+ * Marvell Wireless LAN device driver: CFG80211
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#ifndef __MWIFIEX_CFG80211__
+#define __MWIFIEX_CFG80211__
+
+#include <net/cfg80211.h>
+
+#include "main.h"
+
+int mwifiex_register_cfg80211(struct net_device *, u8 *,
+                                struct mwifiex_private *);
+
+void mwifiex_cfg80211_results(struct work_struct *work);
+#endif
diff --git a/drivers/net/wireless/mwifiex/cfp.c b/drivers/net/wireless/mwifiex/cfp.c
new file mode 100644
index 00000000000..999ed81512f
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/cfp.c
@@ -0,0 +1,368 @@
+/*
+ * Marvell Wireless LAN device driver: Channel, Frequence and Power
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "cfg80211.h"
+
+/* 100mW */
+#define MWIFIEX_TX_PWR_DEFAULT     20
+/* 100mW */
+#define MWIFIEX_TX_PWR_US_DEFAULT      20
+/* 50mW */
+#define MWIFIEX_TX_PWR_JP_DEFAULT      16
+/* 100mW */
+#define MWIFIEX_TX_PWR_FR_100MW        20
+/* 10mW */
+#define MWIFIEX_TX_PWR_FR_10MW         10
+/* 100mW */
+#define MWIFIEX_TX_PWR_EMEA_DEFAULT    20
+
+static u8 adhoc_rates_b[B_SUPPORTED_RATES] = { 0x82, 0x84, 0x8b, 0x96, 0 };
+
+static u8 adhoc_rates_g[G_SUPPORTED_RATES] = { 0x8c, 0x12, 0x98, 0x24,
+                                               0xb0, 0x48, 0x60, 0x6c, 0 };
+
+static u8 adhoc_rates_bg[BG_SUPPORTED_RATES] = { 0x82, 0x84, 0x8b, 0x96,
+                                                 0x0c, 0x12, 0x18, 0x24,
+                                                 0x30, 0x48, 0x60, 0x6c, 0 };
+
+static u8 adhoc_rates_a[A_SUPPORTED_RATES] = { 0x8c, 0x12, 0x98, 0x24,
+                                               0xb0, 0x48, 0x60, 0x6c, 0 };
+u8 supported_rates_a[A_SUPPORTED_RATES] = { 0x0c, 0x12, 0x18, 0x24,
+                                        0xb0, 0x48, 0x60, 0x6c, 0 };
+static u16 mwifiex_data_rates[MWIFIEX_SUPPORTED_RATES_EXT] = { 0x02, 0x04,
+                                        0x0B, 0x16, 0x00, 0x0C, 0x12, 0x18,
+                                        0x24, 0x30, 0x48, 0x60, 0x6C, 0x90,
+                                        0x0D, 0x1A, 0x27, 0x34, 0x4E, 0x68,
+                                        0x75, 0x82, 0x0C, 0x1B, 0x36, 0x51,
+                                        0x6C, 0xA2, 0xD8, 0xF3, 0x10E, 0x00 };
+
+u8 supported_rates_b[B_SUPPORTED_RATES] = { 0x02, 0x04, 0x0b, 0x16, 0 };
+
+u8 supported_rates_g[G_SUPPORTED_RATES] = { 0x0c, 0x12, 0x18, 0x24,
+                                        0x30, 0x48, 0x60, 0x6c, 0 };
+
+u8 supported_rates_bg[BG_SUPPORTED_RATES] = { 0x02, 0x04, 0x0b, 0x0c,
+                                        0x12, 0x16, 0x18, 0x24, 0x30, 0x48,
+                                        0x60, 0x6c, 0 };
+
+u16 region_code_index[MWIFIEX_MAX_REGION_CODE] = { 0x10, 0x20, 0x30,
+                                                0x32, 0x40, 0x41, 0xff };
+
+u8 supported_rates_n[N_SUPPORTED_RATES] = { 0x02, 0x04, 0 };
+
+/*
+ * This function maps an index in supported rates table into
+ * the corresponding data rate.
+ */
+u32 mwifiex_index_to_data_rate(struct mwifiex_adapter *adapter, u8 index,
+                               u8 ht_info)
+{
+        u16 mcs_rate[4][8] = {
+                {0x1b, 0x36, 0x51, 0x6c, 0xa2, 0xd8, 0xf3, 0x10e}
+        ,                       /* LG 40M */
+        {0x1e, 0x3c, 0x5a, 0x78, 0xb4, 0xf0, 0x10e, 0x12c}
+        ,                       /* SG 40M */
+        {0x0d, 0x1a, 0x27, 0x34, 0x4e, 0x68, 0x75, 0x82}
+        ,                       /* LG 20M */
+        {0x0e, 0x1c, 0x2b, 0x39, 0x56, 0x73, 0x82, 0x90}
+        };                      /* SG 20M */
+
+        u32 rate;
+
+        if (ht_info & BIT(0)) {
+                if (index == MWIFIEX_RATE_BITMAP_MCS0) {
+                        if (ht_info & BIT(2))
+                                rate = 0x0D;    /* MCS 32 SGI rate */
+                        else
+                                rate = 0x0C;    /* MCS 32 LGI rate */
+                } else if (index < 8) {
+                        if (ht_info & BIT(1)) {
+                                if (ht_info & BIT(2))
+                                        /* SGI, 40M */
+                                        rate = mcs_rate[1][index];
+                                else
+                                        /* LGI, 40M */
+                                        rate = mcs_rate[0][index];
+                        } else {
+                                if (ht_info & BIT(2))
+                                        /* SGI, 20M */
+                                        rate = mcs_rate[3][index];
+                                else
+                                        /* LGI, 20M */
+                                        rate = mcs_rate[2][index];
+                        }
+                } else
+                        rate = mwifiex_data_rates[0];
+        } else {
+                if (index >= MWIFIEX_SUPPORTED_RATES_EXT)
+                        index = 0;
+                rate = mwifiex_data_rates[index];
+        }
+        return rate;
+}
+
+/*
+ * This function maps a data rate value into corresponding index in supported
+ * rates table.
+ */
+u8 mwifiex_data_rate_to_index(struct mwifiex_adapter *adapter, u32 rate)
+{
+        u16 *ptr;
+
+        if (rate) {
+                ptr = memchr(mwifiex_data_rates, rate,
+                                sizeof(mwifiex_data_rates));
+                if (ptr)
+                        return (u8) (ptr - mwifiex_data_rates);
+        }
+        return 0;
+}
+
+/*
+ * This function returns the current active data rates.
+ *
+ * The result may vary depending upon connection status.
+ */
+u32 mwifiex_get_active_data_rates(struct mwifiex_private *priv, u8 *rates)
+{
+        u32 k;
+
+        if (!priv->media_connected)
+                k = mwifiex_get_supported_rates(priv, rates);
+        else
+                k = mwifiex_copy_rates(rates, 0,
+                                       priv->curr_bss_params.data_rates,
+                                       priv->curr_bss_params.num_of_rates);
+
+        return k;
+}
+
+/*
+ * This function locates the Channel-Frequency-Power triplet based upon
+ * band and channel parameters.
+ */
+struct mwifiex_chan_freq_power *
+mwifiex_get_cfp_by_band_and_channel_from_cfg80211(struct mwifiex_private
+                                                  *priv, u8 band, u16 channel)
+{
+        struct mwifiex_chan_freq_power *cfp = NULL;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *ch;
+        int i;
+
+        if (mwifiex_band_to_radio_type(band) == HostCmd_SCAN_RADIO_TYPE_BG)
+                sband = priv->wdev->wiphy->bands[IEEE80211_BAND_2GHZ];
+        else
+                sband = priv->wdev->wiphy->bands[IEEE80211_BAND_5GHZ];
+
+        if (!sband) {
+                dev_err(priv->adapter->dev, "%s: cannot find cfp by band %d"
+                                " & channel %d\n", __func__, band, channel);
+                return cfp;
+        }
+
+        for (i = 0; i < sband->n_channels; i++) {
+                ch = &sband->channels[i];
+                if (((ch->hw_value == channel) ||
+                        (channel == FIRST_VALID_CHANNEL))
+                        && !(ch->flags & IEEE80211_CHAN_DISABLED)) {
+                        priv->cfp.channel = channel;
+                        priv->cfp.freq = ch->center_freq;
+                        priv->cfp.max_tx_power = ch->max_power;
+                        cfp = &priv->cfp;
+                        break;
+                }
+        }
+        if (i == sband->n_channels)
+                dev_err(priv->adapter->dev, "%s: cannot find cfp by band %d"
+                                " & channel %d\n", __func__, band, channel);
+
+        return cfp;
+}
+
+/*
+ * This function locates the Channel-Frequency-Power triplet based upon
+ * band and frequency parameters.
+ */
+struct mwifiex_chan_freq_power *
+mwifiex_get_cfp_by_band_and_freq_from_cfg80211(struct mwifiex_private *priv,
+                                               u8 band, u32 freq)
+{
+        struct mwifiex_chan_freq_power *cfp = NULL;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *ch;
+        int i;
+
+        if (mwifiex_band_to_radio_type(band) == HostCmd_SCAN_RADIO_TYPE_BG)
+                sband = priv->wdev->wiphy->bands[IEEE80211_BAND_2GHZ];
+        else
+                sband = priv->wdev->wiphy->bands[IEEE80211_BAND_5GHZ];
+
+        if (!sband) {
+                dev_err(priv->adapter->dev, "%s: cannot find cfp by band %d"
+                                " & freq %d\n", __func__, band, freq);
+                return cfp;
+        }
+
+        for (i = 0; i < sband->n_channels; i++) {
+                ch = &sband->channels[i];
+                if ((ch->center_freq == freq) &&
+                        !(ch->flags & IEEE80211_CHAN_DISABLED)) {
+                        priv->cfp.channel = ch->hw_value;
+                        priv->cfp.freq = freq;
+                        priv->cfp.max_tx_power = ch->max_power;
+                        cfp = &priv->cfp;
+                        break;
+                }
+        }
+        if (i == sband->n_channels)
+                dev_err(priv->adapter->dev, "%s: cannot find cfp by band %d"
+                                " & freq %d\n", __func__, band, freq);
+
+        return cfp;
+}
+
+/*
+ * This function checks if the data rate is set to auto.
+ */
+u8
+mwifiex_is_rate_auto(struct mwifiex_private *priv)
+{
+        u32 i;
+        int rate_num = 0;
+
+        for (i = 0; i < ARRAY_SIZE(priv->bitmap_rates); i++)
+                if (priv->bitmap_rates[i])
+                        rate_num++;
+
+        if (rate_num > 1)
+                return true;
+        else
+                return false;
+}
+
+/*
+ * This function converts rate bitmap into rate index.
+ */
+int
+mwifiex_get_rate_index(struct mwifiex_adapter *adapter, u16 *rate_bitmap,
+                       int size)
+{
+        int i;
+
+        for (i = 0; i < size * 8; i++)
+                if (rate_bitmap[i / 16] & (1 << (i % 16)))
+                        return i;
+
+        return 0;
+}
+
+/*
+ * This function gets the supported data rates.
+ *
+ * The function works in both Ad-Hoc and infra mode by printing the
+ * band and returning the data rates.
+ */
+u32 mwifiex_get_supported_rates(struct mwifiex_private *priv, u8 *rates)
+{
+        u32 k = 0;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        if (priv->bss_mode == MWIFIEX_BSS_MODE_INFRA) {
+                /* Infra. mode */
+                switch (adapter->config_bands) {
+                case BAND_B:
+                        dev_dbg(adapter->dev, "info: infra band=%d "
+                                "supported_rates_b\n", adapter->config_bands);
+                        k = mwifiex_copy_rates(rates, k, supported_rates_b,
+                                               sizeof(supported_rates_b));
+                        break;
+                case BAND_G:
+                case BAND_G | BAND_GN:
+                        dev_dbg(adapter->dev, "info: infra band=%d "
+                                "supported_rates_g\n", adapter->config_bands);
+                        k = mwifiex_copy_rates(rates, k, supported_rates_g,
+                                               sizeof(supported_rates_g));
+                        break;
+                case BAND_B | BAND_G:
+                case BAND_A | BAND_B | BAND_G:
+                case BAND_A | BAND_B:
+                case BAND_A | BAND_B | BAND_G | BAND_GN | BAND_AN:
+                case BAND_B | BAND_G | BAND_GN:
+                        dev_dbg(adapter->dev, "info: infra band=%d "
+                                "supported_rates_bg\n", adapter->config_bands);
+                        k = mwifiex_copy_rates(rates, k, supported_rates_bg,
+                                               sizeof(supported_rates_bg));
+                        break;
+                case BAND_A:
+                case BAND_A | BAND_G:
+                        dev_dbg(adapter->dev, "info: infra band=%d "
+                                "supported_rates_a\n", adapter->config_bands);
+                        k = mwifiex_copy_rates(rates, k, supported_rates_a,
+                                               sizeof(supported_rates_a));
+                        break;
+                case BAND_A | BAND_AN:
+                case BAND_A | BAND_G | BAND_AN | BAND_GN:
+                        dev_dbg(adapter->dev, "info: infra band=%d "
+                                "supported_rates_a\n", adapter->config_bands);
+                        k = mwifiex_copy_rates(rates, k, supported_rates_a,
+                                               sizeof(supported_rates_a));
+                        break;
+                case BAND_GN:
+                        dev_dbg(adapter->dev, "info: infra band=%d "
+                                "supported_rates_n\n", adapter->config_bands);
+                        k = mwifiex_copy_rates(rates, k, supported_rates_n,
+                                               sizeof(supported_rates_n));
+                        break;
+                }
+        } else {
+                /* Ad-hoc mode */
+                switch (adapter->adhoc_start_band) {
+                case BAND_B:
+                        dev_dbg(adapter->dev, "info: adhoc B\n");
+                        k = mwifiex_copy_rates(rates, k, adhoc_rates_b,
+                                               sizeof(adhoc_rates_b));
+                        break;
+                case BAND_G:
+                case BAND_G | BAND_GN:
+                        dev_dbg(adapter->dev, "info: adhoc G only\n");
+                        k = mwifiex_copy_rates(rates, k, adhoc_rates_g,
+                                               sizeof(adhoc_rates_g));
+                        break;
+                case BAND_B | BAND_G:
+                case BAND_B | BAND_G | BAND_GN:
+                        dev_dbg(adapter->dev, "info: adhoc BG\n");
+                        k = mwifiex_copy_rates(rates, k, adhoc_rates_bg,
+                                               sizeof(adhoc_rates_bg));
+                        break;
+                case BAND_A:
+                case BAND_A | BAND_AN:
+                        dev_dbg(adapter->dev, "info: adhoc A\n");
+                        k = mwifiex_copy_rates(rates, k, adhoc_rates_a,
+                                               sizeof(adhoc_rates_a));
+                        break;
+                }
+        }
+
+        return k;
+}
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c
new file mode 100644
index 00000000000..3a8fe1e122f
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/cmdevt.c
@@ -0,0 +1,1463 @@
+/*
+ * Marvell Wireless LAN device driver: commands and events
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+#include "11n.h"
+
+/*
+ * This function initializes a command node.
+ *
+ * The actual allocation of the node is not done by this function. It only
+ * initiates a node by filling it with default parameters. Similarly,
+ * allocation of the different buffers used (IOCTL buffer, data buffer) are
+ * not done by this function either.
+ */
+static void
+mwifiex_init_cmd_node(struct mwifiex_private *priv,
+                      struct cmd_ctrl_node *cmd_node,
+                      u32 cmd_oid, void *wait_queue, void *data_buf)
+{
+        cmd_node->priv = priv;
+        cmd_node->cmd_oid = cmd_oid;
+        cmd_node->wq_buf = wait_queue;
+        cmd_node->data_buf = data_buf;
+        cmd_node->cmd_skb = cmd_node->skb;
+}
+
+/*
+ * This function returns a command node from the free queue depending upon
+ * availability.
+ */
+static struct cmd_ctrl_node *
+mwifiex_get_cmd_node(struct mwifiex_adapter *adapter)
+{
+        struct cmd_ctrl_node *cmd_node;
+        unsigned long flags;
+
+        spin_lock_irqsave(&adapter->cmd_free_q_lock, flags);
+        if (list_empty(&adapter->cmd_free_q)) {
+                dev_err(adapter->dev, "GET_CMD_NODE: cmd node not available\n");
+                spin_unlock_irqrestore(&adapter->cmd_free_q_lock, flags);
+                return NULL;
+        }
+        cmd_node = list_first_entry(&adapter->cmd_free_q,
+                        struct cmd_ctrl_node, list);
+        list_del(&cmd_node->list);
+        spin_unlock_irqrestore(&adapter->cmd_free_q_lock, flags);
+
+        return cmd_node;
+}
+
+/*
+ * This function cleans up a command node.
+ *
+ * The function resets the fields including the buffer pointers.
+ * This function does not try to free the buffers. They must be
+ * freed before calling this function.
+ *
+ * This function will however call the receive completion callback
+ * in case a response buffer is still available before resetting
+ * the pointer.
+ */
+static void
+mwifiex_clean_cmd_node(struct mwifiex_adapter *adapter,
+                       struct cmd_ctrl_node *cmd_node)
+{
+        cmd_node->cmd_oid = 0;
+        cmd_node->cmd_flag = 0;
+        cmd_node->wq_buf = NULL;
+        cmd_node->data_buf = NULL;
+
+        if (cmd_node->resp_skb) {
+                mwifiex_recv_complete(adapter, cmd_node->resp_skb, 0);
+                cmd_node->resp_skb = NULL;
+        }
+
+        return;
+}
+
+/*
+ * This function returns a command node from the pending queue which
+ * matches the given IOCTL request.
+ */
+static struct cmd_ctrl_node *
+mwifiex_get_pending_ioctl_cmd(struct mwifiex_adapter *adapter,
+                              struct mwifiex_wait_queue *wait_queue)
+{
+        unsigned long flags;
+        struct cmd_ctrl_node *cmd_node;
+
+        spin_lock_irqsave(&adapter->cmd_pending_q_lock, flags);
+        list_for_each_entry(cmd_node, &adapter->cmd_pending_q, list) {
+                if (cmd_node->wq_buf == wait_queue) {
+                        spin_unlock_irqrestore(&adapter->cmd_pending_q_lock,
+                                               flags);
+                        return cmd_node;
+                }
+        }
+        spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, flags);
+
+        return NULL;
+}
+
+/*
+ * This function sends a host command to the firmware.
+ *
+ * The function copies the host command into the driver command
+ * buffer, which will be transferred to the firmware later by the
+ * main thread.
+ */
+static int mwifiex_cmd_host_cmd(struct mwifiex_private *priv,
+                                struct host_cmd_ds_command *cmd, void *data_buf)
+{
+        struct mwifiex_ds_misc_cmd *pcmd_ptr =
+                (struct mwifiex_ds_misc_cmd *) data_buf;
+
+        /* Copy the HOST command to command buffer */
+        memcpy((void *) cmd, pcmd_ptr->cmd, pcmd_ptr->len);
+        dev_dbg(priv->adapter->dev, "cmd: host cmd size = %d\n", pcmd_ptr->len);
+        return 0;
+}
+
+/*
+ * This function downloads a command to the firmware.
+ *
+ * The function performs sanity tests, sets the command sequence
+ * number and size, converts the header fields to CPU format before
+ * sending. Afterwards, it logs the command ID and action for debugging
+ * and sets up the command timeout timer.
+ */
+static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv,
+                                  struct cmd_ctrl_node *cmd_node)
+{
+
+        struct mwifiex_adapter *adapter = priv->adapter;
+        int ret = 0;
+        struct host_cmd_ds_command *host_cmd;
+        struct mwifiex_wait_queue *wait_queue = NULL;
+        uint16_t cmd_code;
+        uint16_t cmd_size;
+        struct timeval tstamp;
+        unsigned long flags;
+
+        if (!adapter || !cmd_node)
+                return -1;
+
+        host_cmd = (struct host_cmd_ds_command *) (cmd_node->cmd_skb->data);
+        if (cmd_node->wq_buf)
+                wait_queue = (struct mwifiex_wait_queue *) cmd_node->wq_buf;
+
+        /* Sanity test */
+        if (host_cmd == NULL || host_cmd->size == 0) {
+                dev_err(adapter->dev, "DNLD_CMD: host_cmd is null"
+                        " or cmd size is 0, not sending\n");
+                if (wait_queue)
+                        wait_queue->status = MWIFIEX_ERROR_CMD_DNLD_FAIL;
+                mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+                return -1;
+        }
+
+        /* Set command sequence number */
+        adapter->seq_num++;
+        host_cmd->seq_num = cpu_to_le16(HostCmd_SET_SEQ_NO_BSS_INFO
+                            (adapter->seq_num, cmd_node->priv->bss_num,
+                             cmd_node->priv->bss_type));
+
+        spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
+        adapter->curr_cmd = cmd_node;
+        spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
+
+        cmd_code = le16_to_cpu(host_cmd->command);
+        cmd_size = le16_to_cpu(host_cmd->size);
+
+        skb_trim(cmd_node->cmd_skb, cmd_size);
+
+        do_gettimeofday(&tstamp);
+        dev_dbg(adapter->dev, "cmd: DNLD_CMD: (%lu.%lu): %#x, act %#x, len %d,"
+                " seqno %#x\n",
+                tstamp.tv_sec, tstamp.tv_usec, cmd_code,
+               le16_to_cpu(*(__le16 *) ((u8 *) host_cmd + S_DS_GEN)), cmd_size,
+               le16_to_cpu(host_cmd->seq_num));
+
+        skb_push(cmd_node->cmd_skb, INTF_HEADER_LEN);
+
+        ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_CMD,
+                                             cmd_node->cmd_skb->data,
+                                             cmd_node->cmd_skb->len, NULL);
+
+        if (ret == -1) {
+                dev_err(adapter->dev, "DNLD_CMD: host to card failed\n");
+                if (wait_queue)
+                        wait_queue->status = MWIFIEX_ERROR_CMD_DNLD_FAIL;
+                mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
+
+                spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
+                adapter->curr_cmd = NULL;
+                spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
+
+                adapter->dbg.num_cmd_host_to_card_failure++;
+                return -1;
+        }
+
+        /* Save the last command id and action to debug log */
+        adapter->dbg.last_cmd_index =
+                (adapter->dbg.last_cmd_index + 1) % DBG_CMD_NUM;
+        adapter->dbg.last_cmd_id[adapter->dbg.last_cmd_index] = cmd_code;
+        adapter->dbg.last_cmd_act[adapter->dbg.last_cmd_index] =
+                le16_to_cpu(*(__le16 *) ((u8 *) host_cmd + S_DS_GEN));
+
+        /* Clear BSS_NO_BITS from HostCmd */
+        cmd_code &= HostCmd_CMD_ID_MASK;
+
+        /* Setup the timer after transmit command */
+        mod_timer(&adapter->cmd_timer,
+                jiffies + (MWIFIEX_TIMER_10S * HZ) / 1000);
+
+        return 0;
+}
+
+/*
+ * This function downloads a sleep confirm command to the firmware.
+ *
+ * The function performs sanity tests, sets the command sequence
+ * number and size, converts the header fields to CPU format before
+ * sending.
+ *
+ * No responses are needed for sleep confirm command.
+ */
+static int mwifiex_dnld_sleep_confirm_cmd(struct mwifiex_adapter *adapter)
+{
+        int ret = 0;
+        u16 cmd_len = 0;
+        struct mwifiex_private *priv;
+        struct mwifiex_opt_sleep_confirm_buffer *sleep_cfm_buf =
+                                (struct mwifiex_opt_sleep_confirm_buffer *)
+                                adapter->sleep_cfm->data;
+        cmd_len = sizeof(struct mwifiex_opt_sleep_confirm);
+        priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
+
+        sleep_cfm_buf->ps_cfm_sleep.seq_num =
+                cpu_to_le16((HostCmd_SET_SEQ_NO_BSS_INFO
+                                        (adapter->seq_num, priv->bss_num,
+                                         priv->bss_type)));
+        adapter->seq_num++;
+
+        ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_CMD,
+                                             adapter->sleep_cfm->data,
+                                             adapter->sleep_cfm->len +
+                                             INTF_HEADER_LEN, NULL);
+
+        if (ret == -1) {
+                dev_err(adapter->dev, "SLEEP_CFM: failed\n");
+                adapter->dbg.num_cmd_sleep_cfm_host_to_card_failure++;
+                return -1;
+        }
+        if (GET_BSS_ROLE(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY))
+                        == MWIFIEX_BSS_ROLE_STA) {
+                if (!sleep_cfm_buf->ps_cfm_sleep.sleep_cfm.resp_ctrl)
+                        /* Response is not needed for sleep
+                           confirm command */
+                        adapter->ps_state = PS_STATE_SLEEP;
+                else
+                        adapter->ps_state = PS_STATE_SLEEP_CFM;
+
+                if (!sleep_cfm_buf->ps_cfm_sleep.sleep_cfm.resp_ctrl
+                                && (adapter->is_hs_configured
+                                        && !adapter->sleep_period.period)) {
+                        adapter->pm_wakeup_card_req = true;
+                        mwifiex_hs_activated_event(mwifiex_get_priv(adapter,
+                                                MWIFIEX_BSS_ROLE_STA), true);
+                }
+        }
+
+        return ret;
+}
+
+/*
+ * This function allocates the command buffers and links them to
+ * the command free queue.
+ *
+ * The driver uses a pre allocated number of command buffers, which
+ * are created at driver initializations and freed at driver cleanup.
+ * Every command needs to obtain a command buffer from this pool before
+ * it can be issued. The command free queue lists the command buffers
+ * currently free to use, while the command pending queue lists the
+ * command buffers already in use and awaiting handling. Command buffers
+ * are returned to the free queue after use.
+ */
+int mwifiex_alloc_cmd_buffer(struct mwifiex_adapter *adapter)
+{
+        struct cmd_ctrl_node *cmd_array;
+        u32 buf_size;
+        u32 i;
+
+        /* Allocate and initialize struct cmd_ctrl_node */
+        buf_size = sizeof(struct cmd_ctrl_node) * MWIFIEX_NUM_OF_CMD_BUFFER;
+        cmd_array = kzalloc(buf_size, GFP_KERNEL);
+        if (!cmd_array) {
+                dev_err(adapter->dev, "%s: failed to alloc cmd_array\n",
+                                __func__);
+                return -1;
+        }
+
+        adapter->cmd_pool = cmd_array;
+        memset(adapter->cmd_pool, 0, buf_size);
+
+        /* Allocate and initialize command buffers */
+        for (i = 0; i < MWIFIEX_NUM_OF_CMD_BUFFER; i++) {
+                cmd_array[i].skb = dev_alloc_skb(MWIFIEX_SIZE_OF_CMD_BUFFER);
+                if (!cmd_array[i].skb) {
+                        dev_err(adapter->dev, "ALLOC_CMD_BUF: out of memory\n");
+                        return -1;
+                }
+        }
+
+        for (i = 0; i < MWIFIEX_NUM_OF_CMD_BUFFER; i++)
+                mwifiex_insert_cmd_to_free_q(adapter, &cmd_array[i]);
+
+        return 0;
+}
+
+/*
+ * This function frees the command buffers.
+ *
+ * The function calls the completion callback for all the command
+ * buffers that still have response buffers associated with them.
+ */
+int mwifiex_free_cmd_buffer(struct mwifiex_adapter *adapter)
+{
+        struct cmd_ctrl_node *cmd_array;
+        u32 i;
+
+        /* Need to check if cmd pool is allocated or not */
+        if (!adapter->cmd_pool) {
+                dev_dbg(adapter->dev, "info: FREE_CMD_BUF: cmd_pool is null\n");
+                return 0;
+        }
+
+        cmd_array = adapter->cmd_pool;
+
+        /* Release shared memory buffers */
+        for (i = 0; i < MWIFIEX_NUM_OF_CMD_BUFFER; i++) {
+                if (cmd_array[i].skb) {
+                        dev_dbg(adapter->dev, "cmd: free cmd buffer %d\n", i);
+                        dev_kfree_skb_any(cmd_array[i].skb);
+                }
+                if (!cmd_array[i].resp_skb)
+                        continue;
+                mwifiex_recv_complete(adapter, cmd_array[i].resp_skb, 0);
+        }
+        /* Release struct cmd_ctrl_node */
+        if (adapter->cmd_pool) {
+                dev_dbg(adapter->dev, "cmd: free cmd pool\n");
+                kfree(adapter->cmd_pool);
+                adapter->cmd_pool = NULL;
+        }
+
+        return 0;
+}
+
+/*
+ * This function handles events generated by firmware.
+ *
+ * Event body of events received from firmware are not used (though they are
+ * saved), only the event ID is used. Some events are re-invoked by
+ * the driver, with a new event body.
+ *
+ * After processing, the function calls the completion callback
+ * for cleanup.
+ */
+int mwifiex_process_event(struct mwifiex_adapter *adapter)
+{
+        int ret = 0;
+        struct mwifiex_private *priv =
+                mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
+        struct sk_buff *skb = adapter->event_skb;
+        u32 eventcause = adapter->event_cause;
+        struct timeval tstamp;
+        struct mwifiex_rxinfo *rx_info = NULL;
+
+        /* Save the last event to debug log */
+        adapter->dbg.last_event_index =
+                (adapter->dbg.last_event_index + 1) % DBG_CMD_NUM;
+        adapter->dbg.last_event[adapter->dbg.last_event_index] =
+                (u16) eventcause;
+
+        /* Get BSS number and corresponding priv */
+        priv = mwifiex_get_priv_by_id(adapter, EVENT_GET_BSS_NUM(eventcause),
+                                      EVENT_GET_BSS_TYPE(eventcause));
+        if (!priv)
+                priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
+        /* Clear BSS_NO_BITS from event */
+        eventcause &= EVENT_ID_MASK;
+        adapter->event_cause = eventcause;
+
+        if (skb) {
+                rx_info = MWIFIEX_SKB_RXCB(skb);
+                rx_info->bss_index = priv->bss_index;
+        }
+
+        if (eventcause != EVENT_PS_SLEEP && eventcause != EVENT_PS_AWAKE) {
+                do_gettimeofday(&tstamp);
+                dev_dbg(adapter->dev, "event: %lu.%lu: cause: %#x\n",
+                       tstamp.tv_sec, tstamp.tv_usec, eventcause);
+        }
+
+        ret = mwifiex_process_sta_event(priv);
+
+        adapter->event_cause = 0;
+        adapter->event_skb = NULL;
+
+        mwifiex_recv_complete(adapter, skb, 0);
+
+        return ret;
+}
+
+/*
+ * This function prepares a command before sending it to the firmware.
+ *
+ * Preparation includes -
+ *      - Sanity tests to make sure the card is still present or the FW
+ *        is not reset
+ *      - Getting a new command node from the command free queue
+ *      - Initializing the command node for default parameters
+ *      - Fill up the non-default parameters and buffer pointers
+ *      - Add the command to pending queue
+ */
+int mwifiex_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
+                        u16 cmd_action, u32 cmd_oid,
+                        void *wait_queue, void *data_buf)
+{
+        int ret = 0;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct cmd_ctrl_node *cmd_node = NULL;
+        struct host_cmd_ds_command *cmd_ptr = NULL;
+
+        if (!adapter) {
+                pr_err("PREP_CMD: adapter is NULL\n");
+                return -1;
+        }
+
+        if (adapter->is_suspended) {
+                dev_err(adapter->dev, "PREP_CMD: device in suspended state\n");
+                return -1;
+        }
+
+        if (adapter->surprise_removed) {
+                dev_err(adapter->dev, "PREP_CMD: card is removed\n");
+                return -1;
+        }
+
+        if (adapter->hw_status == MWIFIEX_HW_STATUS_RESET) {
+                if (cmd_no != HostCmd_CMD_FUNC_INIT) {
+                        dev_err(adapter->dev, "PREP_CMD: FW in reset state\n");
+                        return -1;
+                }
+        }
+
+        /* Get a new command node */
+        cmd_node = mwifiex_get_cmd_node(adapter);
+
+        if (!cmd_node) {
+                dev_err(adapter->dev, "PREP_CMD: no free cmd node\n");
+                return -1;
+        }
+
+        /* Initialize the command node */
+        mwifiex_init_cmd_node(priv, cmd_node, cmd_oid, wait_queue, data_buf);
+
+        if (!cmd_node->cmd_skb) {
+                dev_err(adapter->dev, "PREP_CMD: no free cmd buf\n");
+                return -1;
+        }
+
+        memset(skb_put(cmd_node->cmd_skb, sizeof(struct host_cmd_ds_command)),
+               0, sizeof(struct host_cmd_ds_command));
+
+        cmd_ptr = (struct host_cmd_ds_command *) (cmd_node->cmd_skb->data);
+        cmd_ptr->command = cpu_to_le16(cmd_no);
+        cmd_ptr->result = 0;
+
+        /* Prepare command */
+        if (cmd_no) {
+                ret = mwifiex_sta_prepare_cmd(priv, cmd_no, cmd_action,
+                                              cmd_oid, data_buf, cmd_ptr);
+        } else {
+                ret = mwifiex_cmd_host_cmd(priv, cmd_ptr, data_buf);
+                cmd_node->cmd_flag |= CMD_F_HOSTCMD;
+        }
+
+        /* Return error, since the command preparation failed */
+        if (ret) {
+                dev_err(adapter->dev, "PREP_CMD: cmd %#x preparation failed\n",
+                                                        cmd_no);
+                mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+                return -1;
+        }
+
+        /* Send command */
+        if (cmd_no == HostCmd_CMD_802_11_SCAN)
+                mwifiex_queue_scan_cmd(priv, cmd_node);
+        else
+                mwifiex_insert_cmd_to_pending_q(adapter, cmd_node, true);
+
+        return ret;
+}
+
+/*
+ * This function returns a command to the command free queue.
+ *
+ * The function also calls the completion callback if required, before
+ * cleaning the command node and re-inserting it into the free queue.
+ */
+void
+mwifiex_insert_cmd_to_free_q(struct mwifiex_adapter *adapter,
+                             struct cmd_ctrl_node *cmd_node)
+{
+        struct mwifiex_wait_queue *wait_queue = NULL;
+        unsigned long flags;
+
+        if (cmd_node == NULL)
+                return;
+        if (cmd_node->wq_buf) {
+                wait_queue = (struct mwifiex_wait_queue *) cmd_node->wq_buf;
+                if (wait_queue->status != MWIFIEX_ERROR_NO_ERROR)
+                        mwifiex_ioctl_complete(adapter, wait_queue, -1);
+                else
+                        mwifiex_ioctl_complete(adapter, wait_queue, 0);
+        }
+        /* Clean the node */
+        mwifiex_clean_cmd_node(adapter, cmd_node);
+
+        /* Insert node into cmd_free_q */
+        spin_lock_irqsave(&adapter->cmd_free_q_lock, flags);
+        list_add_tail(&cmd_node->list, &adapter->cmd_free_q);
+        spin_unlock_irqrestore(&adapter->cmd_free_q_lock, flags);
+
+        return;
+}
+
+/*
+ * This function queues a command to the command pending queue.
+ *
+ * This in effect adds the command to the command list to be executed.
+ * Exit PS command is handled specially, by placing it always to the
+ * front of the command queue.
+ */
+void
+mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,
+                                struct cmd_ctrl_node *cmd_node, u32 add_tail)
+{
+        struct host_cmd_ds_command *host_cmd = NULL;
+        u16 command;
+        unsigned long flags;
+
+        host_cmd = (struct host_cmd_ds_command *) (cmd_node->cmd_skb->data);
+        if (!host_cmd) {
+                dev_err(adapter->dev, "QUEUE_CMD: host_cmd is NULL\n");
+                return;
+        }
+
+        command = le16_to_cpu(host_cmd->command);
+
+        /* Exit_PS command needs to be queued in the header always. */
+        if (command == HostCmd_CMD_802_11_PS_MODE_ENH) {
+                struct host_cmd_ds_802_11_ps_mode_enh *pm =
+                        &host_cmd->params.psmode_enh;
+                if ((le16_to_cpu(pm->action) == DIS_PS)
+                    || (le16_to_cpu(pm->action) == DIS_AUTO_PS)) {
+                        if (adapter->ps_state != PS_STATE_AWAKE)
+                                add_tail = false;
+                }
+        }
+
+        spin_lock_irqsave(&adapter->cmd_pending_q_lock, flags);
+        if (add_tail)
+                list_add_tail(&cmd_node->list, &adapter->cmd_pending_q);
+        else
+                list_add(&cmd_node->list, &adapter->cmd_pending_q);
+        spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, flags);
+
+        dev_dbg(adapter->dev, "cmd: QUEUE_CMD: cmd=%#x is queued\n", command);
+
+        return;
+}
+
+/*
+ * This function executes the next command in command pending queue.
+ *
+ * This function will fail if a command is already in processing stage,
+ * otherwise it will dequeue the first command from the command pending
+ * queue and send to the firmware.
+ *
+ * If the device is currently in host sleep mode, any commands, except the
+ * host sleep configuration command will de-activate the host sleep. For PS
+ * mode, the function will put the firmware back to sleep if applicable.
+ */
+int mwifiex_exec_next_cmd(struct mwifiex_adapter *adapter)
+{
+        struct mwifiex_private *priv = NULL;
+        struct cmd_ctrl_node *cmd_node = NULL;
+        int ret = 0;
+        struct host_cmd_ds_command *host_cmd;
+        unsigned long cmd_flags;
+        unsigned long cmd_pending_q_flags;
+
+        /* Check if already in processing */
+        if (adapter->curr_cmd) {
+                dev_err(adapter->dev, "EXEC_NEXT_CMD: cmd in processing\n");
+                return -1;
+        }
+
+        spin_lock_irqsave(&adapter->mwifiex_cmd_lock, cmd_flags);
+        /* Check if any command is pending */
+        spin_lock_irqsave(&adapter->cmd_pending_q_lock, cmd_pending_q_flags);
+        if (list_empty(&adapter->cmd_pending_q)) {
+                spin_unlock_irqrestore(&adapter->cmd_pending_q_lock,
+                                       cmd_pending_q_flags);
+                spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, cmd_flags);
+                return 0;
+        }
+        cmd_node = list_first_entry(&adapter->cmd_pending_q,
+                                    struct cmd_ctrl_node, list);
+        spin_unlock_irqrestore(&adapter->cmd_pending_q_lock,
+                               cmd_pending_q_flags);
+
+        host_cmd = (struct host_cmd_ds_command *) (cmd_node->cmd_skb->data);
+        priv = cmd_node->priv;
+
+        if (adapter->ps_state != PS_STATE_AWAKE) {
+                dev_err(adapter->dev, "%s: cannot send cmd in sleep state,"
+                                " this should not happen\n", __func__);
+                spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, cmd_flags);
+                return ret;
+        }
+
+        spin_lock_irqsave(&adapter->cmd_pending_q_lock, cmd_pending_q_flags);
+        list_del(&cmd_node->list);
+        spin_unlock_irqrestore(&adapter->cmd_pending_q_lock,
+                               cmd_pending_q_flags);
+
+        spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, cmd_flags);
+        ret = mwifiex_dnld_cmd_to_fw(priv, cmd_node);
+        priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
+        /* Any command sent to the firmware when host is in sleep
+         * mode should de-configure host sleep. We should skip the
+         * host sleep configuration command itself though
+         */
+        if (priv && (host_cmd->command !=
+             cpu_to_le16(HostCmd_CMD_802_11_HS_CFG_ENH))) {
+                if (adapter->hs_activated) {
+                        adapter->is_hs_configured = false;
+                        mwifiex_hs_activated_event(priv, false);
+                }
+        }
+
+        return ret;
+}
+
+/*
+ * This function handles the command response.
+ *
+ * After processing, the function cleans the command node and puts
+ * it back to the command free queue.
+ */
+int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter)
+{
+        struct host_cmd_ds_command *resp = NULL;
+        struct mwifiex_private *priv =
+                mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
+        int ret = 0;
+        uint16_t orig_cmdresp_no;
+        uint16_t cmdresp_no;
+        uint16_t cmdresp_result;
+        struct mwifiex_wait_queue *wait_queue = NULL;
+        struct timeval tstamp;
+        unsigned long flags;
+
+        /* Now we got response from FW, cancel the command timer */
+        del_timer(&adapter->cmd_timer);
+
+        if (!adapter->curr_cmd || !adapter->curr_cmd->resp_skb) {
+                resp = (struct host_cmd_ds_command *) adapter->upld_buf;
+                dev_err(adapter->dev, "CMD_RESP: NULL curr_cmd, %#x\n",
+                       le16_to_cpu(resp->command));
+                return -1;
+        }
+
+        if (adapter->curr_cmd->wq_buf)
+                wait_queue = (struct mwifiex_wait_queue *)
+                                adapter->curr_cmd->wq_buf;
+
+        adapter->num_cmd_timeout = 0;
+
+        resp = (struct host_cmd_ds_command *) adapter->curr_cmd->resp_skb->data;
+        if (adapter->curr_cmd->cmd_flag & CMD_F_CANCELED) {
+                dev_err(adapter->dev, "CMD_RESP: %#x been canceled\n",
+                                le16_to_cpu(resp->command));
+                mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
+                spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
+                adapter->curr_cmd = NULL;
+                spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
+                return -1;
+        }
+
+        if (adapter->curr_cmd->cmd_flag & CMD_F_HOSTCMD) {
+                /* Copy original response back to response buffer */
+                struct mwifiex_ds_misc_cmd *hostcmd = NULL;
+                uint16_t size = le16_to_cpu(resp->size);
+                dev_dbg(adapter->dev, "info: host cmd resp size = %d\n", size);
+                size = min_t(u16, size, MWIFIEX_SIZE_OF_CMD_BUFFER);
+                if (adapter->curr_cmd->data_buf) {
+                        hostcmd = (struct mwifiex_ds_misc_cmd *)
+                                                adapter->curr_cmd->data_buf;
+                        hostcmd->len = size;
+                        memcpy(hostcmd->cmd, (void *) resp, size);
+                }
+        }
+        orig_cmdresp_no = le16_to_cpu(resp->command);
+
+        /* Get BSS number and corresponding priv */
+        priv = mwifiex_get_priv_by_id(adapter,
+                        HostCmd_GET_BSS_NO(le16_to_cpu(resp->seq_num)),
+                        HostCmd_GET_BSS_TYPE(le16_to_cpu(resp->seq_num)));
+        if (!priv)
+                priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
+        /* Clear RET_BIT from HostCmd */
+        resp->command = cpu_to_le16(orig_cmdresp_no & HostCmd_CMD_ID_MASK);
+
+        cmdresp_no = le16_to_cpu(resp->command);
+        cmdresp_result = le16_to_cpu(resp->result);
+
+        /* Save the last command response to debug log */
+        adapter->dbg.last_cmd_resp_index =
+                (adapter->dbg.last_cmd_resp_index + 1) % DBG_CMD_NUM;
+        adapter->dbg.last_cmd_resp_id[adapter->dbg.last_cmd_resp_index] =
+                orig_cmdresp_no;
+
+        do_gettimeofday(&tstamp);
+        dev_dbg(adapter->dev, "cmd: CMD_RESP: (%lu.%lu): 0x%x, result %d,"
+                " len %d, seqno 0x%x\n",
+               tstamp.tv_sec, tstamp.tv_usec, orig_cmdresp_no, cmdresp_result,
+               le16_to_cpu(resp->size), le16_to_cpu(resp->seq_num));
+
+        if (!(orig_cmdresp_no & HostCmd_RET_BIT)) {
+                dev_err(adapter->dev, "CMD_RESP: invalid cmd resp\n");
+                if (wait_queue)
+                        wait_queue->status = MWIFIEX_ERROR_FW_CMDRESP;
+
+                mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
+                spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
+                adapter->curr_cmd = NULL;
+                spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
+                return -1;
+        }
+
+        if (adapter->curr_cmd->cmd_flag & CMD_F_HOSTCMD) {
+                adapter->curr_cmd->cmd_flag &= ~CMD_F_HOSTCMD;
+                if ((cmdresp_result == HostCmd_RESULT_OK)
+                    && (cmdresp_no == HostCmd_CMD_802_11_HS_CFG_ENH))
+                        ret = mwifiex_ret_802_11_hs_cfg(priv, resp);
+        } else {
+                /* handle response */
+                ret = mwifiex_process_sta_cmdresp(priv, cmdresp_no, resp,
+                                                  wait_queue);
+        }
+
+        /* Check init command response */
+        if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING) {
+                if (ret == -1) {
+                        dev_err(adapter->dev, "%s: cmd %#x failed during "
+                                "initialization\n", __func__, cmdresp_no);
+                        mwifiex_init_fw_complete(adapter);
+                        return -1;
+                } else if (adapter->last_init_cmd == cmdresp_no)
+                        adapter->hw_status = MWIFIEX_HW_STATUS_INIT_DONE;
+        }
+
+        if (adapter->curr_cmd) {
+                if (wait_queue && (!ret))
+                        wait_queue->status = MWIFIEX_ERROR_NO_ERROR;
+                else if (wait_queue && (ret == -1))
+                        wait_queue->status = MWIFIEX_ERROR_CMD_RESP_FAIL;
+
+                /* Clean up and put current command back to cmd_free_q */
+                mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
+
+                spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
+                adapter->curr_cmd = NULL;
+                spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
+        }
+
+        return ret;
+}
+
+/*
+ * This function handles the timeout of command sending.
+ *
+ * It will re-send the same command again.
+ */
+void
+mwifiex_cmd_timeout_func(unsigned long function_context)
+{
+        struct mwifiex_adapter *adapter =
+                (struct mwifiex_adapter *) function_context;
+        struct cmd_ctrl_node *cmd_node = NULL;
+        struct mwifiex_wait_queue *wait_queue = NULL;
+        struct timeval tstamp;
+
+        adapter->num_cmd_timeout++;
+        adapter->dbg.num_cmd_timeout++;
+        if (!adapter->curr_cmd) {
+                dev_dbg(adapter->dev, "cmd: empty curr_cmd\n");
+                return;
+        }
+        cmd_node = adapter->curr_cmd;
+        if (cmd_node->wq_buf) {
+                wait_queue = (struct mwifiex_wait_queue *) cmd_node->wq_buf;
+                wait_queue->status = MWIFIEX_ERROR_CMD_TIMEOUT;
+        }
+
+        if (cmd_node) {
+                adapter->dbg.timeout_cmd_id =
+                        adapter->dbg.last_cmd_id[adapter->dbg.last_cmd_index];
+                adapter->dbg.timeout_cmd_act =
+                        adapter->dbg.last_cmd_act[adapter->dbg.last_cmd_index];
+                do_gettimeofday(&tstamp);
+                dev_err(adapter->dev, "%s: Timeout cmd id (%lu.%lu) = %#x,"
+                        " act = %#x\n", __func__,
+                       tstamp.tv_sec, tstamp.tv_usec,
+                       adapter->dbg.timeout_cmd_id,
+                       adapter->dbg.timeout_cmd_act);
+
+                dev_err(adapter->dev, "num_data_h2c_failure = %d\n",
+                       adapter->dbg.num_tx_host_to_card_failure);
+                dev_err(adapter->dev, "num_cmd_h2c_failure = %d\n",
+                       adapter->dbg.num_cmd_host_to_card_failure);
+
+                dev_err(adapter->dev, "num_cmd_timeout = %d\n",
+                       adapter->dbg.num_cmd_timeout);
+                dev_err(adapter->dev, "num_tx_timeout = %d\n",
+                       adapter->dbg.num_tx_timeout);
+
+                dev_err(adapter->dev, "last_cmd_index = %d\n",
+                       adapter->dbg.last_cmd_index);
+                print_hex_dump_bytes("last_cmd_id: ", DUMP_PREFIX_OFFSET,
+                                adapter->dbg.last_cmd_id, DBG_CMD_NUM);
+                print_hex_dump_bytes("last_cmd_act: ", DUMP_PREFIX_OFFSET,
+                                adapter->dbg.last_cmd_act, DBG_CMD_NUM);
+
+                dev_err(adapter->dev, "last_cmd_resp_index = %d\n",
+                       adapter->dbg.last_cmd_resp_index);
+                print_hex_dump_bytes("last_cmd_resp_id: ", DUMP_PREFIX_OFFSET,
+                                adapter->dbg.last_cmd_resp_id, DBG_CMD_NUM);
+
+                dev_err(adapter->dev, "last_event_index = %d\n",
+                       adapter->dbg.last_event_index);
+                print_hex_dump_bytes("last_event: ", DUMP_PREFIX_OFFSET,
+                                adapter->dbg.last_event, DBG_CMD_NUM);
+
+                dev_err(adapter->dev, "data_sent=%d cmd_sent=%d\n",
+                       adapter->data_sent, adapter->cmd_sent);
+
+                dev_err(adapter->dev, "ps_mode=%d ps_state=%d\n",
+                                adapter->ps_mode, adapter->ps_state);
+        }
+        if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING)
+                mwifiex_init_fw_complete(adapter);
+
+        return;
+}
+
+/*
+ * This function cancels all the pending commands.
+ *
+ * The current command, all commands in command pending queue and all scan
+ * commands in scan pending queue are cancelled. All the completion callbacks
+ * are called with failure status to ensure cleanup.
+ */
+void
+mwifiex_cancel_all_pending_cmd(struct mwifiex_adapter *adapter)
+{
+        struct cmd_ctrl_node *cmd_node = NULL, *tmp_node = NULL;
+        struct mwifiex_wait_queue *wait_queue = NULL;
+        unsigned long flags;
+
+        /* Cancel current cmd */
+        if ((adapter->curr_cmd) && (adapter->curr_cmd->wq_buf)) {
+                wait_queue =
+                        (struct mwifiex_wait_queue *) adapter->curr_cmd->wq_buf;
+                spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
+                adapter->curr_cmd->wq_buf = NULL;
+                spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
+                wait_queue->status = MWIFIEX_ERROR_CMD_CANCEL;
+                mwifiex_ioctl_complete(adapter, wait_queue, -1);
+        }
+        /* Cancel all pending command */
+        spin_lock_irqsave(&adapter->cmd_pending_q_lock, flags);
+        list_for_each_entry_safe(cmd_node, tmp_node,
+                                 &adapter->cmd_pending_q, list) {
+                list_del(&cmd_node->list);
+                spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, flags);
+
+                if (cmd_node->wq_buf) {
+                        wait_queue =
+                                (struct mwifiex_wait_queue *) cmd_node->wq_buf;
+                        wait_queue->status = MWIFIEX_ERROR_CMD_CANCEL;
+                        mwifiex_ioctl_complete(adapter, wait_queue, -1);
+                        cmd_node->wq_buf = NULL;
+                }
+                mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+                spin_lock_irqsave(&adapter->cmd_pending_q_lock, flags);
+        }
+        spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, flags);
+
+        /* Cancel 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);
+                spin_unlock_irqrestore(&adapter->scan_pending_q_lock, flags);
+
+                cmd_node->wq_buf = NULL;
+                mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+                spin_lock_irqsave(&adapter->scan_pending_q_lock, flags);
+        }
+        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);
+}
+
+/*
+ * This function cancels all pending commands that matches with
+ * the given IOCTL request.
+ *
+ * Both the current command buffer and the pending command queue are
+ * searched for matching IOCTL request. The completion callback of
+ * the matched command is called with failure status to ensure cleanup.
+ * In case of scan commands, all pending commands in scan pending queue
+ * are cancelled.
+ */
+void
+mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter,
+                             struct mwifiex_wait_queue *wait_queue)
+{
+        struct cmd_ctrl_node *cmd_node = NULL, *tmp_node = NULL;
+        unsigned long cmd_flags;
+        unsigned long cmd_pending_q_flags;
+        unsigned long scan_pending_q_flags;
+        uint16_t cancel_scan_cmd = false;
+
+        if ((adapter->curr_cmd) &&
+            (adapter->curr_cmd->wq_buf == wait_queue)) {
+                spin_lock_irqsave(&adapter->mwifiex_cmd_lock, cmd_flags);
+                cmd_node = adapter->curr_cmd;
+                cmd_node->wq_buf = NULL;
+                cmd_node->cmd_flag |= CMD_F_CANCELED;
+                spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, cmd_flags);
+        }
+
+        spin_lock_irqsave(&adapter->mwifiex_cmd_lock, cmd_flags);
+        while (1) {
+                cmd_node = mwifiex_get_pending_ioctl_cmd(adapter, wait_queue);
+                if (!cmd_node)
+                        break;
+
+                spin_lock_irqsave(&adapter->cmd_pending_q_lock,
+                                  cmd_pending_q_flags);
+                list_del(&cmd_node->list);
+                spin_unlock_irqrestore(&adapter->cmd_pending_q_lock,
+                                       cmd_pending_q_flags);
+
+                cmd_node->wq_buf = NULL;
+                mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+        }
+        spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, cmd_flags);
+        /* Cancel all pending scan command */
+        spin_lock_irqsave(&adapter->scan_pending_q_lock,
+                          scan_pending_q_flags);
+        list_for_each_entry_safe(cmd_node, tmp_node,
+                                 &adapter->scan_pending_q, list) {
+                if (cmd_node->wq_buf == wait_queue) {
+                        list_del(&cmd_node->list);
+                        spin_unlock_irqrestore(&adapter->scan_pending_q_lock,
+                                               scan_pending_q_flags);
+                        cmd_node->wq_buf = NULL;
+                        mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+                        spin_lock_irqsave(&adapter->scan_pending_q_lock,
+                                          scan_pending_q_flags);
+                        cancel_scan_cmd = true;
+                }
+        }
+        spin_unlock_irqrestore(&adapter->scan_pending_q_lock,
+                               scan_pending_q_flags);
+
+        if (cancel_scan_cmd) {
+                spin_lock_irqsave(&adapter->mwifiex_cmd_lock, cmd_flags);
+                adapter->scan_processing = false;
+                spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, cmd_flags);
+        }
+        wait_queue->status = MWIFIEX_ERROR_CMD_CANCEL;
+        mwifiex_ioctl_complete(adapter, wait_queue, -1);
+
+        return;
+}
+
+/*
+ * This function sends the sleep confirm command to firmware, if
+ * possible.
+ *
+ * The sleep confirm command cannot be issued if command response,
+ * data response or event response is awaiting handling, or if we
+ * are in the middle of sending a command, or expecting a command
+ * response.
+ */
+void
+mwifiex_check_ps_cond(struct mwifiex_adapter *adapter)
+{
+        if (!adapter->cmd_sent &&
+            !adapter->curr_cmd && !IS_CARD_RX_RCVD(adapter))
+                mwifiex_dnld_sleep_confirm_cmd(adapter);
+        else
+                dev_dbg(adapter->dev,
+                        "cmd: Delay Sleep Confirm (%s%s%s)\n",
+                       (adapter->cmd_sent) ? "D" : "",
+                       (adapter->curr_cmd) ? "C" : "",
+                       (IS_CARD_RX_RCVD(adapter)) ? "R" : "");
+}
+
+/*
+ * This function sends a Host Sleep activated event to applications.
+ *
+ * This event is generated by the driver, with a blank event body.
+ */
+void
+mwifiex_hs_activated_event(struct mwifiex_private *priv, u8 activated)
+{
+        if (activated) {
+                if (priv->adapter->is_hs_configured) {
+                        priv->adapter->hs_activated = true;
+                        dev_dbg(priv->adapter->dev, "event: hs_activated\n");
+                        priv->adapter->hs_activate_wait_q_woken = true;
+                        wake_up_interruptible(
+                                &priv->adapter->hs_activate_wait_q);
+                } else {
+                        dev_dbg(priv->adapter->dev, "event: HS not configured\n");
+                }
+        } else {
+                dev_dbg(priv->adapter->dev, "event: hs_deactivated\n");
+                priv->adapter->hs_activated = false;
+        }
+}
+
+/*
+ * This function handles the command response of a Host Sleep configuration
+ * command.
+ *
+ * Handling includes changing the header fields into CPU format
+ * and setting the current host sleep activation status in driver.
+ *
+ * In case host sleep status change, the function generates an event to
+ * notify the applications.
+ */
+int mwifiex_ret_802_11_hs_cfg(struct mwifiex_private *priv,
+                              struct host_cmd_ds_command *resp)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct host_cmd_ds_802_11_hs_cfg_enh *phs_cfg =
+                &resp->params.opt_hs_cfg;
+        uint32_t conditions = le32_to_cpu(phs_cfg->params.hs_config.conditions);
+
+        if (phs_cfg->action == cpu_to_le16(HS_ACTIVATE)) {
+                mwifiex_hs_activated_event(priv, true);
+                return 0;
+        } else {
+                dev_dbg(adapter->dev, "cmd: CMD_RESP: HS_CFG cmd reply"
+                        " result=%#x, conditions=0x%x gpio=0x%x gap=0x%x\n",
+                        resp->result, conditions,
+                       phs_cfg->params.hs_config.gpio,
+                       phs_cfg->params.hs_config.gap);
+        }
+        if (conditions != HOST_SLEEP_CFG_CANCEL) {
+                adapter->is_hs_configured = true;
+        } else {
+                adapter->is_hs_configured = false;
+                if (adapter->hs_activated)
+                        mwifiex_hs_activated_event(priv, false);
+        }
+
+        return 0;
+}
+
+/*
+ * This function wakes up the adapter and generates a Host Sleep
+ * cancel event on receiving the power up interrupt.
+ */
+void
+mwifiex_process_hs_config(struct mwifiex_adapter *adapter)
+{
+        dev_dbg(adapter->dev, "info: %s: auto cancelling host sleep"
+                " since there is interrupt from the firmware\n", __func__);
+
+        adapter->if_ops.wakeup(adapter);
+        adapter->hs_activated = false;
+        adapter->is_hs_configured = false;
+        mwifiex_hs_activated_event(mwifiex_get_priv(adapter,
+                                   MWIFIEX_BSS_ROLE_ANY), false);
+        return;
+}
+
+/*
+ * This function handles the command response of a sleep confirm command.
+ *
+ * The function sets the card state to SLEEP if the response indicates success.
+ */
+void
+mwifiex_process_sleep_confirm_resp(struct mwifiex_adapter *adapter,
+                                   u8 *pbuf, u32 upld_len)
+{
+        struct host_cmd_ds_command *cmd = (struct host_cmd_ds_command *) pbuf;
+        struct mwifiex_private *priv =
+                mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
+        uint16_t result = le16_to_cpu(cmd->result);
+        uint16_t command = le16_to_cpu(cmd->command);
+        uint16_t seq_num = le16_to_cpu(cmd->seq_num);
+
+        if (!upld_len) {
+                dev_err(adapter->dev, "%s: cmd size is 0\n", __func__);
+                return;
+        }
+
+        /* Get BSS number and corresponding priv */
+        priv = mwifiex_get_priv_by_id(adapter, HostCmd_GET_BSS_NO(seq_num),
+                                      HostCmd_GET_BSS_TYPE(seq_num));
+        if (!priv)
+                priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
+
+        /* Update sequence number */
+        seq_num = HostCmd_GET_SEQ_NO(seq_num);
+        /* Clear RET_BIT from HostCmd */
+        command &= HostCmd_CMD_ID_MASK;
+
+        if (command != HostCmd_CMD_802_11_PS_MODE_ENH) {
+                dev_err(adapter->dev, "%s: received unexpected response for"
+                        " cmd %x, result = %x\n", __func__, command, result);
+                return;
+        }
+
+        if (result) {
+                dev_err(adapter->dev, "%s: sleep confirm cmd failed\n",
+                                                __func__);
+                adapter->pm_wakeup_card_req = false;
+                adapter->ps_state = PS_STATE_AWAKE;
+                return;
+        }
+        adapter->pm_wakeup_card_req = true;
+        if (adapter->is_hs_configured)
+                mwifiex_hs_activated_event(mwifiex_get_priv(adapter,
+                                           MWIFIEX_BSS_ROLE_ANY), true);
+        adapter->ps_state = PS_STATE_SLEEP;
+        cmd->command = cpu_to_le16(command);
+        cmd->seq_num = cpu_to_le16(seq_num);
+}
+EXPORT_SYMBOL_GPL(mwifiex_process_sleep_confirm_resp);
+
+/*
+ * This function prepares an enhanced power mode command.
+ *
+ * This function can be used to disable power save or to configure
+ * power save with auto PS or STA PS or auto deep sleep.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting Power Save bitmap, PS parameters TLV, PS mode TLV,
+ *        auto deep sleep TLV (as required)
+ *      - Ensuring correct endian-ness
+ */
+int mwifiex_cmd_enh_power_mode(struct mwifiex_private *priv,
+                               struct host_cmd_ds_command *cmd,
+                               u16 cmd_action, uint16_t ps_bitmap,
+                               void *data_buf)
+{
+        struct host_cmd_ds_802_11_ps_mode_enh *psmode_enh =
+                &cmd->params.psmode_enh;
+        u8 *tlv = NULL;
+        u16 cmd_size = 0;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH);
+        if (cmd_action == DIS_AUTO_PS) {
+                psmode_enh->action = cpu_to_le16(DIS_AUTO_PS);
+                psmode_enh->params.ps_bitmap = cpu_to_le16(ps_bitmap);
+                cmd->size = cpu_to_le16(S_DS_GEN + AUTO_PS_FIX_SIZE);
+        } else if (cmd_action == GET_PS) {
+                psmode_enh->action = cpu_to_le16(GET_PS);
+                psmode_enh->params.ps_bitmap = cpu_to_le16(ps_bitmap);
+                cmd->size = cpu_to_le16(S_DS_GEN + AUTO_PS_FIX_SIZE);
+        } else if (cmd_action == EN_AUTO_PS) {
+                psmode_enh->action = cpu_to_le16(EN_AUTO_PS);
+                psmode_enh->params.auto_ps.ps_bitmap = cpu_to_le16(ps_bitmap);
+                cmd_size = S_DS_GEN + AUTO_PS_FIX_SIZE;
+                tlv = (u8 *) cmd + cmd_size;
+                if (ps_bitmap & BITMAP_STA_PS) {
+                        struct mwifiex_adapter *adapter = priv->adapter;
+                        struct mwifiex_ie_types_ps_param *ps_tlv =
+                                (struct mwifiex_ie_types_ps_param *) tlv;
+                        struct mwifiex_ps_param *ps_mode = &ps_tlv->param;
+                        ps_tlv->header.type = cpu_to_le16(TLV_TYPE_PS_PARAM);
+                        ps_tlv->header.len = cpu_to_le16(sizeof(*ps_tlv) -
+                                        sizeof(struct mwifiex_ie_types_header));
+                        cmd_size += sizeof(*ps_tlv);
+                        tlv += sizeof(*ps_tlv);
+                        dev_dbg(adapter->dev, "cmd: PS Command: Enter PS\n");
+                        ps_mode->null_pkt_interval =
+                                cpu_to_le16(adapter->null_pkt_interval);
+                        ps_mode->multiple_dtims =
+                                cpu_to_le16(adapter->multiple_dtim);
+                        ps_mode->bcn_miss_timeout =
+                                cpu_to_le16(adapter->bcn_miss_time_out);
+                        ps_mode->local_listen_interval =
+                                cpu_to_le16(adapter->local_listen_interval);
+                        ps_mode->adhoc_wake_period =
+                                cpu_to_le16(adapter->adhoc_awake_period);
+                        ps_mode->delay_to_ps =
+                                cpu_to_le16(adapter->delay_to_ps);
+                        ps_mode->mode =
+                                cpu_to_le16(adapter->enhanced_ps_mode);
+
+                }
+                if (ps_bitmap & BITMAP_AUTO_DS) {
+                        struct mwifiex_ie_types_auto_ds_param *auto_ps_tlv =
+                                (struct mwifiex_ie_types_auto_ds_param *) tlv;
+                        struct mwifiex_auto_ds_param *auto_ds =
+                                &auto_ps_tlv->param;
+                        u16 idletime = 0;
+                        auto_ps_tlv->header.type =
+                                cpu_to_le16(TLV_TYPE_AUTO_DS_PARAM);
+                        auto_ps_tlv->header.len =
+                                cpu_to_le16(sizeof(*auto_ps_tlv) -
+                                        sizeof(struct mwifiex_ie_types_header));
+                        cmd_size += sizeof(*auto_ps_tlv);
+                        tlv += sizeof(*auto_ps_tlv);
+                        if (data_buf)
+                                idletime = ((struct mwifiex_ds_auto_ds *)
+                                             data_buf)->idle_time;
+                        dev_dbg(priv->adapter->dev,
+                                        "cmd: PS Command: Enter Auto Deep Sleep\n");
+                        auto_ds->deep_sleep_timeout = cpu_to_le16(idletime);
+                }
+                cmd->size = cpu_to_le16(cmd_size);
+        }
+        return 0;
+}
+
+/*
+ * This function handles the command response of an enhanced power mode
+ * command.
+ *
+ * Handling includes changing the header fields into CPU format
+ * and setting the current enhanced power mode in driver.
+ */
+int mwifiex_ret_enh_power_mode(struct mwifiex_private *priv,
+                               struct host_cmd_ds_command *resp,
+                               void *data_buf)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct host_cmd_ds_802_11_ps_mode_enh *ps_mode =
+                &resp->params.psmode_enh;
+        uint16_t action = le16_to_cpu(ps_mode->action);
+        uint16_t ps_bitmap = le16_to_cpu(ps_mode->params.ps_bitmap);
+        uint16_t auto_ps_bitmap =
+                le16_to_cpu(ps_mode->params.auto_ps.ps_bitmap);
+
+        dev_dbg(adapter->dev, "info: %s: PS_MODE cmd reply result=%#x action=%#X\n",
+                                        __func__, resp->result, action);
+        if (action == EN_AUTO_PS) {
+                if (auto_ps_bitmap & BITMAP_AUTO_DS) {
+                        dev_dbg(adapter->dev, "cmd: Enabled auto deep sleep\n");
+                        priv->adapter->is_deep_sleep = true;
+                }
+                if (auto_ps_bitmap & BITMAP_STA_PS) {
+                        dev_dbg(adapter->dev, "cmd: Enabled STA power save\n");
+                        if (adapter->sleep_period.period)
+                                dev_dbg(adapter->dev, "cmd: set to uapsd/pps mode\n");
+                }
+        } else if (action == DIS_AUTO_PS) {
+                if (ps_bitmap & BITMAP_AUTO_DS) {
+                        priv->adapter->is_deep_sleep = false;
+                        dev_dbg(adapter->dev, "cmd: Disabled auto deep sleep\n");
+                }
+                if (ps_bitmap & BITMAP_STA_PS) {
+                        dev_dbg(adapter->dev, "cmd: Disabled STA power save\n");
+                        if (adapter->sleep_period.period) {
+                                adapter->delay_null_pkt = false;
+                                adapter->tx_lock_flag = false;
+                                adapter->pps_uapsd_mode = false;
+                        }
+                }
+        } else if (action == GET_PS) {
+                if (ps_bitmap & (BITMAP_STA_PS | BITMAP_UAP_INACT_PS
+                                                        | BITMAP_UAP_DTIM_PS))
+                        adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_PSP;
+                else
+                        adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_CAM;
+
+                dev_dbg(adapter->dev, "cmd: ps_bitmap=%#x\n", ps_bitmap);
+
+                if (data_buf) {
+                        /* This section is for get power save mode */
+                        struct mwifiex_ds_pm_cfg *pm_cfg =
+                                        (struct mwifiex_ds_pm_cfg *)data_buf;
+                        if (ps_bitmap & BITMAP_STA_PS)
+                                pm_cfg->param.ps_mode = 1;
+                        else
+                                pm_cfg->param.ps_mode = 0;
+                }
+        }
+        return 0;
+}
+
+/*
+ * This function prepares command to get hardware specifications.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting permanent address parameter
+ *      - Ensuring correct endian-ness
+ */
+int mwifiex_cmd_get_hw_spec(struct mwifiex_private *priv,
+                            struct host_cmd_ds_command *cmd)
+{
+        struct host_cmd_ds_get_hw_spec *hw_spec = &cmd->params.hw_spec;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_GET_HW_SPEC);
+        cmd->size =
+                cpu_to_le16(sizeof(struct host_cmd_ds_get_hw_spec) + S_DS_GEN);
+        memcpy(hw_spec->permanent_addr, priv->curr_addr, ETH_ALEN);
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of get hardware
+ * specifications.
+ *
+ * Handling includes changing the header fields into CPU format
+ * and saving/updating the following parameters in driver -
+ *      - Firmware capability information
+ *      - Firmware band settings
+ *      - Ad-hoc start band and channel
+ *      - Ad-hoc 11n activation status
+ *      - Firmware release number
+ *      - Number of antennas
+ *      - Hardware address
+ *      - Hardware interface version
+ *      - Firmware version
+ *      - Region code
+ *      - 11n capabilities
+ *      - MCS support fields
+ *      - MP end port
+ */
+int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv,
+                            struct host_cmd_ds_command *resp)
+{
+        struct host_cmd_ds_get_hw_spec *hw_spec = &resp->params.hw_spec;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        int i;
+
+        adapter->fw_cap_info = le32_to_cpu(hw_spec->fw_cap_info);
+
+        if (IS_SUPPORT_MULTI_BANDS(adapter))
+                adapter->fw_bands = (u8) GET_FW_DEFAULT_BANDS(adapter);
+        else
+                adapter->fw_bands = BAND_B;
+
+        adapter->config_bands = adapter->fw_bands;
+
+        if (adapter->fw_bands & BAND_A) {
+                if (adapter->fw_bands & BAND_GN) {
+                        adapter->config_bands |= BAND_AN;
+                        adapter->fw_bands |= BAND_AN;
+                }
+                if (adapter->fw_bands & BAND_AN) {
+                        adapter->adhoc_start_band = BAND_A | BAND_AN;
+                        adapter->adhoc_11n_enabled = true;
+                } else {
+                        adapter->adhoc_start_band = BAND_A;
+                }
+                priv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL_A;
+        } else if (adapter->fw_bands & BAND_GN) {
+                adapter->adhoc_start_band = BAND_G | BAND_B | BAND_GN;
+                priv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL;
+                adapter->adhoc_11n_enabled = true;
+        } else if (adapter->fw_bands & BAND_G) {
+                adapter->adhoc_start_band = BAND_G | BAND_B;
+                priv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL;
+        } else if (adapter->fw_bands & BAND_B) {
+                adapter->adhoc_start_band = BAND_B;
+                priv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL;
+        }
+
+        adapter->fw_release_number = le32_to_cpu(hw_spec->fw_release_number);
+        adapter->number_of_antenna = le16_to_cpu(hw_spec->number_of_antenna);
+
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: fw_release_number- %#x\n",
+               adapter->fw_release_number);
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: permanent addr: %pM\n",
+                                        hw_spec->permanent_addr);
+        dev_dbg(adapter->dev, "info: GET_HW_SPEC: hw_if_version=%#x  version=%#x\n",
+                le16_to_cpu(hw_spec->hw_if_version),
+               le16_to_cpu(hw_spec->version));
+
+        if (priv->curr_addr[0] == 0xff)
+                memmove(priv->curr_addr, hw_spec->permanent_addr, ETH_ALEN);
+
+        adapter->region_code = le16_to_cpu(hw_spec->region_code);
+
+        for (i = 0; i < MWIFIEX_MAX_REGION_CODE; i++)
+                /* Use the region code to search for the index */
+                if (adapter->region_code == region_code_index[i])
+                        break;
+
+        /* If it's unidentified region code, use the default (USA) */
+        if (i >= MWIFIEX_MAX_REGION_CODE) {
+                adapter->region_code = 0x10;
+                dev_dbg(adapter->dev, "cmd: unknown region code, use default (USA)\n");
+        }
+
+        adapter->hw_dot_11n_dev_cap = le32_to_cpu(hw_spec->dot_11n_dev_cap);
+        adapter->usr_dot_11n_dev_cap = adapter->hw_dot_11n_dev_cap &
+                DEFAULT_11N_CAP_MASK;
+        adapter->hw_dev_mcs_support = hw_spec->dev_mcs_support;
+        adapter->usr_dev_mcs_support = adapter->hw_dev_mcs_support;
+        mwifiex_show_dot_11n_dev_cap(adapter, adapter->hw_dot_11n_dev_cap);
+        mwifiex_show_dev_mcs_support(adapter, adapter->hw_dev_mcs_support);
+
+        if (adapter->if_ops.update_mp_end_port)
+                adapter->if_ops.update_mp_end_port(adapter,
+                                        le16_to_cpu(hw_spec->mp_end_port));
+
+        return 0;
+}
diff --git a/drivers/net/wireless/mwifiex/debugfs.c b/drivers/net/wireless/mwifiex/debugfs.c
new file mode 100644
index 00000000000..63b09692f27
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/debugfs.c
@@ -0,0 +1,773 @@
+/*
+ * Marvell Wireless LAN device driver: debugfs
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include <linux/debugfs.h>
+
+#include "main.h"
+#include "11n.h"
+
+
+static struct dentry *mwifiex_dfs_dir;
+
+static char *bss_modes[] = {
+        "Unknown",
+        "Managed",
+        "Ad-hoc",
+        "Auto"
+};
+
+/* size/addr for mwifiex_debug_info */
+#define item_size(n)            (FIELD_SIZEOF(struct mwifiex_debug_info, n))
+#define item_addr(n)            (offsetof(struct mwifiex_debug_info, n))
+
+/* size/addr for struct mwifiex_adapter */
+#define adapter_item_size(n)    (FIELD_SIZEOF(struct mwifiex_adapter, n))
+#define adapter_item_addr(n)    (offsetof(struct mwifiex_adapter, n))
+
+struct mwifiex_debug_data {
+        char name[32];          /* variable/array name */
+        u32 size;               /* size of the variable/array */
+        size_t addr;            /* address of the variable/array */
+        int num;                /* number of variables in an array */
+};
+
+static struct mwifiex_debug_data items[] = {
+        {"int_counter", item_size(int_counter),
+         item_addr(int_counter), 1},
+        {"wmm_ac_vo", item_size(packets_out[WMM_AC_VO]),
+         item_addr(packets_out[WMM_AC_VO]), 1},
+        {"wmm_ac_vi", item_size(packets_out[WMM_AC_VI]),
+         item_addr(packets_out[WMM_AC_VI]), 1},
+        {"wmm_ac_be", item_size(packets_out[WMM_AC_BE]),
+         item_addr(packets_out[WMM_AC_BE]), 1},
+        {"wmm_ac_bk", item_size(packets_out[WMM_AC_BK]),
+         item_addr(packets_out[WMM_AC_BK]), 1},
+        {"max_tx_buf_size", item_size(max_tx_buf_size),
+         item_addr(max_tx_buf_size), 1},
+        {"tx_buf_size", item_size(tx_buf_size),
+         item_addr(tx_buf_size), 1},
+        {"curr_tx_buf_size", item_size(curr_tx_buf_size),
+         item_addr(curr_tx_buf_size), 1},
+        {"ps_mode", item_size(ps_mode),
+         item_addr(ps_mode), 1},
+        {"ps_state", item_size(ps_state),
+         item_addr(ps_state), 1},
+        {"is_deep_sleep", item_size(is_deep_sleep),
+         item_addr(is_deep_sleep), 1},
+        {"wakeup_dev_req", item_size(pm_wakeup_card_req),
+         item_addr(pm_wakeup_card_req), 1},
+        {"wakeup_tries", item_size(pm_wakeup_fw_try),
+         item_addr(pm_wakeup_fw_try), 1},
+        {"hs_configured", item_size(is_hs_configured),
+         item_addr(is_hs_configured), 1},
+        {"hs_activated", item_size(hs_activated),
+         item_addr(hs_activated), 1},
+        {"num_tx_timeout", item_size(num_tx_timeout),
+         item_addr(num_tx_timeout), 1},
+        {"num_cmd_timeout", item_size(num_cmd_timeout),
+         item_addr(num_cmd_timeout), 1},
+        {"timeout_cmd_id", item_size(timeout_cmd_id),
+         item_addr(timeout_cmd_id), 1},
+        {"timeout_cmd_act", item_size(timeout_cmd_act),
+         item_addr(timeout_cmd_act), 1},
+        {"last_cmd_id", item_size(last_cmd_id),
+         item_addr(last_cmd_id), DBG_CMD_NUM},
+        {"last_cmd_act", item_size(last_cmd_act),
+         item_addr(last_cmd_act), DBG_CMD_NUM},
+        {"last_cmd_index", item_size(last_cmd_index),
+         item_addr(last_cmd_index), 1},
+        {"last_cmd_resp_id", item_size(last_cmd_resp_id),
+         item_addr(last_cmd_resp_id), DBG_CMD_NUM},
+        {"last_cmd_resp_index", item_size(last_cmd_resp_index),
+         item_addr(last_cmd_resp_index), 1},
+        {"last_event", item_size(last_event),
+         item_addr(last_event), DBG_CMD_NUM},
+        {"last_event_index", item_size(last_event_index),
+         item_addr(last_event_index), 1},
+        {"num_cmd_h2c_fail", item_size(num_cmd_host_to_card_failure),
+         item_addr(num_cmd_host_to_card_failure), 1},
+        {"num_cmd_sleep_cfm_fail",
+         item_size(num_cmd_sleep_cfm_host_to_card_failure),
+         item_addr(num_cmd_sleep_cfm_host_to_card_failure), 1},
+        {"num_tx_h2c_fail", item_size(num_tx_host_to_card_failure),
+         item_addr(num_tx_host_to_card_failure), 1},
+        {"num_evt_deauth", item_size(num_event_deauth),
+         item_addr(num_event_deauth), 1},
+        {"num_evt_disassoc", item_size(num_event_disassoc),
+         item_addr(num_event_disassoc), 1},
+        {"num_evt_link_lost", item_size(num_event_link_lost),
+         item_addr(num_event_link_lost), 1},
+        {"num_cmd_deauth", item_size(num_cmd_deauth),
+         item_addr(num_cmd_deauth), 1},
+        {"num_cmd_assoc_ok", item_size(num_cmd_assoc_success),
+         item_addr(num_cmd_assoc_success), 1},
+        {"num_cmd_assoc_fail", item_size(num_cmd_assoc_failure),
+         item_addr(num_cmd_assoc_failure), 1},
+        {"cmd_sent", item_size(cmd_sent),
+         item_addr(cmd_sent), 1},
+        {"data_sent", item_size(data_sent),
+         item_addr(data_sent), 1},
+        {"cmd_resp_received", item_size(cmd_resp_received),
+         item_addr(cmd_resp_received), 1},
+        {"event_received", item_size(event_received),
+         item_addr(event_received), 1},
+
+        /* variables defined in struct mwifiex_adapter */
+        {"ioctl_pending", adapter_item_size(ioctl_pending),
+         adapter_item_addr(ioctl_pending), 1},
+        {"tx_pending", adapter_item_size(tx_pending),
+         adapter_item_addr(tx_pending), 1},
+        {"rx_pending", adapter_item_size(rx_pending),
+         adapter_item_addr(rx_pending), 1},
+};
+
+static int num_of_items = ARRAY_SIZE(items);
+
+/*
+ * Generic proc file open handler.
+ *
+ * This function is called every time a file is accessed for read or write.
+ */
+static int
+mwifiex_open_generic(struct inode *inode, struct file *file)
+{
+        file->private_data = inode->i_private;
+        return 0;
+}
+
+/*
+ * Proc info file read handler.
+ *
+ * This function is called when the 'info' file is opened for reading.
+ * It prints the following driver related information -
+ *      - Driver name
+ *      - Driver version
+ *      - Driver extended version
+ *      - Interface name
+ *      - BSS mode
+ *      - Media state (connected or disconnected)
+ *      - MAC address
+ *      - Total number of Tx bytes
+ *      - Total number of Rx bytes
+ *      - Total number of Tx packets
+ *      - Total number of Rx packets
+ *      - Total number of dropped Tx packets
+ *      - Total number of dropped Rx packets
+ *      - Total number of corrupted Tx packets
+ *      - Total number of corrupted Rx packets
+ *      - Carrier status (on or off)
+ *      - Tx queue status (started or stopped)
+ *
+ * For STA mode drivers, it also prints the following extra -
+ *      - ESSID
+ *      - BSSID
+ *      - Channel
+ *      - Region code
+ *      - Multicast count
+ *      - Multicast addresses
+ */
+static ssize_t
+mwifiex_info_read(struct file *file, char __user *ubuf,
+                  size_t count, loff_t *ppos)
+{
+        struct mwifiex_private *priv =
+                (struct mwifiex_private *) file->private_data;
+        struct net_device *netdev = priv->netdev;
+        struct netdev_hw_addr *ha;
+        unsigned long page = get_zeroed_page(GFP_KERNEL);
+        char *p = (char *) page, fmt[64];
+        struct mwifiex_bss_info info;
+        ssize_t ret = 0;
+        int i = 0;
+
+        if (!p)
+                return -ENOMEM;
+
+        memset(&info, 0, sizeof(info));
+        ret = mwifiex_get_bss_info(priv, &info);
+        if (ret)
+                goto free_and_exit;
+
+        mwifiex_drv_get_driver_version(priv->adapter, fmt, sizeof(fmt) - 1);
+
+        if (!priv->version_str[0])
+                mwifiex_get_ver_ext(priv);
+
+        p += sprintf(p, "driver_name = " "\"mwifiex\"\n");
+        p += sprintf(p, "driver_version = %s", fmt);
+        p += sprintf(p, "\nverext = %s", priv->version_str);
+        p += sprintf(p, "\ninterface_name=\"%s\"\n", netdev->name);
+        p += sprintf(p, "bss_mode=\"%s\"\n", bss_modes[info.bss_mode]);
+        p += sprintf(p, "media_state=\"%s\"\n",
+                     (!priv->media_connected ? "Disconnected" : "Connected"));
+        p += sprintf(p, "mac_address=\"%02x:%02x:%02x:%02x:%02x:%02x\"\n",
+                     netdev->dev_addr[0], netdev->dev_addr[1],
+                     netdev->dev_addr[2], netdev->dev_addr[3],
+                     netdev->dev_addr[4], netdev->dev_addr[5]);
+
+        if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) {
+                p += sprintf(p, "multicast_count=\"%d\"\n",
+                             netdev_mc_count(netdev));
+                p += sprintf(p, "essid=\"%s\"\n", info.ssid.ssid);
+                p += sprintf(p, "bssid=\"%02x:%02x:%02x:%02x:%02x:%02x\"\n",
+                             info.bssid[0], info.bssid[1],
+                             info.bssid[2], info.bssid[3],
+                             info.bssid[4], info.bssid[5]);
+                p += sprintf(p, "channel=\"%d\"\n", (int) info.bss_chan);
+                p += sprintf(p, "region_code = \"%02x\"\n", info.region_code);
+
+                netdev_for_each_mc_addr(ha, netdev)
+                        p += sprintf(p, "multicast_address[%d]="
+                                     "\"%02x:%02x:%02x:%02x:%02x:%02x\"\n", i++,
+                                     ha->addr[0], ha->addr[1],
+                                     ha->addr[2], ha->addr[3],
+                                     ha->addr[4], ha->addr[5]);
+        }
+
+        p += sprintf(p, "num_tx_bytes = %lu\n", priv->stats.tx_bytes);
+        p += sprintf(p, "num_rx_bytes = %lu\n", priv->stats.rx_bytes);
+        p += sprintf(p, "num_tx_pkts = %lu\n", priv->stats.tx_packets);
+        p += sprintf(p, "num_rx_pkts = %lu\n", priv->stats.rx_packets);
+        p += sprintf(p, "num_tx_pkts_dropped = %lu\n", priv->stats.tx_dropped);
+        p += sprintf(p, "num_rx_pkts_dropped = %lu\n", priv->stats.rx_dropped);
+        p += sprintf(p, "num_tx_pkts_err = %lu\n", priv->stats.tx_errors);
+        p += sprintf(p, "num_rx_pkts_err = %lu\n", priv->stats.rx_errors);
+        p += sprintf(p, "carrier %s\n", ((netif_carrier_ok(priv->netdev))
+                                         ? "on" : "off"));
+        p += sprintf(p, "tx queue %s\n", ((netif_queue_stopped(priv->netdev))
+                                          ? "stopped" : "started"));
+
+        ret = simple_read_from_buffer(ubuf, count, ppos, (char *) page,
+                                      (unsigned long) p - page);
+
+free_and_exit:
+        free_page(page);
+        return ret;
+}
+
+/*
+ * Proc getlog file read handler.
+ *
+ * This function is called when the 'getlog' file is opened for reading
+ * It prints the following log information -
+ *      - Number of multicast Tx frames
+ *      - Number of failed packets
+ *      - Number of Tx retries
+ *      - Number of multicast Tx retries
+ *      - Number of duplicate frames
+ *      - Number of RTS successes
+ *      - Number of RTS failures
+ *      - Number of ACK failures
+ *      - Number of fragmented Rx frames
+ *      - Number of multicast Rx frames
+ *      - Number of FCS errors
+ *      - Number of Tx frames
+ *      - WEP ICV error counts
+ */
+static ssize_t
+mwifiex_getlog_read(struct file *file, char __user *ubuf,
+                    size_t count, loff_t *ppos)
+{
+        struct mwifiex_private *priv =
+                (struct mwifiex_private *) file->private_data;
+        unsigned long page = get_zeroed_page(GFP_KERNEL);
+        char *p = (char *) page;
+        ssize_t ret = 0;
+        struct mwifiex_ds_get_stats stats;
+
+        if (!p)
+                return -ENOMEM;
+
+        memset(&stats, 0, sizeof(stats));
+        ret = mwifiex_get_stats_info(priv, &stats);
+        if (ret)
+                goto free_and_exit;
+
+        p += sprintf(p, "\n"
+                     "mcasttxframe     %u\n"
+                     "failed           %u\n"
+                     "retry            %u\n"
+                     "multiretry       %u\n"
+                     "framedup         %u\n"
+                     "rtssuccess       %u\n"
+                     "rtsfailure       %u\n"
+                     "ackfailure       %u\n"
+                     "rxfrag           %u\n"
+                     "mcastrxframe     %u\n"
+                     "fcserror         %u\n"
+                     "txframe          %u\n"
+                     "wepicverrcnt-1   %u\n"
+                     "wepicverrcnt-2   %u\n"
+                     "wepicverrcnt-3   %u\n"
+                     "wepicverrcnt-4   %u\n",
+                     stats.mcast_tx_frame,
+                     stats.failed,
+                     stats.retry,
+                     stats.multi_retry,
+                     stats.frame_dup,
+                     stats.rts_success,
+                     stats.rts_failure,
+                     stats.ack_failure,
+                     stats.rx_frag,
+                     stats.mcast_rx_frame,
+                     stats.fcs_error,
+                     stats.tx_frame,
+                     stats.wep_icv_error[0],
+                     stats.wep_icv_error[1],
+                     stats.wep_icv_error[2],
+                     stats.wep_icv_error[3]);
+
+
+        ret = simple_read_from_buffer(ubuf, count, ppos, (char *) page,
+                                      (unsigned long) p - page);
+
+free_and_exit:
+        free_page(page);
+        return ret;
+}
+
+static struct mwifiex_debug_info info;
+
+/*
+ * Proc debug file read handler.
+ *
+ * This function is called when the 'debug' file is opened for reading
+ * It prints the following log information -
+ *      - Interrupt count
+ *      - WMM AC VO packets count
+ *      - WMM AC VI packets count
+ *      - WMM AC BE packets count
+ *      - WMM AC BK packets count
+ *      - Maximum Tx buffer size
+ *      - Tx buffer size
+ *      - Current Tx buffer size
+ *      - Power Save mode
+ *      - Power Save state
+ *      - Deep Sleep status
+ *      - Device wakeup required status
+ *      - Number of wakeup tries
+ *      - Host Sleep configured status
+ *      - Host Sleep activated status
+ *      - Number of Tx timeouts
+ *      - Number of command timeouts
+ *      - Last timed out command ID
+ *      - Last timed out command action
+ *      - Last command ID
+ *      - Last command action
+ *      - Last command index
+ *      - Last command response ID
+ *      - Last command response index
+ *      - Last event
+ *      - Last event index
+ *      - Number of host to card command failures
+ *      - Number of sleep confirm command failures
+ *      - Number of host to card data failure
+ *      - Number of deauthentication events
+ *      - Number of disassociation events
+ *      - Number of link lost events
+ *      - Number of deauthentication commands
+ *      - Number of association success commands
+ *      - Number of association failure commands
+ *      - Number of commands sent
+ *      - Number of data packets sent
+ *      - Number of command responses received
+ *      - Number of events received
+ *      - Tx BA stream table (TID, RA)
+ *      - Rx reorder table (TID, TA, Start window, Window size, Buffer)
+ */
+static ssize_t
+mwifiex_debug_read(struct file *file, char __user *ubuf,
+                   size_t count, loff_t *ppos)
+{
+        struct mwifiex_private *priv =
+                (struct mwifiex_private *) file->private_data;
+        struct mwifiex_debug_data *d = &items[0];
+        unsigned long page = get_zeroed_page(GFP_KERNEL);
+        char *p = (char *) page;
+        ssize_t ret = 0;
+        size_t size, addr;
+        long val;
+        int i, j;
+
+        if (!p)
+                return -ENOMEM;
+
+        ret = mwifiex_get_debug_info(priv, &info);
+        if (ret)
+                goto free_and_exit;
+
+        for (i = 0; i < num_of_items; i++) {
+                p += sprintf(p, "%s=", d[i].name);
+
+                size = d[i].size / d[i].num;
+
+                if (i < (num_of_items - 3))
+                        addr = d[i].addr + (size_t) &info;
+                else /* The last 3 items are struct mwifiex_adapter variables */
+                        addr = d[i].addr + (size_t) priv->adapter;
+
+                for (j = 0; j < d[i].num; j++) {
+                        switch (size) {
+                        case 1:
+                                val = *((u8 *) addr);
+                                break;
+                        case 2:
+                                val = *((u16 *) addr);
+                                break;
+                        case 4:
+                                val = *((u32 *) addr);
+                                break;
+                        case 8:
+                                val = *((long long *) addr);
+                                break;
+                        default:
+                                val = -1;
+                                break;
+                        }
+
+                        p += sprintf(p, "%#lx ", val);
+                        addr += size;
+                }
+
+                p += sprintf(p, "\n");
+        }
+
+        if (info.tx_tbl_num) {
+                p += sprintf(p, "Tx BA stream table:\n");
+                for (i = 0; i < info.tx_tbl_num; i++)
+                        p += sprintf(p, "tid = %d, "
+                                     "ra = %02x:%02x:%02x:%02x:%02x:%02x\n",
+                                     info.tx_tbl[i].tid, info.tx_tbl[i].ra[0],
+                                     info.tx_tbl[i].ra[1], info.tx_tbl[i].ra[2],
+                                     info.tx_tbl[i].ra[3], info.tx_tbl[i].ra[4],
+                                     info.tx_tbl[i].ra[5]);
+        }
+
+        if (info.rx_tbl_num) {
+                p += sprintf(p, "Rx reorder table:\n");
+                for (i = 0; i < info.rx_tbl_num; i++) {
+
+                        p += sprintf(p, "tid = %d, "
+                                     "ta = %02x:%02x:%02x:%02x:%02x:%02x, "
+                                     "start_win = %d, "
+                                     "win_size = %d, buffer: ",
+                                     info.rx_tbl[i].tid,
+                                     info.rx_tbl[i].ta[0], info.rx_tbl[i].ta[1],
+                                     info.rx_tbl[i].ta[2], info.rx_tbl[i].ta[3],
+                                     info.rx_tbl[i].ta[4], info.rx_tbl[i].ta[5],
+                                     info.rx_tbl[i].start_win,
+                                     info.rx_tbl[i].win_size);
+
+                        for (j = 0; j < info.rx_tbl[i].win_size; j++)
+                                p += sprintf(p, "%c ",
+                                             info.rx_tbl[i].buffer[j] ?
+                                             '1' : '0');
+
+                        p += sprintf(p, "\n");
+                }
+        }
+
+        ret = simple_read_from_buffer(ubuf, count, ppos, (char *) page,
+                                      (unsigned long) p - page);
+
+free_and_exit:
+        free_page(page);
+        return ret;
+}
+
+static u32 saved_reg_type, saved_reg_offset, saved_reg_value;
+
+/*
+ * Proc regrdwr file write handler.
+ *
+ * This function is called when the 'regrdwr' file is opened for writing
+ *
+ * This function can be used to write to a register.
+ */
+static ssize_t
+mwifiex_regrdwr_write(struct file *file,
+                      const char __user *ubuf, size_t count, loff_t *ppos)
+{
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *) addr;
+        size_t buf_size = min(count, (size_t) (PAGE_SIZE - 1));
+        int ret = 0;
+        u32 reg_type = 0, reg_offset = 0, reg_value = UINT_MAX;
+
+        if (!buf)
+                return -ENOMEM;
+
+
+        if (copy_from_user(buf, ubuf, buf_size)) {
+                ret = -EFAULT;
+                goto done;
+        }
+
+        sscanf(buf, "%u %x %x", &reg_type, &reg_offset, &reg_value);
+
+        if (reg_type == 0 || reg_offset == 0) {
+                ret = -EINVAL;
+                goto done;
+        } else {
+                saved_reg_type = reg_type;
+                saved_reg_offset = reg_offset;
+                saved_reg_value = reg_value;
+                ret = count;
+        }
+done:
+        free_page(addr);
+        return ret;
+}
+
+/*
+ * Proc regrdwr file read handler.
+ *
+ * This function is called when the 'regrdwr' file is opened for reading
+ *
+ * This function can be used to read from a register.
+ */
+static ssize_t
+mwifiex_regrdwr_read(struct file *file, char __user *ubuf,
+                     size_t count, loff_t *ppos)
+{
+        struct mwifiex_private *priv =
+                (struct mwifiex_private *) file->private_data;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *) addr;
+        int pos = 0, ret = 0;
+        u32 reg_value;
+
+        if (!buf)
+                return -ENOMEM;
+
+        if (!saved_reg_type) {
+                /* No command has been given */
+                pos += snprintf(buf, PAGE_SIZE, "0");
+                goto done;
+        }
+        /* Set command has been given */
+        if (saved_reg_value != UINT_MAX) {
+                ret = mwifiex_reg_write(priv, saved_reg_type, saved_reg_offset,
+                                        saved_reg_value);
+
+                pos += snprintf(buf, PAGE_SIZE, "%u 0x%x 0x%x\n",
+                                saved_reg_type, saved_reg_offset,
+                                saved_reg_value);
+
+                ret = simple_read_from_buffer(ubuf, count, ppos, buf, pos);
+
+                goto done;
+        }
+        /* Get command has been given */
+        ret = mwifiex_reg_read(priv, saved_reg_type,
+                               saved_reg_offset, &reg_value);
+        if (ret) {
+                ret = -EINVAL;
+                goto done;
+        }
+
+        pos += snprintf(buf, PAGE_SIZE, "%u 0x%x 0x%x\n", saved_reg_type,
+                        saved_reg_offset, reg_value);
+
+        ret = simple_read_from_buffer(ubuf, count, ppos, buf, pos);
+
+done:
+        free_page(addr);
+        return ret;
+}
+
+static u32 saved_offset = -1, saved_bytes = -1;
+
+/*
+ * Proc rdeeprom file write handler.
+ *
+ * This function is called when the 'rdeeprom' file is opened for writing
+ *
+ * This function can be used to write to a RDEEPROM location.
+ */
+static ssize_t
+mwifiex_rdeeprom_write(struct file *file,
+                       const char __user *ubuf, size_t count, loff_t *ppos)
+{
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *) addr;
+        size_t buf_size = min(count, (size_t) (PAGE_SIZE - 1));
+        int ret = 0;
+        int offset = -1, bytes = -1;
+
+        if (!buf)
+                return -ENOMEM;
+
+
+        if (copy_from_user(buf, ubuf, buf_size)) {
+                ret = -EFAULT;
+                goto done;
+        }
+
+        sscanf(buf, "%d %d", &offset, &bytes);
+
+        if (offset == -1 || bytes == -1) {
+                ret = -EINVAL;
+                goto done;
+        } else {
+                saved_offset = offset;
+                saved_bytes = bytes;
+                ret = count;
+        }
+done:
+        free_page(addr);
+        return ret;
+}
+
+/*
+ * Proc rdeeprom read write handler.
+ *
+ * This function is called when the 'rdeeprom' file is opened for reading
+ *
+ * This function can be used to read from a RDEEPROM location.
+ */
+static ssize_t
+mwifiex_rdeeprom_read(struct file *file, char __user *ubuf,
+                      size_t count, loff_t *ppos)
+{
+        struct mwifiex_private *priv =
+                (struct mwifiex_private *) file->private_data;
+        unsigned long addr = get_zeroed_page(GFP_KERNEL);
+        char *buf = (char *) addr;
+        int pos = 0, ret = 0, i = 0;
+        u8 value[MAX_EEPROM_DATA];
+
+        if (!buf)
+                return -ENOMEM;
+
+        if (saved_offset == -1) {
+                /* No command has been given */
+                pos += snprintf(buf, PAGE_SIZE, "0");
+                goto done;
+        }
+
+        /* Get command has been given */
+        ret = mwifiex_eeprom_read(priv, (u16) saved_offset,
+                                  (u16) saved_bytes, value);
+        if (ret) {
+                ret = -EINVAL;
+                goto done;
+        }
+
+        pos += snprintf(buf, PAGE_SIZE, "%d %d ", saved_offset, saved_bytes);
+
+        for (i = 0; i < saved_bytes; i++)
+                pos += snprintf(buf + strlen(buf), PAGE_SIZE, "%d ", value[i]);
+
+        ret = simple_read_from_buffer(ubuf, count, ppos, buf, pos);
+
+done:
+        free_page(addr);
+        return ret;
+}
+
+
+#define MWIFIEX_DFS_ADD_FILE(name) do {                                 \
+        if (!debugfs_create_file(#name, 0644, priv->dfs_dev_dir,        \
+                        priv, &mwifiex_dfs_##name##_fops))              \
+                return;                                                 \
+} while (0);
+
+#define MWIFIEX_DFS_FILE_OPS(name)                                      \
+static const struct file_operations mwifiex_dfs_##name##_fops = {       \
+        .read = mwifiex_##name##_read,                                  \
+        .write = mwifiex_##name##_write,                                \
+        .open = mwifiex_open_generic,                                   \
+};
+
+#define MWIFIEX_DFS_FILE_READ_OPS(name)                                 \
+static const struct file_operations mwifiex_dfs_##name##_fops = {       \
+        .read = mwifiex_##name##_read,                                  \
+        .open = mwifiex_open_generic,                                   \
+};
+
+#define MWIFIEX_DFS_FILE_WRITE_OPS(name)                                \
+static const struct file_operations mwifiex_dfs_##name##_fops = {       \
+        .write = mwifiex_##name##_write,                                \
+        .open = mwifiex_open_generic,                                   \
+};
+
+
+MWIFIEX_DFS_FILE_READ_OPS(info);
+MWIFIEX_DFS_FILE_READ_OPS(debug);
+MWIFIEX_DFS_FILE_READ_OPS(getlog);
+MWIFIEX_DFS_FILE_OPS(regrdwr);
+MWIFIEX_DFS_FILE_OPS(rdeeprom);
+
+/*
+ * This function creates the debug FS directory structure and the files.
+ */
+void
+mwifiex_dev_debugfs_init(struct mwifiex_private *priv)
+{
+        if (!mwifiex_dfs_dir || !priv)
+                return;
+
+        priv->dfs_dev_dir = debugfs_create_dir(priv->netdev->name,
+                                               mwifiex_dfs_dir);
+
+        if (!priv->dfs_dev_dir)
+                return;
+
+        MWIFIEX_DFS_ADD_FILE(info);
+        MWIFIEX_DFS_ADD_FILE(debug);
+        MWIFIEX_DFS_ADD_FILE(getlog);
+        MWIFIEX_DFS_ADD_FILE(regrdwr);
+        MWIFIEX_DFS_ADD_FILE(rdeeprom);
+
+        return;
+}
+
+/*
+ * This function removes the debug FS directory structure and the files.
+ */
+void
+mwifiex_dev_debugfs_remove(struct mwifiex_private *priv)
+{
+        if (!priv)
+                return;
+
+        debugfs_remove_recursive(priv->dfs_dev_dir);
+        return;
+}
+
+/*
+ * This function creates the top level proc directory.
+ */
+void
+mwifiex_debugfs_init(void)
+{
+        if (!mwifiex_dfs_dir)
+                mwifiex_dfs_dir = debugfs_create_dir("mwifiex", NULL);
+}
+
+/*
+ * This function removes the top level proc directory.
+ */
+void
+mwifiex_debugfs_remove(void)
+{
+        if (mwifiex_dfs_dir)
+                debugfs_remove(mwifiex_dfs_dir);
+}
diff --git a/drivers/net/wireless/mwifiex/decl.h b/drivers/net/wireless/mwifiex/decl.h
new file mode 100644
index 00000000000..4e1f115d3ec
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/decl.h
@@ -0,0 +1,177 @@
+/*
+ * Marvell Wireless LAN device driver: generic data structures and APIs
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#ifndef _MWIFIEX_DECL_H_
+#define _MWIFIEX_DECL_H_
+
+#undef pr_fmt
+#define pr_fmt(fmt)     KBUILD_MODNAME ": " fmt
+
+#include <linux/wait.h>
+#include <linux/timer.h>
+#include <linux/ieee80211.h>
+
+
+#define MWIFIEX_MAX_BSS_NUM         (1)
+
+#define MWIFIEX_MIN_DATA_HEADER_LEN 32  /* (sizeof(mwifiex_txpd)) */
+
+#define MWIFIEX_MAX_TX_BASTREAM_SUPPORTED       2
+#define MWIFIEX_MAX_RX_BASTREAM_SUPPORTED       16
+
+#define MWIFIEX_AMPDU_DEF_TXWINSIZE        32
+#define MWIFIEX_AMPDU_DEF_RXWINSIZE        16
+#define MWIFIEX_DEFAULT_BLOCK_ACK_TIMEOUT  0xffff
+
+#define MWIFIEX_RATE_INDEX_HRDSSS0 0
+#define MWIFIEX_RATE_INDEX_HRDSSS3 3
+#define MWIFIEX_RATE_INDEX_OFDM0   4
+#define MWIFIEX_RATE_INDEX_OFDM7   11
+#define MWIFIEX_RATE_INDEX_MCS0    12
+
+#define MWIFIEX_RATE_BITMAP_OFDM0  16
+#define MWIFIEX_RATE_BITMAP_OFDM7  23
+#define MWIFIEX_RATE_BITMAP_MCS0   32
+#define MWIFIEX_RATE_BITMAP_MCS127 159
+
+#define MWIFIEX_RX_DATA_BUF_SIZE     (4 * 1024)
+#define MWIFIEX_RX_CMD_BUF_SIZE      (2 * 1024)
+
+#define MWIFIEX_RTS_MIN_VALUE              (0)
+#define MWIFIEX_RTS_MAX_VALUE              (2347)
+#define MWIFIEX_FRAG_MIN_VALUE             (256)
+#define MWIFIEX_FRAG_MAX_VALUE             (2346)
+
+#define MWIFIEX_SDIO_BLOCK_SIZE            256
+
+#define MWIFIEX_BUF_FLAG_REQUEUED_PKT      BIT(0)
+
+enum mwifiex_error_code {
+        MWIFIEX_ERROR_NO_ERROR = 0,
+        MWIFIEX_ERROR_FW_NOT_READY = 0x00000001,
+        MWIFIEX_ERROR_FW_BUSY,
+        MWIFIEX_ERROR_FW_CMDRESP,
+        MWIFIEX_ERROR_PKT_SIZE_INVALID = 0x80000001,
+        MWIFIEX_ERROR_PKT_TIMEOUT,
+        MWIFIEX_ERROR_CMD_INVALID,
+        MWIFIEX_ERROR_CMD_TIMEOUT,
+        MWIFIEX_ERROR_CMD_DNLD_FAIL,
+        MWIFIEX_ERROR_CMD_CANCEL,
+        MWIFIEX_ERROR_CMD_RESP_FAIL,
+        MWIFIEX_ERROR_ASSOC_FAIL,
+        MWIFIEX_ERROR_EVENT_UNKNOWN,
+        MWIFIEX_ERROR_INVALID_PARAMETER,
+};
+
+enum mwifiex_bss_type {
+        MWIFIEX_BSS_TYPE_STA = 0,
+        MWIFIEX_BSS_TYPE_UAP = 1,
+        MWIFIEX_BSS_TYPE_ANY = 0xff,
+};
+
+enum mwifiex_bss_role {
+        MWIFIEX_BSS_ROLE_STA = 0,
+        MWIFIEX_BSS_ROLE_UAP = 1,
+        MWIFIEX_BSS_ROLE_ANY = 0xff,
+};
+
+#define BSS_ROLE_BIT_MASK    BIT(0)
+
+#define GET_BSS_ROLE(priv)   ((priv)->bss_role & BSS_ROLE_BIT_MASK)
+
+enum mwifiex_data_frame_type {
+        MWIFIEX_DATA_FRAME_TYPE_ETH_II = 0,
+        MWIFIEX_DATA_FRAME_TYPE_802_11,
+};
+
+struct mwifiex_fw_image {
+        u8 *helper_buf;
+        u32 helper_len;
+        u8 *fw_buf;
+        u32 fw_len;
+};
+
+struct mwifiex_802_11_ssid {
+        u32 ssid_len;
+        u8 ssid[IEEE80211_MAX_SSID_LEN];
+};
+
+struct mwifiex_wait_queue {
+        u32 bss_index;
+        wait_queue_head_t *wait;
+        u16 *condition;
+        u32 start_time;
+        int status;
+        u32 enabled;
+};
+
+struct mwifiex_rxinfo {
+        u8 bss_index;
+        struct sk_buff *parent;
+        u8 use_count;
+};
+
+struct mwifiex_txinfo {
+        u32 status_code;
+        u8 flags;
+        u8 bss_index;
+};
+
+struct mwifiex_bss_attr {
+        u32 bss_type;
+        u32 frame_type;
+        u32 active;
+        u32 bss_priority;
+        u32 bss_num;
+};
+
+enum mwifiex_cmd_result_e {
+        MWIFIEX_CMD_RESULT_SUCCESS = 0,
+        MWIFIEX_CMD_RESULT_FAILURE = 1,
+        MWIFIEX_CMD_RESULT_TIMEOUT = 2,
+        MWIFIEX_CMD_RESULT_INVALID_DATA = 3
+} __packed;
+
+enum mwifiex_wmm_ac_e {
+        WMM_AC_BK,
+        WMM_AC_BE,
+        WMM_AC_VI,
+        WMM_AC_VO
+} __packed;
+
+enum mwifiex_wmm_queue_config_action_e {
+        MWIFIEX_WMM_QUEUE_CONFIG_ACTION_GET = 0,
+        MWIFIEX_WMM_QUEUE_CONFIG_ACTION_SET = 1,
+        MWIFIEX_WMM_QUEUE_CONFIG_ACTION_DEFAULT = 2,
+        MWIFIEX_WMM_QUEUE_CONFIG_ACTION_MAX
+} __packed;
+
+enum mwifiex_wmm_queue_stats_action_e {
+        MWIFIEX_WMM_STATS_ACTION_START = 0,
+        MWIFIEX_WMM_STATS_ACTION_STOP = 1,
+        MWIFIEX_WMM_STATS_ACTION_GET_CLR = 2,
+        MWIFIEX_WMM_STATS_ACTION_SET_CFG = 3,   /* Not currently used */
+        MWIFIEX_WMM_STATS_ACTION_GET_CFG = 4,   /* Not currently used */
+        MWIFIEX_WMM_STATS_ACTION_MAX
+} __packed;
+
+struct mwifiex_device {
+        struct mwifiex_bss_attr bss_attr[MWIFIEX_MAX_BSS_NUM];
+};
+#endif /* !_MWIFIEX_DECL_H_ */
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
new file mode 100644
index 00000000000..e5dae45b11d
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -0,0 +1,1376 @@
+/*
+ * Marvell Wireless LAN device driver: Firmware specific macros & structures
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#ifndef _MWIFIEX_FW_H_
+#define _MWIFIEX_FW_H_
+
+#include <linux/if_ether.h>
+
+
+#define INTF_HEADER_LEN     4
+
+struct rfc_1042_hdr {
+        u8 llc_dsap;
+        u8 llc_ssap;
+        u8 llc_ctrl;
+        u8 snap_oui[3];
+        u16 snap_type;
+};
+
+struct rx_packet_hdr {
+        struct ethhdr eth803_hdr;
+        struct rfc_1042_hdr rfc1042_hdr;
+};
+
+struct tx_packet_hdr {
+        struct ethhdr eth803_hdr;
+        struct rfc_1042_hdr rfc1042_hdr;
+};
+
+#define B_SUPPORTED_RATES               5
+#define G_SUPPORTED_RATES               9
+#define BG_SUPPORTED_RATES              13
+#define A_SUPPORTED_RATES               9
+#define HOSTCMD_SUPPORTED_RATES         14
+#define N_SUPPORTED_RATES               3
+#define ALL_802_11_BANDS           (BAND_A | BAND_B | BAND_G | BAND_GN)
+
+#define FW_MULTI_BANDS_SUPPORT  (BIT(8) | BIT(9) | BIT(10) | BIT(11))
+#define IS_SUPPORT_MULTI_BANDS(adapter)        \
+        (adapter->fw_cap_info & FW_MULTI_BANDS_SUPPORT)
+#define GET_FW_DEFAULT_BANDS(adapter)  \
+        ((adapter->fw_cap_info >> 8) & ALL_802_11_BANDS)
+
+#define SHORT_SLOT_TIME_DISABLED(CapInfo) (CapInfo &= ~BIT(10))
+#define SHORT_SLOT_TIME_ENABLED(CapInfo)  (CapInfo |= BIT(10))
+
+extern u8 supported_rates_b[B_SUPPORTED_RATES];
+extern u8 supported_rates_g[G_SUPPORTED_RATES];
+extern u8 supported_rates_bg[BG_SUPPORTED_RATES];
+extern u8 supported_rates_a[A_SUPPORTED_RATES];
+extern u8 supported_rates_n[N_SUPPORTED_RATES];
+
+#define HostCmd_WEP_KEY_INDEX_MASK              0x3fff
+
+#define KEY_INFO_ENABLED        0x01
+enum KEY_TYPE_ID {
+        KEY_TYPE_ID_WEP = 0,
+        KEY_TYPE_ID_TKIP,
+        KEY_TYPE_ID_AES,
+        KEY_TYPE_ID_WAPI,
+};
+
+enum KEY_INFO_WEP {
+        KEY_INFO_WEP_MCAST = 0x01,
+        KEY_INFO_WEP_UNICAST = 0x02,
+        KEY_INFO_WEP_ENABLED = 0x04
+};
+
+enum KEY_INFO_TKIP {
+        KEY_INFO_TKIP_MCAST = 0x01,
+        KEY_INFO_TKIP_UNICAST = 0x02,
+        KEY_INFO_TKIP_ENABLED = 0x04
+};
+
+enum KEY_INFO_AES {
+        KEY_INFO_AES_MCAST = 0x01,
+        KEY_INFO_AES_UNICAST = 0x02,
+        KEY_INFO_AES_ENABLED = 0x04
+};
+
+#define WAPI_KEY_LEN                    50
+
+enum KEY_INFO_WAPI {
+        KEY_INFO_WAPI_MCAST = 0x01,
+        KEY_INFO_WAPI_UNICAST = 0x02,
+        KEY_INFO_WAPI_ENABLED = 0x04
+};
+
+#define MAX_POLL_TRIES                  100
+
+#define MAX_MULTI_INTERFACE_POLL_TRIES  1000
+
+#define MAX_FIRMWARE_POLL_TRIES                 100
+
+#define FIRMWARE_READY                          0xfedc
+
+#define FIRMWARE_TRANSFER_NBLOCK                2
+
+enum MWIFIEX_802_11_PRIVACY_FILTER {
+        MWIFIEX_802_11_PRIV_FILTER_ACCEPT_ALL,
+        MWIFIEX_802_11_PRIV_FILTER_8021X_WEP
+};
+
+enum MWIFIEX_802_11_WEP_STATUS {
+        MWIFIEX_802_11_WEP_ENABLED,
+        MWIFIEX_802_11_WEP_DISABLED,
+};
+
+#define CAL_SNR(RSSI, NF)               ((s16)((s16)(RSSI)-(s16)(NF)))
+
+#define PROPRIETARY_TLV_BASE_ID                 0x0100
+#define TLV_TYPE_KEY_MATERIAL       (PROPRIETARY_TLV_BASE_ID + 0)
+#define TLV_TYPE_CHANLIST           (PROPRIETARY_TLV_BASE_ID + 1)
+#define TLV_TYPE_NUMPROBES          (PROPRIETARY_TLV_BASE_ID + 2)
+#define TLV_TYPE_RSSI_LOW           (PROPRIETARY_TLV_BASE_ID + 4)
+#define TLV_TYPE_SNR_LOW            (PROPRIETARY_TLV_BASE_ID + 5)
+#define TLV_TYPE_FAILCOUNT          (PROPRIETARY_TLV_BASE_ID + 6)
+#define TLV_TYPE_BCNMISS            (PROPRIETARY_TLV_BASE_ID + 7)
+#define TLV_TYPE_LEDBEHAVIOR        (PROPRIETARY_TLV_BASE_ID + 9)
+#define TLV_TYPE_PASSTHROUGH        (PROPRIETARY_TLV_BASE_ID + 10)
+#define TLV_TYPE_POWER_TBL_2_4GHZ   (PROPRIETARY_TLV_BASE_ID + 12)
+#define TLV_TYPE_POWER_TBL_5GHZ     (PROPRIETARY_TLV_BASE_ID + 13)
+#define TLV_TYPE_WMMQSTATUS         (PROPRIETARY_TLV_BASE_ID + 16)
+#define TLV_TYPE_WILDCARDSSID       (PROPRIETARY_TLV_BASE_ID + 18)
+#define TLV_TYPE_TSFTIMESTAMP       (PROPRIETARY_TLV_BASE_ID + 19)
+#define TLV_TYPE_RSSI_HIGH          (PROPRIETARY_TLV_BASE_ID + 22)
+#define TLV_TYPE_SNR_HIGH           (PROPRIETARY_TLV_BASE_ID + 23)
+
+#define TLV_TYPE_STARTBGSCANLATER   (PROPRIETARY_TLV_BASE_ID + 30)
+#define TLV_TYPE_AUTH_TYPE          (PROPRIETARY_TLV_BASE_ID + 31)
+#define TLV_TYPE_LINK_QUALITY       (PROPRIETARY_TLV_BASE_ID + 36)
+#define TLV_TYPE_RSSI_LOW_DATA      (PROPRIETARY_TLV_BASE_ID + 38)
+#define TLV_TYPE_SNR_LOW_DATA       (PROPRIETARY_TLV_BASE_ID + 39)
+#define TLV_TYPE_RSSI_HIGH_DATA     (PROPRIETARY_TLV_BASE_ID + 40)
+#define TLV_TYPE_SNR_HIGH_DATA      (PROPRIETARY_TLV_BASE_ID + 41)
+
+#define TLV_TYPE_CHANNELBANDLIST    (PROPRIETARY_TLV_BASE_ID + 42)
+#define TLV_TYPE_WAPI_IE            (PROPRIETARY_TLV_BASE_ID + 94)
+#define TLV_TYPE_BSSID              (PROPRIETARY_TLV_BASE_ID + 35)
+
+#define MWIFIEX_TX_DATA_BUF_SIZE_2K        2048
+
+#define TLV_TYPE_HT_CAP                  (PROPRIETARY_TLV_BASE_ID + 74)
+#define TLV_TYPE_HT_INFO                 (PROPRIETARY_TLV_BASE_ID + 75)
+#define TLV_SECONDARY_CHANNEL_OFFSET     (PROPRIETARY_TLV_BASE_ID + 76)
+#define TLV_TYPE_2040BSS_COEXISTENCE     (PROPRIETARY_TLV_BASE_ID + 77)
+#define TLV_TYPE_OVERLAP_BSS_SCAN_PARAM  (PROPRIETARY_TLV_BASE_ID + 78)
+#define TLV_TYPE_EXTCAP                  (PROPRIETARY_TLV_BASE_ID + 79)
+#define TLV_TYPE_HT_OPERATIONAL_MCS_SET  (PROPRIETARY_TLV_BASE_ID + 80)
+
+#define ADDBA_TID_MASK   (BIT(2) | BIT(3) | BIT(4) | BIT(5))
+#define DELBA_TID_MASK   (BIT(12) | BIT(13) | BIT(14) | BIT(15))
+#define SSN_MASK         0xfff0
+
+#define BA_RESULT_SUCCESS        0x0
+#define BA_RESULT_FAILURE        0x1
+#define BA_RESULT_TIMEOUT        0x2
+#define BA_RESULT_DATA_INVALID   0x3
+
+#define IS_BASTREAM_SETUP(ptr)  (ptr->ba_status)
+
+#define BA_STREAM_NOT_ALLOWED   0xff
+
+#define IS_11N_ENABLED(priv) ((priv->adapter->config_bands & BAND_GN || \
+                        priv->adapter->config_bands & BAND_AN) \
+                        && priv->curr_bss_params.bss_descriptor.bcn_ht_cap)
+#define INITIATOR_BIT(DelBAParamSet) (((DelBAParamSet) &\
+                        BIT(DELBA_INITIATOR_POS)) >> DELBA_INITIATOR_POS)
+
+#define MWIFIEX_TX_DATA_BUF_SIZE_4K        4096
+#define MWIFIEX_TX_DATA_BUF_SIZE_8K        8192
+#define MAX_RX_AMPDU_SIZE_64K   0x03
+#define NON_GREENFIELD_STAS     0x04
+
+#define HWSPEC_GREENFIELD_SUPP   BIT(29)
+#define HWSPEC_RXSTBC_SUPP       BIT(26)
+#define HWSPEC_SHORTGI40_SUPP    BIT(24)
+#define HWSPEC_SHORTGI20_SUPP    BIT(23)
+#define HWSPEC_CHANBW40_SUPP     BIT(17)
+
+#define DEFAULT_11N_CAP_MASK    (HWSPEC_SHORTGI20_SUPP | HWSPEC_RXSTBC_SUPP)
+#define ISSUPP_11NENABLED(FwCapInfo) (FwCapInfo & BIT(11))
+#define ISSUPP_MAXAMSDU(Dot11nDevCap) (Dot11nDevCap & BIT(31))
+#define ISSUPP_BEAMFORMING(Dot11nDevCap) (Dot11nDevCap & BIT(30))
+#define ISSUPP_GREENFIELD(Dot11nDevCap) (Dot11nDevCap & BIT(29))
+#define ISSUPP_AMPDU(Dot11nDevCap) (Dot11nDevCap & BIT(28))
+#define ISSUPP_MIMOPS(Dot11nDevCap) (Dot11nDevCap & BIT(27))
+#define ISSUPP_RXSTBC(Dot11nDevCap) (Dot11nDevCap & BIT(26))
+#define ISSUPP_TXSTBC(Dot11nDevCap) (Dot11nDevCap & BIT(25))
+#define ISSUPP_SHORTGI40(Dot11nDevCap) (Dot11nDevCap & BIT(24))
+#define ISSUPP_SHORTGI20(Dot11nDevCap) (Dot11nDevCap & BIT(23))
+#define ISSUPP_RXLDPC(Dot11nDevCap) (Dot11nDevCap & BIT(22))
+#define GET_DELAYEDBACK(Dot11nDevCap) (((Dot11nDevCap >> 20) & 0x03))
+#define GET_IMMEDIATEBACK(Dot11nDevCap) (((Dot11nDevCap >> 18) & 0x03))
+#define ISSUPP_CHANWIDTH40(Dot11nDevCap) (Dot11nDevCap & BIT(17))
+#define ISSUPP_CHANWIDTH20(Dot11nDevCap) (Dot11nDevCap & BIT(16))
+#define ISSUPP_CHANWIDTH10(Dot11nDevCap) (Dot11nDevCap & BIT(15))
+#define ISENABLED_40MHZ_INTOLARENT(Dot11nDevCap) (Dot11nDevCap & BIT(8))
+#define ISSUPP_RXANTENNAD(Dot11nDevCap) (Dot11nDevCap & BIT(7))
+#define ISSUPP_RXANTENNAC(Dot11nDevCap) (Dot11nDevCap & BIT(6))
+#define ISSUPP_RXANTENNAB(Dot11nDevCap) (Dot11nDevCap & BIT(5))
+#define ISSUPP_RXANTENNAA(Dot11nDevCap) (Dot11nDevCap & BIT(4))
+#define ISSUPP_TXANTENNAD(Dot11nDevCap) (Dot11nDevCap & BIT(3))
+#define ISSUPP_TXANTENNAC(Dot11nDevCap) (Dot11nDevCap & BIT(2))
+#define ISSUPP_TXANTENNAB(Dot11nDevCap) (Dot11nDevCap & BIT(1))
+#define ISSUPP_TXANTENNAA(Dot11nDevCap) (Dot11nDevCap & BIT(0))
+#define SETSUPP_CHANWIDTH40(Dot11nDevCap) (Dot11nDevCap |= BIT(17))
+#define RESETSUPP_CHANWIDTH40(Dot11nDevCap) (Dot11nDevCap &= ~BIT(17))
+#define GET_TXMCSSUPP(DevMCSSupported) (DevMCSSupported >> 4)
+#define GET_RXMCSSUPP(DevMCSSupported) (DevMCSSupported & 0x0f)
+#define GETHT_SUPPCHANWIDTH(HTCapInfo) (HTCapInfo & BIT(1))
+#define GETHT_GREENFIELD(HTCapInfo) (HTCapInfo & BIT(4))
+#define GETHT_SHORTGI20(HTCapInfo) (HTCapInfo & BIT(5))
+#define GETHT_SHORTGI40(HTCapInfo) (HTCapInfo & BIT(6))
+#define GETHT_TXSTBC(HTCapInfo) (HTCapInfo & BIT(7))
+#define GETHT_RXSTBC(HTCapInfo) ((HTCapInfo >> 8) & 0x03)
+#define GETHT_DELAYEDBACK(HTCapInfo) (HTCapInfo & BIT(10))
+#define GETHT_MAXAMSDU(HTCapInfo) (HTCapInfo & BIT(11))
+#define SETHT_SUPPCHANWIDTH(HTCapInfo) (HTCapInfo |= BIT(1))
+#define SETHT_GREENFIELD(HTCapInfo) (HTCapInfo |= BIT(4))
+#define SETHT_SHORTGI20(HTCapInfo) (HTCapInfo |= BIT(5))
+#define SETHT_SHORTGI40(HTCapInfo) (HTCapInfo |= BIT(6))
+#define SETHT_TXSTBC(HTCapInfo) (HTCapInfo |= BIT(7))
+#define SETHT_RXSTBC(HTCapInfo, value) (HTCapInfo |= (value << 8))
+#define SETHT_DELAYEDBACK(HTCapInfo) (HTCapInfo |= BIT(10))
+#define SETHT_MAXAMSDU(HTCapInfo) (HTCapInfo |= BIT(11))
+#define SETHT_DSSSCCK40(HTCapInfo) (HTCapInfo |= BIT(12))
+#define SETHT_40MHZ_INTOLARANT(HTCapInfo) (HTCapInfo |= BIT(14))
+#define RESETHT_SUPPCHANWIDTH(HTCapInfo) (HTCapInfo &= ~BIT(1))
+#define RESETHT_GREENFIELD(HTCapInfo) (HTCapInfo &= ~BIT(4))
+#define RESETHT_SHORTGI20(HTCapInfo) (HTCapInfo &= ~BIT(5))
+#define RESETHT_SHORTGI40(HTCapInfo) (HTCapInfo &= ~BIT(6))
+#define RESETHT_TXSTBC(HTCapInfo) (HTCapInfo &= ~BIT(7))
+#define RESETHT_RXSTBC(HTCapInfo) (HTCapInfo &= ~(0x03 << 8))
+#define RESETHT_DELAYEDBACK(HTCapInfo) (HTCapInfo &= ~BIT(10))
+#define RESETHT_MAXAMSDU(HTCapInfo) (HTCapInfo &= ~BIT(11))
+#define RESETHT_40MHZ_INTOLARANT(HTCapInfo) (HTCapInfo &= ~BIT(14))
+#define RESETHT_EXTCAP_RDG(HTExtCap) (HTExtCap &= ~BIT(11))
+#define SETHT_MCS32(x) (x[4] |= 1)
+#define SETHT_MCS_SET_DEFINED(x) (x[12] |= 1)
+#define SETHT_RX_HIGHEST_DT_SUPP(x, y) ((*(u16 *) (x + 10)) = y)
+#define AMPDU_FACTOR_64K        0x03
+#define SETAMPDU_SIZE(x, y) do { \
+        x = x & ~0x03; \
+        x |= y & 0x03; \
+} while (0) \
+
+#define SETAMPDU_SPACING(x, y) do { \
+        x = x & ~0x1c; \
+        x |= (y & 0x07) << 2; \
+} while (0) \
+
+#define ISSUPP_BANDA(FwCapInfo) (FwCapInfo & BIT(10))
+#define ISALLOWED_CHANWIDTH40(Field2) (Field2 & BIT(2))
+#define SET_CHANWIDTH40(Field2) (Field2 |= BIT(2))
+#define RESET_CHANWIDTH40(Field2) (Field2 &= ~(BIT(0) | BIT(1) | BIT(2)))
+#define GET_SECONDARYCHAN(Field2) (Field2 & (BIT(0) | BIT(1)))
+#define SET_SECONDARYCHAN(RadioType, SECCHAN) (RadioType |= (SECCHAN << 4))
+
+#define LLC_SNAP_LEN    8
+
+#define TLV_TYPE_RATE_DROP_PATTERN  (PROPRIETARY_TLV_BASE_ID + 81)
+#define TLV_TYPE_RATE_DROP_CONTROL  (PROPRIETARY_TLV_BASE_ID + 82)
+#define TLV_TYPE_RATE_SCOPE         (PROPRIETARY_TLV_BASE_ID + 83)
+
+#define TLV_TYPE_POWER_GROUP        (PROPRIETARY_TLV_BASE_ID + 84)
+
+#define MOD_CLASS_HR_DSSS       0x03
+#define MOD_CLASS_OFDM          0x07
+#define MOD_CLASS_HT            0x08
+#define HT_BW_20    0
+#define HT_BW_40    1
+
+#define HostCmd_CMD_GET_HW_SPEC                       0x0003
+#define HostCmd_CMD_802_11_SCAN                       0x0006
+#define HostCmd_CMD_802_11_GET_LOG                    0x000b
+#define HostCmd_CMD_MAC_MULTICAST_ADR                 0x0010
+#define HostCmd_CMD_802_11_EEPROM_ACCESS              0x0059
+#define HostCmd_CMD_802_11_ASSOCIATE                  0x0012
+#define HostCmd_CMD_802_11_SNMP_MIB                   0x0016
+#define HostCmd_CMD_MAC_REG_ACCESS                    0x0019
+#define HostCmd_CMD_BBP_REG_ACCESS                    0x001a
+#define HostCmd_CMD_RF_REG_ACCESS                     0x001b
+#define HostCmd_CMD_PMIC_REG_ACCESS                   0x00ad
+#define HostCmd_CMD_802_11_RF_CHANNEL                 0x001d
+#define HostCmd_CMD_802_11_DEAUTHENTICATE             0x0024
+#define HostCmd_CMD_MAC_CONTROL                       0x0028
+#define HostCmd_CMD_802_11_AD_HOC_START               0x002b
+#define HostCmd_CMD_802_11_AD_HOC_JOIN                0x002c
+#define HostCmd_CMD_802_11_AD_HOC_STOP                0x0040
+#define HostCmd_CMD_802_11_MAC_ADDRESS                0x004D
+#define HostCmd_CMD_802_11D_DOMAIN_INFO               0x005b
+#define HostCmd_CMD_802_11_KEY_MATERIAL               0x005e
+#define HostCmd_CMD_802_11_BG_SCAN_QUERY              0x006c
+#define HostCmd_CMD_WMM_GET_STATUS                    0x0071
+#define HostCmd_CMD_802_11_TX_RATE_QUERY              0x007f
+#define HostCmd_CMD_802_11_IBSS_COALESCING_STATUS     0x0083
+#define HostCmd_CMD_VERSION_EXT                       0x0097
+#define HostCmd_CMD_RSSI_INFO                         0x00a4
+#define HostCmd_CMD_FUNC_INIT                         0x00a9
+#define HostCmd_CMD_FUNC_SHUTDOWN                     0x00aa
+#define HostCmd_CMD_11N_CFG                           0x00cd
+#define HostCmd_CMD_11N_ADDBA_REQ                     0x00ce
+#define HostCmd_CMD_11N_ADDBA_RSP                     0x00cf
+#define HostCmd_CMD_11N_DELBA                         0x00d0
+#define HostCmd_CMD_RECONFIGURE_TX_BUFF               0x00d9
+#define HostCmd_CMD_AMSDU_AGGR_CTRL                   0x00df
+#define HostCmd_CMD_TXPWR_CFG                         0x00d1
+#define HostCmd_CMD_TX_RATE_CFG                       0x00d6
+#define HostCmd_CMD_802_11_PS_MODE_ENH                0x00e4
+#define HostCmd_CMD_802_11_HS_CFG_ENH                 0x00e5
+#define HostCmd_CMD_CAU_REG_ACCESS                    0x00ed
+#define HostCmd_CMD_SET_BSS_MODE                      0x00f7
+
+
+enum ENH_PS_MODES {
+        EN_PS = 1,
+        DIS_PS = 2,
+        EN_AUTO_DS = 3,
+        DIS_AUTO_DS = 4,
+        SLEEP_CONFIRM = 5,
+        GET_PS = 0,
+        EN_AUTO_PS = 0xff,
+        DIS_AUTO_PS = 0xfe,
+};
+
+#define HostCmd_RET_BIT                       0x8000
+#define HostCmd_ACT_GEN_GET                   0x0000
+#define HostCmd_ACT_GEN_SET                   0x0001
+#define HostCmd_ACT_GEN_REMOVE                0x0004
+#define HostCmd_ACT_SET_BOTH                  0x0003
+#define HostCmd_ACT_GET_BOTH                  0x000c
+#define HostCmd_RESULT_OK                     0x0000
+#define HostCmd_RESULT_ERROR                  0x0001
+#define HostCmd_RESULT_NOT_SUPPORT            0x0002
+#define HostCmd_RESULT_PENDING                0x0003
+#define HostCmd_RESULT_BUSY                   0x0004
+#define HostCmd_RESULT_PARTIAL_DATA           0x0005
+
+#define HostCmd_ACT_MAC_RX_ON                 0x0001
+#define HostCmd_ACT_MAC_TX_ON                 0x0002
+#define HostCmd_ACT_MAC_WEP_ENABLE            0x0008
+#define HostCmd_ACT_MAC_ETHERNETII_ENABLE     0x0010
+#define HostCmd_ACT_MAC_PROMISCUOUS_ENABLE    0x0080
+#define HostCmd_ACT_MAC_ALL_MULTICAST_ENABLE  0x0100
+#define HostCmd_ACT_MAC_RTS_CTS_ENABLE        0x0200
+#define HostCmd_ACT_MAC_STRICT_PROTECTION_ENABLE  0x0400
+#define HostCmd_ACT_MAC_ADHOC_G_PROTECTION_ON     0x2000
+
+#define HostCmd_BSS_MODE_BSS                0x0001
+#define HostCmd_BSS_MODE_IBSS               0x0002
+#define HostCmd_BSS_MODE_ANY                0x0003
+
+#define HostCmd_SCAN_RADIO_TYPE_BG          0
+#define HostCmd_SCAN_RADIO_TYPE_A           1
+
+#define HOST_SLEEP_CFG_CANCEL           0xffffffff
+#define HOST_SLEEP_CFG_COND_DEF         0x0000000f
+#define HOST_SLEEP_CFG_GPIO_DEF         0xff
+#define HOST_SLEEP_CFG_GAP_DEF          0
+
+#define CMD_F_HOSTCMD           (1 << 0)
+#define CMD_F_CANCELED          (1 << 1)
+
+#define HostCmd_CMD_ID_MASK             0x0fff
+
+#define HostCmd_SEQ_NUM_MASK            0x00ff
+
+#define HostCmd_BSS_NUM_MASK            0x0f00
+
+#define HostCmd_BSS_TYPE_MASK           0xf000
+
+#define HostCmd_SET_SEQ_NO_BSS_INFO(seq, num, type) {   \
+        (((seq) & 0x00ff) |                             \
+         (((num) & 0x000f) << 8)) |                     \
+        (((type) & 0x000f) << 12);                  }
+
+#define HostCmd_GET_SEQ_NO(seq)       \
+        ((seq) & HostCmd_SEQ_NUM_MASK)
+
+#define HostCmd_GET_BSS_NO(seq)         \
+        (((seq) & HostCmd_BSS_NUM_MASK) >> 8)
+
+#define HostCmd_GET_BSS_TYPE(seq)       \
+        (((seq) & HostCmd_BSS_TYPE_MASK) >> 12)
+
+#define EVENT_DUMMY_HOST_WAKEUP_SIGNAL  0x00000001
+#define EVENT_LINK_LOST                 0x00000003
+#define EVENT_LINK_SENSED               0x00000004
+#define EVENT_MIB_CHANGED               0x00000006
+#define EVENT_INIT_DONE                 0x00000007
+#define EVENT_DEAUTHENTICATED           0x00000008
+#define EVENT_DISASSOCIATED             0x00000009
+#define EVENT_PS_AWAKE                  0x0000000a
+#define EVENT_PS_SLEEP                  0x0000000b
+#define EVENT_MIC_ERR_MULTICAST         0x0000000d
+#define EVENT_MIC_ERR_UNICAST           0x0000000e
+#define EVENT_DEEP_SLEEP_AWAKE          0x00000010
+#define EVENT_ADHOC_BCN_LOST            0x00000011
+
+#define EVENT_WMM_STATUS_CHANGE         0x00000017
+#define EVENT_BG_SCAN_REPORT            0x00000018
+#define EVENT_RSSI_LOW                  0x00000019
+#define EVENT_SNR_LOW                   0x0000001a
+#define EVENT_MAX_FAIL                  0x0000001b
+#define EVENT_RSSI_HIGH                 0x0000001c
+#define EVENT_SNR_HIGH                  0x0000001d
+#define EVENT_IBSS_COALESCED            0x0000001e
+#define EVENT_DATA_RSSI_LOW             0x00000024
+#define EVENT_DATA_SNR_LOW              0x00000025
+#define EVENT_DATA_RSSI_HIGH            0x00000026
+#define EVENT_DATA_SNR_HIGH             0x00000027
+#define EVENT_LINK_QUALITY              0x00000028
+#define EVENT_PORT_RELEASE              0x0000002b
+#define EVENT_PRE_BEACON_LOST           0x00000031
+#define EVENT_ADDBA                     0x00000033
+#define EVENT_DELBA                     0x00000034
+#define EVENT_BA_STREAM_TIEMOUT         0x00000037
+#define EVENT_AMSDU_AGGR_CTRL           0x00000042
+#define EVENT_WEP_ICV_ERR               0x00000046
+#define EVENT_HS_ACT_REQ                0x00000047
+#define EVENT_BW_CHANGE                 0x00000048
+
+#define EVENT_HOSTWAKE_STAIE            0x0000004d
+
+#define EVENT_ID_MASK                   0xffff
+#define BSS_NUM_MASK                    0xf
+
+#define EVENT_GET_BSS_NUM(event_cause)          \
+        (((event_cause) >> 16) & BSS_NUM_MASK)
+
+#define EVENT_GET_BSS_TYPE(event_cause)         \
+        (((event_cause) >> 24) & 0x00ff)
+
+struct mwifiex_event_wep_icv_err {
+        u16 reason_code;
+        u8 src_mac_addr[ETH_ALEN];
+        u8 wep_key_index;
+        u8 wep_key_length;
+        u8 key[WLAN_KEY_LEN_WEP104];
+};
+
+struct mwifiex_802_11_fixed_ies {
+        u8 time_stamp[8];
+        __le16 beacon_interval;
+        __le16 capabilities;
+};
+
+struct mwifiex_ie_types_header {
+        __le16 type;
+        __le16 len;
+} __packed;
+
+struct mwifiex_ie_types_data {
+        struct mwifiex_ie_types_header header;
+        u8 data[1];
+} __packed;
+
+#define MWIFIEX_TxPD_POWER_MGMT_NULL_PACKET 0x01
+#define MWIFIEX_TxPD_POWER_MGMT_LAST_PACKET 0x08
+
+struct txpd {
+        u8 bss_type;
+        u8 bss_num;
+        __le16 tx_pkt_length;
+        __le16 tx_pkt_offset;
+        __le16 tx_pkt_type;
+        __le32 tx_control;
+        u8 priority;
+        u8 flags;
+        u8 pkt_delay_2ms;
+        u8 reserved1;
+} __packed;
+
+struct rxpd {
+        u8 bss_type;
+        u8 bss_num;
+        u16 rx_pkt_length;
+        u16 rx_pkt_offset;
+        u16 rx_pkt_type;
+        u16 seq_num;
+        u8 priority;
+        u8 rx_rate;
+        s8 snr;
+        s8 nf;
+        /* Ht Info [Bit 0] RxRate format: LG=0, HT=1
+         * [Bit 1]  HT Bandwidth: BW20 = 0, BW40 = 1
+         * [Bit 2]  HT Guard Interval: LGI = 0, SGI = 1 */
+        u8 ht_info;
+        u8 reserved;
+} __packed;
+
+enum mwifiex_chan_scan_mode_bitmasks {
+        MWIFIEX_PASSIVE_SCAN = BIT(0),
+        MWIFIEX_DISABLE_CHAN_FILT = BIT(1),
+};
+
+#define SECOND_CHANNEL_BELOW    0x30
+#define SECOND_CHANNEL_ABOVE    0x10
+struct mwifiex_chan_scan_param_set {
+        u8 radio_type;
+        u8 chan_number;
+        u8 chan_scan_mode_bitmap;
+        __le16 min_scan_time;
+        __le16 max_scan_time;
+} __packed;
+
+struct mwifiex_ie_types_chan_list_param_set {
+        struct mwifiex_ie_types_header header;
+        struct mwifiex_chan_scan_param_set chan_scan_param[1];
+} __packed;
+
+struct chan_band_param_set {
+        u8 radio_type;
+        u8 chan_number;
+};
+
+struct mwifiex_ie_types_chan_band_list_param_set {
+        struct mwifiex_ie_types_header header;
+        struct chan_band_param_set chan_band_param[1];
+} __packed;
+
+struct mwifiex_ie_types_rates_param_set {
+        struct mwifiex_ie_types_header header;
+        u8 rates[1];
+} __packed;
+
+struct mwifiex_ie_types_ssid_param_set {
+        struct mwifiex_ie_types_header header;
+        u8 ssid[1];
+} __packed;
+
+struct mwifiex_ie_types_num_probes {
+        struct mwifiex_ie_types_header header;
+        __le16 num_probes;
+} __packed;
+
+struct mwifiex_ie_types_wildcard_ssid_params {
+        struct mwifiex_ie_types_header header;
+        u8 max_ssid_length;
+        u8 ssid[1];
+} __packed;
+
+#define TSF_DATA_SIZE            8
+struct mwifiex_ie_types_tsf_timestamp {
+        struct mwifiex_ie_types_header header;
+        u8 tsf_data[1];
+} __packed;
+
+struct mwifiex_cf_param_set {
+        u8 cfp_cnt;
+        u8 cfp_period;
+        u16 cfp_max_duration;
+        u16 cfp_duration_remaining;
+} __packed;
+
+struct mwifiex_ibss_param_set {
+        u16 atim_window;
+} __packed;
+
+struct mwifiex_ie_types_ss_param_set {
+        struct mwifiex_ie_types_header header;
+        union {
+                struct mwifiex_cf_param_set cf_param_set[1];
+                struct mwifiex_ibss_param_set ibss_param_set[1];
+        } cf_ibss;
+} __packed;
+
+struct mwifiex_fh_param_set {
+        u16 dwell_time;
+        u8 hop_set;
+        u8 hop_pattern;
+        u8 hop_index;
+} __packed;
+
+struct mwifiex_ds_param_set {
+        u8 current_chan;
+} __packed;
+
+struct mwifiex_ie_types_phy_param_set {
+        struct mwifiex_ie_types_header header;
+        union {
+                struct mwifiex_fh_param_set fh_param_set[1];
+                struct mwifiex_ds_param_set ds_param_set[1];
+        } fh_ds;
+} __packed;
+
+struct mwifiex_ie_types_auth_type {
+        struct mwifiex_ie_types_header header;
+        __le16 auth_type;
+} __packed;
+
+struct mwifiex_ie_types_vendor_param_set {
+        struct mwifiex_ie_types_header header;
+        u8 ie[MWIFIEX_MAX_VSIE_LEN];
+};
+
+struct mwifiex_ie_types_rsn_param_set {
+        struct mwifiex_ie_types_header header;
+        u8 rsn_ie[1];
+} __packed;
+
+#define KEYPARAMSET_FIXED_LEN 6
+
+struct mwifiex_ie_type_key_param_set {
+        __le16 type;
+        __le16 length;
+        __le16 key_type_id;
+        __le16 key_info;
+        __le16 key_len;
+        u8 key[50];
+} __packed;
+
+struct host_cmd_ds_802_11_key_material {
+        __le16 action;
+        struct mwifiex_ie_type_key_param_set key_param_set;
+} __packed;
+
+struct host_cmd_ds_gen {
+        u16 command;
+        u16 size;
+        u16 seq_num;
+        u16 result;
+};
+
+#define S_DS_GEN        sizeof(struct host_cmd_ds_gen)
+
+enum sleep_resp_ctrl {
+        RESP_NOT_NEEDED = 0,
+        RESP_NEEDED,
+};
+
+struct mwifiex_ps_param {
+        __le16 null_pkt_interval;
+        __le16 multiple_dtims;
+        __le16 bcn_miss_timeout;
+        __le16 local_listen_interval;
+        __le16 adhoc_wake_period;
+        __le16 mode;
+        __le16 delay_to_ps;
+};
+
+struct mwifiex_auto_ds_param {
+        __le16 deep_sleep_timeout;
+};
+
+struct sleep_confirm_param {
+        __le16 resp_ctrl;
+};
+
+#define BITMAP_AUTO_DS         0x01
+#define BITMAP_STA_PS          0x10
+#define BITMAP_UAP_INACT_PS    0x100
+#define BITMAP_UAP_DTIM_PS     0x200
+struct auto_ps_param {
+        __le16 ps_bitmap;
+        /* auto deep sleep parameter,
+         * sta power save parameter
+         * uap inactivity parameter
+         * uap DTIM parameter */
+};
+
+#define AUTO_PS_FIX_SIZE    4
+
+#define TLV_TYPE_AUTO_DS_PARAM        (PROPRIETARY_TLV_BASE_ID + 113)
+#define TLV_TYPE_PS_PARAM             (PROPRIETARY_TLV_BASE_ID + 114)
+
+struct mwifiex_ie_types_auto_ds_param {
+        struct mwifiex_ie_types_header header;
+        struct mwifiex_auto_ds_param param;
+} __packed;
+
+struct mwifiex_ie_types_ps_param {
+        struct mwifiex_ie_types_header header;
+        struct mwifiex_ps_param param;
+} __packed;
+
+struct host_cmd_ds_802_11_ps_mode_enh {
+        __le16 action;
+
+        union {
+                struct mwifiex_ps_param opt_ps;
+                struct mwifiex_auto_ds_param auto_ds;
+                struct sleep_confirm_param sleep_cfm;
+                __le16 ps_bitmap;
+                struct auto_ps_param auto_ps;
+        } params;
+} __packed;
+
+struct host_cmd_ds_get_hw_spec {
+        __le16 hw_if_version;
+        __le16 version;
+        __le16 reserved;
+        __le16 num_of_mcast_adr;
+        u8 permanent_addr[ETH_ALEN];
+        __le16 region_code;
+        __le16 number_of_antenna;
+        __le32 fw_release_number;
+        __le32 reserved_1;
+        __le32 reserved_2;
+        __le32 reserved_3;
+        __le32 fw_cap_info;
+        __le32 dot_11n_dev_cap;
+        u8 dev_mcs_support;
+        __le16 mp_end_port;     /* SDIO only, reserved for other interfacces */
+        __le16 reserved_4;
+} __packed;
+
+struct host_cmd_ds_802_11_rssi_info {
+        __le16 action;
+        __le16 ndata;
+        __le16 nbcn;
+        __le16 reserved[9];
+        long long reserved_1;
+};
+
+struct host_cmd_ds_802_11_rssi_info_rsp {
+        __le16 action;
+        __le16 ndata;
+        __le16 nbcn;
+        __le16 data_rssi_last;
+        __le16 data_nf_last;
+        __le16 data_rssi_avg;
+        __le16 data_nf_avg;
+        __le16 bcn_rssi_last;
+        __le16 bcn_nf_last;
+        __le16 bcn_rssi_avg;
+        __le16 bcn_nf_avg;
+        long long tsf_bcn;
+};
+
+struct host_cmd_ds_802_11_mac_address {
+        __le16 action;
+        u8 mac_addr[ETH_ALEN];
+};
+
+struct host_cmd_ds_mac_control {
+        __le16 action;
+        __le16 reserved;
+};
+
+struct host_cmd_ds_mac_multicast_adr {
+        __le16 action;
+        __le16 num_of_adrs;
+        u8 mac_list[MWIFIEX_MAX_MULTICAST_LIST_SIZE][ETH_ALEN];
+} __packed;
+
+struct host_cmd_ds_802_11_deauthenticate {
+        u8 mac_addr[ETH_ALEN];
+        __le16 reason_code;
+} __packed;
+
+struct host_cmd_ds_802_11_associate {
+        u8 peer_sta_addr[ETH_ALEN];
+        __le16 cap_info_bitmap;
+        __le16 listen_interval;
+        __le16 beacon_period;
+        u8 dtim_period;
+} __packed;
+
+struct ieee_types_assoc_rsp {
+        __le16 cap_info_bitmap;
+        __le16 status_code;
+        __le16 a_id;
+        u8 ie_buffer[1];
+} __packed;
+
+struct host_cmd_ds_802_11_associate_rsp {
+        struct ieee_types_assoc_rsp assoc_rsp;
+} __packed;
+
+struct ieee_types_cf_param_set {
+        u8 element_id;
+        u8 len;
+        u8 cfp_cnt;
+        u8 cfp_period;
+        u16 cfp_max_duration;
+        u16 cfp_duration_remaining;
+} __packed;
+
+struct ieee_types_ibss_param_set {
+        u8 element_id;
+        u8 len;
+        __le16 atim_window;
+} __packed;
+
+union ieee_types_ss_param_set {
+        struct ieee_types_cf_param_set cf_param_set;
+        struct ieee_types_ibss_param_set ibss_param_set;
+} __packed;
+
+struct ieee_types_fh_param_set {
+        u8 element_id;
+        u8 len;
+        __le16 dwell_time;
+        u8 hop_set;
+        u8 hop_pattern;
+        u8 hop_index;
+} __packed;
+
+struct ieee_types_ds_param_set {
+        u8 element_id;
+        u8 len;
+        u8 current_chan;
+} __packed;
+
+union ieee_types_phy_param_set {
+        struct ieee_types_fh_param_set fh_param_set;
+        struct ieee_types_ds_param_set ds_param_set;
+} __packed;
+
+struct host_cmd_ds_802_11_ad_hoc_start {
+        u8 ssid[IEEE80211_MAX_SSID_LEN];
+        u8 bss_mode;
+        __le16 beacon_period;
+        u8 dtim_period;
+        union ieee_types_ss_param_set ss_param_set;
+        union ieee_types_phy_param_set phy_param_set;
+        u16 reserved1;
+        __le16 cap_info_bitmap;
+        u8 DataRate[HOSTCMD_SUPPORTED_RATES];
+} __packed;
+
+struct host_cmd_ds_802_11_ad_hoc_result {
+        u8 pad[3];
+        u8 bssid[ETH_ALEN];
+} __packed;
+
+struct adhoc_bss_desc {
+        u8 bssid[ETH_ALEN];
+        u8 ssid[IEEE80211_MAX_SSID_LEN];
+        u8 bss_mode;
+        __le16 beacon_period;
+        u8 dtim_period;
+        u8 time_stamp[8];
+        u8 local_time[8];
+        union ieee_types_phy_param_set phy_param_set;
+        union ieee_types_ss_param_set ss_param_set;
+        __le16 cap_info_bitmap;
+        u8 data_rates[HOSTCMD_SUPPORTED_RATES];
+
+        /*
+         *  DO NOT ADD ANY FIELDS TO THIS STRUCTURE.
+         *  It is used in the Adhoc join command and will cause a
+         *  binary layout mismatch with the firmware
+         */
+} __packed;
+
+struct host_cmd_ds_802_11_ad_hoc_join {
+        struct adhoc_bss_desc bss_descriptor;
+        u16 reserved1;
+        u16 reserved2;
+} __packed;
+
+struct host_cmd_ds_802_11_get_log {
+        __le32 mcast_tx_frame;
+        __le32 failed;
+        __le32 retry;
+        __le32 multi_retry;
+        __le32 frame_dup;
+        __le32 rts_success;
+        __le32 rts_failure;
+        __le32 ack_failure;
+        __le32 rx_frag;
+        __le32 mcast_rx_frame;
+        __le32 fcs_error;
+        __le32 tx_frame;
+        __le32 reserved;
+        __le32 wep_icv_err_cnt[4];
+};
+
+struct host_cmd_ds_tx_rate_query {
+        u8 tx_rate;
+        /* Ht Info [Bit 0] RxRate format: LG=0, HT=1
+         * [Bit 1]  HT Bandwidth: BW20 = 0, BW40 = 1
+         * [Bit 2]  HT Guard Interval: LGI = 0, SGI = 1 */
+        u8 ht_info;
+} __packed;
+
+enum Host_Sleep_Action {
+        HS_CONFIGURE = 0x0001,
+        HS_ACTIVATE  = 0x0002,
+};
+
+struct mwifiex_hs_config_param {
+        __le32 conditions;
+        u8 gpio;
+        u8 gap;
+} __packed;
+
+struct hs_activate_param {
+        u16 resp_ctrl;
+} __packed;
+
+struct host_cmd_ds_802_11_hs_cfg_enh {
+        __le16 action;
+
+        union {
+                struct mwifiex_hs_config_param hs_config;
+                struct hs_activate_param hs_activate;
+        } params;
+} __packed;
+
+enum SNMP_MIB_INDEX {
+        OP_RATE_SET_I = 1,
+        DTIM_PERIOD_I = 3,
+        RTS_THRESH_I = 5,
+        SHORT_RETRY_LIM_I = 6,
+        LONG_RETRY_LIM_I = 7,
+        FRAG_THRESH_I = 8,
+        DOT11D_I = 9,
+};
+
+#define MAX_SNMP_BUF_SIZE   128
+
+struct host_cmd_ds_802_11_snmp_mib {
+        __le16 query_type;
+        __le16 oid;
+        __le16 buf_size;
+        u8 value[1];
+} __packed;
+
+#define RADIO_ON                                0x01
+#define RADIO_OFF                               0x00
+
+struct mwifiex_rate_scope {
+        __le16 type;
+        __le16 length;
+        __le16 hr_dsss_rate_bitmap;
+        __le16 ofdm_rate_bitmap;
+        __le16 ht_mcs_rate_bitmap[8];
+} __packed;
+
+struct mwifiex_rate_drop_pattern {
+        __le16 type;
+        __le16 length;
+        __le32 rate_drop_mode;
+} __packed;
+
+struct host_cmd_ds_tx_rate_cfg {
+        __le16 action;
+        __le16 cfg_index;
+} __packed;
+
+struct mwifiex_power_group {
+        u8 modulation_class;
+        u8 first_rate_code;
+        u8 last_rate_code;
+        s8 power_step;
+        s8 power_min;
+        s8 power_max;
+        u8 ht_bandwidth;
+        u8 reserved;
+} __packed;
+
+struct mwifiex_types_power_group {
+        u16 type;
+        u16 length;
+} __packed;
+
+struct host_cmd_ds_txpwr_cfg {
+        __le16 action;
+        __le16 cfg_index;
+        __le32 mode;
+} __packed;
+
+#define MWIFIEX_USER_SCAN_CHAN_MAX             50
+
+#define MWIFIEX_MAX_SSID_LIST_LENGTH         10
+
+struct mwifiex_scan_cmd_config {
+        /*
+         *  BSS Type to be sent in the firmware command
+         *
+         *  Field can be used to restrict the types of networks returned in the
+         *    scan.  Valid settings are:
+         *
+         *   - MWIFIEX_SCAN_MODE_BSS  (infrastructure)
+         *   - MWIFIEX_SCAN_MODE_IBSS (adhoc)
+         *   - MWIFIEX_SCAN_MODE_ANY  (unrestricted, adhoc and infrastructure)
+         */
+        u8 bss_mode;
+
+        /* Specific BSSID used to filter scan results in the firmware */
+        u8 specific_bssid[ETH_ALEN];
+
+        /* Length of TLVs sent in command starting at tlvBuffer */
+        u32 tlv_buf_len;
+
+        /*
+         *  SSID TLV(s) and ChanList TLVs to be sent in the firmware command
+         *
+         *  TLV_TYPE_CHANLIST, mwifiex_ie_types_chan_list_param_set
+         *  WLAN_EID_SSID, mwifiex_ie_types_ssid_param_set
+         */
+        u8 tlv_buf[1];  /* SSID TLV(s) and ChanList TLVs are stored
+                                   here */
+} __packed;
+
+struct mwifiex_user_scan_chan {
+        u8 chan_number;
+        u8 radio_type;
+        u8 scan_type;
+        u8 reserved;
+        u32 scan_time;
+} __packed;
+
+struct mwifiex_user_scan_ssid {
+        u8 ssid[IEEE80211_MAX_SSID_LEN + 1];
+        u8 max_len;
+} __packed;
+
+struct mwifiex_user_scan_cfg {
+        /*
+         *  Flag set to keep the previous scan table intact
+         *
+         *  If set, the scan results will accumulate, replacing any previous
+         *   matched entries for a BSS with the new scan data
+         */
+        u8 keep_previous_scan;
+        /*
+         *  BSS mode to be sent in the firmware command
+         *
+         *  Field can be used to restrict the types of networks returned in the
+         *    scan.  Valid settings are:
+         *
+         *   - MWIFIEX_SCAN_MODE_BSS  (infrastructure)
+         *   - MWIFIEX_SCAN_MODE_IBSS (adhoc)
+         *   - MWIFIEX_SCAN_MODE_ANY  (unrestricted, adhoc and infrastructure)
+         */
+        u8 bss_mode;
+        /* Configure the number of probe requests for active chan scans */
+        u8 num_probes;
+        u8 reserved;
+        /* BSSID filter sent in the firmware command to limit the results */
+        u8 specific_bssid[ETH_ALEN];
+        /* SSID filter list used in the to limit the scan results */
+        struct mwifiex_user_scan_ssid ssid_list[MWIFIEX_MAX_SSID_LIST_LENGTH];
+        /* Variable number (fixed maximum) of channels to scan up */
+        struct mwifiex_user_scan_chan chan_list[MWIFIEX_USER_SCAN_CHAN_MAX];
+} __packed;
+
+struct ie_body {
+        u8 grp_key_oui[4];
+        u8 ptk_cnt[2];
+        u8 ptk_body[4];
+} __packed;
+
+struct host_cmd_ds_802_11_scan {
+        u8 bss_mode;
+        u8 bssid[ETH_ALEN];
+        u8 tlv_buffer[1];
+} __packed;
+
+struct host_cmd_ds_802_11_scan_rsp {
+        __le16 bss_descript_size;
+        u8 number_of_sets;
+        u8 bss_desc_and_tlv_buffer[1];
+} __packed;
+
+struct host_cmd_ds_802_11_bg_scan_query {
+        u8 flush;
+} __packed;
+
+struct host_cmd_ds_802_11_bg_scan_query_rsp {
+        u32 report_condition;
+        struct host_cmd_ds_802_11_scan_rsp scan_resp;
+} __packed;
+
+struct mwifiex_ietypes_domain_param_set {
+        struct mwifiex_ie_types_header header;
+        u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
+        struct ieee80211_country_ie_triplet triplet[1];
+} __packed;
+
+struct host_cmd_ds_802_11d_domain_info {
+        __le16 action;
+        struct mwifiex_ietypes_domain_param_set domain;
+} __packed;
+
+struct host_cmd_ds_802_11d_domain_info_rsp {
+        __le16 action;
+        struct mwifiex_ietypes_domain_param_set domain;
+} __packed;
+
+struct host_cmd_ds_11n_addba_req {
+        u8 add_req_result;
+        u8 peer_mac_addr[ETH_ALEN];
+        u8 dialog_token;
+        __le16 block_ack_param_set;
+        __le16 block_ack_tmo;
+        __le16 ssn;
+} __packed;
+
+struct host_cmd_ds_11n_addba_rsp {
+        u8 add_rsp_result;
+        u8 peer_mac_addr[ETH_ALEN];
+        u8 dialog_token;
+        __le16 status_code;
+        __le16 block_ack_param_set;
+        __le16 block_ack_tmo;
+        __le16 ssn;
+} __packed;
+
+struct host_cmd_ds_11n_delba {
+        u8 del_result;
+        u8 peer_mac_addr[ETH_ALEN];
+        __le16 del_ba_param_set;
+        __le16 reason_code;
+        u8 reserved;
+} __packed;
+
+struct host_cmd_ds_11n_batimeout {
+        u8 tid;
+        u8 peer_mac_addr[ETH_ALEN];
+        u8 origninator;
+} __packed;
+
+struct host_cmd_ds_11n_cfg {
+        __le16 action;
+        __le16 ht_tx_cap;
+        __le16 ht_tx_info;
+} __packed;
+
+struct host_cmd_ds_txbuf_cfg {
+        __le16 action;
+        __le16 buff_size;
+        __le16 mp_end_port;     /* SDIO only, reserved for other interfacces */
+        __le16 reserved3;
+} __packed;
+
+struct host_cmd_ds_amsdu_aggr_ctrl {
+        __le16 action;
+        __le16 enable;
+        __le16 curr_buf_size;
+} __packed;
+
+struct mwifiex_ie_types_wmm_param_set {
+        struct mwifiex_ie_types_header header;
+        u8 wmm_ie[1];
+};
+
+struct mwifiex_ie_types_wmm_queue_status {
+        struct mwifiex_ie_types_header header;
+        u8 queue_index;
+        u8 disabled;
+        u16 medium_time;
+        u8 flow_required;
+        u8 flow_created;
+        u32 reserved;
+};
+
+struct ieee_types_vendor_header {
+        u8 element_id;
+        u8 len;
+        u8 oui[3];
+        u8 oui_type;
+        u8 oui_subtype;
+        u8 version;
+} __packed;
+
+struct ieee_types_wmm_ac_parameters {
+        u8 aci_aifsn_bitmap;
+        u8 ecw_bitmap;
+        __le16 tx_op_limit;
+} __packed;
+
+struct ieee_types_wmm_parameter {
+        /*
+         * WMM Parameter IE - Vendor Specific Header:
+         *   element_id  [221/0xdd]
+         *   Len         [24]
+         *   Oui         [00:50:f2]
+         *   OuiType     [2]
+         *   OuiSubType  [1]
+         *   Version     [1]
+         */
+        struct ieee_types_vendor_header vend_hdr;
+        u8 qos_info_bitmap;
+        u8 reserved;
+        struct ieee_types_wmm_ac_parameters ac_params[IEEE80211_MAX_QUEUES];
+} __packed;
+
+struct ieee_types_wmm_info {
+
+        /*
+         * WMM Info IE - Vendor Specific Header:
+         *   element_id  [221/0xdd]
+         *   Len         [7]
+         *   Oui         [00:50:f2]
+         *   OuiType     [2]
+         *   OuiSubType  [0]
+         *   Version     [1]
+         */
+        struct ieee_types_vendor_header vend_hdr;
+
+        u8 qos_info_bitmap;
+} __packed;
+
+struct host_cmd_ds_wmm_get_status {
+        u8 queue_status_tlv[sizeof(struct mwifiex_ie_types_wmm_queue_status) *
+                              IEEE80211_MAX_QUEUES];
+        u8 wmm_param_tlv[sizeof(struct ieee_types_wmm_parameter) + 2];
+} __packed;
+
+struct mwifiex_wmm_ac_status {
+        u8 disabled;
+        u8 flow_required;
+        u8 flow_created;
+};
+
+struct mwifiex_ie_types_htcap {
+        struct mwifiex_ie_types_header header;
+        struct ieee80211_ht_cap ht_cap;
+} __packed;
+
+struct mwifiex_ie_types_htinfo {
+        struct mwifiex_ie_types_header header;
+        struct ieee80211_ht_info ht_info;
+} __packed;
+
+struct mwifiex_ie_types_2040bssco {
+        struct mwifiex_ie_types_header header;
+        u8 bss_co_2040;
+} __packed;
+
+struct mwifiex_ie_types_extcap {
+        struct mwifiex_ie_types_header header;
+        u8 ext_cap;
+} __packed;
+
+struct host_cmd_ds_mac_reg_access {
+        __le16 action;
+        __le16 offset;
+        __le32 value;
+} __packed;
+
+struct host_cmd_ds_bbp_reg_access {
+        __le16 action;
+        __le16 offset;
+        u8 value;
+        u8 reserved[3];
+} __packed;
+
+struct host_cmd_ds_rf_reg_access {
+        __le16 action;
+        __le16 offset;
+        u8 value;
+        u8 reserved[3];
+} __packed;
+
+struct host_cmd_ds_pmic_reg_access {
+        __le16 action;
+        __le16 offset;
+        u8 value;
+        u8 reserved[3];
+} __packed;
+
+struct host_cmd_ds_802_11_eeprom_access {
+        __le16 action;
+
+        __le16 offset;
+        __le16 byte_count;
+        u8 value;
+} __packed;
+
+struct host_cmd_ds_802_11_rf_channel {
+        __le16 action;
+        __le16 current_channel;
+        __le16 rf_type;
+        __le16 reserved;
+        u8 reserved_1[32];
+} __packed;
+
+struct host_cmd_ds_version_ext {
+        u8 version_str_sel;
+        char version_str[128];
+} __packed;
+
+struct host_cmd_ds_802_11_ibss_status {
+        __le16 action;
+        __le16 enable;
+        u8 bssid[ETH_ALEN];
+        __le16 beacon_interval;
+        __le16 atim_window;
+        __le16 use_g_rate_protect;
+} __packed;
+
+#define CONNECTION_TYPE_INFRA   0
+#define CONNECTION_TYPE_ADHOC   1
+
+struct host_cmd_ds_set_bss_mode {
+        u8 con_type;
+} __packed;
+
+struct host_cmd_ds_command {
+        __le16 command;
+        __le16 size;
+        __le16 seq_num;
+        __le16 result;
+        union {
+                struct host_cmd_ds_get_hw_spec hw_spec;
+                struct host_cmd_ds_mac_control mac_ctrl;
+                struct host_cmd_ds_802_11_mac_address mac_addr;
+                struct host_cmd_ds_mac_multicast_adr mc_addr;
+                struct host_cmd_ds_802_11_get_log get_log;
+                struct host_cmd_ds_802_11_rssi_info rssi_info;
+                struct host_cmd_ds_802_11_rssi_info_rsp rssi_info_rsp;
+                struct host_cmd_ds_802_11_snmp_mib smib;
+                struct host_cmd_ds_802_11_rf_channel rf_channel;
+                struct host_cmd_ds_tx_rate_query tx_rate;
+                struct host_cmd_ds_tx_rate_cfg tx_rate_cfg;
+                struct host_cmd_ds_txpwr_cfg txp_cfg;
+                struct host_cmd_ds_802_11_ps_mode_enh psmode_enh;
+                struct host_cmd_ds_802_11_hs_cfg_enh opt_hs_cfg;
+                struct host_cmd_ds_802_11_scan scan;
+                struct host_cmd_ds_802_11_scan_rsp scan_resp;
+                struct host_cmd_ds_802_11_bg_scan_query bg_scan_query;
+                struct host_cmd_ds_802_11_bg_scan_query_rsp bg_scan_query_resp;
+                struct host_cmd_ds_802_11_associate associate;
+                struct host_cmd_ds_802_11_associate_rsp associate_rsp;
+                struct host_cmd_ds_802_11_deauthenticate deauth;
+                struct host_cmd_ds_802_11_ad_hoc_start adhoc_start;
+                struct host_cmd_ds_802_11_ad_hoc_result adhoc_result;
+                struct host_cmd_ds_802_11_ad_hoc_join adhoc_join;
+                struct host_cmd_ds_802_11d_domain_info domain_info;
+                struct host_cmd_ds_802_11d_domain_info_rsp domain_info_resp;
+                struct host_cmd_ds_11n_addba_req add_ba_req;
+                struct host_cmd_ds_11n_addba_rsp add_ba_rsp;
+                struct host_cmd_ds_11n_delba del_ba;
+                struct host_cmd_ds_txbuf_cfg tx_buf;
+                struct host_cmd_ds_amsdu_aggr_ctrl amsdu_aggr_ctrl;
+                struct host_cmd_ds_11n_cfg htcfg;
+                struct host_cmd_ds_wmm_get_status get_wmm_status;
+                struct host_cmd_ds_802_11_key_material key_material;
+                struct host_cmd_ds_version_ext verext;
+                struct host_cmd_ds_802_11_ibss_status ibss_coalescing;
+                struct host_cmd_ds_mac_reg_access mac_reg;
+                struct host_cmd_ds_bbp_reg_access bbp_reg;
+                struct host_cmd_ds_rf_reg_access rf_reg;
+                struct host_cmd_ds_pmic_reg_access pmic_reg;
+                struct host_cmd_ds_set_bss_mode bss_mode;
+                struct host_cmd_ds_802_11_eeprom_access eeprom;
+        } params;
+} __packed;
+
+struct mwifiex_opt_sleep_confirm {
+        __le16 command;
+        __le16 size;
+        __le16 seq_num;
+        __le16 result;
+        __le16 action;
+        struct sleep_confirm_param sleep_cfm;
+} __packed;
+
+struct mwifiex_opt_sleep_confirm_buffer {
+        u8 hdr[4];
+        struct mwifiex_opt_sleep_confirm ps_cfm_sleep;
+} __packed;
+#endif /* !_MWIFIEX_FW_H_ */
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
new file mode 100644
index 00000000000..07ebc97e19c
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -0,0 +1,665 @@
+/*
+ * Marvell Wireless LAN device driver: HW/FW Initialization
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+#include "11n.h"
+
+/*
+ * This function adds a BSS priority table to the table list.
+ *
+ * The function allocates a new BSS priority table node and adds it to
+ * the end of BSS priority table list, kept in driver memory.
+ */
+static int mwifiex_add_bss_prio_tbl(struct mwifiex_private *priv)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct mwifiex_bss_prio_node *bss_prio;
+        int status = 0;
+        unsigned long flags;
+
+        bss_prio = kzalloc(sizeof(struct mwifiex_bss_prio_node), GFP_KERNEL);
+        if (!bss_prio) {
+                dev_err(adapter->dev, "%s: failed to alloc bss_prio\n",
+                                                __func__);
+                return -1;
+        }
+
+        bss_prio->priv = priv;
+        INIT_LIST_HEAD(&bss_prio->list);
+        if (!adapter->bss_prio_tbl[priv->bss_priority].bss_prio_cur)
+                adapter->bss_prio_tbl[priv->bss_priority].bss_prio_cur =
+                        bss_prio;
+
+        spin_lock_irqsave(&adapter->bss_prio_tbl[priv->bss_priority]
+                        .bss_prio_lock, flags);
+        list_add_tail(&bss_prio->list,
+                        &adapter->bss_prio_tbl[priv->bss_priority]
+                        .bss_prio_head);
+        spin_unlock_irqrestore(&adapter->bss_prio_tbl[priv->bss_priority]
+                        .bss_prio_lock, flags);
+
+        return status;
+}
+
+/*
+ * This function initializes the private structure and sets default
+ * values to the members.
+ *
+ * Additionally, it also initializes all the locks and sets up all the
+ * lists.
+ */
+static int mwifiex_init_priv(struct mwifiex_private *priv)
+{
+        u32 i;
+        int ret = 0;
+
+        priv->media_connected = false;
+        memset(priv->curr_addr, 0xff, ETH_ALEN);
+
+        priv->pkt_tx_ctrl = 0;
+        priv->bss_mode = MWIFIEX_BSS_MODE_INFRA;
+        priv->data_rate = 0;    /* Initially indicate the rate as auto */
+        priv->is_data_rate_auto = true;
+        priv->bcn_avg_factor = DEFAULT_BCN_AVG_FACTOR;
+        priv->data_avg_factor = DEFAULT_DATA_AVG_FACTOR;
+
+        priv->sec_info.wep_status = MWIFIEX_802_11_WEP_DISABLED;
+        priv->sec_info.authentication_mode = MWIFIEX_AUTH_MODE_OPEN;
+        priv->sec_info.encryption_mode = MWIFIEX_ENCRYPTION_MODE_NONE;
+        for (i = 0; i < ARRAY_SIZE(priv->wep_key); i++)
+                memset(&priv->wep_key[i], 0, sizeof(struct mwifiex_wep_key));
+        priv->wep_key_curr_index = 0;
+        priv->curr_pkt_filter = HostCmd_ACT_MAC_RX_ON | HostCmd_ACT_MAC_TX_ON |
+                                HostCmd_ACT_MAC_ETHERNETII_ENABLE;
+
+        priv->beacon_period = 100; /* beacon interval */ ;
+        priv->attempted_bss_desc = NULL;
+        memset(&priv->curr_bss_params, 0, sizeof(priv->curr_bss_params));
+        priv->listen_interval = MWIFIEX_DEFAULT_LISTEN_INTERVAL;
+
+        memset(&priv->prev_ssid, 0, sizeof(priv->prev_ssid));
+        memset(&priv->prev_bssid, 0, sizeof(priv->prev_bssid));
+        memset(&priv->assoc_rsp_buf, 0, sizeof(priv->assoc_rsp_buf));
+        priv->assoc_rsp_size = 0;
+        priv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL;
+        priv->atim_window = 0;
+        priv->adhoc_state = ADHOC_IDLE;
+        priv->tx_power_level = 0;
+        priv->max_tx_power_level = 0;
+        priv->min_tx_power_level = 0;
+        priv->tx_rate = 0;
+        priv->rxpd_htinfo = 0;
+        priv->rxpd_rate = 0;
+        priv->rate_bitmap = 0;
+        priv->data_rssi_last = 0;
+        priv->data_rssi_avg = 0;
+        priv->data_nf_avg = 0;
+        priv->data_nf_last = 0;
+        priv->bcn_rssi_last = 0;
+        priv->bcn_rssi_avg = 0;
+        priv->bcn_nf_avg = 0;
+        priv->bcn_nf_last = 0;
+        memset(&priv->wpa_ie, 0, sizeof(priv->wpa_ie));
+        memset(&priv->aes_key, 0, sizeof(priv->aes_key));
+        priv->wpa_ie_len = 0;
+        priv->wpa_is_gtk_set = false;
+
+        memset(&priv->assoc_tlv_buf, 0, sizeof(priv->assoc_tlv_buf));
+        priv->assoc_tlv_buf_len = 0;
+        memset(&priv->wps, 0, sizeof(priv->wps));
+        memset(&priv->gen_ie_buf, 0, sizeof(priv->gen_ie_buf));
+        priv->gen_ie_buf_len = 0;
+        memset(priv->vs_ie, 0, sizeof(priv->vs_ie));
+
+        priv->wmm_required = true;
+        priv->wmm_enabled = false;
+        priv->wmm_qosinfo = 0;
+        priv->curr_bcn_buf = NULL;
+        priv->curr_bcn_size = 0;
+
+        priv->scan_block = false;
+
+        ret = mwifiex_add_bss_prio_tbl(priv);
+
+        return ret;
+}
+
+/*
+ * This function allocates buffers for members of the adapter
+ * structure.
+ *
+ * The memory allocated includes scan table, command buffers, and
+ * sleep confirm command buffer. In addition, the queues are
+ * also initialized.
+ */
+static int mwifiex_allocate_adapter(struct mwifiex_adapter *adapter)
+{
+        int ret = 0;
+        u32 buf_size;
+        struct mwifiex_bssdescriptor *temp_scan_table;
+
+        /* Allocate buffer to store the BSSID list */
+        buf_size = sizeof(struct mwifiex_bssdescriptor) * IW_MAX_AP;
+        temp_scan_table = kzalloc(buf_size, GFP_KERNEL);
+        if (!temp_scan_table) {
+                dev_err(adapter->dev, "%s: failed to alloc temp_scan_table\n",
+                       __func__);
+                return -1;
+        }
+
+        adapter->scan_table = temp_scan_table;
+
+        /* Allocate command buffer */
+        ret = mwifiex_alloc_cmd_buffer(adapter);
+        if (ret) {
+                dev_err(adapter->dev, "%s: failed to alloc cmd buffer\n",
+                       __func__);
+                return -1;
+        }
+
+        adapter->sleep_cfm =
+                dev_alloc_skb(sizeof(struct mwifiex_opt_sleep_confirm_buffer)
+                                + INTF_HEADER_LEN);
+
+        if (!adapter->sleep_cfm) {
+                dev_err(adapter->dev, "%s: failed to alloc sleep cfm"
+                        " cmd buffer\n", __func__);
+                return -1;
+        }
+        skb_reserve(adapter->sleep_cfm, INTF_HEADER_LEN);
+
+        return 0;
+}
+
+/*
+ * This function initializes the adapter structure and sets default
+ * values to the members of adapter.
+ *
+ * This also initializes the WMM related parameters in the driver private
+ * structures.
+ */
+static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
+{
+        struct mwifiex_opt_sleep_confirm_buffer *sleep_cfm_buf = NULL;
+
+        skb_put(adapter->sleep_cfm, sizeof(sleep_cfm_buf->ps_cfm_sleep));
+        sleep_cfm_buf = (struct mwifiex_opt_sleep_confirm_buffer *)
+                                                (adapter->sleep_cfm->data);
+
+        adapter->cmd_sent = false;
+        adapter->data_sent = true;
+        adapter->cmd_resp_received = false;
+        adapter->event_received = false;
+        adapter->data_received = false;
+
+        adapter->surprise_removed = false;
+
+        adapter->hw_status = MWIFIEX_HW_STATUS_INITIALIZING;
+
+        adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_CAM;
+        adapter->ps_state = PS_STATE_AWAKE;
+        adapter->need_to_wakeup = false;
+
+        adapter->scan_mode = HostCmd_BSS_MODE_ANY;
+        adapter->specific_scan_time = MWIFIEX_SPECIFIC_SCAN_CHAN_TIME;
+        adapter->active_scan_time = MWIFIEX_ACTIVE_SCAN_CHAN_TIME;
+        adapter->passive_scan_time = MWIFIEX_PASSIVE_SCAN_CHAN_TIME;
+
+        adapter->num_in_scan_table = 0;
+        memset(adapter->scan_table, 0,
+               (sizeof(struct mwifiex_bssdescriptor) * IW_MAX_AP));
+        adapter->scan_probes = 1;
+
+        memset(adapter->bcn_buf, 0, sizeof(adapter->bcn_buf));
+        adapter->bcn_buf_end = adapter->bcn_buf;
+
+        adapter->radio_on = RADIO_ON;
+        adapter->multiple_dtim = 1;
+
+        adapter->local_listen_interval = 0;     /* default value in firmware
+                                                   will be used */
+
+        adapter->is_deep_sleep = false;
+
+        adapter->delay_null_pkt = false;
+        adapter->delay_to_ps = 1000;
+        adapter->enhanced_ps_mode = PS_MODE_AUTO;
+
+        adapter->gen_null_pkt = false;  /* Disable NULL Pkg generation by
+                                           default */
+        adapter->pps_uapsd_mode = false; /* Disable pps/uapsd mode by
+                                           default */
+        adapter->pm_wakeup_card_req = false;
+
+        adapter->pm_wakeup_fw_try = false;
+
+        adapter->max_tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;
+        adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;
+        adapter->curr_tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;
+
+        adapter->is_hs_configured = false;
+        adapter->hs_cfg.conditions = cpu_to_le32(HOST_SLEEP_CFG_COND_DEF);
+        adapter->hs_cfg.gpio = HOST_SLEEP_CFG_GPIO_DEF;
+        adapter->hs_cfg.gap = HOST_SLEEP_CFG_GAP_DEF;
+        adapter->hs_activated = false;
+
+        memset(adapter->event_body, 0, sizeof(adapter->event_body));
+        adapter->hw_dot_11n_dev_cap = 0;
+        adapter->hw_dev_mcs_support = 0;
+        adapter->usr_dot_11n_dev_cap = 0;
+        adapter->usr_dev_mcs_support = 0;
+        adapter->chan_offset = 0;
+        adapter->adhoc_11n_enabled = false;
+
+        mwifiex_wmm_init(adapter);
+
+        if (adapter->sleep_cfm) {
+                memset(&sleep_cfm_buf->ps_cfm_sleep, 0,
+                        adapter->sleep_cfm->len);
+                sleep_cfm_buf->ps_cfm_sleep.command =
+                        cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH);
+                sleep_cfm_buf->ps_cfm_sleep.size =
+                        cpu_to_le16(adapter->sleep_cfm->len);
+                sleep_cfm_buf->ps_cfm_sleep.result = 0;
+                sleep_cfm_buf->ps_cfm_sleep.action = cpu_to_le16(SLEEP_CONFIRM);
+                sleep_cfm_buf->ps_cfm_sleep.sleep_cfm.resp_ctrl =
+                        cpu_to_le16(RESP_NEEDED);
+        }
+        memset(&adapter->sleep_params, 0, sizeof(adapter->sleep_params));
+        memset(&adapter->sleep_period, 0, sizeof(adapter->sleep_period));
+        adapter->tx_lock_flag = false;
+        adapter->null_pkt_interval = 0;
+        adapter->fw_bands = 0;
+        adapter->config_bands = 0;
+        adapter->adhoc_start_band = 0;
+        adapter->scan_channels = NULL;
+        adapter->fw_release_number = 0;
+        adapter->fw_cap_info = 0;
+        memset(&adapter->upld_buf, 0, sizeof(adapter->upld_buf));
+        adapter->event_cause = 0;
+        adapter->region_code = 0;
+        adapter->bcn_miss_time_out = DEFAULT_BCN_MISS_TIMEOUT;
+        adapter->adhoc_awake_period = 0;
+        memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter));
+        adapter->arp_filter_size = 0;
+
+        return;
+}
+
+/*
+ * This function frees the adapter structure.
+ *
+ * The freeing operation is done recursively, by canceling all
+ * pending commands, freeing the member buffers previously
+ * allocated (command buffers, scan table buffer, sleep confirm
+ * command buffer), stopping the timers and calling the cleanup
+ * routines for every interface, before the actual adapter
+ * structure is freed.
+ */
+static void
+mwifiex_free_adapter(struct mwifiex_adapter *adapter)
+{
+        if (!adapter) {
+                pr_err("%s: adapter is NULL\n", __func__);
+                return;
+        }
+
+        mwifiex_cancel_all_pending_cmd(adapter);
+
+        /* Free lock variables */
+        mwifiex_free_lock_list(adapter);
+
+        /* Free command buffer */
+        dev_dbg(adapter->dev, "info: free cmd buffer\n");
+        mwifiex_free_cmd_buffer(adapter);
+
+        del_timer(&adapter->cmd_timer);
+
+        dev_dbg(adapter->dev, "info: free scan table\n");
+        kfree(adapter->scan_table);
+        adapter->scan_table = NULL;
+
+        adapter->if_ops.cleanup_if(adapter);
+
+        dev_kfree_skb_any(adapter->sleep_cfm);
+
+        return;
+}
+
+/*
+ *  This function intializes the lock variables and
+ *  the list heads.
+ */
+int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)
+{
+        struct mwifiex_private   *priv = NULL;
+        s32           i = 0;
+        u32           j = 0;
+
+        spin_lock_init(&adapter->mwifiex_lock);
+        spin_lock_init(&adapter->int_lock);
+        spin_lock_init(&adapter->main_proc_lock);
+        spin_lock_init(&adapter->mwifiex_cmd_lock);
+        for (i = 0; i < adapter->priv_num; i++) {
+                if (adapter->priv[i]) {
+                        priv = adapter->priv[i];
+                        spin_lock_init(&priv->rx_pkt_lock);
+                        spin_lock_init(&priv->wmm.ra_list_spinlock);
+                        spin_lock_init(&priv->curr_bcn_buf_lock);
+                }
+        }
+
+        /* Initialize cmd_free_q */
+        INIT_LIST_HEAD(&adapter->cmd_free_q);
+        /* Initialize cmd_pending_q */
+        INIT_LIST_HEAD(&adapter->cmd_pending_q);
+        /* Initialize scan_pending_q */
+        INIT_LIST_HEAD(&adapter->scan_pending_q);
+
+        spin_lock_init(&adapter->cmd_free_q_lock);
+        spin_lock_init(&adapter->cmd_pending_q_lock);
+        spin_lock_init(&adapter->scan_pending_q_lock);
+
+        for (i = 0; i < adapter->priv_num; ++i) {
+                INIT_LIST_HEAD(&adapter->bss_prio_tbl[i].bss_prio_head);
+                adapter->bss_prio_tbl[i].bss_prio_cur = NULL;
+                spin_lock_init(&adapter->bss_prio_tbl[i].bss_prio_lock);
+        }
+
+        for (i = 0; i < adapter->priv_num; i++) {
+                if (!adapter->priv[i])
+                        continue;
+                priv = adapter->priv[i];
+                for (j = 0; j < MAX_NUM_TID; ++j) {
+                        INIT_LIST_HEAD(&priv->wmm.tid_tbl_ptr[j].ra_list);
+                        spin_lock_init(&priv->wmm.tid_tbl_ptr[j].tid_tbl_lock);
+                }
+                INIT_LIST_HEAD(&priv->tx_ba_stream_tbl_ptr);
+                INIT_LIST_HEAD(&priv->rx_reorder_tbl_ptr);
+
+                spin_lock_init(&priv->tx_ba_stream_tbl_lock);
+                spin_lock_init(&priv->rx_reorder_tbl_lock);
+        }
+
+        return 0;
+}
+
+/*
+ *  This function releases the lock variables and frees the locks and
+ *  associated locks.
+ */
+void mwifiex_free_lock_list(struct mwifiex_adapter *adapter)
+{
+        struct mwifiex_private *priv = NULL;
+        s32           i = 0;
+        s32           j = 0;
+
+        /* Free lists */
+        list_del(&adapter->cmd_free_q);
+        list_del(&adapter->cmd_pending_q);
+        list_del(&adapter->scan_pending_q);
+
+        for (i = 0; i < adapter->priv_num; i++)
+                list_del(&adapter->bss_prio_tbl[i].bss_prio_head);
+
+        for (i = 0; i < adapter->priv_num; i++) {
+                if (adapter->priv[i]) {
+                        priv = adapter->priv[i];
+                        for (j = 0; j < MAX_NUM_TID; ++j)
+                                list_del(&priv->wmm.tid_tbl_ptr[j].ra_list);
+                        list_del(&priv->tx_ba_stream_tbl_ptr);
+                        list_del(&priv->rx_reorder_tbl_ptr);
+                }
+        }
+
+        return;
+}
+
+/*
+ * This function initializes the firmware.
+ *
+ * The following operations are performed sequentially -
+ *      - Allocate adapter structure
+ *      - Initialize the adapter structure
+ *      - Initialize the private structure
+ *      - Add BSS priority tables to the adapter structure
+ *      - For each interface, send the init commands to firmware
+ *      - Send the first command in command pending queue, if available
+ */
+int mwifiex_init_fw(struct mwifiex_adapter *adapter)
+{
+        int ret = 0;
+        struct mwifiex_private *priv = NULL;
+        u8 i = 0;
+        u8 first_sta = true;
+        int is_cmd_pend_q_empty;
+        unsigned long flags;
+
+        adapter->hw_status = MWIFIEX_HW_STATUS_INITIALIZING;
+
+        /* Allocate memory for member of adapter structure */
+        ret = mwifiex_allocate_adapter(adapter);
+        if (ret)
+                return -1;
+
+        /* Initialize adapter structure */
+        mwifiex_init_adapter(adapter);
+
+        for (i = 0; i < adapter->priv_num; i++) {
+                if (adapter->priv[i]) {
+                        priv = adapter->priv[i];
+
+                        /* Initialize private structure */
+                        ret = mwifiex_init_priv(priv);
+                        if (ret)
+                                return -1;
+                }
+        }
+        for (i = 0; i < adapter->priv_num; i++) {
+                if (adapter->priv[i]) {
+                        ret = mwifiex_sta_init_cmd(adapter->priv[i], first_sta);
+                        if (ret == -1)
+                                return -1;
+
+                        first_sta = false;
+                }
+        }
+
+        spin_lock_irqsave(&adapter->cmd_pending_q_lock, flags);
+        is_cmd_pend_q_empty = list_empty(&adapter->cmd_pending_q);
+        spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, flags);
+        if (!is_cmd_pend_q_empty) {
+                /* Send the first command in queue and return */
+                if (mwifiex_main_process(adapter) != -1)
+                        ret = -EINPROGRESS;
+        } else {
+                adapter->hw_status = MWIFIEX_HW_STATUS_READY;
+        }
+
+        return ret;
+}
+
+/*
+ * This function deletes the BSS priority tables.
+ *
+ * The function traverses through all the allocated BSS priority nodes
+ * in every BSS priority table and frees them.
+ */
+static void mwifiex_delete_bss_prio_tbl(struct mwifiex_private *priv)
+{
+        int i;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct mwifiex_bss_prio_node *bssprio_node = NULL, *tmp_node = NULL,
+                                                                **cur = NULL;
+        struct list_head *head;
+        spinlock_t *lock;
+        unsigned long flags;
+
+        for (i = 0; i < adapter->priv_num; ++i) {
+                head = &adapter->bss_prio_tbl[i].bss_prio_head;
+                cur = &adapter->bss_prio_tbl[i].bss_prio_cur;
+                lock = &adapter->bss_prio_tbl[i].bss_prio_lock;
+                dev_dbg(adapter->dev, "info: delete BSS priority table,"
+                                " index = %d, i = %d, head = %p, cur = %p\n",
+                              priv->bss_index, i, head, *cur);
+                if (*cur) {
+                        spin_lock_irqsave(lock, flags);
+                        if (list_empty(head)) {
+                                spin_unlock_irqrestore(lock, flags);
+                                continue;
+                        }
+                        bssprio_node = list_first_entry(head,
+                                        struct mwifiex_bss_prio_node, list);
+                        spin_unlock_irqrestore(lock, flags);
+
+                        list_for_each_entry_safe(bssprio_node, tmp_node, head,
+                                                 list) {
+                                if (bssprio_node->priv == priv) {
+                                        dev_dbg(adapter->dev, "info: Delete "
+                                                "node %p, next = %p\n",
+                                                bssprio_node, tmp_node);
+                                        spin_lock_irqsave(lock, flags);
+                                        list_del(&bssprio_node->list);
+                                        spin_unlock_irqrestore(lock, flags);
+                                        kfree(bssprio_node);
+                                }
+                        }
+                        *cur = (struct mwifiex_bss_prio_node *)head;
+                }
+        }
+}
+
+/*
+ * This function is used to shutdown the driver.
+ *
+ * The following operations are performed sequentially -
+ *      - Check if already shut down
+ *      - Make sure the main process has stopped
+ *      - Clean up the Tx and Rx queues
+ *      - Delete BSS priority tables
+ *      - Free the adapter
+ *      - Notify completion
+ */
+int
+mwifiex_shutdown_drv(struct mwifiex_adapter *adapter)
+{
+        int ret = -EINPROGRESS;
+        struct mwifiex_private *priv = NULL;
+        s32 i = 0;
+        unsigned long flags;
+
+        /* mwifiex already shutdown */
+        if (adapter->hw_status == MWIFIEX_HW_STATUS_NOT_READY)
+                return 0;
+
+        adapter->hw_status = MWIFIEX_HW_STATUS_CLOSING;
+        /* wait for mwifiex_process to complete */
+        if (adapter->mwifiex_processing) {
+                dev_warn(adapter->dev, "main process is still running\n");
+                return ret;
+        }
+
+        /* shut down mwifiex */
+        dev_dbg(adapter->dev, "info: shutdown mwifiex...\n");
+
+        /* Clean up Tx/Rx queues and delete BSS priority table */
+        for (i = 0; i < adapter->priv_num; i++) {
+                if (adapter->priv[i]) {
+                        priv = adapter->priv[i];
+
+                        mwifiex_clean_txrx(priv);
+                        mwifiex_delete_bss_prio_tbl(priv);
+                }
+        }
+
+        spin_lock_irqsave(&adapter->mwifiex_lock, flags);
+
+        /* Free adapter structure */
+        mwifiex_free_adapter(adapter);
+
+        spin_unlock_irqrestore(&adapter->mwifiex_lock, flags);
+
+        /* Notify completion */
+        ret = mwifiex_shutdown_fw_complete(adapter);
+
+        return ret;
+}
+
+/*
+ * This function downloads the firmware to the card.
+ *
+ * The actual download is preceded by two sanity checks -
+ *      - Check if firmware is already running
+ *      - Check if the interface is the winner to download the firmware
+ *
+ * ...and followed by another -
+ *      - Check if the firmware is downloaded successfully
+ *
+ * After download is successfully completed, the host interrupts are enabled.
+ */
+int mwifiex_dnld_fw(struct mwifiex_adapter *adapter,
+                    struct mwifiex_fw_image *pmfw)
+{
+        int ret = 0;
+        u32 poll_num = 1;
+        int winner;
+
+        /* Check if firmware is already running */
+        ret = adapter->if_ops.check_fw_status(adapter, poll_num, &winner);
+        if (!ret) {
+                dev_notice(adapter->dev,
+                                "WLAN FW already running! Skip FW download\n");
+                goto done;
+        }
+        poll_num = MAX_FIRMWARE_POLL_TRIES;
+
+        /* Check if we are the winner for downloading FW */
+        if (!winner) {
+                dev_notice(adapter->dev,
+                                "Other interface already running!"
+                                " Skip FW download\n");
+                poll_num = MAX_MULTI_INTERFACE_POLL_TRIES;
+                goto poll_fw;
+        }
+        if (pmfw) {
+                /* Download firmware with helper */
+                ret = adapter->if_ops.prog_fw(adapter, pmfw);
+                if (ret) {
+                        dev_err(adapter->dev, "prog_fw failed ret=%#x\n", ret);
+                        return ret;
+                }
+        }
+
+poll_fw:
+        /* Check if the firmware is downloaded successfully or not */
+        ret = adapter->if_ops.check_fw_status(adapter, poll_num, NULL);
+        if (ret) {
+                dev_err(adapter->dev, "FW failed to be active in time\n");
+                return -1;
+        }
+done:
+        /* re-enable host interrupt for mwifiex after fw dnld is successful */
+        adapter->if_ops.enable_int(adapter);
+        return ret;
+}
diff --git a/drivers/net/wireless/mwifiex/ioctl.h b/drivers/net/wireless/mwifiex/ioctl.h
new file mode 100644
index 00000000000..d6babfb1495
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/ioctl.h
@@ -0,0 +1,433 @@
+/*
+ * Marvell Wireless LAN device driver: ioctl data structures & APIs
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#ifndef _MWIFIEX_IOCTL_H_
+#define _MWIFIEX_IOCTL_H_
+
+#include <net/mac80211.h>
+
+enum {
+        MWIFIEX_SCAN_MODE_UNCHANGED = 0,
+        MWIFIEX_SCAN_MODE_BSS,
+        MWIFIEX_SCAN_MODE_IBSS,
+        MWIFIEX_SCAN_MODE_ANY
+};
+
+enum {
+        MWIFIEX_SCAN_TYPE_UNCHANGED = 0,
+        MWIFIEX_SCAN_TYPE_ACTIVE,
+        MWIFIEX_SCAN_TYPE_PASSIVE
+};
+
+struct mwifiex_get_scan_table_fixed {
+        u8 bssid[ETH_ALEN];
+        u8 channel;
+        u8 rssi;
+        long long network_tsf;
+};
+
+struct mwifiex_scan_time_params {
+        u32 specific_scan_time;
+        u32 active_scan_time;
+        u32 passive_scan_time;
+};
+
+struct mwifiex_user_scan {
+        u32 scan_cfg_len;
+        u8 scan_cfg_buf[1];
+};
+
+struct mwifiex_scan_req {
+        u32 scan_mode;
+        u32 scan_type;
+        struct mwifiex_802_11_ssid scan_ssid;
+        struct mwifiex_scan_time_params scan_time;
+        struct mwifiex_user_scan user_scan;
+};
+
+struct mwifiex_scan_resp {
+        u32 num_in_scan_table;
+        u8 *scan_table;
+};
+
+enum {
+        MWIFIEX_BSS_MODE_INFRA = 1,
+        MWIFIEX_BSS_MODE_IBSS,
+        MWIFIEX_BSS_MODE_AUTO
+};
+
+#define MWIFIEX_PROMISC_MODE            1
+#define MWIFIEX_MULTICAST_MODE          2
+#define MWIFIEX_ALL_MULTI_MODE          4
+#define MWIFIEX_MAX_MULTICAST_LIST_SIZE 32
+
+struct mwifiex_multicast_list {
+        u32 mode;
+        u32 num_multicast_addr;
+        u8 mac_list[MWIFIEX_MAX_MULTICAST_LIST_SIZE][ETH_ALEN];
+};
+
+#define MWIFIEX_MAX_CHANNEL_NUM         128
+
+struct mwifiex_chan_freq {
+        u32 channel;
+        u32 freq;
+};
+
+struct mwifiex_chan_list {
+        u32 num_of_chan;
+        struct mwifiex_chan_freq cf[MWIFIEX_MAX_CHANNEL_NUM];
+};
+
+struct mwifiex_ssid_bssid {
+        struct mwifiex_802_11_ssid ssid;
+        u8 bssid[ETH_ALEN];
+};
+
+enum {
+        BAND_B = 1,
+        BAND_G = 2,
+        BAND_A = 4,
+        BAND_GN = 8,
+        BAND_AN = 16,
+};
+
+#define NO_SEC_CHANNEL               0
+#define SEC_CHANNEL_ABOVE            1
+#define SEC_CHANNEL_BELOW            3
+
+struct mwifiex_ds_band_cfg {
+        u32 config_bands;
+        u32 adhoc_start_band;
+        u32 adhoc_channel;
+        u32 sec_chan_offset;
+};
+
+enum {
+        ADHOC_IDLE,
+        ADHOC_STARTED,
+        ADHOC_JOINED,
+        ADHOC_COALESCED
+};
+
+struct mwifiex_ds_get_stats {
+        u32 mcast_tx_frame;
+        u32 failed;
+        u32 retry;
+        u32 multi_retry;
+        u32 frame_dup;
+        u32 rts_success;
+        u32 rts_failure;
+        u32 ack_failure;
+        u32 rx_frag;
+        u32 mcast_rx_frame;
+        u32 fcs_error;
+        u32 tx_frame;
+        u32 wep_icv_error[4];
+};
+
+#define BCN_RSSI_LAST_MASK              0x00000001
+#define BCN_RSSI_AVG_MASK               0x00000002
+#define DATA_RSSI_LAST_MASK             0x00000004
+#define DATA_RSSI_AVG_MASK              0x00000008
+#define BCN_SNR_LAST_MASK               0x00000010
+#define BCN_SNR_AVG_MASK                0x00000020
+#define DATA_SNR_LAST_MASK              0x00000040
+#define DATA_SNR_AVG_MASK               0x00000080
+#define BCN_NF_LAST_MASK                0x00000100
+#define BCN_NF_AVG_MASK                 0x00000200
+#define DATA_NF_LAST_MASK               0x00000400
+#define DATA_NF_AVG_MASK                0x00000800
+#define ALL_RSSI_INFO_MASK              0x00000fff
+
+struct mwifiex_ds_get_signal {
+        /*
+         * Bit0:  Last Beacon RSSI,  Bit1:  Average Beacon RSSI,
+         * Bit2:  Last Data RSSI,    Bit3:  Average Data RSSI,
+         * Bit4:  Last Beacon SNR,   Bit5:  Average Beacon SNR,
+         * Bit6:  Last Data SNR,     Bit7:  Average Data SNR,
+         * Bit8:  Last Beacon NF,    Bit9:  Average Beacon NF,
+         * Bit10: Last Data NF,      Bit11: Average Data NF
+         */
+        u16 selector;
+        s16 bcn_rssi_last;
+        s16 bcn_rssi_avg;
+        s16 data_rssi_last;
+        s16 data_rssi_avg;
+        s16 bcn_snr_last;
+        s16 bcn_snr_avg;
+        s16 data_snr_last;
+        s16 data_snr_avg;
+        s16 bcn_nf_last;
+        s16 bcn_nf_avg;
+        s16 data_nf_last;
+        s16 data_nf_avg;
+};
+
+struct mwifiex_fw_info {
+        u32 fw_ver;
+        u8 mac_addr[ETH_ALEN];
+};
+
+#define MWIFIEX_MAX_VER_STR_LEN    128
+
+struct mwifiex_ver_ext {
+        u32 version_str_sel;
+        char version_str[MWIFIEX_MAX_VER_STR_LEN];
+};
+
+struct mwifiex_bss_info {
+        u32 bss_mode;
+        struct mwifiex_802_11_ssid ssid;
+        u32 scan_table_idx;
+        u32 bss_chan;
+        u32 region_code;
+        u32 media_connected;
+        u32 radio_on;
+        u32 max_power_level;
+        u32 min_power_level;
+        u32 adhoc_state;
+        signed int bcn_nf_last;
+        u32 wep_status;
+        u32 is_hs_configured;
+        u32 is_deep_sleep;
+        u8 bssid[ETH_ALEN];
+};
+
+#define MAX_NUM_TID     8
+
+#define MAX_RX_WINSIZE  64
+
+struct mwifiex_ds_rx_reorder_tbl {
+        u16 tid;
+        u8 ta[ETH_ALEN];
+        u32 start_win;
+        u32 win_size;
+        u32 buffer[MAX_RX_WINSIZE];
+};
+
+struct mwifiex_ds_tx_ba_stream_tbl {
+        u16 tid;
+        u8 ra[ETH_ALEN];
+};
+
+#define DBG_CMD_NUM     5
+
+struct mwifiex_debug_info {
+        u32 int_counter;
+        u32 packets_out[MAX_NUM_TID];
+        u32 max_tx_buf_size;
+        u32 tx_buf_size;
+        u32 curr_tx_buf_size;
+        u32 tx_tbl_num;
+        struct mwifiex_ds_tx_ba_stream_tbl
+                tx_tbl[MWIFIEX_MAX_TX_BASTREAM_SUPPORTED];
+        u32 rx_tbl_num;
+        struct mwifiex_ds_rx_reorder_tbl rx_tbl
+                [MWIFIEX_MAX_RX_BASTREAM_SUPPORTED];
+        u16 ps_mode;
+        u32 ps_state;
+        u8 is_deep_sleep;
+        u8 pm_wakeup_card_req;
+        u32 pm_wakeup_fw_try;
+        u8 is_hs_configured;
+        u8 hs_activated;
+        u32 num_cmd_host_to_card_failure;
+        u32 num_cmd_sleep_cfm_host_to_card_failure;
+        u32 num_tx_host_to_card_failure;
+        u32 num_event_deauth;
+        u32 num_event_disassoc;
+        u32 num_event_link_lost;
+        u32 num_cmd_deauth;
+        u32 num_cmd_assoc_success;
+        u32 num_cmd_assoc_failure;
+        u32 num_tx_timeout;
+        u32 num_cmd_timeout;
+        u16 timeout_cmd_id;
+        u16 timeout_cmd_act;
+        u16 last_cmd_id[DBG_CMD_NUM];
+        u16 last_cmd_act[DBG_CMD_NUM];
+        u16 last_cmd_index;
+        u16 last_cmd_resp_id[DBG_CMD_NUM];
+        u16 last_cmd_resp_index;
+        u16 last_event[DBG_CMD_NUM];
+        u16 last_event_index;
+        u8 data_sent;
+        u8 cmd_sent;
+        u8 cmd_resp_received;
+        u8 event_received;
+};
+
+enum {
+        MWIFIEX_AUTH_MODE_OPEN = 0x00,
+        MWIFIEX_AUTH_MODE_SHARED = 0x01,
+        MWIFIEX_AUTH_MODE_NETWORKEAP = 0x80,
+        MWIFIEX_AUTH_MODE_AUTO = 0xFF,
+};
+
+enum {
+        MWIFIEX_ENCRYPTION_MODE_NONE = 0,
+        MWIFIEX_ENCRYPTION_MODE_WEP40 = 1,
+        MWIFIEX_ENCRYPTION_MODE_TKIP = 2,
+        MWIFIEX_ENCRYPTION_MODE_CCMP = 3,
+        MWIFIEX_ENCRYPTION_MODE_WEP104 = 4,
+};
+
+#define MWIFIEX_KEY_INDEX_UNICAST       0x40000000
+#define MWIFIEX_MAX_KEY_LENGTH          32
+#define WAPI_RXPN_LEN                   16
+
+struct mwifiex_ds_encrypt_key {
+        u32 key_disable;
+        u32 key_index;
+        u32 key_len;
+        u8 key_material[MWIFIEX_MAX_KEY_LENGTH];
+        u8 mac_addr[ETH_ALEN];
+        u32 is_wapi_key;
+        u8 wapi_rxpn[WAPI_RXPN_LEN];
+};
+
+struct mwifiex_rate_cfg {
+        u32 action;
+        u32 is_rate_auto;
+        u32 rate;
+};
+
+struct mwifiex_data_rate {
+        u32 tx_data_rate;
+        u32 rx_data_rate;
+};
+
+struct mwifiex_power_cfg {
+        u32 is_power_auto;
+        u32 power_level;
+};
+
+struct mwifiex_ds_hs_cfg {
+        u32 is_invoke_hostcmd;
+        /*  Bit0: non-unicast data
+         *  Bit1: unicast data
+         *  Bit2: mac events
+         *  Bit3: magic packet
+         */
+        u32 conditions;
+        u32 gpio;
+        u32 gap;
+};
+
+#define DEEP_SLEEP_ON  1
+#define DEEP_SLEEP_OFF 0
+
+#define DEEP_SLEEP_IDLE_TIME    100
+
+struct mwifiex_ds_auto_ds {
+        u16 auto_ds;
+        u16 idle_time;
+};
+
+#define PS_MODE_UNCHANGED                       0
+#define PS_MODE_AUTO                            1
+#define PS_MODE_POLL                            2
+#define PS_MODE_NULL                            3
+
+
+struct mwifiex_ds_pm_cfg {
+        union {
+                u32 ps_mode;
+                struct mwifiex_ds_hs_cfg hs_cfg;
+                struct mwifiex_ds_auto_ds auto_deep_sleep;
+                u32 sleep_period;
+        } param;
+};
+
+struct mwifiex_ioctl_wmm_queue_status_ac {
+        u8 wmm_acm;
+        u8 flow_required;
+        u8 flow_created;
+        u8 disabled;
+};
+
+struct mwifiex_ds_wmm_queue_status {
+        struct mwifiex_ioctl_wmm_queue_status_ac
+                ac_status[IEEE80211_MAX_QUEUES];
+};
+
+struct mwifiex_ds_11n_tx_cfg {
+        u16 tx_htcap;
+        u16 tx_htinfo;
+};
+
+struct mwifiex_ds_11n_amsdu_aggr_ctrl {
+        u16 enable;
+        u16 curr_buf_size;
+};
+
+#define MWIFIEX_NUM_OF_CMD_BUFFER       20
+#define MWIFIEX_SIZE_OF_CMD_BUFFER      2048
+
+enum {
+        MWIFIEX_IE_TYPE_GEN_IE = 0,
+        MWIFIEX_IE_TYPE_ARP_FILTER,
+};
+
+enum {
+        MWIFIEX_REG_MAC = 1,
+        MWIFIEX_REG_BBP,
+        MWIFIEX_REG_RF,
+        MWIFIEX_REG_PMIC,
+        MWIFIEX_REG_CAU,
+};
+
+struct mwifiex_ds_reg_rw {
+        __le32 type;
+        __le32 offset;
+        __le32 value;
+};
+
+#define MAX_EEPROM_DATA 256
+
+struct mwifiex_ds_read_eeprom {
+        __le16 offset;
+        __le16 byte_count;
+        u8 value[MAX_EEPROM_DATA];
+};
+
+struct mwifiex_ds_misc_gen_ie {
+        u32 type;
+        u32 len;
+        u8 ie_data[IW_CUSTOM_MAX];
+};
+
+struct mwifiex_ds_misc_cmd {
+        u32 len;
+        u8 cmd[MWIFIEX_SIZE_OF_CMD_BUFFER];
+};
+
+#define MWIFIEX_MAX_VSIE_LEN       (256)
+#define MWIFIEX_MAX_VSIE_NUM       (8)
+#define MWIFIEX_VSIE_MASK_SCAN     0x01
+#define MWIFIEX_VSIE_MASK_ASSOC    0x02
+#define MWIFIEX_VSIE_MASK_ADHOC    0x04
+
+enum {
+        MWIFIEX_FUNC_INIT = 1,
+        MWIFIEX_FUNC_SHUTDOWN,
+};
+
+#endif /* !_MWIFIEX_IOCTL_H_ */
diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
new file mode 100644
index 00000000000..d06f4c2d1d3
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -0,0 +1,1464 @@
+/*
+ * Marvell Wireless LAN device driver: association and ad-hoc start/join
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+#include "11n.h"
+
+#define CAPINFO_MASK    (~(BIT(15) | BIT(14) | BIT(12) | BIT(11) | BIT(9)))
+
+/*
+ * Append a generic IE as a pass through TLV to a TLV buffer.
+ *
+ * This function is called from the network join command preparation routine.
+ *
+ * If the IE buffer has been setup by the application, this routine appends
+ * the buffer as a pass through TLV type to the request.
+ */
+static int
+mwifiex_cmd_append_generic_ie(struct mwifiex_private *priv, u8 **buffer)
+{
+        int ret_len = 0;
+        struct mwifiex_ie_types_header ie_header;
+
+        /* Null Checks */
+        if (!buffer)
+                return 0;
+        if (!(*buffer))
+                return 0;
+
+        /*
+         * If there is a generic ie buffer setup, append it to the return
+         *   parameter buffer pointer.
+         */
+        if (priv->gen_ie_buf_len) {
+                dev_dbg(priv->adapter->dev, "info: %s: append generic %d to %p\n",
+                                __func__, priv->gen_ie_buf_len, *buffer);
+
+                /* Wrap the generic IE buffer with a pass through TLV type */
+                ie_header.type = cpu_to_le16(TLV_TYPE_PASSTHROUGH);
+                ie_header.len = cpu_to_le16(priv->gen_ie_buf_len);
+                memcpy(*buffer, &ie_header, sizeof(ie_header));
+
+                /* Increment the return size and the return buffer pointer
+                   param */
+                *buffer += sizeof(ie_header);
+                ret_len += sizeof(ie_header);
+
+                /* Copy the generic IE buffer to the output buffer, advance
+                   pointer */
+                memcpy(*buffer, priv->gen_ie_buf, priv->gen_ie_buf_len);
+
+                /* Increment the return size and the return buffer pointer
+                   param */
+                *buffer += priv->gen_ie_buf_len;
+                ret_len += priv->gen_ie_buf_len;
+
+                /* Reset the generic IE buffer */
+                priv->gen_ie_buf_len = 0;
+        }
+
+        /* return the length appended to the buffer */
+        return ret_len;
+}
+
+/*
+ * Append TSF tracking info from the scan table for the target AP.
+ *
+ * This function is called from the network join command preparation routine.
+ *
+ * The TSF table TSF sent to the firmware contains two TSF values:
+ *      - The TSF of the target AP from its previous beacon/probe response
+ *      - The TSF timestamp of our local MAC at the time we observed the
+ *        beacon/probe response.
+ *
+ * The firmware uses the timestamp values to set an initial TSF value
+ * in the MAC for the new association after a reassociation attempt.
+ */
+static int
+mwifiex_cmd_append_tsf_tlv(struct mwifiex_private *priv, u8 **buffer,
+                           struct mwifiex_bssdescriptor *bss_desc)
+{
+        struct mwifiex_ie_types_tsf_timestamp tsf_tlv;
+        long long tsf_val;
+
+        /* Null Checks */
+        if (buffer == NULL)
+                return 0;
+        if (*buffer == NULL)
+                return 0;
+
+        memset(&tsf_tlv, 0x00, sizeof(struct mwifiex_ie_types_tsf_timestamp));
+
+        tsf_tlv.header.type = cpu_to_le16(TLV_TYPE_TSFTIMESTAMP);
+        tsf_tlv.header.len = cpu_to_le16(2 * sizeof(tsf_val));
+
+        memcpy(*buffer, &tsf_tlv, sizeof(tsf_tlv.header));
+        *buffer += sizeof(tsf_tlv.header);
+
+        memcpy(*buffer, &tsf_val, sizeof(tsf_val));
+        *buffer += sizeof(tsf_val);
+
+        memcpy(&tsf_val, bss_desc->time_stamp, sizeof(tsf_val));
+
+        dev_dbg(priv->adapter->dev, "info: %s: TSF offset calc: %016llx - "
+                        "%016llx\n", __func__, tsf_val, bss_desc->network_tsf);
+
+        memcpy(*buffer, &tsf_val, sizeof(tsf_val));
+        *buffer += sizeof(tsf_val);
+
+        return sizeof(tsf_tlv.header) + (2 * sizeof(tsf_val));
+}
+
+/*
+ * This function finds out the common rates between rate1 and rate2.
+ *
+ * It will fill common rates in rate1 as output if found.
+ *
+ * NOTE: Setting the MSB of the basic rates needs to be taken
+ * care of, either before or after calling this function.
+ */
+static int mwifiex_get_common_rates(struct mwifiex_private *priv, u8 *rate1,
+                                    u32 rate1_size, u8 *rate2, u32 rate2_size)
+{
+        int ret = 0;
+        u8 *ptr = rate1;
+        u8 *tmp = NULL;
+        u32 i, j;
+
+        tmp = kmalloc(rate1_size, GFP_KERNEL);
+        if (!tmp) {
+                dev_err(priv->adapter->dev, "failed to alloc tmp buf\n");
+                return -ENOMEM;
+        }
+
+        memcpy(tmp, rate1, rate1_size);
+        memset(rate1, 0, rate1_size);
+
+        for (i = 0; rate2[i] && i < rate2_size; i++) {
+                for (j = 0; tmp[j] && j < rate1_size; j++) {
+                        /* Check common rate, excluding the bit for
+                           basic rate */
+                        if ((rate2[i] & 0x7F) == (tmp[j] & 0x7F)) {
+                                *rate1++ = tmp[j];
+                                break;
+                        }
+                }
+        }
+
+        dev_dbg(priv->adapter->dev, "info: Tx data rate set to %#x\n",
+                                                priv->data_rate);
+
+        if (!priv->is_data_rate_auto) {
+                while (*ptr) {
+                        if ((*ptr & 0x7f) == priv->data_rate) {
+                                ret = 0;
+                                goto done;
+                        }
+                        ptr++;
+                }
+                dev_err(priv->adapter->dev, "previously set fixed data rate %#x"
+                        " is not compatible with the network\n",
+                        priv->data_rate);
+
+                ret = -1;
+                goto done;
+        }
+
+        ret = 0;
+done:
+        kfree(tmp);
+        return ret;
+}
+
+/*
+ * This function creates the intersection of the rates supported by a
+ * target BSS and our adapter settings for use in an assoc/join command.
+ */
+static int
+mwifiex_setup_rates_from_bssdesc(struct mwifiex_private *priv,
+                                 struct mwifiex_bssdescriptor *bss_desc,
+                                 u8 *out_rates, u32 *out_rates_size)
+{
+        u8 card_rates[MWIFIEX_SUPPORTED_RATES];
+        u32 card_rates_size = 0;
+
+        /* Copy AP supported rates */
+        memcpy(out_rates, bss_desc->supported_rates, MWIFIEX_SUPPORTED_RATES);
+        /* Get the STA supported rates */
+        card_rates_size = mwifiex_get_active_data_rates(priv, card_rates);
+        /* Get the common rates between AP and STA supported rates */
+        if (mwifiex_get_common_rates(priv, out_rates, MWIFIEX_SUPPORTED_RATES,
+                                     card_rates, card_rates_size)) {
+                *out_rates_size = 0;
+                dev_err(priv->adapter->dev, "%s: cannot get common rates\n",
+                                                __func__);
+                return -1;
+        }
+
+        *out_rates_size =
+                min_t(size_t, strlen(out_rates), MWIFIEX_SUPPORTED_RATES);
+
+        return 0;
+}
+
+/*
+ * This function updates the scan entry TSF timestamps to reflect
+ * a new association.
+ */
+static void
+mwifiex_update_tsf_timestamps(struct mwifiex_private *priv,
+                              struct mwifiex_bssdescriptor *new_bss_desc)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        u32 table_idx;
+        long long new_tsf_base;
+        signed long long tsf_delta;
+
+        memcpy(&new_tsf_base, new_bss_desc->time_stamp, sizeof(new_tsf_base));
+
+        tsf_delta = new_tsf_base - new_bss_desc->network_tsf;
+
+        dev_dbg(adapter->dev, "info: TSF: update TSF timestamps, "
+                "0x%016llx -> 0x%016llx\n",
+               new_bss_desc->network_tsf, new_tsf_base);
+
+        for (table_idx = 0; table_idx < adapter->num_in_scan_table;
+             table_idx++)
+                adapter->scan_table[table_idx].network_tsf += tsf_delta;
+}
+
+/*
+ * This function appends a WAPI IE.
+ *
+ * This function is called from the network join command preparation routine.
+ *
+ * If the IE buffer has been setup by the application, this routine appends
+ * the buffer as a WAPI TLV type to the request.
+ */
+static int
+mwifiex_cmd_append_wapi_ie(struct mwifiex_private *priv, u8 **buffer)
+{
+        int retLen = 0;
+        struct mwifiex_ie_types_header ie_header;
+
+        /* Null Checks */
+        if (buffer == NULL)
+                return 0;
+        if (*buffer == NULL)
+                return 0;
+
+        /*
+         * If there is a wapi ie buffer setup, append it to the return
+         *   parameter buffer pointer.
+         */
+        if (priv->wapi_ie_len) {
+                dev_dbg(priv->adapter->dev, "cmd: append wapi ie %d to %p\n",
+                                priv->wapi_ie_len, *buffer);
+
+                /* Wrap the generic IE buffer with a pass through TLV type */
+                ie_header.type = cpu_to_le16(TLV_TYPE_WAPI_IE);
+                ie_header.len = cpu_to_le16(priv->wapi_ie_len);
+                memcpy(*buffer, &ie_header, sizeof(ie_header));
+
+                /* Increment the return size and the return buffer pointer
+                   param */
+                *buffer += sizeof(ie_header);
+                retLen += sizeof(ie_header);
+
+                /* Copy the wapi IE buffer to the output buffer, advance
+                   pointer */
+                memcpy(*buffer, priv->wapi_ie, priv->wapi_ie_len);
+
+                /* Increment the return size and the return buffer pointer
+                   param */
+                *buffer += priv->wapi_ie_len;
+                retLen += priv->wapi_ie_len;
+
+        }
+        /* return the length appended to the buffer */
+        return retLen;
+}
+
+/*
+ * This function appends rsn ie tlv for wpa/wpa2 security modes.
+ * It is called from the network join command preparation routine.
+ */
+static int mwifiex_append_rsn_ie_wpa_wpa2(struct mwifiex_private *priv,
+                                          u8 **buffer)
+{
+        struct mwifiex_ie_types_rsn_param_set *rsn_ie_tlv;
+        int rsn_ie_len;
+
+        if (!buffer || !(*buffer))
+                return 0;
+
+        rsn_ie_tlv = (struct mwifiex_ie_types_rsn_param_set *) (*buffer);
+        rsn_ie_tlv->header.type = cpu_to_le16((u16) priv->wpa_ie[0]);
+        rsn_ie_tlv->header.type = cpu_to_le16(
+                                 le16_to_cpu(rsn_ie_tlv->header.type) & 0x00FF);
+        rsn_ie_tlv->header.len = cpu_to_le16((u16) priv->wpa_ie[1]);
+        rsn_ie_tlv->header.len = cpu_to_le16(le16_to_cpu(rsn_ie_tlv->header.len)
+                                                        & 0x00FF);
+        if (le16_to_cpu(rsn_ie_tlv->header.len) <= (sizeof(priv->wpa_ie) - 2))
+                memcpy(rsn_ie_tlv->rsn_ie, &priv->wpa_ie[2],
+                                        le16_to_cpu(rsn_ie_tlv->header.len));
+        else
+                return -1;
+
+        rsn_ie_len = sizeof(rsn_ie_tlv->header) +
+                                        le16_to_cpu(rsn_ie_tlv->header.len);
+        *buffer += rsn_ie_len;
+
+        return rsn_ie_len;
+}
+
+/*
+ * This function prepares command for association.
+ *
+ * This sets the following parameters -
+ *      - Peer MAC address
+ *      - Listen interval
+ *      - Beacon interval
+ *      - Capability information
+ *
+ * ...and the following TLVs, as required -
+ *      - SSID TLV
+ *      - PHY TLV
+ *      - SS TLV
+ *      - Rates TLV
+ *      - Authentication TLV
+ *      - Channel TLV
+ *      - WPA/WPA2 IE
+ *      - 11n TLV
+ *      - Vendor specific TLV
+ *      - WMM TLV
+ *      - WAPI IE
+ *      - Generic IE
+ *      - TSF TLV
+ *
+ * Preparation also includes -
+ *      - Setting command ID and proper size
+ *      - Ensuring correct endian-ness
+ */
+int mwifiex_cmd_802_11_associate(struct mwifiex_private *priv,
+                                 struct host_cmd_ds_command *cmd,
+                                 void *data_buf)
+{
+        struct host_cmd_ds_802_11_associate *assoc = &cmd->params.associate;
+        struct mwifiex_bssdescriptor *bss_desc;
+        struct mwifiex_ie_types_ssid_param_set *ssid_tlv;
+        struct mwifiex_ie_types_phy_param_set *phy_tlv;
+        struct mwifiex_ie_types_ss_param_set *ss_tlv;
+        struct mwifiex_ie_types_rates_param_set *rates_tlv;
+        struct mwifiex_ie_types_auth_type *auth_tlv;
+        struct mwifiex_ie_types_chan_list_param_set *chan_tlv;
+        u8 rates[MWIFIEX_SUPPORTED_RATES];
+        u32 rates_size;
+        u16 tmp_cap;
+        u8 *pos;
+        int rsn_ie_len = 0;
+
+        bss_desc = (struct mwifiex_bssdescriptor *) data_buf;
+        pos = (u8 *) assoc;
+
+        mwifiex_cfg_tx_buf(priv, bss_desc);
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_ASSOCIATE);
+
+        /* Save so we know which BSS Desc to use in the response handler */
+        priv->attempted_bss_desc = bss_desc;
+
+        memcpy(assoc->peer_sta_addr,
+               bss_desc->mac_address, sizeof(assoc->peer_sta_addr));
+        pos += sizeof(assoc->peer_sta_addr);
+
+        /* Set the listen interval */
+        assoc->listen_interval = cpu_to_le16(priv->listen_interval);
+        /* Set the beacon period */
+        assoc->beacon_period = cpu_to_le16(bss_desc->beacon_period);
+
+        pos += sizeof(assoc->cap_info_bitmap);
+        pos += sizeof(assoc->listen_interval);
+        pos += sizeof(assoc->beacon_period);
+        pos += sizeof(assoc->dtim_period);
+
+        ssid_tlv = (struct mwifiex_ie_types_ssid_param_set *) pos;
+        ssid_tlv->header.type = cpu_to_le16(WLAN_EID_SSID);
+        ssid_tlv->header.len = cpu_to_le16((u16) bss_desc->ssid.ssid_len);
+        memcpy(ssid_tlv->ssid, bss_desc->ssid.ssid,
+                le16_to_cpu(ssid_tlv->header.len));
+        pos += sizeof(ssid_tlv->header) + le16_to_cpu(ssid_tlv->header.len);
+
+        phy_tlv = (struct mwifiex_ie_types_phy_param_set *) pos;
+        phy_tlv->header.type = cpu_to_le16(WLAN_EID_DS_PARAMS);
+        phy_tlv->header.len = cpu_to_le16(sizeof(phy_tlv->fh_ds.ds_param_set));
+        memcpy(&phy_tlv->fh_ds.ds_param_set,
+               &bss_desc->phy_param_set.ds_param_set.current_chan,
+               sizeof(phy_tlv->fh_ds.ds_param_set));
+        pos += sizeof(phy_tlv->header) + le16_to_cpu(phy_tlv->header.len);
+
+        ss_tlv = (struct mwifiex_ie_types_ss_param_set *) pos;
+        ss_tlv->header.type = cpu_to_le16(WLAN_EID_CF_PARAMS);
+        ss_tlv->header.len = cpu_to_le16(sizeof(ss_tlv->cf_ibss.cf_param_set));
+        pos += sizeof(ss_tlv->header) + le16_to_cpu(ss_tlv->header.len);
+
+        /* Get the common rates supported between the driver and the BSS Desc */
+        if (mwifiex_setup_rates_from_bssdesc
+            (priv, bss_desc, rates, &rates_size))
+                return -1;
+
+        /* Save the data rates into Current BSS state structure */
+        priv->curr_bss_params.num_of_rates = rates_size;
+        memcpy(&priv->curr_bss_params.data_rates, rates, rates_size);
+
+        /* Setup the Rates TLV in the association command */
+        rates_tlv = (struct mwifiex_ie_types_rates_param_set *) pos;
+        rates_tlv->header.type = cpu_to_le16(WLAN_EID_SUPP_RATES);
+        rates_tlv->header.len = cpu_to_le16((u16) rates_size);
+        memcpy(rates_tlv->rates, rates, rates_size);
+        pos += sizeof(rates_tlv->header) + rates_size;
+        dev_dbg(priv->adapter->dev, "info: ASSOC_CMD: rates size = %d\n",
+                                        rates_size);
+
+        /* Add the Authentication type to be used for Auth frames if needed */
+        if (priv->sec_info.authentication_mode != MWIFIEX_AUTH_MODE_AUTO) {
+                auth_tlv = (struct mwifiex_ie_types_auth_type *) pos;
+                auth_tlv->header.type = cpu_to_le16(TLV_TYPE_AUTH_TYPE);
+                auth_tlv->header.len = cpu_to_le16(sizeof(auth_tlv->auth_type));
+                if (priv->sec_info.wep_status == MWIFIEX_802_11_WEP_ENABLED)
+                        auth_tlv->auth_type = cpu_to_le16((u16) priv->sec_info.
+                                                          authentication_mode);
+                else
+                        auth_tlv->auth_type =
+                                cpu_to_le16(MWIFIEX_AUTH_MODE_OPEN);
+                pos += sizeof(auth_tlv->header) +
+                        le16_to_cpu(auth_tlv->header.len);
+        }
+
+        if (IS_SUPPORT_MULTI_BANDS(priv->adapter)
+            && !(ISSUPP_11NENABLED(priv->adapter->fw_cap_info)
+                && (!bss_desc->disable_11n)
+                 && (priv->adapter->config_bands & BAND_GN
+                     || priv->adapter->config_bands & BAND_AN)
+                 && (bss_desc->bcn_ht_cap)
+            )
+                ) {
+                /* Append a channel TLV for the channel the attempted AP was
+                   found on */
+                chan_tlv = (struct mwifiex_ie_types_chan_list_param_set *) pos;
+                chan_tlv->header.type = cpu_to_le16(TLV_TYPE_CHANLIST);
+                chan_tlv->header.len =
+                        cpu_to_le16(sizeof(struct mwifiex_chan_scan_param_set));
+
+                memset(chan_tlv->chan_scan_param, 0x00,
+                       sizeof(struct mwifiex_chan_scan_param_set));
+                chan_tlv->chan_scan_param[0].chan_number =
+                        (bss_desc->phy_param_set.ds_param_set.current_chan);
+                dev_dbg(priv->adapter->dev, "info: Assoc: TLV Chan = %d\n",
+                       chan_tlv->chan_scan_param[0].chan_number);
+
+                chan_tlv->chan_scan_param[0].radio_type =
+                        mwifiex_band_to_radio_type((u8) bss_desc->bss_band);
+
+                dev_dbg(priv->adapter->dev, "info: Assoc: TLV Band = %d\n",
+                       chan_tlv->chan_scan_param[0].radio_type);
+                pos += sizeof(chan_tlv->header) +
+                        sizeof(struct mwifiex_chan_scan_param_set);
+        }
+
+        if (!priv->wps.session_enable) {
+                if (priv->sec_info.wpa_enabled || priv->sec_info.wpa2_enabled)
+                        rsn_ie_len = mwifiex_append_rsn_ie_wpa_wpa2(priv, &pos);
+
+                if (rsn_ie_len == -1)
+                        return -1;
+        }
+
+        if (ISSUPP_11NENABLED(priv->adapter->fw_cap_info)
+                && (!bss_desc->disable_11n)
+            && (priv->adapter->config_bands & BAND_GN
+                || priv->adapter->config_bands & BAND_AN))
+                mwifiex_cmd_append_11n_tlv(priv, bss_desc, &pos);
+
+        /* Append vendor specific IE TLV */
+        mwifiex_cmd_append_vsie_tlv(priv, MWIFIEX_VSIE_MASK_ASSOC, &pos);
+
+        mwifiex_wmm_process_association_req(priv, &pos, &bss_desc->wmm_ie,
+                                            bss_desc->bcn_ht_cap);
+        if (priv->sec_info.wapi_enabled && priv->wapi_ie_len)
+                mwifiex_cmd_append_wapi_ie(priv, &pos);
+
+
+        mwifiex_cmd_append_generic_ie(priv, &pos);
+
+        mwifiex_cmd_append_tsf_tlv(priv, &pos, bss_desc);
+
+        cmd->size = cpu_to_le16((u16) (pos - (u8 *) assoc) + S_DS_GEN);
+
+        /* Set the Capability info at last */
+        tmp_cap = bss_desc->cap_info_bitmap;
+
+        if (priv->adapter->config_bands == BAND_B)
+                SHORT_SLOT_TIME_DISABLED(tmp_cap);
+
+        tmp_cap &= CAPINFO_MASK;
+        dev_dbg(priv->adapter->dev, "info: ASSOC_CMD: tmp_cap=%4X CAPINFO_MASK=%4lX\n",
+               tmp_cap, CAPINFO_MASK);
+        assoc->cap_info_bitmap = cpu_to_le16(tmp_cap);
+
+        return 0;
+}
+
+/*
+ * Association firmware command response handler
+ *
+ * The response buffer for the association command has the following
+ * memory layout.
+ *
+ * For cases where an association response was not received (indicated
+ * by the CapInfo and AId field):
+ *
+ *     .------------------------------------------------------------.
+ *     |  Header(4 * sizeof(t_u16)):  Standard command response hdr |
+ *     .------------------------------------------------------------.
+ *     |  cap_info/Error Return(t_u16):                             |
+ *     |           0xFFFF(-1): Internal error                       |
+ *     |           0xFFFE(-2): Authentication unhandled message     |
+ *     |           0xFFFD(-3): Authentication refused               |
+ *     |           0xFFFC(-4): Timeout waiting for AP response      |
+ *     .------------------------------------------------------------.
+ *     |  status_code(t_u16):                                       |
+ *     |        If cap_info is -1:                                  |
+ *     |           An internal firmware failure prevented the       |
+ *     |           command from being processed.  The status_code   |
+ *     |           will be set to 1.                                |
+ *     |                                                            |
+ *     |        If cap_info is -2:                                  |
+ *     |           An authentication frame was received but was     |
+ *     |           not handled by the firmware.  IEEE Status        |
+ *     |           code for the failure is returned.                |
+ *     |                                                            |
+ *     |        If cap_info is -3:                                  |
+ *     |           An authentication frame was received and the     |
+ *     |           status_code is the IEEE Status reported in the   |
+ *     |           response.                                        |
+ *     |                                                            |
+ *     |        If cap_info is -4:                                  |
+ *     |           (1) Association response timeout                 |
+ *     |           (2) Authentication response timeout              |
+ *     .------------------------------------------------------------.
+ *     |  a_id(t_u16): 0xFFFF                                       |
+ *     .------------------------------------------------------------.
+ *
+ *
+ * For cases where an association response was received, the IEEE
+ * standard association response frame is returned:
+ *
+ *     .------------------------------------------------------------.
+ *     |  Header(4 * sizeof(t_u16)):  Standard command response hdr |
+ *     .------------------------------------------------------------.
+ *     |  cap_info(t_u16): IEEE Capability                          |
+ *     .------------------------------------------------------------.
+ *     |  status_code(t_u16): IEEE Status Code                      |
+ *     .------------------------------------------------------------.
+ *     |  a_id(t_u16): IEEE Association ID                          |
+ *     .------------------------------------------------------------.
+ *     |  IEEE IEs(variable): Any received IEs comprising the       |
+ *     |                      remaining portion of a received       |
+ *     |                      association response frame.           |
+ *     .------------------------------------------------------------.
+ *
+ * For simplistic handling, the status_code field can be used to determine
+ * an association success (0) or failure (non-zero).
+ */
+int mwifiex_ret_802_11_associate(struct mwifiex_private *priv,
+                             struct host_cmd_ds_command *resp, void *wq_buf)
+{
+        int ret = 0;
+        struct mwifiex_wait_queue *wait_queue =
+                (struct mwifiex_wait_queue *) wq_buf;
+        struct ieee_types_assoc_rsp *assoc_rsp;
+        struct mwifiex_bssdescriptor *bss_desc;
+        u8 enable_data = true;
+
+        assoc_rsp = (struct ieee_types_assoc_rsp *) &resp->params;
+
+        priv->assoc_rsp_size = min(le16_to_cpu(resp->size) - S_DS_GEN,
+                                     sizeof(priv->assoc_rsp_buf));
+
+        memcpy(priv->assoc_rsp_buf, &resp->params, priv->assoc_rsp_size);
+
+        if (le16_to_cpu(assoc_rsp->status_code)) {
+                priv->adapter->dbg.num_cmd_assoc_failure++;
+                dev_err(priv->adapter->dev, "ASSOC_RESP: association failed, "
+                       "status code = %d, error = 0x%x, a_id = 0x%x\n",
+                       le16_to_cpu(assoc_rsp->status_code),
+                       le16_to_cpu(assoc_rsp->cap_info_bitmap),
+                       le16_to_cpu(assoc_rsp->a_id));
+
+                ret = -1;
+                goto done;
+        }
+
+        /* Send a Media Connected event, according to the Spec */
+        priv->media_connected = true;
+
+        priv->adapter->ps_state = PS_STATE_AWAKE;
+        priv->adapter->pps_uapsd_mode = false;
+        priv->adapter->tx_lock_flag = false;
+
+        /* Set the attempted BSSID Index to current */
+        bss_desc = priv->attempted_bss_desc;
+
+        dev_dbg(priv->adapter->dev, "info: ASSOC_RESP: %s\n",
+                                                bss_desc->ssid.ssid);
+
+        /* Make a copy of current BSSID descriptor */
+        memcpy(&priv->curr_bss_params.bss_descriptor,
+               bss_desc, sizeof(struct mwifiex_bssdescriptor));
+
+        /* Update curr_bss_params */
+        priv->curr_bss_params.bss_descriptor.channel
+                = bss_desc->phy_param_set.ds_param_set.current_chan;
+
+        priv->curr_bss_params.band = (u8) bss_desc->bss_band;
+
+        /*
+         * Adjust the timestamps in the scan table to be relative to the newly
+         * associated AP's TSF
+         */
+        mwifiex_update_tsf_timestamps(priv, bss_desc);
+
+        if (bss_desc->wmm_ie.vend_hdr.element_id == WLAN_EID_VENDOR_SPECIFIC)
+                priv->curr_bss_params.wmm_enabled = true;
+        else
+                priv->curr_bss_params.wmm_enabled = false;
+
+        if ((priv->wmm_required || bss_desc->bcn_ht_cap)
+                        && priv->curr_bss_params.wmm_enabled)
+                priv->wmm_enabled = true;
+        else
+                priv->wmm_enabled = false;
+
+        priv->curr_bss_params.wmm_uapsd_enabled = false;
+
+        if (priv->wmm_enabled)
+                priv->curr_bss_params.wmm_uapsd_enabled
+                        = ((bss_desc->wmm_ie.qos_info_bitmap &
+                                IEEE80211_WMM_IE_AP_QOSINFO_UAPSD) ? 1 : 0);
+
+        dev_dbg(priv->adapter->dev, "info: ASSOC_RESP: curr_pkt_filter is %#x\n",
+               priv->curr_pkt_filter);
+        if (priv->sec_info.wpa_enabled || priv->sec_info.wpa2_enabled)
+                priv->wpa_is_gtk_set = false;
+
+        if (priv->wmm_enabled) {
+                /* Don't re-enable carrier until we get the WMM_GET_STATUS
+                   event */
+                enable_data = false;
+        } else {
+                /* Since WMM is not enabled, setup the queues with the
+                   defaults */
+                mwifiex_wmm_setup_queue_priorities(priv, NULL);
+                mwifiex_wmm_setup_ac_downgrade(priv);
+        }
+
+        if (enable_data)
+                dev_dbg(priv->adapter->dev,
+                        "info: post association, re-enabling data flow\n");
+
+        /* Reset SNR/NF/RSSI values */
+        priv->data_rssi_last = 0;
+        priv->data_nf_last = 0;
+        priv->data_rssi_avg = 0;
+        priv->data_nf_avg = 0;
+        priv->bcn_rssi_last = 0;
+        priv->bcn_nf_last = 0;
+        priv->bcn_rssi_avg = 0;
+        priv->bcn_nf_avg = 0;
+        priv->rxpd_rate = 0;
+        priv->rxpd_htinfo = 0;
+
+        mwifiex_save_curr_bcn(priv);
+
+        priv->adapter->dbg.num_cmd_assoc_success++;
+
+        dev_dbg(priv->adapter->dev, "info: ASSOC_RESP: associated\n");
+
+        /* Add the ra_list here for infra mode as there will be only 1 ra
+           always */
+        mwifiex_ralist_add(priv,
+                           priv->curr_bss_params.bss_descriptor.mac_address);
+
+        if (!netif_carrier_ok(priv->netdev))
+                netif_carrier_on(priv->netdev);
+        if (netif_queue_stopped(priv->netdev))
+                netif_wake_queue(priv->netdev);
+
+        if (priv->sec_info.wpa_enabled || priv->sec_info.wpa2_enabled)
+                priv->scan_block = true;
+
+done:
+        /* Need to indicate IOCTL complete */
+        if (wait_queue) {
+                if (ret) {
+                        if (assoc_rsp->status_code)
+                                wait_queue->status =
+                                        le16_to_cpu(assoc_rsp->status_code);
+                        else
+                                wait_queue->status = MWIFIEX_ERROR_ASSOC_FAIL;
+                } else {
+                        wait_queue->status = MWIFIEX_ERROR_NO_ERROR;
+                }
+        }
+
+        return ret;
+}
+
+/*
+ * This function prepares command for ad-hoc start.
+ *
+ * Driver will fill up SSID, BSS mode, IBSS parameters, physical
+ * parameters, probe delay, and capability information. Firmware
+ * will fill up beacon period, basic rates and operational rates.
+ *
+ * In addition, the following TLVs are added -
+ *      - Channel TLV
+ *      - Vendor specific IE
+ *      - WPA/WPA2 IE
+ *      - HT Capabilities IE
+ *      - HT Information IE
+ *
+ * Preparation also includes -
+ *      - Setting command ID and proper size
+ *      - Ensuring correct endian-ness
+ */
+int
+mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
+                                struct host_cmd_ds_command *cmd, void *data_buf)
+{
+        int ret = 0, rsn_ie_len = 0;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct host_cmd_ds_802_11_ad_hoc_start *adhoc_start =
+                &cmd->params.adhoc_start;
+        struct mwifiex_bssdescriptor *bss_desc;
+        u32 cmd_append_size = 0;
+        u32 i;
+        u16 tmp_cap;
+        uint16_t ht_cap_info;
+        struct mwifiex_ie_types_chan_list_param_set *chan_tlv;
+
+        struct mwifiex_ie_types_htcap *ht_cap;
+        struct mwifiex_ie_types_htinfo *ht_info;
+        u8 *pos = (u8 *) adhoc_start +
+                        sizeof(struct host_cmd_ds_802_11_ad_hoc_start);
+
+        if (!adapter)
+                return -1;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_AD_HOC_START);
+
+        bss_desc = &priv->curr_bss_params.bss_descriptor;
+        priv->attempted_bss_desc = bss_desc;
+
+        /*
+         * Fill in the parameters for 2 data structures:
+         *   1. struct host_cmd_ds_802_11_ad_hoc_start command
+         *   2. bss_desc
+         * Driver will fill up SSID, bss_mode,IBSS param, Physical Param,
+         * probe delay, and Cap info.
+         * Firmware will fill up beacon period, Basic rates
+         * and operational rates.
+         */
+
+        memset(adhoc_start->ssid, 0, IEEE80211_MAX_SSID_LEN);
+
+        memcpy(adhoc_start->ssid,
+               ((struct mwifiex_802_11_ssid *) data_buf)->ssid,
+               ((struct mwifiex_802_11_ssid *) data_buf)->ssid_len);
+
+        dev_dbg(adapter->dev, "info: ADHOC_S_CMD: SSID = %s\n",
+                                adhoc_start->ssid);
+
+        memset(bss_desc->ssid.ssid, 0, IEEE80211_MAX_SSID_LEN);
+        memcpy(bss_desc->ssid.ssid,
+               ((struct mwifiex_802_11_ssid *) data_buf)->ssid,
+               ((struct mwifiex_802_11_ssid *) data_buf)->ssid_len);
+
+        bss_desc->ssid.ssid_len =
+                ((struct mwifiex_802_11_ssid *) data_buf)->ssid_len;
+
+        /* Set the BSS mode */
+        adhoc_start->bss_mode = HostCmd_BSS_MODE_IBSS;
+        bss_desc->bss_mode = MWIFIEX_BSS_MODE_IBSS;
+        adhoc_start->beacon_period = cpu_to_le16(priv->beacon_period);
+        bss_desc->beacon_period = priv->beacon_period;
+
+        /* Set Physical param set */
+/* Parameter IE Id */
+#define DS_PARA_IE_ID   3
+/* Parameter IE length */
+#define DS_PARA_IE_LEN  1
+
+        adhoc_start->phy_param_set.ds_param_set.element_id = DS_PARA_IE_ID;
+        adhoc_start->phy_param_set.ds_param_set.len = DS_PARA_IE_LEN;
+
+        if (!mwifiex_get_cfp_by_band_and_channel_from_cfg80211
+                        (priv, adapter->adhoc_start_band, (u16)
+                                priv->adhoc_channel)) {
+                struct mwifiex_chan_freq_power *cfp;
+                cfp = mwifiex_get_cfp_by_band_and_channel_from_cfg80211(priv,
+                                adapter->adhoc_start_band, FIRST_VALID_CHANNEL);
+                if (cfp)
+                        priv->adhoc_channel = (u8) cfp->channel;
+        }
+
+        if (!priv->adhoc_channel) {
+                dev_err(adapter->dev, "ADHOC_S_CMD: adhoc_channel cannot be 0\n");
+                return -1;
+        }
+
+        dev_dbg(adapter->dev, "info: ADHOC_S_CMD: creating ADHOC on channel %d\n",
+                                priv->adhoc_channel);
+
+        priv->curr_bss_params.bss_descriptor.channel = priv->adhoc_channel;
+        priv->curr_bss_params.band = adapter->adhoc_start_band;
+
+        bss_desc->channel = priv->adhoc_channel;
+        adhoc_start->phy_param_set.ds_param_set.current_chan =
+                priv->adhoc_channel;
+
+        memcpy(&bss_desc->phy_param_set, &adhoc_start->phy_param_set,
+               sizeof(union ieee_types_phy_param_set));
+
+        /* Set IBSS param set */
+/* IBSS parameter IE Id */
+#define IBSS_PARA_IE_ID   6
+/* IBSS parameter IE length */
+#define IBSS_PARA_IE_LEN  2
+
+        adhoc_start->ss_param_set.ibss_param_set.element_id = IBSS_PARA_IE_ID;
+        adhoc_start->ss_param_set.ibss_param_set.len = IBSS_PARA_IE_LEN;
+        adhoc_start->ss_param_set.ibss_param_set.atim_window
+                = cpu_to_le16(priv->atim_window);
+        memcpy(&bss_desc->ss_param_set, &adhoc_start->ss_param_set,
+               sizeof(union ieee_types_ss_param_set));
+
+        /* Set Capability info */
+        bss_desc->cap_info_bitmap |= WLAN_CAPABILITY_IBSS;
+        tmp_cap = le16_to_cpu(adhoc_start->cap_info_bitmap);
+        tmp_cap &= ~WLAN_CAPABILITY_ESS;
+        tmp_cap |= WLAN_CAPABILITY_IBSS;
+
+        /* Set up privacy in bss_desc */
+        if (priv->sec_info.encryption_mode != MWIFIEX_ENCRYPTION_MODE_NONE) {
+                /* Ad-Hoc capability privacy on */
+                dev_dbg(adapter->dev,
+                        "info: ADHOC_S_CMD: wep_status set privacy to WEP\n");
+                bss_desc->privacy = MWIFIEX_802_11_PRIV_FILTER_8021X_WEP;
+                tmp_cap |= WLAN_CAPABILITY_PRIVACY;
+        } else {
+                dev_dbg(adapter->dev, "info: ADHOC_S_CMD: wep_status NOT set,"
+                                " setting privacy to ACCEPT ALL\n");
+                bss_desc->privacy = MWIFIEX_802_11_PRIV_FILTER_ACCEPT_ALL;
+        }
+
+        memset(adhoc_start->DataRate, 0, sizeof(adhoc_start->DataRate));
+        mwifiex_get_active_data_rates(priv, adhoc_start->DataRate);
+        if ((adapter->adhoc_start_band & BAND_G) &&
+            (priv->curr_pkt_filter & HostCmd_ACT_MAC_ADHOC_G_PROTECTION_ON)) {
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_MAC_CONTROL,
+                                          HostCmd_ACT_GEN_SET,
+                                          0, NULL, &priv->curr_pkt_filter);
+
+                if (ret) {
+                        dev_err(adapter->dev,
+                               "ADHOC_S_CMD: G Protection config failed\n");
+                        return -1;
+                }
+        }
+        /* Find the last non zero */
+        for (i = 0; i < sizeof(adhoc_start->DataRate) &&
+                        adhoc_start->DataRate[i];
+                        i++)
+                        ;
+
+        priv->curr_bss_params.num_of_rates = i;
+
+        /* Copy the ad-hoc creating rates into Current BSS rate structure */
+        memcpy(&priv->curr_bss_params.data_rates,
+               &adhoc_start->DataRate, priv->curr_bss_params.num_of_rates);
+
+        dev_dbg(adapter->dev, "info: ADHOC_S_CMD: rates=%02x %02x %02x %02x\n",
+               adhoc_start->DataRate[0], adhoc_start->DataRate[1],
+               adhoc_start->DataRate[2], adhoc_start->DataRate[3]);
+
+        dev_dbg(adapter->dev, "info: ADHOC_S_CMD: AD-HOC Start command is ready\n");
+
+        if (IS_SUPPORT_MULTI_BANDS(adapter)) {
+                /* Append a channel TLV */
+                chan_tlv = (struct mwifiex_ie_types_chan_list_param_set *) pos;
+                chan_tlv->header.type = cpu_to_le16(TLV_TYPE_CHANLIST);
+                chan_tlv->header.len =
+                        cpu_to_le16(sizeof(struct mwifiex_chan_scan_param_set));
+
+                memset(chan_tlv->chan_scan_param, 0x00,
+                       sizeof(struct mwifiex_chan_scan_param_set));
+                chan_tlv->chan_scan_param[0].chan_number =
+                        (u8) priv->curr_bss_params.bss_descriptor.channel;
+
+                dev_dbg(adapter->dev, "info: ADHOC_S_CMD: TLV Chan = %d\n",
+                       chan_tlv->chan_scan_param[0].chan_number);
+
+                chan_tlv->chan_scan_param[0].radio_type
+                       = mwifiex_band_to_radio_type(priv->curr_bss_params.band);
+                if (adapter->adhoc_start_band & BAND_GN
+                    || adapter->adhoc_start_band & BAND_AN) {
+                        if (adapter->chan_offset == SEC_CHANNEL_ABOVE)
+                                chan_tlv->chan_scan_param[0].radio_type |=
+                                        SECOND_CHANNEL_ABOVE;
+                        else if (adapter->chan_offset == SEC_CHANNEL_BELOW)
+                                chan_tlv->chan_scan_param[0].radio_type |=
+                                        SECOND_CHANNEL_BELOW;
+                }
+                dev_dbg(adapter->dev, "info: ADHOC_S_CMD: TLV Band = %d\n",
+                       chan_tlv->chan_scan_param[0].radio_type);
+                pos += sizeof(chan_tlv->header) +
+                        sizeof(struct mwifiex_chan_scan_param_set);
+                cmd_append_size +=
+                        sizeof(chan_tlv->header) +
+                        sizeof(struct mwifiex_chan_scan_param_set);
+        }
+
+        /* Append vendor specific IE TLV */
+        cmd_append_size += mwifiex_cmd_append_vsie_tlv(priv,
+                                MWIFIEX_VSIE_MASK_ADHOC, &pos);
+
+        if (priv->sec_info.wpa_enabled) {
+                rsn_ie_len = mwifiex_append_rsn_ie_wpa_wpa2(priv, &pos);
+                if (rsn_ie_len == -1)
+                        return -1;
+                cmd_append_size += rsn_ie_len;
+        }
+
+        if (adapter->adhoc_11n_enabled) {
+                {
+                        ht_cap = (struct mwifiex_ie_types_htcap *) pos;
+                        memset(ht_cap, 0,
+                               sizeof(struct mwifiex_ie_types_htcap));
+                        ht_cap->header.type =
+                                cpu_to_le16(WLAN_EID_HT_CAPABILITY);
+                        ht_cap->header.len =
+                               cpu_to_le16(sizeof(struct ieee80211_ht_cap));
+                        ht_cap_info = le16_to_cpu(ht_cap->ht_cap.cap_info);
+
+                        SETHT_SHORTGI20(ht_cap_info);
+                        if (adapter->chan_offset) {
+                                SETHT_SHORTGI40(ht_cap_info);
+                                SETHT_DSSSCCK40(ht_cap_info);
+                                SETHT_SUPPCHANWIDTH(ht_cap_info);
+                                SETHT_MCS32(ht_cap->ht_cap.mcs.rx_mask);
+                        }
+
+                        ht_cap->ht_cap.ampdu_params_info
+                                        = MAX_RX_AMPDU_SIZE_64K;
+                        ht_cap->ht_cap.mcs.rx_mask[0] = 0xff;
+                        pos += sizeof(struct mwifiex_ie_types_htcap);
+                        cmd_append_size +=
+                                sizeof(struct mwifiex_ie_types_htcap);
+                }
+                {
+                        ht_info = (struct mwifiex_ie_types_htinfo *) pos;
+                        memset(ht_info, 0,
+                               sizeof(struct mwifiex_ie_types_htinfo));
+                        ht_info->header.type =
+                                cpu_to_le16(WLAN_EID_HT_INFORMATION);
+                        ht_info->header.len =
+                                cpu_to_le16(sizeof(struct ieee80211_ht_info));
+                        ht_info->ht_info.control_chan =
+                                (u8) priv->curr_bss_params.bss_descriptor.
+                                channel;
+                        if (adapter->chan_offset) {
+                                ht_info->ht_info.ht_param =
+                                        adapter->chan_offset;
+                                SET_CHANWIDTH40(ht_info->ht_info.ht_param);
+                        }
+                        ht_info->ht_info.operation_mode =
+                                cpu_to_le16(NON_GREENFIELD_STAS);
+                        ht_info->ht_info.basic_set[0] = 0xff;
+                        pos += sizeof(struct mwifiex_ie_types_htinfo);
+                        cmd_append_size +=
+                                sizeof(struct mwifiex_ie_types_htinfo);
+                }
+        }
+
+        cmd->size = cpu_to_le16((u16)
+                            (sizeof(struct host_cmd_ds_802_11_ad_hoc_start)
+                             + S_DS_GEN + cmd_append_size));
+
+        if (adapter->adhoc_start_band == BAND_B)
+                SHORT_SLOT_TIME_DISABLED(tmp_cap);
+        else
+                SHORT_SLOT_TIME_ENABLED(tmp_cap);
+
+        adhoc_start->cap_info_bitmap = cpu_to_le16(tmp_cap);
+
+        return 0;
+}
+
+/*
+ * This function prepares command for ad-hoc join.
+ *
+ * Most of the parameters are set up by copying from the target BSS descriptor
+ * from the scan response.
+ *
+ * In addition, the following TLVs are added -
+ *      - Channel TLV
+ *      - Vendor specific IE
+ *      - WPA/WPA2 IE
+ *      - 11n IE
+ *
+ * Preparation also includes -
+ *      - Setting command ID and proper size
+ *      - Ensuring correct endian-ness
+ */
+int
+mwifiex_cmd_802_11_ad_hoc_join(struct mwifiex_private *priv,
+                               struct host_cmd_ds_command *cmd, void *data_buf)
+{
+        int ret = 0, rsn_ie_len = 0;
+        struct host_cmd_ds_802_11_ad_hoc_join *adhoc_join =
+                &cmd->params.adhoc_join;
+        struct mwifiex_bssdescriptor *bss_desc =
+                (struct mwifiex_bssdescriptor *) data_buf;
+        struct mwifiex_ie_types_chan_list_param_set *chan_tlv;
+        u32 cmd_append_size = 0;
+        u16 tmp_cap;
+        u32 i, rates_size = 0;
+        u16 curr_pkt_filter;
+        u8 *pos =
+                (u8 *) adhoc_join +
+                sizeof(struct host_cmd_ds_802_11_ad_hoc_join);
+
+/* Use G protection */
+#define USE_G_PROTECTION        0x02
+        if (bss_desc->erp_flags & USE_G_PROTECTION) {
+                curr_pkt_filter =
+                        priv->
+                        curr_pkt_filter | HostCmd_ACT_MAC_ADHOC_G_PROTECTION_ON;
+
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_MAC_CONTROL,
+                                          HostCmd_ACT_GEN_SET, 0, NULL,
+                                          &curr_pkt_filter);
+                if (ret) {
+                        dev_err(priv->adapter->dev,
+                               "ADHOC_J_CMD: G Protection config failed\n");
+                        return -1;
+                }
+        }
+
+        priv->attempted_bss_desc = bss_desc;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_AD_HOC_JOIN);
+
+        adhoc_join->bss_descriptor.bss_mode = HostCmd_BSS_MODE_IBSS;
+
+        adhoc_join->bss_descriptor.beacon_period
+                = cpu_to_le16(bss_desc->beacon_period);
+
+        memcpy(&adhoc_join->bss_descriptor.bssid,
+               &bss_desc->mac_address, ETH_ALEN);
+
+        memcpy(&adhoc_join->bss_descriptor.ssid,
+               &bss_desc->ssid.ssid, bss_desc->ssid.ssid_len);
+
+        memcpy(&adhoc_join->bss_descriptor.phy_param_set,
+               &bss_desc->phy_param_set,
+               sizeof(union ieee_types_phy_param_set));
+
+        memcpy(&adhoc_join->bss_descriptor.ss_param_set,
+               &bss_desc->ss_param_set, sizeof(union ieee_types_ss_param_set));
+
+        tmp_cap = bss_desc->cap_info_bitmap;
+
+        tmp_cap &= CAPINFO_MASK;
+
+        dev_dbg(priv->adapter->dev, "info: ADHOC_J_CMD: tmp_cap=%4X"
+                        " CAPINFO_MASK=%4lX\n", tmp_cap, CAPINFO_MASK);
+
+        /* Information on BSSID descriptor passed to FW */
+        dev_dbg(priv->adapter->dev, "info: ADHOC_J_CMD: BSSID = %pM, SSID = %s\n",
+                                adhoc_join->bss_descriptor.bssid,
+                                adhoc_join->bss_descriptor.ssid);
+
+        for (i = 0; bss_desc->supported_rates[i] &&
+                        i < MWIFIEX_SUPPORTED_RATES;
+                        i++)
+                        ;
+        rates_size = i;
+
+        /* Copy Data Rates from the Rates recorded in scan response */
+        memset(adhoc_join->bss_descriptor.data_rates, 0,
+               sizeof(adhoc_join->bss_descriptor.data_rates));
+        memcpy(adhoc_join->bss_descriptor.data_rates,
+               bss_desc->supported_rates, rates_size);
+
+        /* Copy the adhoc join rates into Current BSS state structure */
+        priv->curr_bss_params.num_of_rates = rates_size;
+        memcpy(&priv->curr_bss_params.data_rates, bss_desc->supported_rates,
+               rates_size);
+
+        /* Copy the channel information */
+        priv->curr_bss_params.bss_descriptor.channel = bss_desc->channel;
+        priv->curr_bss_params.band = (u8) bss_desc->bss_band;
+
+        if (priv->sec_info.wep_status == MWIFIEX_802_11_WEP_ENABLED
+            || priv->sec_info.wpa_enabled)
+                tmp_cap |= WLAN_CAPABILITY_PRIVACY;
+
+        if (IS_SUPPORT_MULTI_BANDS(priv->adapter)) {
+                /* Append a channel TLV */
+                chan_tlv = (struct mwifiex_ie_types_chan_list_param_set *) pos;
+                chan_tlv->header.type = cpu_to_le16(TLV_TYPE_CHANLIST);
+                chan_tlv->header.len =
+                        cpu_to_le16(sizeof(struct mwifiex_chan_scan_param_set));
+
+                memset(chan_tlv->chan_scan_param, 0x00,
+                       sizeof(struct mwifiex_chan_scan_param_set));
+                chan_tlv->chan_scan_param[0].chan_number =
+                        (bss_desc->phy_param_set.ds_param_set.current_chan);
+                dev_dbg(priv->adapter->dev, "info: ADHOC_J_CMD: TLV Chan = %d\n",
+                       chan_tlv->chan_scan_param[0].chan_number);
+
+                chan_tlv->chan_scan_param[0].radio_type =
+                        mwifiex_band_to_radio_type((u8) bss_desc->bss_band);
+
+                dev_dbg(priv->adapter->dev, "info: ADHOC_J_CMD: TLV Band = %d\n",
+                       chan_tlv->chan_scan_param[0].radio_type);
+                pos += sizeof(chan_tlv->header) +
+                        sizeof(struct mwifiex_chan_scan_param_set);
+                cmd_append_size += sizeof(chan_tlv->header) +
+                        sizeof(struct mwifiex_chan_scan_param_set);
+        }
+
+        if (priv->sec_info.wpa_enabled)
+                rsn_ie_len = mwifiex_append_rsn_ie_wpa_wpa2(priv, &pos);
+        if (rsn_ie_len == -1)
+                return -1;
+        cmd_append_size += rsn_ie_len;
+
+        if (ISSUPP_11NENABLED(priv->adapter->fw_cap_info))
+                cmd_append_size += mwifiex_cmd_append_11n_tlv(priv,
+                        bss_desc, &pos);
+
+        /* Append vendor specific IE TLV */
+        cmd_append_size += mwifiex_cmd_append_vsie_tlv(priv,
+                        MWIFIEX_VSIE_MASK_ADHOC, &pos);
+
+        cmd->size = cpu_to_le16((u16)
+                            (sizeof(struct host_cmd_ds_802_11_ad_hoc_join)
+                             + S_DS_GEN + cmd_append_size));
+
+        adhoc_join->bss_descriptor.cap_info_bitmap = cpu_to_le16(tmp_cap);
+
+        return ret;
+}
+
+/*
+ * This function handles the command response of ad-hoc start and
+ * ad-hoc join.
+ *
+ * The function generates a device-connected event to notify
+ * the applications, in case of successful ad-hoc start/join, and
+ * saves the beacon buffer.
+ */
+int mwifiex_ret_802_11_ad_hoc(struct mwifiex_private *priv,
+                              struct host_cmd_ds_command *resp, void *wq_buf)
+{
+        int ret = 0;
+        struct mwifiex_wait_queue *wait_queue =
+                (struct mwifiex_wait_queue *) wq_buf;
+        struct host_cmd_ds_802_11_ad_hoc_result *adhoc_result;
+        struct mwifiex_bssdescriptor *bss_desc;
+        u16 command = le16_to_cpu(resp->command);
+        u16 result = le16_to_cpu(resp->result);
+
+        adhoc_result = &resp->params.adhoc_result;
+
+        bss_desc = priv->attempted_bss_desc;
+
+        /* Join result code 0 --> SUCCESS */
+        if (result) {
+                dev_err(priv->adapter->dev, "ADHOC_RESP: failed\n");
+                if (priv->media_connected)
+                        mwifiex_reset_connect_state(priv);
+
+                memset(&priv->curr_bss_params.bss_descriptor,
+                       0x00, sizeof(struct mwifiex_bssdescriptor));
+
+                ret = -1;
+                goto done;
+        }
+
+        /* Send a Media Connected event, according to the Spec */
+        priv->media_connected = true;
+
+        if (command == HostCmd_CMD_802_11_AD_HOC_START) {
+                dev_dbg(priv->adapter->dev, "info: ADHOC_S_RESP %s\n",
+                                bss_desc->ssid.ssid);
+
+                /* Update the created network descriptor with the new BSSID */
+                memcpy(bss_desc->mac_address,
+                       adhoc_result->bssid, ETH_ALEN);
+
+                priv->adhoc_state = ADHOC_STARTED;
+        } else {
+                /*
+                 * Now the join cmd should be successful.
+                 * If BSSID has changed use SSID to compare instead of BSSID
+                 */
+                dev_dbg(priv->adapter->dev, "info: ADHOC_J_RESP %s\n",
+                                bss_desc->ssid.ssid);
+
+                /*
+                 * Make a copy of current BSSID descriptor, only needed for
+                 * join since the current descriptor is already being used
+                 * for adhoc start
+                 */
+                memcpy(&priv->curr_bss_params.bss_descriptor,
+                       bss_desc, sizeof(struct mwifiex_bssdescriptor));
+
+                priv->adhoc_state = ADHOC_JOINED;
+        }
+
+        dev_dbg(priv->adapter->dev, "info: ADHOC_RESP: channel = %d\n",
+                                priv->adhoc_channel);
+        dev_dbg(priv->adapter->dev, "info: ADHOC_RESP: BSSID = %pM\n",
+               priv->curr_bss_params.bss_descriptor.mac_address);
+
+        if (!netif_carrier_ok(priv->netdev))
+                netif_carrier_on(priv->netdev);
+        if (netif_queue_stopped(priv->netdev))
+                netif_wake_queue(priv->netdev);
+
+        mwifiex_save_curr_bcn(priv);
+
+done:
+        /* Need to indicate IOCTL complete */
+        if (wait_queue) {
+                if (ret)
+                        wait_queue->status = MWIFIEX_ERROR_ASSOC_FAIL;
+                else
+                        wait_queue->status = MWIFIEX_ERROR_NO_ERROR;
+
+        }
+
+        return ret;
+}
+
+/*
+ * This function associates to a specific BSS discovered in a scan.
+ *
+ * It clears any past association response stored for application
+ * retrieval and calls the command preparation routine to send the
+ * command to firmware.
+ */
+int mwifiex_associate(struct mwifiex_private *priv,
+                      void *wait_queue, struct mwifiex_bssdescriptor *bss_desc)
+{
+        int ret = 0;
+        u8 current_bssid[ETH_ALEN];
+
+        /* Return error if the adapter or table entry is not marked as infra */
+        if ((priv->bss_mode != MWIFIEX_BSS_MODE_INFRA) ||
+            (bss_desc->bss_mode != MWIFIEX_BSS_MODE_INFRA))
+                return -1;
+
+        memcpy(&current_bssid,
+               &priv->curr_bss_params.bss_descriptor.mac_address,
+               sizeof(current_bssid));
+
+        /* Clear any past association response stored for application
+           retrieval */
+        priv->assoc_rsp_size = 0;
+
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_ASSOCIATE,
+                                  HostCmd_ACT_GEN_SET, 0, wait_queue,
+                                  bss_desc);
+
+        return ret;
+}
+
+/*
+ * This function starts an ad-hoc network.
+ *
+ * It calls the command preparation routine to send the command to firmware.
+ */
+int
+mwifiex_adhoc_start(struct mwifiex_private *priv,
+                    void *wait_queue, struct mwifiex_802_11_ssid *adhoc_ssid)
+{
+        int ret = 0;
+
+        dev_dbg(priv->adapter->dev, "info: Adhoc Channel = %d\n",
+                priv->adhoc_channel);
+        dev_dbg(priv->adapter->dev, "info: curr_bss_params.channel = %d\n",
+               priv->curr_bss_params.bss_descriptor.channel);
+        dev_dbg(priv->adapter->dev, "info: curr_bss_params.band = %d\n",
+               priv->curr_bss_params.band);
+
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_AD_HOC_START,
+                                  HostCmd_ACT_GEN_SET, 0, wait_queue,
+                                  adhoc_ssid);
+
+        return ret;
+}
+
+/*
+ * This function joins an ad-hoc network found in a previous scan.
+ *
+ * It calls the command preparation routine to send the command to firmware,
+ * if already not connected to the requested SSID.
+ */
+int mwifiex_adhoc_join(struct mwifiex_private *priv,
+                       void *wait_queue, struct mwifiex_bssdescriptor *bss_desc)
+{
+        int ret = 0;
+
+        dev_dbg(priv->adapter->dev, "info: adhoc join: curr_bss ssid =%s\n",
+               priv->curr_bss_params.bss_descriptor.ssid.ssid);
+        dev_dbg(priv->adapter->dev, "info: adhoc join: curr_bss ssid_len =%u\n",
+               priv->curr_bss_params.bss_descriptor.ssid.ssid_len);
+        dev_dbg(priv->adapter->dev, "info: adhoc join: ssid =%s\n",
+                bss_desc->ssid.ssid);
+        dev_dbg(priv->adapter->dev, "info: adhoc join: ssid_len =%u\n",
+               bss_desc->ssid.ssid_len);
+
+        /* Check if the requested SSID is already joined */
+        if (priv->curr_bss_params.bss_descriptor.ssid.ssid_len &&
+            !mwifiex_ssid_cmp(&bss_desc->ssid,
+                              &priv->curr_bss_params.bss_descriptor.ssid) &&
+            (priv->curr_bss_params.bss_descriptor.bss_mode ==
+             MWIFIEX_BSS_MODE_IBSS)) {
+                dev_dbg(priv->adapter->dev, "info: ADHOC_J_CMD: new ad-hoc SSID"
+                        " is the same as current; not attempting to re-join\n");
+                return -1;
+        }
+
+        dev_dbg(priv->adapter->dev, "info: curr_bss_params.channel = %d\n",
+               priv->curr_bss_params.bss_descriptor.channel);
+        dev_dbg(priv->adapter->dev, "info: curr_bss_params.band = %c\n",
+               priv->curr_bss_params.band);
+
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_AD_HOC_JOIN,
+                                  HostCmd_ACT_GEN_SET, 0, wait_queue,
+                                  bss_desc);
+
+        return ret;
+}
+
+/*
+ * This function deauthenticates/disconnects from infra network by sending
+ * deauthentication request.
+ */
+static int mwifiex_deauthenticate_infra(struct mwifiex_private *priv,
+                                        struct mwifiex_wait_queue *wait,
+                                        u8 *mac)
+{
+        u8 mac_address[ETH_ALEN];
+        int ret = 0;
+        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);
+        }
+
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_DEAUTHENTICATE,
+                                  HostCmd_ACT_GEN_SET, 0, wait, &mac_address);
+
+        if (!ret && wait)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * This function deauthenticates/disconnects from a BSS.
+ *
+ * In case of infra made, it sends deauthentication request, and
+ * in case of ad-hoc mode, a stop network request is sent to the firmware.
+ */
+int mwifiex_deauthenticate(struct mwifiex_private *priv,
+                           struct mwifiex_wait_queue *wait, u8 *mac)
+{
+        int ret = 0;
+
+        if (priv->media_connected) {
+                if (priv->bss_mode == MWIFIEX_BSS_MODE_INFRA) {
+                        ret = mwifiex_deauthenticate_infra(priv, wait, mac);
+                } else if (priv->bss_mode == MWIFIEX_BSS_MODE_IBSS) {
+                        ret = mwifiex_prepare_cmd(priv,
+                                        HostCmd_CMD_802_11_AD_HOC_STOP,
+                                        HostCmd_ACT_GEN_SET, 0, wait, NULL);
+
+                        if (!ret && wait)
+                                ret = -EINPROGRESS;
+                }
+        }
+
+        return ret;
+}
+
+/*
+ * This function converts band to radio type used in channel TLV.
+ */
+u8
+mwifiex_band_to_radio_type(u8 band)
+{
+        u8 ret_radio_type;
+
+        switch (band) {
+        case BAND_A:
+        case BAND_AN:
+        case BAND_A | BAND_AN:
+                ret_radio_type = HostCmd_SCAN_RADIO_TYPE_A;
+                break;
+        case BAND_B:
+        case BAND_G:
+        case BAND_B | BAND_G:
+        default:
+                ret_radio_type = HostCmd_SCAN_RADIO_TYPE_BG;
+                break;
+        }
+
+        return ret_radio_type;
+}
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
new file mode 100644
index 00000000000..ed89ca41a90
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -0,0 +1,1102 @@
+/*
+ * Marvell Wireless LAN device driver: major functions
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "main.h"
+#include "wmm.h"
+#include "cfg80211.h"
+#include "11n.h"
+
+#define VERSION "1.0"
+
+const char driver_version[] = "mwifiex " VERSION " (%s) ";
+
+struct mwifiex_adapter *g_adapter;
+EXPORT_SYMBOL_GPL(g_adapter);
+
+static struct mwifiex_bss_attr mwifiex_bss_sta[] = {
+        {MWIFIEX_BSS_TYPE_STA, MWIFIEX_DATA_FRAME_TYPE_ETH_II, true, 0, 0},
+};
+
+static int drv_mode = DRV_MODE_STA;
+
+static char fw_name[32] = DEFAULT_FW_NAME;
+
+/* Supported drv_mode table */
+static struct mwifiex_drv_mode mwifiex_drv_mode_tbl[] = {
+        {
+         /* drv_mode */
+         .drv_mode = DRV_MODE_STA,
+         /* intf number */
+         .intf_num = ARRAY_SIZE(mwifiex_bss_sta),
+         /* bss_attr */
+         .bss_attr = mwifiex_bss_sta,
+         }
+        ,
+};
+
+/*
+ * This function registers the device and performs all the necessary
+ * initializations.
+ *
+ * The following initialization operations are performed -
+ *      - Allocate adapter structure
+ *      - Save interface specific operations table in adapter
+ *      - Call interface specific initialization routine
+ *      - Allocate private structures
+ *      - Set default adapter structure parameters
+ *      - Initialize locks
+ *
+ * In case of any errors during inittialization, this function also ensures
+ * proper cleanup before exiting.
+ */
+static int mwifiex_register(void *card, struct mwifiex_if_ops *if_ops,
+                            struct mwifiex_device *mdevice, void **padapter)
+{
+        int ret = 0;
+        struct mwifiex_adapter *adapter = NULL;
+        u8 i = 0;
+
+        adapter = kzalloc(sizeof(struct mwifiex_adapter), GFP_KERNEL);
+        /* Allocate memory for adapter structure */
+        if (!adapter)
+                return -1;
+
+        g_adapter = adapter;
+        adapter->card = card;
+
+        /* Save interface specific operations in adapter */
+        memmove(&adapter->if_ops, if_ops, sizeof(struct mwifiex_if_ops));
+
+        /* card specific initialization has been deferred until now .. */
+        ret = adapter->if_ops.init_if(adapter);
+        if (ret)
+                goto error;
+
+        adapter->priv_num = 0;
+        for (i = 0; i < MWIFIEX_MAX_BSS_NUM; i++) {
+                adapter->priv[i] = NULL;
+
+                if (!mdevice->bss_attr[i].active)
+                        continue;
+
+                /* For valid bss_attr,
+                   allocate memory for private structure */
+                adapter->priv[i] = kzalloc(sizeof(struct mwifiex_private),
+                                GFP_KERNEL);
+                if (!adapter->priv[i]) {
+                        dev_err(adapter->dev, "%s: failed to alloc priv[%d]\n",
+                               __func__, i);
+                        goto error;
+                }
+
+                adapter->priv_num++;
+                memset(adapter->priv[i], 0,
+                       sizeof(struct mwifiex_private));
+                adapter->priv[i]->adapter = adapter;
+                /* Save bss_type, frame_type & bss_priority */
+                adapter->priv[i]->bss_type = (u8) mdevice->bss_attr[i].bss_type;
+                adapter->priv[i]->frame_type =
+                        (u8) mdevice->bss_attr[i].frame_type;
+                adapter->priv[i]->bss_priority =
+                        (u8) mdevice->bss_attr[i].bss_priority;
+                if (mdevice->bss_attr[i].bss_type == MWIFIEX_BSS_TYPE_STA)
+                        adapter->priv[i]->bss_role = MWIFIEX_BSS_ROLE_STA;
+                else if (mdevice->bss_attr[i].bss_type == MWIFIEX_BSS_TYPE_UAP)
+                        adapter->priv[i]->bss_role = MWIFIEX_BSS_ROLE_UAP;
+
+                /* Save bss_index & bss_num */
+                adapter->priv[i]->bss_index = i;
+                adapter->priv[i]->bss_num = mdevice->bss_attr[i].bss_num;
+        }
+
+        /* Initialize lock variables */
+        if (mwifiex_init_lock_list(adapter))
+                goto error;
+
+        init_timer(&adapter->cmd_timer);
+        adapter->cmd_timer.function = mwifiex_cmd_timeout_func;
+        adapter->cmd_timer.data = (unsigned long) adapter;
+
+        /* Return pointer of struct mwifiex_adapter */
+        *padapter = adapter;
+        return 0;
+
+error:
+        dev_dbg(adapter->dev, "info: leave mwifiex_register with error\n");
+
+        /* Free lock variables */
+        mwifiex_free_lock_list(adapter);
+        for (i = 0; i < MWIFIEX_MAX_BSS_NUM; i++)
+                kfree(adapter->priv[i]);
+        kfree(adapter);
+
+        return -1;
+}
+
+/*
+ * This function unregisters the device and performs all the necessary
+ * cleanups.
+ *
+ * The following cleanup operations are performed -
+ *      - Free the timers
+ *      - Free beacon buffers
+ *      - Free private structures
+ *      - Free adapter structure
+ */
+static int mwifiex_unregister(struct mwifiex_adapter *adapter)
+{
+        s32 i = 0;
+
+        del_timer(&adapter->cmd_timer);
+
+        /* Free private structures */
+        for (i = 0; i < adapter->priv_num; i++) {
+                if (adapter->priv[i]) {
+                        mwifiex_free_curr_bcn(adapter->priv[i]);
+                        kfree(adapter->priv[i]);
+                }
+        }
+
+        kfree(adapter);
+        return 0;
+}
+
+/*
+ * The main process.
+ *
+ * This function is the main procedure of the driver and handles various driver
+ * operations. It runs in a loop and provides the core functionalities.
+ *
+ * The main responsibilities of this function are -
+ *      - Ensure concurrency control
+ *      - Handle pending interrupts and call interrupt handlers
+ *      - Wake up the card if required
+ *      - Handle command responses and call response handlers
+ *      - Handle events and call event handlers
+ *      - Execute pending commands
+ *      - Transmit pending data packets
+ */
+int mwifiex_main_process(struct mwifiex_adapter *adapter)
+{
+        int ret = 0;
+        unsigned long flags;
+
+        spin_lock_irqsave(&adapter->main_proc_lock, flags);
+
+        /* Check if already processing */
+        if (adapter->mwifiex_processing) {
+                spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
+                goto exit_main_proc;
+        } else {
+                adapter->mwifiex_processing = true;
+                spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
+        }
+process_start:
+        do {
+                if ((adapter->hw_status == MWIFIEX_HW_STATUS_CLOSING) ||
+                    (adapter->hw_status == MWIFIEX_HW_STATUS_NOT_READY))
+                        break;
+
+                /* Handle pending interrupt if any */
+                if (adapter->int_status) {
+                        if (adapter->hs_activated)
+                                mwifiex_process_hs_config(adapter);
+                        adapter->if_ops.process_int_status(adapter);
+                }
+
+                /* Need to wake up the card ? */
+                if ((adapter->ps_state == PS_STATE_SLEEP) &&
+                    (adapter->pm_wakeup_card_req &&
+                     !adapter->pm_wakeup_fw_try) &&
+                    (is_command_pending(adapter)
+                     || !mwifiex_wmm_lists_empty(adapter))) {
+                        adapter->pm_wakeup_fw_try = true;
+                        adapter->if_ops.wakeup(adapter);
+                        continue;
+                }
+                if (IS_CARD_RX_RCVD(adapter)) {
+                        adapter->pm_wakeup_fw_try = false;
+                        if (adapter->ps_state == PS_STATE_SLEEP)
+                                adapter->ps_state = PS_STATE_AWAKE;
+                } else {
+                        /* We have tried to wakeup the card already */
+                        if (adapter->pm_wakeup_fw_try)
+                                break;
+                        if (adapter->ps_state != PS_STATE_AWAKE ||
+                            adapter->tx_lock_flag)
+                                break;
+
+                        if (adapter->scan_processing || adapter->data_sent
+                            || mwifiex_wmm_lists_empty(adapter)) {
+                                if (adapter->cmd_sent || adapter->curr_cmd
+                                    || (!is_command_pending(adapter)))
+                                        break;
+                        }
+                }
+
+                /* Check for Cmd Resp */
+                if (adapter->cmd_resp_received) {
+                        adapter->cmd_resp_received = false;
+                        mwifiex_process_cmdresp(adapter);
+
+                        /* call mwifiex back when init_fw is done */
+                        if (adapter->hw_status == MWIFIEX_HW_STATUS_INIT_DONE) {
+                                adapter->hw_status = MWIFIEX_HW_STATUS_READY;
+                                mwifiex_init_fw_complete(adapter);
+                        }
+                }
+
+                /* Check for event */
+                if (adapter->event_received) {
+                        adapter->event_received = false;
+                        mwifiex_process_event(adapter);
+                }
+
+                /* Check if we need to confirm Sleep Request
+                   received previously */
+                if (adapter->ps_state == PS_STATE_PRE_SLEEP) {
+                        if (!adapter->cmd_sent && !adapter->curr_cmd)
+                                mwifiex_check_ps_cond(adapter);
+                }
+
+                /* * The ps_state may have been changed during processing of
+                 * Sleep Request event.
+                 */
+                if ((adapter->ps_state == PS_STATE_SLEEP)
+                    || (adapter->ps_state == PS_STATE_PRE_SLEEP)
+                    || (adapter->ps_state == PS_STATE_SLEEP_CFM)
+                    || adapter->tx_lock_flag)
+                        continue;
+
+                if (!adapter->cmd_sent && !adapter->curr_cmd) {
+                        if (mwifiex_exec_next_cmd(adapter) == -1) {
+                                ret = -1;
+                                break;
+                        }
+                }
+
+                if (!adapter->scan_processing && !adapter->data_sent &&
+                    !mwifiex_wmm_lists_empty(adapter)) {
+                        mwifiex_wmm_process_tx(adapter);
+                        if (adapter->hs_activated) {
+                                adapter->is_hs_configured = false;
+                                mwifiex_hs_activated_event
+                                        (mwifiex_get_priv
+                                         (adapter, MWIFIEX_BSS_ROLE_ANY),
+                                         false);
+                        }
+                }
+
+                if (adapter->delay_null_pkt && !adapter->cmd_sent &&
+                    !adapter->curr_cmd && !is_command_pending(adapter)
+                    && mwifiex_wmm_lists_empty(adapter)) {
+                        if (!mwifiex_send_null_packet
+                            (mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA),
+                             MWIFIEX_TxPD_POWER_MGMT_NULL_PACKET |
+                             MWIFIEX_TxPD_POWER_MGMT_LAST_PACKET)) {
+                                adapter->delay_null_pkt = false;
+                                adapter->ps_state = PS_STATE_SLEEP;
+                        }
+                        break;
+                }
+        } while (true);
+
+        if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter))
+                goto process_start;
+
+        spin_lock_irqsave(&adapter->main_proc_lock, flags);
+        adapter->mwifiex_processing = false;
+        spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
+
+exit_main_proc:
+        if (adapter->hw_status == MWIFIEX_HW_STATUS_CLOSING)
+                mwifiex_shutdown_drv(adapter);
+        return ret;
+}
+
+/*
+ * This function initializes the software.
+ *
+ * The main work includes allocating and initializing the adapter structure
+ * and initializing the private structures.
+ */
+static int
+mwifiex_init_sw(void *card, struct mwifiex_if_ops *if_ops, void **pmwifiex)
+{
+        int i;
+        struct mwifiex_device device;
+        struct mwifiex_drv_mode *drv_mode_ptr;
+
+        /* find mwifiex_drv_mode entry from mwifiex_drv_mode_tbl */
+        drv_mode_ptr = NULL;
+        for (i = 0; i < ARRAY_SIZE(mwifiex_drv_mode_tbl); i++) {
+                if (mwifiex_drv_mode_tbl[i].drv_mode == drv_mode) {
+                        drv_mode_ptr = &mwifiex_drv_mode_tbl[i];
+                        break;
+                }
+        }
+
+        if (!drv_mode_ptr) {
+                pr_err("invalid drv_mode=%d\n", drv_mode);
+                return -1;
+        }
+
+        memset(&device, 0, sizeof(struct mwifiex_device));
+
+        for (i = 0; i < drv_mode_ptr->intf_num; i++) {
+                device.bss_attr[i].bss_type =
+                        drv_mode_ptr->bss_attr[i].bss_type;
+                device.bss_attr[i].frame_type =
+                        drv_mode_ptr->bss_attr[i].frame_type;
+                device.bss_attr[i].active = drv_mode_ptr->bss_attr[i].active;
+                device.bss_attr[i].bss_priority =
+                        drv_mode_ptr->bss_attr[i].bss_priority;
+                device.bss_attr[i].bss_num = drv_mode_ptr->bss_attr[i].bss_num;
+        }
+
+        if (mwifiex_register(card, if_ops, &device, pmwifiex))
+                return -1;
+
+        return 0;
+}
+
+/*
+ * This function frees the adapter structure.
+ *
+ * Additionally, this closes the netlink socket, frees the timers
+ * and private structures.
+ */
+static void mwifiex_free_adapter(struct mwifiex_adapter *adapter)
+{
+        if (!adapter) {
+                pr_err("%s: adapter is NULL\n", __func__);
+                return;
+        }
+
+        mwifiex_unregister(adapter);
+        pr_debug("info: %s: free adapter\n", __func__);
+}
+
+/*
+ * This function initializes the hardware and firmware.
+ *
+ * The main initialization steps followed are -
+ *      - Download the correct firmware to card
+ *      - Allocate and initialize the adapter structure
+ *      - Initialize the private structures
+ *      - Issue the init commands to firmware
+ */
+static int mwifiex_init_hw_fw(struct mwifiex_adapter *adapter)
+{
+        int ret = 0;
+        int err;
+        struct mwifiex_fw_image fw;
+
+        memset(&fw, 0, sizeof(struct mwifiex_fw_image));
+
+        switch (adapter->revision_id) {
+        case SD8787_W0:
+        case SD8787_W1:
+                strcpy(fw_name, SD8787_W1_FW_NAME);
+                break;
+        case SD8787_A0:
+        case SD8787_A1:
+                strcpy(fw_name, SD8787_AX_FW_NAME);
+                break;
+        default:
+                break;
+        }
+
+        err = request_firmware(&adapter->firmware, fw_name, adapter->dev);
+        if (err < 0) {
+                dev_err(adapter->dev, "request_firmware() returned"
+                                " error code %#x\n", err);
+                ret = -1;
+                goto done;
+        }
+        fw.fw_buf = (u8 *) adapter->firmware->data;
+        fw.fw_len = adapter->firmware->size;
+
+        ret = mwifiex_dnld_fw(adapter, &fw);
+        if (ret == -1)
+                goto done;
+
+        dev_notice(adapter->dev, "WLAN FW is active\n");
+
+        adapter->init_wait_q_woken = false;
+        ret = mwifiex_init_fw(adapter);
+        if (ret == -1) {
+                goto done;
+        } else if (!ret) {
+                adapter->hw_status = MWIFIEX_HW_STATUS_READY;
+                goto done;
+        }
+        /* Wait for mwifiex_init to complete */
+        wait_event_interruptible(adapter->init_wait_q,
+                                 adapter->init_wait_q_woken);
+        if (adapter->hw_status != MWIFIEX_HW_STATUS_READY) {
+                ret = -1;
+                goto done;
+        }
+        ret = 0;
+
+done:
+        if (adapter->firmware)
+                release_firmware(adapter->firmware);
+        if (ret)
+                ret = -1;
+        return ret;
+}
+
+/*
+ * This function fills a driver buffer.
+ *
+ * The function associates a given SKB with the provided driver buffer
+ * and also updates some of the SKB parameters, including IP header,
+ * priority and timestamp.
+ */
+static void
+mwifiex_fill_buffer(struct sk_buff *skb)
+{
+        struct ethhdr *eth = NULL;
+        struct iphdr *iph;
+        struct timeval tv;
+        u8 tid = 0;
+
+        eth = (struct ethhdr *) skb->data;
+        switch (eth->h_proto) {
+        case __constant_htons(ETH_P_IP):
+                iph = ip_hdr(skb);
+                tid = IPTOS_PREC(iph->tos);
+                pr_debug("data: packet type ETH_P_IP: %04x, tid=%#x prio=%#x\n",
+                       eth->h_proto, tid, skb->priority);
+                break;
+        case __constant_htons(ETH_P_ARP):
+                pr_debug("data: ARP packet: %04x\n", eth->h_proto);
+        default:
+                break;
+        }
+/* Offset for TOS field in the IP header */
+#define IPTOS_OFFSET 5
+        tid = (tid >> IPTOS_OFFSET);
+        skb->priority = tid;
+        /* Record the current time the packet was queued; used to
+           determine the amount of time the packet was queued in
+           the driver before it was sent to the firmware.
+           The delay is then sent along with the packet to the
+           firmware for aggregate delay calculation for stats and
+           MSDU lifetime expiry.
+         */
+        do_gettimeofday(&tv);
+        skb->tstamp = timeval_to_ktime(tv);
+        return;
+}
+
+/*
+ * CFG802.11 network device handler for open.
+ *
+ * Starts the data queue.
+ */
+static int
+mwifiex_open(struct net_device *dev)
+{
+        netif_start_queue(dev);
+        return 0;
+}
+
+/*
+ * CFG802.11 network device handler for close.
+ */
+static int
+mwifiex_close(struct net_device *dev)
+{
+        return 0;
+}
+
+/*
+ * CFG802.11 network device handler for data transmission.
+ */
+static int
+mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+        struct sk_buff *new_skb = NULL;
+        struct mwifiex_txinfo *tx_info;
+
+        dev_dbg(priv->adapter->dev, "data: %lu BSS(%d): Data <= kernel\n",
+                                jiffies, priv->bss_index);
+
+        if (priv->adapter->surprise_removed) {
+                kfree(skb);
+                priv->stats.tx_dropped++;
+                return 0;
+        }
+        if (!skb->len || (skb->len > ETH_FRAME_LEN)) {
+                dev_err(priv->adapter->dev, "Tx: bad skb len %d\n", skb->len);
+                kfree(skb);
+                priv->stats.tx_dropped++;
+                return 0;
+        }
+        if (skb_headroom(skb) < MWIFIEX_MIN_DATA_HEADER_LEN) {
+                dev_dbg(priv->adapter->dev,
+                        "data: Tx: insufficient skb headroom %d\n",
+                       skb_headroom(skb));
+                /* Insufficient skb headroom - allocate a new skb */
+                new_skb =
+                        skb_realloc_headroom(skb, MWIFIEX_MIN_DATA_HEADER_LEN);
+                if (unlikely(!new_skb)) {
+                        dev_err(priv->adapter->dev, "Tx: cannot alloca new_skb\n");
+                        kfree(skb);
+                        priv->stats.tx_dropped++;
+                        return 0;
+                }
+                kfree_skb(skb);
+                skb = new_skb;
+                dev_dbg(priv->adapter->dev, "info: new skb headroomd %d\n",
+                                skb_headroom(skb));
+        }
+
+        tx_info = MWIFIEX_SKB_TXCB(skb);
+        tx_info->bss_index = priv->bss_index;
+        mwifiex_fill_buffer(skb);
+
+        mwifiex_wmm_add_buf_txqueue(priv->adapter, skb);
+        atomic_inc(&priv->adapter->tx_pending);
+
+        if (atomic_read(&priv->adapter->tx_pending) >= MAX_TX_PENDING) {
+                netif_stop_queue(priv->netdev);
+                dev->trans_start = jiffies;
+        }
+
+        queue_work(priv->adapter->workqueue, &priv->adapter->main_work);
+
+        return 0;
+}
+
+/*
+ * CFG802.11 network device handler for setting MAC address.
+ */
+static int
+mwifiex_set_mac_address(struct net_device *dev, void *addr)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+        struct sockaddr *hw_addr = (struct sockaddr *) addr;
+
+        memcpy(priv->curr_addr, hw_addr->sa_data, ETH_ALEN);
+
+        if (mwifiex_request_set_mac_address(priv)) {
+                dev_err(priv->adapter->dev, "set MAC address failed\n");
+                return -EFAULT;
+        }
+        memcpy(dev->dev_addr, priv->curr_addr, ETH_ALEN);
+
+        return 0;
+}
+
+/*
+ * CFG802.11 network device handler for setting multicast list.
+ */
+static void mwifiex_set_multicast_list(struct net_device *dev)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+        mwifiex_request_set_multicast_list(priv, dev);
+}
+
+/*
+ * CFG802.11 network device handler for transmission timeout.
+ */
+static void
+mwifiex_tx_timeout(struct net_device *dev)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+
+        dev_err(priv->adapter->dev, "%lu : Tx timeout, bss_index=%d\n",
+                                jiffies, priv->bss_index);
+        dev->trans_start = jiffies;
+        priv->num_tx_timeout++;
+}
+
+/*
+ * CFG802.11 network device handler for statistics retrieval.
+ */
+static struct net_device_stats *mwifiex_get_stats(struct net_device *dev)
+{
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+
+        return &priv->stats;
+}
+
+/* Network device handlers */
+static const struct net_device_ops mwifiex_netdev_ops = {
+        .ndo_open = mwifiex_open,
+        .ndo_stop = mwifiex_close,
+        .ndo_start_xmit = mwifiex_hard_start_xmit,
+        .ndo_set_mac_address = mwifiex_set_mac_address,
+        .ndo_tx_timeout = mwifiex_tx_timeout,
+        .ndo_get_stats = mwifiex_get_stats,
+        .ndo_set_multicast_list = mwifiex_set_multicast_list,
+};
+
+/*
+ * This function initializes the private structure parameters.
+ *
+ * The following wait queues are initialized -
+ *      - IOCTL wait queue
+ *      - Command wait queue
+ *      - Statistics wait queue
+ *
+ * ...and the following default parameters are set -
+ *      - Current key index     : Set to 0
+ *      - Rate index            : Set to auto
+ *      - Media connected       : Set to disconnected
+ *      - Adhoc link sensed     : Set to false
+ *      - Nick name             : Set to null
+ *      - Number of Tx timeout  : Set to 0
+ *      - Device address        : Set to current address
+ *
+ * In addition, the CFG80211 work queue is also created.
+ */
+static void
+mwifiex_init_priv_params(struct mwifiex_private *priv, struct net_device *dev)
+{
+        dev->netdev_ops = &mwifiex_netdev_ops;
+        /* Initialize private structure */
+        init_waitqueue_head(&priv->ioctl_wait_q);
+        init_waitqueue_head(&priv->cmd_wait_q);
+        init_waitqueue_head(&priv->w_stats_wait_q);
+        priv->current_key_index = 0;
+        priv->media_connected = false;
+        memset(&priv->nick_name, 0, sizeof(priv->nick_name));
+        priv->num_tx_timeout = 0;
+        priv->workqueue = create_singlethread_workqueue("cfg80211_wq");
+        INIT_WORK(&priv->cfg_workqueue, mwifiex_cfg80211_results);
+        memcpy(dev->dev_addr, priv->curr_addr, ETH_ALEN);
+}
+
+/*
+ * This function adds a new logical interface.
+ *
+ * It allocates, initializes and registers the interface by performing
+ * the following opearations -
+ *      - Allocate a new net device structure
+ *      - Assign device name
+ *      - Register the new device with CFG80211 subsystem
+ *      - Initialize semaphore and private structure
+ *      - Register the new device with kernel
+ *      - Create the complete debug FS structure if configured
+ */
+static struct mwifiex_private *mwifiex_add_interface(
+                        struct mwifiex_adapter *adapter,
+                        u8 bss_index, u8 bss_type)
+{
+        struct net_device *dev = NULL;
+        struct mwifiex_private *priv = NULL;
+        void *mdev_priv = NULL;
+
+        dev = alloc_netdev_mq(sizeof(struct mwifiex_private *), "mlan%d",
+                              ether_setup, 1);
+        if (!dev) {
+                dev_err(adapter->dev, "no memory available for netdevice\n");
+                goto error;
+        }
+        if (dev_alloc_name(dev, dev->name)) {
+                dev_err(adapter->dev, "unable to alloc name for netdevice\n");
+                goto error;
+        }
+
+        if (mwifiex_register_cfg80211(dev, adapter->priv[bss_index]->curr_addr,
+                                      adapter->priv[bss_index]) != 0) {
+                dev_err(adapter->dev, "cannot register netdevice with cfg80211\n");
+                goto error;
+        }
+        /* Save the priv pointer in netdev */
+        priv = adapter->priv[bss_index];
+        mdev_priv = netdev_priv(dev);
+        *((unsigned long *) mdev_priv) = (unsigned long) priv;
+
+        priv->netdev = dev;
+
+        sema_init(&priv->async_sem, 1);
+        priv->scan_pending_on_block = false;
+
+        mwifiex_init_priv_params(priv, dev);
+
+        SET_NETDEV_DEV(dev, adapter->dev);
+
+        /* Register network device */
+        if (register_netdev(dev)) {
+                dev_err(adapter->dev, "cannot register virtual network device\n");
+                goto error;
+        }
+
+        dev_dbg(adapter->dev, "info: %s: Marvell 802.11 Adapter\n", dev->name);
+#ifdef CONFIG_DEBUG_FS
+        mwifiex_dev_debugfs_init(priv);
+#endif
+        return priv;
+error:
+        if (dev)
+                free_netdev(dev);
+        return NULL;
+}
+
+/*
+ * This function removes a logical interface.
+ *
+ * It deregisters, resets and frees the interface by performing
+ * the following operations -
+ *      - Disconnect the device if connected, send wireless event to
+ *        notify applications.
+ *      - Remove the debug FS structure if configured
+ *      - Unregister the device from kernel
+ *      - Free the net device structure
+ *      - Cancel all works and destroy work queue
+ *      - Unregister and free the wireless device from CFG80211 subsystem
+ */
+static void
+mwifiex_remove_interface(struct mwifiex_adapter *adapter, u8 bss_index)
+{
+        struct net_device *dev = NULL;
+        struct mwifiex_private *priv = adapter->priv[bss_index];
+
+        if (!priv)
+                return;
+        dev = priv->netdev;
+
+        if (priv->media_connected)
+                priv->media_connected = false;
+
+#ifdef CONFIG_DEBUG_FS
+        mwifiex_dev_debugfs_remove(priv);
+#endif
+        /* Last reference is our one */
+        dev_dbg(adapter->dev, "info: %s: refcnt = %d\n",
+                                dev->name, netdev_refcnt_read(dev));
+
+        if (dev->reg_state == NETREG_REGISTERED)
+                unregister_netdev(dev);
+
+        /* Clear the priv in adapter */
+        priv->netdev = NULL;
+        if (dev)
+                free_netdev(dev);
+
+        cancel_work_sync(&priv->cfg_workqueue);
+        flush_workqueue(priv->workqueue);
+        destroy_workqueue(priv->workqueue);
+        wiphy_unregister(priv->wdev->wiphy);
+        wiphy_free(priv->wdev->wiphy);
+        kfree(priv->wdev);
+
+        return;
+}
+
+/*
+ * Sends IOCTL request to shutdown firmware.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int mwifiex_shutdown_fw(struct mwifiex_private *priv, u8 wait_option)
+{
+        struct mwifiex_wait_queue *wait = NULL;
+        int status = 0;
+
+        /* Allocate an IOCTL request buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        status = mwifiex_misc_ioctl_init_shutdown(priv->adapter, wait,
+                                                  MWIFIEX_FUNC_SHUTDOWN);
+
+        status = mwifiex_request_ioctl(priv, wait, status, wait_option);
+
+        kfree(wait);
+        return status;
+}
+EXPORT_SYMBOL_GPL(mwifiex_shutdown_fw);
+
+/*
+ * This function check if command is pending.
+ */
+int is_command_pending(struct mwifiex_adapter *adapter)
+{
+        unsigned long flags;
+        int is_cmd_pend_q_empty;
+
+        spin_lock_irqsave(&adapter->cmd_pending_q_lock, flags);
+        is_cmd_pend_q_empty = list_empty(&adapter->cmd_pending_q);
+        spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, flags);
+
+        return !is_cmd_pend_q_empty;
+}
+
+/*
+ * This function returns the correct private structure pointer based
+ * upon the BSS number.
+ */
+struct mwifiex_private *
+mwifiex_bss_index_to_priv(struct mwifiex_adapter *adapter, u8 bss_index)
+{
+        if (!adapter || (bss_index >= adapter->priv_num))
+                return NULL;
+        return adapter->priv[bss_index];
+}
+
+/*
+ * This is the main work queue function.
+ *
+ * It handles the main process, which in turn handles the complete
+ * driver operations.
+ */
+static void mwifiex_main_work_queue(struct work_struct *work)
+{
+        struct mwifiex_adapter *adapter =
+                container_of(work, struct mwifiex_adapter, main_work);
+
+        if (adapter->surprise_removed)
+                return;
+        mwifiex_main_process(adapter);
+}
+
+/*
+ * This function cancels all works in the queue and destroys
+ * the main workqueue.
+ */
+static void
+mwifiex_terminate_workqueue(struct mwifiex_adapter *adapter)
+{
+        flush_workqueue(adapter->workqueue);
+        destroy_workqueue(adapter->workqueue);
+        adapter->workqueue = NULL;
+}
+
+/*
+ * This function adds the card.
+ *
+ * This function follows the following major steps to set up the device -
+ *      - Initialize software. This includes probing the card, registering
+ *        the interface operations table, and allocating/initializing the
+ *        adapter structure
+ *      - Set up the netlink socket
+ *      - Create and start the main work queue
+ *      - Register the device
+ *      - Initialize firmware and hardware
+ *      - Add logical interfaces
+ */
+int
+mwifiex_add_card(void *card, struct semaphore *sem,
+                 struct mwifiex_if_ops *if_ops)
+{
+        int status = 0;
+        int i;
+        struct mwifiex_adapter *adapter = NULL;
+        struct mwifiex_drv_mode *drv_mode_info = &mwifiex_drv_mode_tbl[0];
+
+        if (down_interruptible(sem))
+                goto exit_sem_err;
+
+        if (mwifiex_init_sw(card, if_ops, (void **) &adapter)) {
+                pr_err("%s: software init failed\n", __func__);
+                goto err_init_sw;
+        }
+
+        adapter->drv_mode = drv_mode_info;
+
+        adapter->hw_status = MWIFIEX_HW_STATUS_INITIALIZING;
+        /* PnP and power profile */
+        adapter->surprise_removed = false;
+        init_waitqueue_head(&adapter->init_wait_q);
+        adapter->is_suspended = false;
+        adapter->hs_activated = false;
+        init_waitqueue_head(&adapter->hs_activate_wait_q);
+
+        /* Create workqueue */
+        adapter->workqueue = create_workqueue("MWIFIEX_WORK_QUEUE");
+        if (!adapter->workqueue)
+                goto err_kmalloc;
+
+        INIT_WORK(&adapter->main_work, mwifiex_main_work_queue);
+
+        /* Register the device. Fill up the private data structure with relevant
+           information from the card and request for the required IRQ. */
+        if (adapter->if_ops.register_dev(adapter)) {
+                pr_err("%s: failed to register mwifiex device\n", __func__);
+                goto err_registerdev;
+        }
+
+        /* Init FW and HW */
+        if (mwifiex_init_hw_fw(adapter)) {
+                pr_err("%s: firmware init failed\n", __func__);
+                goto err_init_fw;
+        }
+        /* Add interfaces */
+        for (i = 0; i < drv_mode_info->intf_num; i++) {
+                if (!mwifiex_add_interface(adapter, i,
+                                adapter->drv_mode->bss_attr[i].bss_type)) {
+                        status = -1;
+                        break;
+                }
+        }
+        if (status)
+                goto err_add_intf;
+
+        up(sem);
+
+        return 0;
+
+err_add_intf:
+        for (i = 0; i < adapter->priv_num; i++)
+                mwifiex_remove_interface(adapter, i);
+err_init_fw:
+        /* Unregister device */
+        pr_debug("info: %s: unregister device\n", __func__);
+        adapter->if_ops.unregister_dev(adapter);
+err_registerdev:
+        adapter->surprise_removed = true;
+        mwifiex_terminate_workqueue(adapter);
+err_kmalloc:
+        if ((adapter->hw_status == MWIFIEX_HW_STATUS_FW_READY) ||
+            (adapter->hw_status == MWIFIEX_HW_STATUS_READY)) {
+                pr_debug("info: %s: shutdown mwifiex\n", __func__);
+                adapter->init_wait_q_woken = false;
+                status = mwifiex_shutdown_drv(adapter);
+                if (status == -EINPROGRESS)
+                        wait_event_interruptible(adapter->init_wait_q,
+                                                 adapter->init_wait_q_woken);
+        }
+
+        mwifiex_free_adapter(adapter);
+
+err_init_sw:
+        up(sem);
+
+exit_sem_err:
+        return -1;
+}
+EXPORT_SYMBOL_GPL(mwifiex_add_card);
+
+/*
+ * This function removes the card.
+ *
+ * This function follows the following major steps to remove the device -
+ *      - Stop data traffic
+ *      - Shutdown firmware
+ *      - Remove the logical interfaces
+ *      - Terminate the work queue
+ *      - Unregister the device
+ *      - Free the adapter structure
+ */
+int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem)
+{
+        struct mwifiex_private *priv = NULL;
+        int status;
+        int i;
+
+        if (down_interruptible(sem))
+                goto exit_sem_err;
+
+        if (!adapter)
+                goto exit_remove;
+
+        adapter->surprise_removed = true;
+
+        /* Stop data */
+        for (i = 0; i < adapter->priv_num; i++) {
+                priv = adapter->priv[i];
+                if (priv) {
+                        if (!netif_queue_stopped(priv->netdev))
+                                netif_stop_queue(priv->netdev);
+                        if (netif_carrier_ok(priv->netdev))
+                                netif_carrier_off(priv->netdev);
+                }
+        }
+
+        dev_dbg(adapter->dev, "cmd: calling mwifiex_shutdown_drv...\n");
+        adapter->init_wait_q_woken = false;
+        status = mwifiex_shutdown_drv(adapter);
+        if (status == -EINPROGRESS)
+                wait_event_interruptible(adapter->init_wait_q,
+                                         adapter->init_wait_q_woken);
+        dev_dbg(adapter->dev, "cmd: mwifiex_shutdown_drv done\n");
+        if (atomic_read(&adapter->rx_pending) ||
+            atomic_read(&adapter->tx_pending) ||
+            atomic_read(&adapter->ioctl_pending)) {
+                dev_err(adapter->dev, "rx_pending=%d, tx_pending=%d, "
+                       "ioctl_pending=%d\n",
+                       atomic_read(&adapter->rx_pending),
+                       atomic_read(&adapter->tx_pending),
+                       atomic_read(&adapter->ioctl_pending));
+        }
+
+        /* Remove interface */
+        for (i = 0; i < adapter->priv_num; i++)
+                mwifiex_remove_interface(adapter, i);
+
+        mwifiex_terminate_workqueue(adapter);
+
+        /* Unregister device */
+        dev_dbg(adapter->dev, "info: unregister device\n");
+        adapter->if_ops.unregister_dev(adapter);
+        /* Free adapter structure */
+        dev_dbg(adapter->dev, "info: free adapter\n");
+        mwifiex_free_adapter(adapter);
+
+exit_remove:
+        up(sem);
+exit_sem_err:
+        return 0;
+}
+EXPORT_SYMBOL_GPL(mwifiex_remove_card);
+
+/*
+ * This function initializes the module.
+ *
+ * The debug FS is also initialized if configured.
+ */
+static int
+mwifiex_init_module(void)
+{
+#ifdef CONFIG_DEBUG_FS
+        mwifiex_debugfs_init();
+#endif
+        return 0;
+}
+
+/*
+ * This function cleans up the module.
+ *
+ * The debug FS is removed if available.
+ */
+static void
+mwifiex_cleanup_module(void)
+{
+#ifdef CONFIG_DEBUG_FS
+        mwifiex_debugfs_remove();
+#endif
+}
+
+module_init(mwifiex_init_module);
+module_exit(mwifiex_cleanup_module);
+
+MODULE_AUTHOR("Marvell International Ltd.");
+MODULE_DESCRIPTION("Marvell WiFi-Ex Driver version " VERSION);
+MODULE_VERSION(VERSION);
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
new file mode 100644
index 00000000000..2b0ad8e3d6e
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -0,0 +1,1081 @@
+/*
+ * Marvell Wireless LAN device driver: major data structures and prototypes
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#ifndef _MWIFIEX_MAIN_H_
+#define _MWIFIEX_MAIN_H_
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/semaphore.h>
+#include <linux/ip.h>
+#include <linux/skbuff.h>
+#include <linux/if_arp.h>
+#include <linux/etherdevice.h>
+#include <net/sock.h>
+#include <net/lib80211.h>
+#include <linux/firmware.h>
+#include <linux/ctype.h>
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+
+extern const char driver_version[];
+extern struct mwifiex_adapter *g_adapter;
+
+enum {
+        MWIFIEX_NO_WAIT,
+        MWIFIEX_IOCTL_WAIT,
+        MWIFIEX_CMD_WAIT,
+        MWIFIEX_PROC_WAIT,
+        MWIFIEX_WSTATS_WAIT
+};
+
+#define DRV_MODE_STA       0x1
+#define DRV_MODE_UAP       0x2
+#define DRV_MODE_UAP_STA   0x3
+
+#define SD8787_W0   0x30
+#define SD8787_W1   0x31
+#define SD8787_A0   0x40
+#define SD8787_A1   0x41
+
+#define DEFAULT_FW_NAME "mrvl/sd8787_uapsta.bin"
+#define SD8787_W1_FW_NAME "mrvl/sd8787_uapsta_w1.bin"
+#define SD8787_AX_FW_NAME "mrvl/sd8787_uapsta.bin"
+
+struct mwifiex_drv_mode {
+        u16 drv_mode;
+        u16 intf_num;
+        struct mwifiex_bss_attr *bss_attr;
+};
+
+
+#define MWIFIEX_DEFAULT_WATCHDOG_TIMEOUT        (5 * HZ)
+
+#define MWIFIEX_TIMER_10S                       10000
+#define MWIFIEX_TIMER_1S                        1000
+
+#define NL_MAX_PAYLOAD      1024
+#define NL_MULTICAST_GROUP  1
+
+#define MAX_TX_PENDING      60
+
+#define HEADER_ALIGNMENT                8
+
+#define MWIFIEX_UPLD_SIZE               (2312)
+
+#define MAX_EVENT_SIZE                  1024
+
+#define ARP_FILTER_MAX_BUF_SIZE         68
+
+#define MWIFIEX_KEY_BUFFER_SIZE                 16
+#define MWIFIEX_DEFAULT_LISTEN_INTERVAL 10
+#define MWIFIEX_MAX_REGION_CODE         7
+
+#define DEFAULT_BCN_AVG_FACTOR          8
+#define DEFAULT_DATA_AVG_FACTOR         8
+
+#define FIRST_VALID_CHANNEL                             0xff
+#define DEFAULT_AD_HOC_CHANNEL                  6
+#define DEFAULT_AD_HOC_CHANNEL_A                36
+
+#define DEFAULT_BCN_MISS_TIMEOUT                5
+
+#define MAX_SCAN_BEACON_BUFFER                  8000
+
+#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 SCAN_RSSI(RSSI)                                 (0x100 - ((u8)(RSSI)))
+
+#define MWIFIEX_MAX_TOTAL_SCAN_TIME     (MWIFIEX_TIMER_10S - MWIFIEX_TIMER_1S)
+
+#define RSN_GTK_OUI_OFFSET                              2
+
+#define MWIFIEX_OUI_NOT_PRESENT                 0
+#define MWIFIEX_OUI_PRESENT                             1
+
+#define IS_CARD_RX_RCVD(adapter) (adapter->cmd_resp_received || \
+                                        adapter->event_received || \
+                                        adapter->data_received)
+
+#define MWIFIEX_TYPE_CMD                                1
+#define MWIFIEX_TYPE_DATA                               0
+#define MWIFIEX_TYPE_EVENT                              3
+
+#define DBG_CMD_NUM                                             5
+
+#define MAX_BITMAP_RATES_SIZE                   10
+
+#define MAX_CHANNEL_BAND_BG     14
+
+#define MAX_FREQUENCY_BAND_BG   2484
+
+struct mwifiex_dbg {
+        u32 num_cmd_host_to_card_failure;
+        u32 num_cmd_sleep_cfm_host_to_card_failure;
+        u32 num_tx_host_to_card_failure;
+        u32 num_event_deauth;
+        u32 num_event_disassoc;
+        u32 num_event_link_lost;
+        u32 num_cmd_deauth;
+        u32 num_cmd_assoc_success;
+        u32 num_cmd_assoc_failure;
+        u32 num_tx_timeout;
+        u32 num_cmd_timeout;
+        u16 timeout_cmd_id;
+        u16 timeout_cmd_act;
+        u16 last_cmd_id[DBG_CMD_NUM];
+        u16 last_cmd_act[DBG_CMD_NUM];
+        u16 last_cmd_index;
+        u16 last_cmd_resp_id[DBG_CMD_NUM];
+        u16 last_cmd_resp_index;
+        u16 last_event[DBG_CMD_NUM];
+        u16 last_event_index;
+};
+
+enum MWIFIEX_HARDWARE_STATUS {
+        MWIFIEX_HW_STATUS_READY,
+        MWIFIEX_HW_STATUS_INITIALIZING,
+        MWIFIEX_HW_STATUS_FW_READY,
+        MWIFIEX_HW_STATUS_INIT_DONE,
+        MWIFIEX_HW_STATUS_RESET,
+        MWIFIEX_HW_STATUS_CLOSING,
+        MWIFIEX_HW_STATUS_NOT_READY
+};
+
+enum MWIFIEX_802_11_POWER_MODE {
+        MWIFIEX_802_11_POWER_MODE_CAM,
+        MWIFIEX_802_11_POWER_MODE_PSP
+};
+
+struct mwifiex_tx_param {
+        u32 next_pkt_len;
+};
+
+enum MWIFIEX_PS_STATE {
+        PS_STATE_AWAKE,
+        PS_STATE_PRE_SLEEP,
+        PS_STATE_SLEEP_CFM,
+        PS_STATE_SLEEP
+};
+
+struct mwifiex_add_ba_param {
+        u32 tx_win_size;
+        u32 rx_win_size;
+        u32 timeout;
+};
+
+struct mwifiex_tx_aggr {
+        u8 ampdu_user;
+        u8 ampdu_ap;
+        u8 amsdu;
+};
+
+struct mwifiex_ra_list_tbl {
+        struct list_head list;
+        struct sk_buff_head skb_head;
+        u8 ra[ETH_ALEN];
+        u32 total_pkts_size;
+        u32 is_11n_enabled;
+};
+
+struct mwifiex_tid_tbl {
+        struct list_head ra_list;
+        /* spin lock for tid table */
+        spinlock_t tid_tbl_lock;
+        struct mwifiex_ra_list_tbl *ra_list_curr;
+};
+
+#define WMM_HIGHEST_PRIORITY            7
+#define HIGH_PRIO_TID                           7
+#define LOW_PRIO_TID                            0
+
+struct mwifiex_wmm_desc {
+        struct mwifiex_tid_tbl tid_tbl_ptr[MAX_NUM_TID];
+        u32 packets_out[MAX_NUM_TID];
+        /* spin lock to protect ra_list */
+        spinlock_t ra_list_spinlock;
+        struct mwifiex_wmm_ac_status ac_status[IEEE80211_MAX_QUEUES];
+        enum mwifiex_wmm_ac_e ac_down_graded_vals[IEEE80211_MAX_QUEUES];
+        u32 drv_pkt_delay_max;
+        u8 queue_priority[IEEE80211_MAX_QUEUES];
+        u32 user_pri_pkt_tx_ctrl[WMM_HIGHEST_PRIORITY + 1];     /* UP: 0 to 7 */
+
+};
+
+struct mwifiex_802_11_security {
+        u8 wpa_enabled;
+        u8 wpa2_enabled;
+        u8 wapi_enabled;
+        u8 wapi_key_on;
+        enum MWIFIEX_802_11_WEP_STATUS wep_status;
+        u32 authentication_mode;
+        u32 encryption_mode;
+};
+
+struct ieee_types_header {
+        u8 element_id;
+        u8 len;
+} __packed;
+
+struct ieee_obss_scan_param {
+        u16 obss_scan_passive_dwell;
+        u16 obss_scan_active_dwell;
+        u16 bss_chan_width_trigger_scan_int;
+        u16 obss_scan_passive_total;
+        u16 obss_scan_active_total;
+        u16 bss_width_chan_trans_delay;
+        u16 obss_scan_active_threshold;
+} __packed;
+
+struct ieee_types_obss_scan_param {
+        struct ieee_types_header ieee_hdr;
+        struct ieee_obss_scan_param obss_scan;
+} __packed;
+
+#define MWIFIEX_SUPPORTED_RATES                 14
+
+#define MWIFIEX_SUPPORTED_RATES_EXT             32
+
+#define IEEE_MAX_IE_SIZE                        256
+
+struct ieee_types_vendor_specific {
+        struct ieee_types_vendor_header vend_hdr;
+        u8 data[IEEE_MAX_IE_SIZE - sizeof(struct ieee_types_vendor_header)];
+} __packed;
+
+struct ieee_types_generic {
+        struct ieee_types_header ieee_hdr;
+        u8 data[IEEE_MAX_IE_SIZE - sizeof(struct ieee_types_header)];
+} __packed;
+
+struct mwifiex_bssdescriptor {
+        u8 mac_address[ETH_ALEN];
+        struct mwifiex_802_11_ssid ssid;
+        u32 privacy;
+        s32 rssi;
+        u32 channel;
+        u32 freq;
+        u16 beacon_period;
+        u8 erp_flags;
+        u32 bss_mode;
+        u8 supported_rates[MWIFIEX_SUPPORTED_RATES];
+        u8 data_rates[MWIFIEX_SUPPORTED_RATES];
+        /* Network band.
+         * BAND_B(0x01): 'b' band
+         * BAND_G(0x02): 'g' band
+         * BAND_A(0X04): 'a' band
+         */
+        u16 bss_band;
+        long long network_tsf;
+        u8 time_stamp[8];
+        union ieee_types_phy_param_set phy_param_set;
+        union ieee_types_ss_param_set ss_param_set;
+        u16 cap_info_bitmap;
+        struct ieee_types_wmm_parameter wmm_ie;
+        u8  disable_11n;
+        struct ieee80211_ht_cap *bcn_ht_cap;
+        u16 ht_cap_offset;
+        struct ieee80211_ht_info *bcn_ht_info;
+        u16 ht_info_offset;
+        u8 *bcn_bss_co_2040;
+        u16 bss_co_2040_offset;
+        u8 *bcn_ext_cap;
+        u16 ext_cap_offset;
+        struct ieee_types_obss_scan_param *bcn_obss_scan;
+        u16 overlap_bss_offset;
+        struct ieee_types_vendor_specific *bcn_wpa_ie;
+        u16 wpa_offset;
+        struct ieee_types_generic *bcn_rsn_ie;
+        u16 rsn_offset;
+        struct ieee_types_generic *bcn_wapi_ie;
+        u16 wapi_offset;
+        u8 *beacon_buf;
+        u32 beacon_buf_size;
+        u32 beacon_buf_size_max;
+
+};
+
+struct mwifiex_current_bss_params {
+        struct mwifiex_bssdescriptor bss_descriptor;
+        u8 wmm_enabled;
+        u8 wmm_uapsd_enabled;
+        u8 band;
+        u32 num_of_rates;
+        u8 data_rates[MWIFIEX_SUPPORTED_RATES];
+};
+
+struct mwifiex_sleep_params {
+        u16 sp_error;
+        u16 sp_offset;
+        u16 sp_stable_time;
+        u8 sp_cal_control;
+        u8 sp_ext_sleep_clk;
+        u16 sp_reserved;
+};
+
+struct mwifiex_sleep_period {
+        u16 period;
+        u16 reserved;
+};
+
+struct mwifiex_wep_key {
+        u32 length;
+        u32 key_index;
+        u32 key_length;
+        u8 key_material[MWIFIEX_KEY_BUFFER_SIZE];
+};
+
+#define MAX_REGION_CHANNEL_NUM  2
+
+struct mwifiex_chan_freq_power {
+        u16 channel;
+        u32 freq;
+        u16 max_tx_power;
+        u8 unsupported;
+};
+
+enum state_11d_t {
+        DISABLE_11D = 0,
+        ENABLE_11D = 1,
+};
+
+#define MWIFIEX_MAX_TRIPLET_802_11D             83
+
+struct mwifiex_802_11d_domain_reg {
+        u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
+        u8 no_of_triplet;
+        struct ieee80211_country_ie_triplet
+                triplet[MWIFIEX_MAX_TRIPLET_802_11D];
+};
+
+struct mwifiex_vendor_spec_cfg_ie {
+        u16 mask;
+        u16 flag;
+        u8 ie[MWIFIEX_MAX_VSIE_LEN];
+};
+
+struct wps {
+        u8 session_enable;
+};
+
+struct mwifiex_adapter;
+struct mwifiex_private;
+
+struct mwifiex_private {
+        struct mwifiex_adapter *adapter;
+        u8 bss_index;
+        u8 bss_type;
+        u8 bss_role;
+        u8 bss_priority;
+        u8 bss_num;
+        u8 frame_type;
+        u8 curr_addr[ETH_ALEN];
+        u8 media_connected;
+        u32 num_tx_timeout;
+        struct net_device *netdev;
+        struct net_device_stats stats;
+        u16 curr_pkt_filter;
+        u32 bss_mode;
+        u32 pkt_tx_ctrl;
+        u16 tx_power_level;
+        u8 max_tx_power_level;
+        u8 min_tx_power_level;
+        u8 tx_rate;
+        u8 tx_htinfo;
+        u8 rxpd_htinfo;
+        u8 rxpd_rate;
+        u16 rate_bitmap;
+        u16 bitmap_rates[MAX_BITMAP_RATES_SIZE];
+        u32 data_rate;
+        u8 is_data_rate_auto;
+        u16 bcn_avg_factor;
+        u16 data_avg_factor;
+        s16 data_rssi_last;
+        s16 data_nf_last;
+        s16 data_rssi_avg;
+        s16 data_nf_avg;
+        s16 bcn_rssi_last;
+        s16 bcn_nf_last;
+        s16 bcn_rssi_avg;
+        s16 bcn_nf_avg;
+        struct mwifiex_bssdescriptor *attempted_bss_desc;
+        struct mwifiex_802_11_ssid prev_ssid;
+        u8 prev_bssid[ETH_ALEN];
+        struct mwifiex_current_bss_params curr_bss_params;
+        u16 beacon_period;
+        u16 listen_interval;
+        u16 atim_window;
+        u8 adhoc_channel;
+        u8 adhoc_is_link_sensed;
+        u8 adhoc_state;
+        struct mwifiex_802_11_security sec_info;
+        struct mwifiex_wep_key wep_key[NUM_WEP_KEYS];
+        u16 wep_key_curr_index;
+        u8 wpa_ie[256];
+        u8 wpa_ie_len;
+        u8 wpa_is_gtk_set;
+        struct host_cmd_ds_802_11_key_material aes_key;
+        u8 wapi_ie[256];
+        u8 wapi_ie_len;
+        u8 wmm_required;
+        u8 wmm_enabled;
+        u8 wmm_qosinfo;
+        struct mwifiex_wmm_desc wmm;
+        struct list_head tx_ba_stream_tbl_ptr;
+        /* spin lock for tx_ba_stream_tbl_ptr queue */
+        spinlock_t tx_ba_stream_tbl_lock;
+        struct mwifiex_tx_aggr aggr_prio_tbl[MAX_NUM_TID];
+        struct mwifiex_add_ba_param add_ba_param;
+        u16 rx_seq[MAX_NUM_TID];
+        struct list_head rx_reorder_tbl_ptr;
+        /* spin lock for rx_reorder_tbl_ptr queue */
+        spinlock_t rx_reorder_tbl_lock;
+        /* spin lock for Rx packets */
+        spinlock_t rx_pkt_lock;
+
+#define MWIFIEX_ASSOC_RSP_BUF_SIZE  500
+        u8 assoc_rsp_buf[MWIFIEX_ASSOC_RSP_BUF_SIZE];
+        u32 assoc_rsp_size;
+
+#define MWIFIEX_GENIE_BUF_SIZE      256
+        u8 gen_ie_buf[MWIFIEX_GENIE_BUF_SIZE];
+        u8 gen_ie_buf_len;
+
+        struct mwifiex_vendor_spec_cfg_ie vs_ie[MWIFIEX_MAX_VSIE_NUM];
+
+#define MWIFIEX_ASSOC_TLV_BUF_SIZE  256
+        u8 assoc_tlv_buf[MWIFIEX_ASSOC_TLV_BUF_SIZE];
+        u8 assoc_tlv_buf_len;
+
+        u8 *curr_bcn_buf;
+        u32 curr_bcn_size;
+        /* spin lock for beacon buffer */
+        spinlock_t curr_bcn_buf_lock;
+        u16 ioctl_wait_q_woken;
+        wait_queue_head_t ioctl_wait_q;
+        u16 cmd_wait_q_woken;
+        wait_queue_head_t cmd_wait_q;
+        struct wireless_dev *wdev;
+        struct mwifiex_chan_freq_power cfp;
+        char version_str[128];
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *dfs_dev_dir;
+#endif
+        u8 nick_name[16];
+        struct iw_statistics w_stats;
+        u16 w_stats_wait_q_woken;
+        wait_queue_head_t w_stats_wait_q;
+        u16 current_key_index;
+        struct semaphore async_sem;
+        u8 scan_pending_on_block;
+        u8 report_scan_result;
+        struct cfg80211_scan_request *scan_request;
+        int scan_result_status;
+        bool assoc_request;
+        u16 assoc_result;
+        bool ibss_join_request;
+        u16 ibss_join_result;
+        bool disconnect;
+        u8 cfg_bssid[6];
+        struct workqueue_struct *workqueue;
+        struct work_struct cfg_workqueue;
+        u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
+        struct wps wps;
+        u8 scan_block;
+};
+
+enum mwifiex_ba_status {
+        BA_STREAM_NOT_SETUP = 0,
+        BA_STREAM_SETUP_INPROGRESS,
+        BA_STREAM_SETUP_COMPLETE
+};
+
+struct mwifiex_tx_ba_stream_tbl {
+        struct list_head list;
+        int tid;
+        u8 ra[ETH_ALEN];
+        enum mwifiex_ba_status ba_status;
+};
+
+struct mwifiex_rx_reorder_tbl;
+
+struct reorder_tmr_cnxt {
+        struct timer_list timer;
+        struct mwifiex_rx_reorder_tbl *ptr;
+        struct mwifiex_private *priv;
+};
+
+struct mwifiex_rx_reorder_tbl {
+        struct list_head list;
+        int tid;
+        u8 ta[ETH_ALEN];
+        int start_win;
+        int win_size;
+        void **rx_reorder_ptr;
+        struct reorder_tmr_cnxt timer_context;
+};
+
+struct mwifiex_bss_prio_node {
+        struct list_head list;
+        struct mwifiex_private *priv;
+};
+
+struct mwifiex_bss_prio_tbl {
+        struct list_head bss_prio_head;
+        /* spin lock for bss priority  */
+        spinlock_t bss_prio_lock;
+        struct mwifiex_bss_prio_node *bss_prio_cur;
+};
+
+struct cmd_ctrl_node {
+        struct list_head list;
+        struct mwifiex_private *priv;
+        u32 cmd_oid;
+        u32 cmd_flag;
+        struct sk_buff *cmd_skb;
+        struct sk_buff *resp_skb;
+        void *data_buf;
+        void *wq_buf;
+        struct sk_buff *skb;
+};
+
+struct mwifiex_if_ops {
+        int (*init_if) (struct mwifiex_adapter *);
+        void (*cleanup_if) (struct mwifiex_adapter *);
+        int (*check_fw_status) (struct mwifiex_adapter *, u32, int *);
+        int (*prog_fw) (struct mwifiex_adapter *, struct mwifiex_fw_image *);
+        int (*register_dev) (struct mwifiex_adapter *);
+        void (*unregister_dev) (struct mwifiex_adapter *);
+        int (*enable_int) (struct mwifiex_adapter *);
+        int (*process_int_status) (struct mwifiex_adapter *);
+        int (*host_to_card) (struct mwifiex_adapter *, u8,
+                             u8 *payload, u32 pkt_len,
+                             struct mwifiex_tx_param *);
+        int (*wakeup) (struct mwifiex_adapter *);
+        int (*wakeup_complete) (struct mwifiex_adapter *);
+
+        void (*update_mp_end_port) (struct mwifiex_adapter *, u16);
+        void (*cleanup_mpa_buf) (struct mwifiex_adapter *);
+};
+
+struct mwifiex_adapter {
+        struct mwifiex_private *priv[MWIFIEX_MAX_BSS_NUM];
+        u8 priv_num;
+        struct mwifiex_drv_mode *drv_mode;
+        const struct firmware *firmware;
+        struct device *dev;
+        bool surprise_removed;
+        u32 fw_release_number;
+        u32 revision_id;
+        u16 init_wait_q_woken;
+        wait_queue_head_t init_wait_q;
+        void *card;
+        struct mwifiex_if_ops if_ops;
+        atomic_t rx_pending;
+        atomic_t tx_pending;
+        atomic_t ioctl_pending;
+        struct workqueue_struct *workqueue;
+        struct work_struct main_work;
+        struct mwifiex_bss_prio_tbl bss_prio_tbl[MWIFIEX_MAX_BSS_NUM];
+        /* spin lock for init/shutdown */
+        spinlock_t mwifiex_lock;
+        /* spin lock for main process */
+        spinlock_t main_proc_lock;
+        u32 mwifiex_processing;
+        u16 max_tx_buf_size;
+        u16 tx_buf_size;
+        u16 curr_tx_buf_size;
+        u32 ioport;
+        enum MWIFIEX_HARDWARE_STATUS hw_status;
+        u16 radio_on;
+        u16 number_of_antenna;
+        u32 fw_cap_info;
+        /* spin lock for interrupt handling */
+        spinlock_t int_lock;
+        u8 int_status;
+        u32 event_cause;
+        struct sk_buff *event_skb;
+        u8 upld_buf[MWIFIEX_UPLD_SIZE];
+        u8 data_sent;
+        u8 cmd_sent;
+        u8 cmd_resp_received;
+        u8 event_received;
+        u8 data_received;
+        u16 seq_num;
+        struct cmd_ctrl_node *cmd_pool;
+        struct cmd_ctrl_node *curr_cmd;
+        /* spin lock for command */
+        spinlock_t mwifiex_cmd_lock;
+        u32 num_cmd_timeout;
+        u16 last_init_cmd;
+        struct timer_list cmd_timer;
+        struct list_head cmd_free_q;
+        /* spin lock for cmd_free_q */
+        spinlock_t cmd_free_q_lock;
+        struct list_head cmd_pending_q;
+        /* spin lock for cmd_pending_q */
+        spinlock_t cmd_pending_q_lock;
+        struct list_head scan_pending_q;
+        /* spin lock for scan_pending_q */
+        spinlock_t scan_pending_q_lock;
+        u32 scan_processing;
+        u16 region_code;
+        struct mwifiex_802_11d_domain_reg domain_reg;
+        struct mwifiex_bssdescriptor *scan_table;
+        u32 num_in_scan_table;
+        u16 scan_probes;
+        u32 scan_mode;
+        u16 specific_scan_time;
+        u16 active_scan_time;
+        u16 passive_scan_time;
+        u8 bcn_buf[MAX_SCAN_BEACON_BUFFER];
+        u8 *bcn_buf_end;
+        u8 fw_bands;
+        u8 adhoc_start_band;
+        u8 config_bands;
+        struct mwifiex_chan_scan_param_set *scan_channels;
+        u8 tx_lock_flag;
+        struct mwifiex_sleep_params sleep_params;
+        struct mwifiex_sleep_period sleep_period;
+        u16 ps_mode;
+        u32 ps_state;
+        u8 need_to_wakeup;
+        u16 multiple_dtim;
+        u16 local_listen_interval;
+        u16 null_pkt_interval;
+        struct sk_buff *sleep_cfm;
+        u16 bcn_miss_time_out;
+        u16 adhoc_awake_period;
+        u8 is_deep_sleep;
+        u8 delay_null_pkt;
+        u16 delay_to_ps;
+        u16 enhanced_ps_mode;
+        u8 pm_wakeup_card_req;
+        u16 gen_null_pkt;
+        u16 pps_uapsd_mode;
+        u32 pm_wakeup_fw_try;
+        u8 is_hs_configured;
+        struct mwifiex_hs_config_param hs_cfg;
+        u8 hs_activated;
+        u16 hs_activate_wait_q_woken;
+        wait_queue_head_t hs_activate_wait_q;
+        bool is_suspended;
+        u8 event_body[MAX_EVENT_SIZE];
+        u32 hw_dot_11n_dev_cap;
+        u8 hw_dev_mcs_support;
+        u32 usr_dot_11n_dev_cap;
+        u8 usr_dev_mcs_support;
+        u8 adhoc_11n_enabled;
+        u8 chan_offset;
+        struct mwifiex_dbg dbg;
+        u8 arp_filter[ARP_FILTER_MAX_BUF_SIZE];
+        u32 arp_filter_size;
+};
+
+int mwifiex_init_lock_list(struct mwifiex_adapter *adapter);
+void mwifiex_free_lock_list(struct mwifiex_adapter *adapter);
+
+int mwifiex_init_fw(struct mwifiex_adapter *adapter);
+
+int mwifiex_init_fw_complete(struct mwifiex_adapter *adapter);
+
+int mwifiex_shutdown_drv(struct mwifiex_adapter *adapter);
+
+int mwifiex_shutdown_fw_complete(struct mwifiex_adapter *adapter);
+
+int mwifiex_dnld_fw(struct mwifiex_adapter *, struct mwifiex_fw_image *);
+
+int mwifiex_recv_complete(struct mwifiex_adapter *,
+                          struct sk_buff *skb,
+                          int status);
+
+int mwifiex_recv_packet(struct mwifiex_adapter *, struct sk_buff *skb);
+
+int mwifiex_process_event(struct mwifiex_adapter *adapter);
+
+int mwifiex_ioctl_complete(struct mwifiex_adapter *adapter,
+                           struct mwifiex_wait_queue *ioctl_wq,
+                           int status);
+
+int mwifiex_prepare_cmd(struct mwifiex_private *priv,
+                        uint16_t cmd_no,
+                        u16 cmd_action,
+                        u32 cmd_oid,
+                        void *wait_queue, void *data_buf);
+
+void mwifiex_cmd_timeout_func(unsigned long function_context);
+
+int mwifiex_misc_ioctl_init_shutdown(struct mwifiex_adapter *adapter,
+                                     struct mwifiex_wait_queue *wait_queue,
+                                     u32 func_init_shutdown);
+int mwifiex_get_debug_info(struct mwifiex_private *,
+                           struct mwifiex_debug_info *);
+
+int mwifiex_alloc_cmd_buffer(struct mwifiex_adapter *adapter);
+int mwifiex_free_cmd_buffer(struct mwifiex_adapter *adapter);
+void mwifiex_cancel_all_pending_cmd(struct mwifiex_adapter *adapter);
+void mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter,
+                                  struct mwifiex_wait_queue *ioctl_wq);
+
+void mwifiex_insert_cmd_to_free_q(struct mwifiex_adapter *adapter,
+                                  struct cmd_ctrl_node *cmd_node);
+
+void mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter,
+                                     struct cmd_ctrl_node *cmd_node,
+                                     u32 addtail);
+
+int mwifiex_exec_next_cmd(struct mwifiex_adapter *adapter);
+int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter);
+int mwifiex_handle_rx_packet(struct mwifiex_adapter *adapter,
+                             struct sk_buff *skb);
+int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,
+                       struct mwifiex_tx_param *tx_param);
+int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags);
+int mwifiex_write_data_complete(struct mwifiex_adapter *adapter,
+                                struct sk_buff *skb, int status);
+int mwifiex_recv_packet_complete(struct mwifiex_adapter *,
+                                 struct sk_buff *skb, int status);
+void mwifiex_clean_txrx(struct mwifiex_private *priv);
+u8 mwifiex_check_last_packet_indication(struct mwifiex_private *priv);
+void mwifiex_check_ps_cond(struct mwifiex_adapter *adapter);
+void mwifiex_process_sleep_confirm_resp(struct mwifiex_adapter *, u8 *,
+                                        u32);
+int mwifiex_cmd_enh_power_mode(struct mwifiex_private *priv,
+                               struct host_cmd_ds_command *cmd,
+                               u16 cmd_action, uint16_t ps_bitmap,
+                               void *data_buf);
+int mwifiex_ret_enh_power_mode(struct mwifiex_private *priv,
+                               struct host_cmd_ds_command *resp,
+                               void *data_buf);
+void mwifiex_process_hs_config(struct mwifiex_adapter *adapter);
+void mwifiex_hs_activated_event(struct mwifiex_private *priv,
+                                        u8 activated);
+int mwifiex_ret_802_11_hs_cfg(struct mwifiex_private *priv,
+                              struct host_cmd_ds_command *resp);
+int mwifiex_process_rx_packet(struct mwifiex_adapter *adapter,
+                              struct sk_buff *skb);
+int mwifiex_sta_prepare_cmd(struct mwifiex_private *, uint16_t cmd_no,
+                            u16 cmd_action, u32 cmd_oid,
+                            void *data_buf, void *cmd_buf);
+int mwifiex_process_sta_cmdresp(struct mwifiex_private *, u16 cmdresp_no,
+                                void *cmd_buf, void *ioctl);
+int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *,
+                                  struct sk_buff *skb);
+int mwifiex_process_sta_event(struct mwifiex_private *);
+void *mwifiex_process_sta_txpd(struct mwifiex_private *, struct sk_buff *skb);
+int mwifiex_sta_init_cmd(struct mwifiex_private *, u8 first_sta);
+int mwifiex_scan_networks(struct mwifiex_private *priv, void *wait_queue,
+                          u16 action,
+                          const struct mwifiex_user_scan_cfg
+                          *user_scan_in, struct mwifiex_scan_resp *);
+int mwifiex_cmd_802_11_scan(struct mwifiex_private *priv,
+                            struct host_cmd_ds_command *cmd,
+                            void *data_buf);
+void mwifiex_queue_scan_cmd(struct mwifiex_private *priv,
+                            struct cmd_ctrl_node *cmd_node);
+int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
+                            struct host_cmd_ds_command *resp,
+                            void *wait_queue);
+s32 mwifiex_find_ssid_in_list(struct mwifiex_private *priv,
+                                struct mwifiex_802_11_ssid *ssid, u8 *bssid,
+                                u32 mode);
+s32 mwifiex_find_bssid_in_list(struct mwifiex_private *priv, u8 *bssid,
+                                 u32 mode);
+int mwifiex_find_best_network(struct mwifiex_private *priv,
+                              struct mwifiex_ssid_bssid *req_ssid_bssid);
+s32 mwifiex_ssid_cmp(struct mwifiex_802_11_ssid *ssid1,
+                       struct mwifiex_802_11_ssid *ssid2);
+int mwifiex_associate(struct mwifiex_private *priv, void *wait_queue,
+                      struct mwifiex_bssdescriptor *bss_desc);
+int mwifiex_cmd_802_11_associate(struct mwifiex_private *priv,
+                                 struct host_cmd_ds_command
+                                 *cmd, void *data_buf);
+int mwifiex_ret_802_11_associate(struct mwifiex_private *priv,
+                                 struct host_cmd_ds_command *resp,
+                                 void *wait_queue);
+void mwifiex_reset_connect_state(struct mwifiex_private *priv);
+void mwifiex_2040_coex_event(struct mwifiex_private *priv);
+u8 mwifiex_band_to_radio_type(u8 band);
+int mwifiex_deauthenticate(struct mwifiex_private *priv,
+                           struct mwifiex_wait_queue *wait_queue,
+                           u8 *mac);
+int mwifiex_adhoc_start(struct mwifiex_private *priv, void *wait_queue,
+                        struct mwifiex_802_11_ssid *adhoc_ssid);
+int mwifiex_adhoc_join(struct mwifiex_private *priv, void *wait_queue,
+                       struct mwifiex_bssdescriptor *bss_desc);
+int mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
+                                    struct host_cmd_ds_command *cmd,
+                                    void *data_buf);
+int mwifiex_cmd_802_11_ad_hoc_join(struct mwifiex_private *priv,
+                                   struct host_cmd_ds_command *cmd,
+                                   void *data_buf);
+int mwifiex_ret_802_11_ad_hoc(struct mwifiex_private *priv,
+                              struct host_cmd_ds_command *resp,
+                              void *wait_queue);
+int mwifiex_cmd_802_11_bg_scan_query(struct mwifiex_private *priv,
+                                     struct host_cmd_ds_command *cmd,
+                                     void *data_buf);
+struct mwifiex_chan_freq_power *
+                        mwifiex_get_cfp_by_band_and_channel_from_cfg80211(
+                                                struct mwifiex_private *priv,
+                                                u8 band, u16 channel);
+struct mwifiex_chan_freq_power *mwifiex_get_cfp_by_band_and_freq_from_cfg80211(
+                                                struct mwifiex_private *priv,
+                                                u8 band, u32 freq);
+u32 mwifiex_index_to_data_rate(struct mwifiex_adapter *adapter, u8 index,
+                                 u8 ht_info);
+u32 mwifiex_find_freq_from_band_chan(u8, u8);
+int mwifiex_cmd_append_vsie_tlv(struct mwifiex_private *priv, u16 vsie_mask,
+                                u8 **buffer);
+u32 mwifiex_index_to_data_rate(struct mwifiex_adapter *adapter, u8 index,
+                                 u8 ht_info);
+u32 mwifiex_get_active_data_rates(struct mwifiex_private *priv,
+                                    u8 *rates);
+u32 mwifiex_get_supported_rates(struct mwifiex_private *priv, u8 *rates);
+u8 mwifiex_data_rate_to_index(struct mwifiex_adapter *adapter, u32 rate);
+u8 mwifiex_is_rate_auto(struct mwifiex_private *priv);
+int mwifiex_get_rate_index(struct mwifiex_adapter *adapter,
+                           u16 *rateBitmap, int size);
+extern u16 region_code_index[MWIFIEX_MAX_REGION_CODE];
+void mwifiex_save_curr_bcn(struct mwifiex_private *priv);
+void mwifiex_free_curr_bcn(struct mwifiex_private *priv);
+int mwifiex_cmd_get_hw_spec(struct mwifiex_private *priv,
+                            struct host_cmd_ds_command *cmd);
+int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv,
+                            struct host_cmd_ds_command *resp);
+int is_command_pending(struct mwifiex_adapter *adapter);
+
+/*
+ * This function checks if the queuing is RA based or not.
+ */
+static inline u8
+mwifiex_queuing_ra_based(struct mwifiex_private *priv)
+{
+        /*
+         * Currently we assume if we are in Infra, then DA=RA. This might not be
+         * true in the future
+         */
+        if ((priv->bss_mode == MWIFIEX_BSS_MODE_INFRA) &&
+            (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA))
+                return false;
+
+        return true;
+}
+
+/*
+ * This function copies rates.
+ */
+static inline u32
+mwifiex_copy_rates(u8 *dest, u32 pos, u8 *src, int len)
+{
+        int i;
+
+        for (i = 0; i < len && src[i]; i++, pos++) {
+                if (pos >= MWIFIEX_SUPPORTED_RATES)
+                        break;
+                dest[pos] = src[i];
+        }
+
+        return pos;
+}
+
+/*
+ * This function returns the correct private structure pointer based
+ * upon the BSS type and BSS number.
+ */
+static inline struct mwifiex_private *
+mwifiex_get_priv_by_id(struct mwifiex_adapter *adapter,
+                       u32 bss_num, u32 bss_type)
+{
+        int i;
+
+        for (i = 0; i < adapter->priv_num; i++) {
+                if (adapter->priv[i]) {
+                        if ((adapter->priv[i]->bss_num == bss_num)
+                            && (adapter->priv[i]->bss_type == bss_type))
+                                break;
+                }
+        }
+        return ((i < adapter->priv_num) ? adapter->priv[i] : NULL);
+}
+
+/*
+ * This function returns the first available private structure pointer
+ * based upon the BSS role.
+ */
+static inline struct mwifiex_private *
+mwifiex_get_priv(struct mwifiex_adapter *adapter,
+                 enum mwifiex_bss_role bss_role)
+{
+        int i;
+
+        for (i = 0; i < adapter->priv_num; i++) {
+                if (adapter->priv[i]) {
+                        if (bss_role == MWIFIEX_BSS_ROLE_ANY ||
+                            GET_BSS_ROLE(adapter->priv[i]) == bss_role)
+                                break;
+                }
+        }
+
+        return ((i < adapter->priv_num) ? adapter->priv[i] : NULL);
+}
+
+/*
+ * This function returns the driver private structure of a network device.
+ */
+static inline struct mwifiex_private *
+mwifiex_netdev_get_priv(struct net_device *dev)
+{
+        return (struct mwifiex_private *) (*(unsigned long *) netdev_priv(dev));
+}
+
+struct mwifiex_wait_queue *mwifiex_alloc_fill_wait_queue(
+                                struct mwifiex_private *,
+                                u8 wait_option);
+struct mwifiex_private *mwifiex_bss_index_to_priv(struct mwifiex_adapter
+                                                *adapter, u8 bss_index);
+int mwifiex_shutdown_fw(struct mwifiex_private *, u8);
+
+int mwifiex_add_card(void *, struct semaphore *, struct mwifiex_if_ops *);
+int mwifiex_remove_card(struct mwifiex_adapter *, struct semaphore *);
+
+void mwifiex_get_version(struct mwifiex_adapter *adapter, char *version,
+                         int maxlen);
+int mwifiex_request_set_mac_address(struct mwifiex_private *priv);
+void mwifiex_request_set_multicast_list(struct mwifiex_private *priv,
+                                        struct net_device *dev);
+int mwifiex_request_ioctl(struct mwifiex_private *priv,
+                          struct mwifiex_wait_queue *req,
+                          int, u8 wait_option);
+int mwifiex_disconnect(struct mwifiex_private *, u8, u8 *);
+int mwifiex_bss_start(struct mwifiex_private *priv,
+                      u8 wait_option,
+                      struct mwifiex_ssid_bssid *ssid_bssid);
+int mwifiex_set_hs_params(struct mwifiex_private *priv,
+                              u16 action, u8 wait_option,
+                              struct mwifiex_ds_hs_cfg *hscfg);
+int mwifiex_cancel_hs(struct mwifiex_private *priv, u8 wait_option);
+int mwifiex_enable_hs(struct mwifiex_adapter *adapter);
+void mwifiex_process_ioctl_resp(struct mwifiex_private *priv,
+                                struct mwifiex_wait_queue *req);
+u32 mwifiex_get_mode(struct mwifiex_private *priv, u8 wait_option);
+int mwifiex_get_signal_info(struct mwifiex_private *priv,
+                            u8 wait_option,
+                            struct mwifiex_ds_get_signal *signal);
+int mwifiex_drv_get_data_rate(struct mwifiex_private *priv,
+                              struct mwifiex_rate_cfg *rate);
+int mwifiex_get_channel_list(struct mwifiex_private *priv,
+                             u8 wait_option,
+                             struct mwifiex_chan_list *chanlist);
+int mwifiex_get_scan_table(struct mwifiex_private *priv,
+                           u8 wait_option,
+                           struct mwifiex_scan_resp *scanresp);
+int mwifiex_get_auth_mode(struct mwifiex_private *priv,
+                          u8 wait_option, u32 *auth_mode);
+int mwifiex_get_encrypt_mode(struct mwifiex_private *priv,
+                             u8 wait_option,
+                             u32 *encrypt_mode);
+int mwifiex_enable_wep_key(struct mwifiex_private *priv, u8 wait_option);
+int mwifiex_find_best_bss(struct mwifiex_private *priv, u8 wait_option,
+                          struct mwifiex_ssid_bssid *ssid_bssid);
+int mwifiex_request_scan(struct mwifiex_private *priv,
+                         u8 wait_option,
+                         struct mwifiex_802_11_ssid *req_ssid);
+int mwifiex_set_user_scan_ioctl(struct mwifiex_private *priv,
+                                struct mwifiex_user_scan_cfg *scan_req);
+int mwifiex_change_adhoc_chan(struct mwifiex_private *priv, int channel);
+int mwifiex_set_radio(struct mwifiex_private *priv, u8 option);
+
+int mwifiex_drv_get_mode(struct mwifiex_private *priv, u8 wait_option);
+
+int mwifiex_drv_change_adhoc_chan(struct mwifiex_private *priv, int channel);
+
+int mwifiex_set_auth(struct mwifiex_private *priv, int encrypt_mode,
+                     int auth_mode, int wpa_enabled);
+
+int mwifiex_set_encode(struct mwifiex_private *priv, const u8 *key,
+                       int key_len, u8 key_index, int disable);
+
+int mwifiex_set_gen_ie(struct mwifiex_private *priv, u8 *ie, int ie_len);
+
+int mwifiex_get_ver_ext(struct mwifiex_private *priv);
+
+int mwifiex_get_stats_info(struct mwifiex_private *priv,
+                           struct mwifiex_ds_get_stats *log);
+
+int mwifiex_reg_write(struct mwifiex_private *priv, u32 reg_type,
+                      u32 reg_offset, u32 reg_value);
+
+int mwifiex_reg_read(struct mwifiex_private *priv, u32 reg_type,
+                     u32 reg_offset, u32 *value);
+
+int mwifiex_eeprom_read(struct mwifiex_private *priv, u16 offset, u16 bytes,
+                        u8 *value);
+
+int mwifiex_set_11n_httx_cfg(struct mwifiex_private *priv, int data);
+
+int mwifiex_get_11n_httx_cfg(struct mwifiex_private *priv, int *data);
+
+int mwifiex_set_tx_rate_cfg(struct mwifiex_private *priv, int tx_rate_index);
+
+int mwifiex_get_tx_rate_cfg(struct mwifiex_private *priv, int *tx_rate_index);
+
+int mwifiex_drv_set_power(struct mwifiex_private *priv, bool power_on);
+
+int mwifiex_drv_get_driver_version(struct mwifiex_adapter *adapter,
+                                   char *version, int max_len);
+
+int mwifiex_set_tx_power(struct mwifiex_private *priv, int type, int dbm);
+
+int mwifiex_main_process(struct mwifiex_adapter *);
+
+int mwifiex_bss_ioctl_mode(struct mwifiex_private *,
+                           struct mwifiex_wait_queue *,
+                           u16 action, int *mode);
+int mwifiex_bss_ioctl_channel(struct mwifiex_private *,
+                              u16 action,
+                              struct mwifiex_chan_freq_power *cfp);
+int mwifiex_bss_ioctl_find_bss(struct mwifiex_private *,
+                               struct mwifiex_wait_queue *,
+                               struct mwifiex_ssid_bssid *);
+int mwifiex_radio_ioctl_band_cfg(struct mwifiex_private *,
+                                 u16 action,
+                                 struct mwifiex_ds_band_cfg *);
+int mwifiex_snmp_mib_ioctl(struct mwifiex_private *,
+                           struct mwifiex_wait_queue *,
+                           u32 cmd_oid, u16 action, u32 *value);
+int mwifiex_get_bss_info(struct mwifiex_private *,
+                         struct mwifiex_bss_info *);
+
+#ifdef CONFIG_DEBUG_FS
+void mwifiex_debugfs_init(void);
+void mwifiex_debugfs_remove(void);
+
+void mwifiex_dev_debugfs_init(struct mwifiex_private *priv);
+void mwifiex_dev_debugfs_remove(struct mwifiex_private *priv);
+#endif
+#endif /* !_MWIFIEX_MAIN_H_ */
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
new file mode 100644
index 00000000000..1152beb930a
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -0,0 +1,3098 @@
+/*
+ * Marvell Wireless LAN device driver: scan ioctl and command handling
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "11n.h"
+#include "cfg80211.h"
+
+/* 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
+
+/* 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)         \
+                                + (MWIFIEX_MAX_CHANNELS_PER_SPECIFIC_SCAN     \
+                                *sizeof(struct mwifiex_chan_scan_param_set)))
+
+/* Memory needed to store supported rate */
+#define RATE_TLV_MAX_SIZE   (sizeof(struct mwifiex_ie_types_rates_param_set) \
+                                + HOSTCMD_SUPPORTED_RATES)
+
+/* Memory needed to store a max number/size WildCard SSID TLV for a firmware
+        scan */
+#define WILDCARD_SSID_TLV_MAX_SIZE  \
+        (MWIFIEX_MAX_SSID_LIST_LENGTH *                                 \
+                (sizeof(struct mwifiex_ie_types_wildcard_ssid_params)   \
+                        + IEEE80211_MAX_SSID_LEN))
+
+/* Maximum memory needed for a mwifiex_scan_cmd_config with all TLVs at max */
+#define MAX_SCAN_CFG_ALLOC (sizeof(struct mwifiex_scan_cmd_config)        \
+                                + sizeof(struct mwifiex_ie_types_num_probes)   \
+                                + sizeof(struct mwifiex_ie_types_htcap)       \
+                                + CHAN_TLV_MAX_SIZE                 \
+                                + RATE_TLV_MAX_SIZE                 \
+                                + WILDCARD_SSID_TLV_MAX_SIZE)
+
+
+union mwifiex_scan_cmd_config_tlv {
+        /* Scan configuration (variable length) */
+        struct mwifiex_scan_cmd_config config;
+        /* Max allocated block */
+        u8 config_alloc_buf[MAX_SCAN_CFG_ALLOC];
+};
+
+enum cipher_suite {
+        CIPHER_SUITE_TKIP,
+        CIPHER_SUITE_CCMP,
+        CIPHER_SUITE_MAX
+};
+static u8 mwifiex_wpa_oui[CIPHER_SUITE_MAX][4] = {
+        { 0x00, 0x50, 0xf2, 0x02 },     /* TKIP */
+        { 0x00, 0x50, 0xf2, 0x04 },     /* AES  */
+};
+static u8 mwifiex_rsn_oui[CIPHER_SUITE_MAX][4] = {
+        { 0x00, 0x0f, 0xac, 0x02 },     /* TKIP */
+        { 0x00, 0x0f, 0xac, 0x04 },     /* AES  */
+};
+
+/*
+ * This function parses a given IE for a given OUI.
+ *
+ * This is used to parse a WPA/RSN IE to find if it has
+ * a given oui in PTK.
+ */
+static u8
+mwifiex_search_oui_in_ie(struct ie_body *iebody, u8 *oui)
+{
+        u8 count;
+
+        count = iebody->ptk_cnt[0];
+
+        /* There could be multiple OUIs for PTK hence
+           1) Take the length.
+           2) Check all the OUIs for AES.
+           3) If one of them is AES then pass success. */
+        while (count) {
+                if (!memcmp(iebody->ptk_body, oui, sizeof(iebody->ptk_body)))
+                        return MWIFIEX_OUI_PRESENT;
+
+                --count;
+                if (count)
+                        iebody = (struct ie_body *) ((u8 *) iebody +
+                                                sizeof(iebody->ptk_body));
+        }
+
+        pr_debug("info: %s: OUI is not found in PTK\n", __func__);
+        return MWIFIEX_OUI_NOT_PRESENT;
+}
+
+/*
+ * This function checks if a given OUI is present in a RSN IE.
+ *
+ * The function first checks if a RSN IE is present or not in the
+ * BSS descriptor. It tries to locate the OUI only if such an IE is
+ * present.
+ */
+static u8
+mwifiex_is_rsn_oui_present(struct mwifiex_bssdescriptor *bss_desc, u32 cipher)
+{
+        u8 *oui = NULL;
+        struct ie_body *iebody = NULL;
+        u8 ret = MWIFIEX_OUI_NOT_PRESENT;
+
+        if (((bss_desc->bcn_rsn_ie) && ((*(bss_desc->bcn_rsn_ie)).
+                                        ieee_hdr.element_id == WLAN_EID_RSN))) {
+                iebody = (struct ie_body *)
+                         (((u8 *) bss_desc->bcn_rsn_ie->data) +
+                         RSN_GTK_OUI_OFFSET);
+                oui = &mwifiex_rsn_oui[cipher][0];
+                ret = mwifiex_search_oui_in_ie(iebody, oui);
+                if (ret)
+                        return ret;
+        }
+        return ret;
+}
+
+/*
+ * This function checks if a given OUI is present in a WPA IE.
+ *
+ * The function first checks if a WPA IE is present or not in the
+ * BSS descriptor. It tries to locate the OUI only if such an IE is
+ * present.
+ */
+static u8
+mwifiex_is_wpa_oui_present(struct mwifiex_bssdescriptor *bss_desc, u32 cipher)
+{
+        u8 *oui = NULL;
+        struct ie_body *iebody = NULL;
+        u8 ret = MWIFIEX_OUI_NOT_PRESENT;
+
+        if (((bss_desc->bcn_wpa_ie) && ((*(bss_desc->bcn_wpa_ie)).
+                                      vend_hdr.element_id == WLAN_EID_WPA))) {
+                iebody = (struct ie_body *) bss_desc->bcn_wpa_ie->data;
+                oui = &mwifiex_wpa_oui[cipher][0];
+                ret = mwifiex_search_oui_in_ie(iebody, oui);
+                if (ret)
+                        return ret;
+        }
+        return ret;
+}
+
+/*
+ * This function compares two SSIDs and checks if they match.
+ */
+s32
+mwifiex_ssid_cmp(struct mwifiex_802_11_ssid *ssid1,
+                 struct mwifiex_802_11_ssid *ssid2)
+{
+        if (!ssid1 || !ssid2 || (ssid1->ssid_len != ssid2->ssid_len))
+                return -1;
+        return memcmp(ssid1->ssid, ssid2->ssid, ssid1->ssid_len);
+}
+
+/*
+ * Sends IOCTL request to get the best BSS.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int mwifiex_find_best_bss(struct mwifiex_private *priv,
+                          u8 wait_option, struct mwifiex_ssid_bssid *ssid_bssid)
+{
+        struct mwifiex_wait_queue *wait = NULL;
+        struct mwifiex_ssid_bssid tmp_ssid_bssid;
+        int ret = 0;
+        u8 *mac = NULL;
+
+        if (!ssid_bssid)
+                return -1;
+
+        /* Allocate wait request buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        memcpy(&tmp_ssid_bssid, ssid_bssid,
+               sizeof(struct mwifiex_ssid_bssid));
+        ret = mwifiex_bss_ioctl_find_bss(priv, wait, &tmp_ssid_bssid);
+
+        if (!ret) {
+                memcpy(ssid_bssid, &tmp_ssid_bssid,
+                       sizeof(struct mwifiex_ssid_bssid));
+                mac = (u8 *) &ssid_bssid->bssid;
+                dev_dbg(priv->adapter->dev, "cmd: found network: ssid=%s,"
+                                " %pM\n", ssid_bssid->ssid.ssid, mac);
+        }
+
+        kfree(wait);
+        return ret;
+}
+
+/*
+ * Sends IOCTL request to start a scan with user configurations.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ *
+ * Upon completion, it also generates a wireless event to notify
+ * applications.
+ */
+int mwifiex_set_user_scan_ioctl(struct mwifiex_private *priv,
+                                struct mwifiex_user_scan_cfg *scan_req)
+{
+        struct mwifiex_wait_queue *wait = NULL;
+        int status = 0;
+        u8 wait_option = MWIFIEX_IOCTL_WAIT;
+
+        /* Allocate an IOCTL request buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        status = mwifiex_scan_networks(priv, wait, HostCmd_ACT_GEN_SET,
+                                       scan_req, NULL);
+
+        status = mwifiex_request_ioctl(priv, wait, status, wait_option);
+
+        if (wait && (status != -EINPROGRESS))
+                kfree(wait);
+        return status;
+}
+
+/*
+ * This function checks if wapi is enabled in driver and scanned network is
+ * compatible with it.
+ */
+static bool
+mwifiex_is_network_compatible_for_wapi(struct mwifiex_private *priv,
+                                       struct mwifiex_bssdescriptor *bss_desc)
+{
+        if (priv->sec_info.wapi_enabled &&
+            (bss_desc->bcn_wapi_ie &&
+             ((*(bss_desc->bcn_wapi_ie)).ieee_hdr.element_id ==
+                        WLAN_EID_BSS_AC_ACCESS_DELAY))) {
+                return true;
+        }
+        return false;
+}
+
+/*
+ * This function checks if driver is configured with no security mode and
+ * scanned network is compatible with it.
+ */
+static bool
+mwifiex_is_network_compatible_for_no_sec(struct mwifiex_private *priv,
+                                       struct mwifiex_bssdescriptor *bss_desc)
+{
+        if (priv->sec_info.wep_status == MWIFIEX_802_11_WEP_DISABLED
+            && !priv->sec_info.wpa_enabled && !priv->sec_info.wpa2_enabled
+            && ((!bss_desc->bcn_wpa_ie) ||
+                ((*(bss_desc->bcn_wpa_ie)).vend_hdr.element_id !=
+            WLAN_EID_WPA))
+            && ((!bss_desc->bcn_rsn_ie) ||
+                ((*(bss_desc->bcn_rsn_ie)).ieee_hdr.element_id !=
+            WLAN_EID_RSN))
+            && priv->sec_info.encryption_mode ==
+            MWIFIEX_ENCRYPTION_MODE_NONE && !bss_desc->privacy) {
+                return true;
+        }
+        return false;
+}
+
+/*
+ * This function checks if static WEP is enabled in driver and scanned network
+ * is compatible with it.
+ */
+static bool
+mwifiex_is_network_compatible_for_static_wep(struct mwifiex_private *priv,
+                                       struct mwifiex_bssdescriptor *bss_desc)
+{
+        if (priv->sec_info.wep_status == MWIFIEX_802_11_WEP_ENABLED
+            && !priv->sec_info.wpa_enabled && !priv->sec_info.wpa2_enabled
+            && bss_desc->privacy) {
+                return true;
+        }
+        return false;
+}
+
+/*
+ * This function checks if wpa is enabled in driver and scanned network is
+ * compatible with it.
+ */
+static bool
+mwifiex_is_network_compatible_for_wpa(struct mwifiex_private *priv,
+                                      struct mwifiex_bssdescriptor *bss_desc,
+                                      int index)
+{
+        if (priv->sec_info.wep_status == MWIFIEX_802_11_WEP_DISABLED
+            && priv->sec_info.wpa_enabled && !priv->sec_info.wpa2_enabled
+            && ((bss_desc->bcn_wpa_ie) && ((*(bss_desc->bcn_wpa_ie)).vend_hdr.
+                                                element_id == WLAN_EID_WPA))
+           /*
+            * Privacy bit may NOT be set in some APs like
+            * LinkSys WRT54G && bss_desc->privacy
+            */
+         ) {
+                dev_dbg(priv->adapter->dev, "info: %s: WPA: index=%d"
+                        " wpa_ie=%#x wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s "
+                        "EncMode=%#x privacy=%#x\n", __func__, index,
+                        (bss_desc->bcn_wpa_ie) ?
+                        (*(bss_desc->bcn_wpa_ie)).
+                        vend_hdr.element_id : 0,
+                        (bss_desc->bcn_rsn_ie) ?
+                        (*(bss_desc->bcn_rsn_ie)).
+                        ieee_hdr.element_id : 0,
+                        (priv->sec_info.wep_status ==
+                        MWIFIEX_802_11_WEP_ENABLED) ? "e" : "d",
+                        (priv->sec_info.wpa_enabled) ? "e" : "d",
+                        (priv->sec_info.wpa2_enabled) ? "e" : "d",
+                        priv->sec_info.encryption_mode,
+                        bss_desc->privacy);
+                return true;
+        }
+        return false;
+}
+
+/*
+ * This function checks if wpa2 is enabled in driver and scanned network is
+ * compatible with it.
+ */
+static bool
+mwifiex_is_network_compatible_for_wpa2(struct mwifiex_private *priv,
+                                       struct mwifiex_bssdescriptor *bss_desc,
+                                       int index)
+{
+        if (priv->sec_info.wep_status == MWIFIEX_802_11_WEP_DISABLED
+           && !priv->sec_info.wpa_enabled && priv->sec_info.wpa2_enabled
+           && ((bss_desc->bcn_rsn_ie) && ((*(bss_desc->bcn_rsn_ie)).ieee_hdr.
+                                                element_id == WLAN_EID_RSN))
+           /*
+            * Privacy bit may NOT be set in some APs like
+            * LinkSys WRT54G && bss_desc->privacy
+            */
+         ) {
+                dev_dbg(priv->adapter->dev, "info: %s: WPA2: index=%d"
+                        " wpa_ie=%#x wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s "
+                        "EncMode=%#x privacy=%#x\n", __func__, index,
+                        (bss_desc->bcn_wpa_ie) ?
+                        (*(bss_desc->bcn_wpa_ie)).
+                        vend_hdr.element_id : 0,
+                        (bss_desc->bcn_rsn_ie) ?
+                        (*(bss_desc->bcn_rsn_ie)).
+                        ieee_hdr.element_id : 0,
+                        (priv->sec_info.wep_status ==
+                        MWIFIEX_802_11_WEP_ENABLED) ? "e" : "d",
+                        (priv->sec_info.wpa_enabled) ? "e" : "d",
+                        (priv->sec_info.wpa2_enabled) ? "e" : "d",
+                        priv->sec_info.encryption_mode,
+                        bss_desc->privacy);
+                return true;
+        }
+        return false;
+}
+
+/*
+ * This function checks if adhoc AES is enabled in driver and scanned network is
+ * compatible with it.
+ */
+static bool
+mwifiex_is_network_compatible_for_adhoc_aes(struct mwifiex_private *priv,
+                                       struct mwifiex_bssdescriptor *bss_desc)
+{
+        if (priv->sec_info.wep_status == MWIFIEX_802_11_WEP_DISABLED
+            && !priv->sec_info.wpa_enabled && !priv->sec_info.wpa2_enabled
+            && ((!bss_desc->bcn_wpa_ie) || ((*(bss_desc->bcn_wpa_ie)).vend_hdr.
+                   element_id != WLAN_EID_WPA))
+            && ((!bss_desc->bcn_rsn_ie) || ((*(bss_desc->bcn_rsn_ie)).ieee_hdr.
+                   element_id != WLAN_EID_RSN))
+            && priv->sec_info.encryption_mode ==
+            MWIFIEX_ENCRYPTION_MODE_NONE && bss_desc->privacy) {
+                return true;
+        }
+        return false;
+}
+
+/*
+ * This function checks if dynamic WEP is enabled in driver and scanned network
+ * is compatible with it.
+ */
+static bool
+mwifiex_is_network_compatible_for_dynamic_wep(struct mwifiex_private *priv,
+                                       struct mwifiex_bssdescriptor *bss_desc,
+                                       int index)
+{
+        if (priv->sec_info.wep_status == MWIFIEX_802_11_WEP_DISABLED
+            && !priv->sec_info.wpa_enabled && !priv->sec_info.wpa2_enabled
+            && ((!bss_desc->bcn_wpa_ie) || ((*(bss_desc->bcn_wpa_ie)).vend_hdr.
+                   element_id != WLAN_EID_WPA))
+            && ((!bss_desc->bcn_rsn_ie) || ((*(bss_desc->bcn_rsn_ie)).ieee_hdr.
+                   element_id != WLAN_EID_RSN))
+            && priv->sec_info.encryption_mode !=
+            MWIFIEX_ENCRYPTION_MODE_NONE && bss_desc->privacy) {
+                dev_dbg(priv->adapter->dev, "info: %s: dynamic "
+                        "WEP: index=%d wpa_ie=%#x wpa2_ie=%#x "
+                        "EncMode=%#x privacy=%#x\n",
+                        __func__, index,
+                        (bss_desc->bcn_wpa_ie) ?
+                        (*(bss_desc->bcn_wpa_ie)).
+                        vend_hdr.element_id : 0,
+                        (bss_desc->bcn_rsn_ie) ?
+                        (*(bss_desc->bcn_rsn_ie)).
+                        ieee_hdr.element_id : 0,
+                        priv->sec_info.encryption_mode,
+                        bss_desc->privacy);
+                return true;
+        }
+        return false;
+}
+
+/*
+ * This function checks if a scanned network is compatible with the driver
+ * settings.
+ *
+ *   WEP     WPA    WPA2   ad-hoc encrypt                  Network
+ * enabled enabled enabled  AES    mode   Privacy WPA WPA2 Compatible
+ *    0       0       0      0     NONE      0     0   0   yes No security
+ *    0       1       0      0      x        1x    1   x   yes WPA (disable
+ *                                                         HT if no AES)
+ *    0       0       1      0      x        1x    x   1   yes WPA2 (disable
+ *                                                         HT if no AES)
+ *    0       0       0      1     NONE      1     0   0   yes Ad-hoc AES
+ *    1       0       0      0     NONE      1     0   0   yes Static WEP
+ *                                                         (disable HT)
+ *    0       0       0      0    !=NONE     1     0   0   yes Dynamic WEP
+ *
+ * Compatibility is not matched while roaming, except for mode.
+ */
+static s32
+mwifiex_is_network_compatible(struct mwifiex_private *priv, u32 index, u32 mode)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct mwifiex_bssdescriptor *bss_desc;
+
+        bss_desc = &adapter->scan_table[index];
+        bss_desc->disable_11n = false;
+
+        /* Don't check for compatibility if roaming */
+        if (priv->media_connected && (priv->bss_mode == MWIFIEX_BSS_MODE_INFRA)
+            && (bss_desc->bss_mode == MWIFIEX_BSS_MODE_INFRA))
+                return index;
+
+        if (priv->wps.session_enable) {
+                dev_dbg(adapter->dev,
+                        "info: return success directly in WPS period\n");
+                return index;
+        }
+
+        if (mwifiex_is_network_compatible_for_wapi(priv, bss_desc)) {
+                dev_dbg(adapter->dev, "info: return success for WAPI AP\n");
+                return index;
+        }
+
+        if (bss_desc->bss_mode == mode) {
+                if (mwifiex_is_network_compatible_for_no_sec(priv, bss_desc)) {
+                        /* No security */
+                        return index;
+                } else if (mwifiex_is_network_compatible_for_static_wep(priv,
+                                                                bss_desc)) {
+                        /* Static WEP enabled */
+                        dev_dbg(adapter->dev, "info: Disable 11n in WEP mode.\n");
+                        bss_desc->disable_11n = true;
+                        return index;
+                } else if (mwifiex_is_network_compatible_for_wpa(priv, bss_desc,
+                                                                 index)) {
+                        /* WPA enabled */
+                        if (((priv->adapter->config_bands & BAND_GN
+                              || priv->adapter->config_bands & BAND_AN)
+                              && bss_desc->bcn_ht_cap)
+                              && !mwifiex_is_wpa_oui_present(bss_desc,
+                                        CIPHER_SUITE_CCMP)) {
+
+                                if (mwifiex_is_wpa_oui_present(bss_desc,
+                                            CIPHER_SUITE_TKIP)) {
+                                        dev_dbg(adapter->dev,
+                                                "info: Disable 11n if AES "
+                                                "is not supported by AP\n");
+                                        bss_desc->disable_11n = true;
+                                } else {
+                                        return -1;
+                                }
+                        }
+                        return index;
+                } else if (mwifiex_is_network_compatible_for_wpa2(priv,
+                                                        bss_desc, index)) {
+                        /* WPA2 enabled */
+                        if (((priv->adapter->config_bands & BAND_GN
+                              || priv->adapter->config_bands & BAND_AN)
+                              && bss_desc->bcn_ht_cap)
+                              && !mwifiex_is_rsn_oui_present(bss_desc,
+                                        CIPHER_SUITE_CCMP)) {
+
+                                if (mwifiex_is_rsn_oui_present(bss_desc,
+                                            CIPHER_SUITE_TKIP)) {
+                                        dev_dbg(adapter->dev,
+                                                "info: Disable 11n if AES "
+                                                "is not supported by AP\n");
+                                        bss_desc->disable_11n = true;
+                                } else {
+                                        return -1;
+                                }
+                        }
+                        return index;
+                } else if (mwifiex_is_network_compatible_for_adhoc_aes(priv,
+                                                                bss_desc)) {
+                        /* Ad-hoc AES enabled */
+                        return index;
+                } else if (mwifiex_is_network_compatible_for_dynamic_wep(priv,
+                                                        bss_desc, index)) {
+                        /* Dynamic WEP enabled */
+                        return index;
+                }
+
+                /* Security doesn't match */
+                dev_dbg(adapter->dev, "info: %s: failed: index=%d "
+                       "wpa_ie=%#x wpa2_ie=%#x WEP=%s WPA=%s WPA2=%s EncMode"
+                       "=%#x privacy=%#x\n",
+                       __func__, index,
+                       (bss_desc->bcn_wpa_ie) ?
+                       (*(bss_desc->bcn_wpa_ie)).vend_hdr.
+                       element_id : 0,
+                       (bss_desc->bcn_rsn_ie) ?
+                       (*(bss_desc->bcn_rsn_ie)).ieee_hdr.
+                       element_id : 0,
+                       (priv->sec_info.wep_status ==
+                                MWIFIEX_802_11_WEP_ENABLED) ? "e" : "d",
+                       (priv->sec_info.wpa_enabled) ? "e" : "d",
+                       (priv->sec_info.wpa2_enabled) ? "e" : "d",
+                       priv->sec_info.encryption_mode, bss_desc->privacy);
+                return -1;
+        }
+
+        /* Mode doesn't match */
+        return -1;
+}
+
+/*
+ * This function finds the best SSID in the scan list.
+ *
+ * It searches the scan table for the best SSID that also matches the current
+ * adapter network preference (mode, security etc.).
+ */
+static s32
+mwifiex_find_best_network_in_list(struct mwifiex_private *priv)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        u32 mode = priv->bss_mode;
+        s32 best_net = -1;
+        s32 best_rssi = 0;
+        u32 i;
+
+        dev_dbg(adapter->dev, "info: num of BSSIDs = %d\n",
+                                adapter->num_in_scan_table);
+
+        for (i = 0; i < adapter->num_in_scan_table; i++) {
+                switch (mode) {
+                case MWIFIEX_BSS_MODE_INFRA:
+                case MWIFIEX_BSS_MODE_IBSS:
+                        if (mwifiex_is_network_compatible(priv, i, mode) >= 0) {
+                                if (SCAN_RSSI(adapter->scan_table[i].rssi) >
+                                    best_rssi) {
+                                        best_rssi = SCAN_RSSI(adapter->
+                                                          scan_table[i].rssi);
+                                        best_net = i;
+                                }
+                        }
+                        break;
+                case MWIFIEX_BSS_MODE_AUTO:
+                default:
+                        if (SCAN_RSSI(adapter->scan_table[i].rssi) >
+                            best_rssi) {
+                                best_rssi = SCAN_RSSI(adapter->scan_table[i].
+                                                      rssi);
+                                best_net = i;
+                        }
+                        break;
+                }
+        }
+
+        return best_net;
+}
+
+/*
+ * This function creates a channel list for the driver to scan, based
+ * on region/band information.
+ *
+ * This routine is used for any scan that is not provided with a
+ * specific channel list to scan.
+ */
+static void
+mwifiex_scan_create_channel_list(struct mwifiex_private *priv,
+                                const struct mwifiex_user_scan_cfg
+                                *user_scan_in,
+                                struct mwifiex_chan_scan_param_set
+                                *scan_chan_list,
+                                u8 filtered_scan)
+{
+        enum ieee80211_band band;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *ch;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        int chan_idx = 0, i;
+        u8 scan_type;
+
+        for (band = 0; (band < IEEE80211_NUM_BANDS) ; band++) {
+
+                if (!priv->wdev->wiphy->bands[band])
+                        continue;
+
+                sband = priv->wdev->wiphy->bands[band];
+
+                for (i = 0; (i < sband->n_channels) ; i++, chan_idx++) {
+                        ch = &sband->channels[i];
+                        if (ch->flags & IEEE80211_CHAN_DISABLED)
+                                continue;
+                        scan_chan_list[chan_idx].radio_type = band;
+                        scan_type = ch->flags & IEEE80211_CHAN_PASSIVE_SCAN;
+                        if (user_scan_in &&
+                                user_scan_in->chan_list[0].scan_time)
+                                scan_chan_list[chan_idx].max_scan_time =
+                                        cpu_to_le16((u16) user_scan_in->
+                                        chan_list[0].scan_time);
+                        else if (scan_type == MWIFIEX_SCAN_TYPE_PASSIVE)
+                                scan_chan_list[chan_idx].max_scan_time =
+                                        cpu_to_le16(adapter->passive_scan_time);
+                        else
+                                scan_chan_list[chan_idx].max_scan_time =
+                                        cpu_to_le16(adapter->active_scan_time);
+                        if (scan_type == MWIFIEX_SCAN_TYPE_PASSIVE)
+                                scan_chan_list[chan_idx].chan_scan_mode_bitmap
+                                        |= MWIFIEX_PASSIVE_SCAN;
+                        else
+                                scan_chan_list[chan_idx].chan_scan_mode_bitmap
+                                        &= ~MWIFIEX_PASSIVE_SCAN;
+                        scan_chan_list[chan_idx].chan_number =
+                                                        (u32) ch->hw_value;
+                        if (filtered_scan) {
+                                scan_chan_list[chan_idx].max_scan_time =
+                                cpu_to_le16(adapter->specific_scan_time);
+                                scan_chan_list[chan_idx].chan_scan_mode_bitmap
+                                        |= MWIFIEX_DISABLE_CHAN_FILT;
+                        }
+                }
+
+        }
+}
+
+/*
+ * This function constructs and sends multiple scan config commands to
+ * the firmware.
+ *
+ * Previous routines in the code flow have created a scan command configuration
+ * with any requested TLVs.  This function splits the channel TLV into maximum
+ * channels supported per scan lists and sends the portion of the channel TLV,
+ * along with the other TLVs, to the firmware.
+ */
+static int
+mwifiex_scan_channel_list(struct mwifiex_private *priv, void *wait_buf,
+                          u32 max_chan_per_scan, u8 filtered_scan,
+                          struct mwifiex_scan_cmd_config *scan_cfg_out,
+                          struct mwifiex_ie_types_chan_list_param_set
+                          *chan_tlv_out,
+                          struct mwifiex_chan_scan_param_set *scan_chan_list)
+{
+        int ret = 0;
+        struct mwifiex_chan_scan_param_set *tmp_chan_list;
+        struct mwifiex_chan_scan_param_set *start_chan;
+
+        u32 tlv_idx;
+        u32 total_scan_time;
+        u32 done_early;
+
+        if (!scan_cfg_out || !chan_tlv_out || !scan_chan_list) {
+                dev_dbg(priv->adapter->dev,
+                        "info: Scan: Null detect: %p, %p, %p\n",
+                       scan_cfg_out, chan_tlv_out, scan_chan_list);
+                return -1;
+        }
+
+        chan_tlv_out->header.type = cpu_to_le16(TLV_TYPE_CHANLIST);
+
+        /* Set the temp channel struct pointer to the start of the desired
+           list */
+        tmp_chan_list = scan_chan_list;
+
+        /* Loop through the desired channel list, sending a new firmware scan
+           commands for each max_chan_per_scan channels (or for 1,6,11
+           individually if configured accordingly) */
+        while (tmp_chan_list->chan_number) {
+
+                tlv_idx = 0;
+                total_scan_time = 0;
+                chan_tlv_out->header.len = 0;
+                start_chan = tmp_chan_list;
+                done_early = false;
+
+                /*
+                 * Construct the Channel TLV for the scan command.  Continue to
+                 * insert channel TLVs until:
+                 *   - the tlv_idx hits the maximum configured per scan command
+                 *   - the next channel to insert is 0 (end of desired channel
+                 *     list)
+                 *   - done_early is set (controlling individual scanning of
+                 *     1,6,11)
+                 */
+                while (tlv_idx < max_chan_per_scan
+                       && tmp_chan_list->chan_number && !done_early) {
+
+                        dev_dbg(priv->adapter->dev,
+                                "info: Scan: Chan(%3d), Radio(%d),"
+                                " Mode(%d, %d), Dur(%d)\n",
+                               tmp_chan_list->chan_number,
+                               tmp_chan_list->radio_type,
+                               tmp_chan_list->chan_scan_mode_bitmap
+                               & MWIFIEX_PASSIVE_SCAN,
+                               (tmp_chan_list->chan_scan_mode_bitmap
+                               & MWIFIEX_DISABLE_CHAN_FILT) >> 1,
+                               le16_to_cpu(tmp_chan_list->max_scan_time));
+
+                        /* Copy the current channel TLV to the command being
+                           prepared */
+                        memcpy(chan_tlv_out->chan_scan_param + tlv_idx,
+                               tmp_chan_list,
+                               sizeof(chan_tlv_out->chan_scan_param));
+
+                        /* Increment the TLV header length by the size
+                           appended */
+                        chan_tlv_out->header.len =
+                        cpu_to_le16(le16_to_cpu(chan_tlv_out->header.len) +
+                        (sizeof(chan_tlv_out->chan_scan_param)));
+
+                        /*
+                         * The tlv buffer length is set to the number of bytes
+                         * of the between the channel tlv pointer and the start
+                         * of the tlv buffer.  This compensates for any TLVs
+                         * that were appended before the channel list.
+                         */
+                        scan_cfg_out->tlv_buf_len = (u32) ((u8 *) chan_tlv_out -
+                                                        scan_cfg_out->tlv_buf);
+
+                        /* Add the size of the channel tlv header and the data
+                           length */
+                        scan_cfg_out->tlv_buf_len +=
+                                (sizeof(chan_tlv_out->header)
+                                 + le16_to_cpu(chan_tlv_out->header.len));
+
+                        /* Increment the index to the channel tlv we are
+                           constructing */
+                        tlv_idx++;
+
+                        /* Count the total scan time per command */
+                        total_scan_time +=
+                                le16_to_cpu(tmp_chan_list->max_scan_time);
+
+                        done_early = false;
+
+                        /* Stop the loop if the *current* channel is in the
+                           1,6,11 set and we are not filtering on a BSSID
+                           or SSID. */
+                        if (!filtered_scan && (tmp_chan_list->chan_number == 1
+                                || tmp_chan_list->chan_number == 6
+                                || tmp_chan_list->chan_number == 11))
+                                done_early = true;
+
+                        /* Increment the tmp pointer to the next channel to
+                           be scanned */
+                        tmp_chan_list++;
+
+                        /* Stop the loop if the *next* channel is in the 1,6,11
+                           set.  This will cause it to be the only channel
+                           scanned on the next interation */
+                        if (!filtered_scan && (tmp_chan_list->chan_number == 1
+                                || tmp_chan_list->chan_number == 6
+                                || tmp_chan_list->chan_number == 11))
+                                done_early = true;
+                }
+
+                /* The total scan time should be less than scan command timeout
+                   value */
+                if (total_scan_time > MWIFIEX_MAX_TOTAL_SCAN_TIME) {
+                        dev_err(priv->adapter->dev, "total scan time %dms"
+                                " is over limit (%dms), scan skipped\n",
+                                total_scan_time, MWIFIEX_MAX_TOTAL_SCAN_TIME);
+                        ret = -1;
+                        break;
+                }
+
+                priv->adapter->scan_channels = start_chan;
+
+                /* Send the scan command to the firmware with the specified
+                   cfg */
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_SCAN,
+                                          HostCmd_ACT_GEN_SET,
+                                          0, wait_buf, scan_cfg_out);
+                if (ret)
+                        break;
+        }
+
+        if (ret)
+                return -1;
+
+        return 0;
+}
+
+/*
+ * This function constructs a scan command configuration structure to use
+ * in scan commands.
+ *
+ * Application layer or other functions can invoke network scanning
+ * with a scan configuration supplied in a user scan configuration structure.
+ * This structure is used as the basis of one or many scan command configuration
+ * commands that are sent to the command processing module and eventually to the
+ * firmware.
+ *
+ * This function creates a scan command configuration structure  based on the
+ * following user supplied parameters (if present):
+ *      - SSID filter
+ *      - BSSID filter
+ *      - Number of Probes to be sent
+ *      - Channel list
+ *
+ * If the SSID or BSSID filter is not present, the filter is disabled/cleared.
+ * If the number of probes is not set, adapter default setting is used.
+ */
+static void
+mwifiex_scan_setup_scan_config(struct mwifiex_private *priv,
+                               const struct mwifiex_user_scan_cfg *user_scan_in,
+                               struct mwifiex_scan_cmd_config *scan_cfg_out,
+                               struct mwifiex_ie_types_chan_list_param_set
+                               **chan_list_out,
+                               struct mwifiex_chan_scan_param_set
+                               *scan_chan_list,
+                               u8 *max_chan_per_scan, u8 *filtered_scan,
+                               u8 *scan_current_only)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct mwifiex_ie_types_num_probes *num_probes_tlv;
+        struct mwifiex_ie_types_wildcard_ssid_params *wildcard_ssid_tlv;
+        struct mwifiex_ie_types_rates_param_set *rates_tlv;
+        const u8 zero_mac[ETH_ALEN] = { 0, 0, 0, 0, 0, 0 };
+        u8 *tlv_pos;
+        u32 num_probes;
+        u32 ssid_len;
+        u32 chan_idx;
+        u32 scan_type;
+        u16 scan_dur;
+        u8 channel;
+        u8 radio_type;
+        u32 ssid_idx;
+        u8 ssid_filter;
+        u8 rates[MWIFIEX_SUPPORTED_RATES];
+        u32 rates_size;
+        struct mwifiex_ie_types_htcap *ht_cap;
+
+        /* The tlv_buf_len is calculated for each scan command.  The TLVs added
+           in this routine will be preserved since the routine that sends the
+           command will append channelTLVs at *chan_list_out.  The difference
+           between the *chan_list_out and the tlv_buf start will be used to
+           calculate the size of anything we add in this routine. */
+        scan_cfg_out->tlv_buf_len = 0;
+
+        /* Running tlv pointer.  Assigned to chan_list_out at end of function
+           so later routines know where channels can be added to the command
+           buf */
+        tlv_pos = scan_cfg_out->tlv_buf;
+
+        /* Initialize the scan as un-filtered; the flag is later set to TRUE
+           below if a SSID or BSSID filter is sent in the command */
+        *filtered_scan = false;
+
+        /* Initialize the scan as not being only on the current channel.  If
+           the channel list is customized, only contains one channel, and is
+           the active channel, this is set true and data flow is not halted. */
+        *scan_current_only = false;
+
+        if (user_scan_in) {
+
+                /* Default the ssid_filter flag to TRUE, set false under
+                   certain wildcard conditions and qualified by the existence
+                   of an SSID list before marking the scan as filtered */
+                ssid_filter = true;
+
+                /* Set the BSS type scan filter, use Adapter setting if
+                   unset */
+                scan_cfg_out->bss_mode =
+                        (user_scan_in->bss_mode ? (u8) user_scan_in->
+                         bss_mode : (u8) adapter->scan_mode);
+
+                /* Set the number of probes to send, use Adapter setting
+                   if unset */
+                num_probes =
+                        (user_scan_in->num_probes ? user_scan_in->
+                         num_probes : adapter->scan_probes);
+
+                /*
+                 * Set the BSSID filter to the incoming configuration,
+                 * if non-zero.  If not set, it will remain disabled
+                 * (all zeros).
+                 */
+                memcpy(scan_cfg_out->specific_bssid,
+                       user_scan_in->specific_bssid,
+                       sizeof(scan_cfg_out->specific_bssid));
+
+                for (ssid_idx = 0;
+                     ((ssid_idx < ARRAY_SIZE(user_scan_in->ssid_list))
+                      && (*user_scan_in->ssid_list[ssid_idx].ssid
+                          || user_scan_in->ssid_list[ssid_idx].max_len));
+                     ssid_idx++) {
+
+                        ssid_len = strlen(user_scan_in->ssid_list[ssid_idx].
+                                          ssid) + 1;
+
+                        wildcard_ssid_tlv =
+                                (struct mwifiex_ie_types_wildcard_ssid_params *)
+                                tlv_pos;
+                        wildcard_ssid_tlv->header.type =
+                                cpu_to_le16(TLV_TYPE_WILDCARDSSID);
+                        wildcard_ssid_tlv->header.len = cpu_to_le16(
+                                (u16) (ssid_len + sizeof(wildcard_ssid_tlv->
+                                                         max_ssid_length)));
+                        wildcard_ssid_tlv->max_ssid_length =
+                                user_scan_in->ssid_list[ssid_idx].max_len;
+
+                        memcpy(wildcard_ssid_tlv->ssid,
+                               user_scan_in->ssid_list[ssid_idx].ssid,
+                               ssid_len);
+
+                        tlv_pos += (sizeof(wildcard_ssid_tlv->header)
+                                + le16_to_cpu(wildcard_ssid_tlv->header.len));
+
+                        dev_dbg(adapter->dev, "info: scan: ssid_list[%d]: %s, %d\n",
+                                ssid_idx, wildcard_ssid_tlv->ssid,
+                                wildcard_ssid_tlv->max_ssid_length);
+
+                        /* Empty wildcard ssid with a maxlen will match many or
+                           potentially all SSIDs (maxlen == 32), therefore do
+                           not treat the scan as
+                           filtered. */
+                        if (!ssid_len && wildcard_ssid_tlv->max_ssid_length)
+                                ssid_filter = false;
+
+                }
+
+                /*
+                 *  The default number of channels sent in the command is low to
+                 *  ensure the response buffer from the firmware does not
+                 *  truncate scan results.  That is not an issue with an SSID
+                 *  or BSSID filter applied to the scan results in the firmware.
+                 */
+                if ((ssid_idx && ssid_filter)
+                    || memcmp(scan_cfg_out->specific_bssid, &zero_mac,
+                              sizeof(zero_mac)))
+                        *filtered_scan = true;
+        } else {
+                scan_cfg_out->bss_mode = (u8) adapter->scan_mode;
+                num_probes = adapter->scan_probes;
+        }
+
+        /*
+         *  If a specific BSSID or SSID is used, the number of channels in the
+         *  scan command will be increased to the absolute maximum.
+         */
+        if (*filtered_scan)
+                *max_chan_per_scan = MWIFIEX_MAX_CHANNELS_PER_SPECIFIC_SCAN;
+        else
+                *max_chan_per_scan = MWIFIEX_CHANNELS_PER_SCAN_CMD;
+
+        /* If the input config or adapter has the number of Probes set,
+           add tlv */
+        if (num_probes) {
+
+                dev_dbg(adapter->dev, "info: scan: num_probes = %d\n",
+                                                num_probes);
+
+                num_probes_tlv = (struct mwifiex_ie_types_num_probes *) tlv_pos;
+                num_probes_tlv->header.type = cpu_to_le16(TLV_TYPE_NUMPROBES);
+                num_probes_tlv->header.len =
+                        cpu_to_le16(sizeof(num_probes_tlv->num_probes));
+                num_probes_tlv->num_probes = cpu_to_le16((u16) num_probes);
+
+                tlv_pos += sizeof(num_probes_tlv->header) +
+                        le16_to_cpu(num_probes_tlv->header.len);
+
+        }
+
+        /* Append rates tlv */
+        memset(rates, 0, sizeof(rates));
+
+        rates_size = mwifiex_get_supported_rates(priv, rates);
+
+        rates_tlv = (struct mwifiex_ie_types_rates_param_set *) tlv_pos;
+        rates_tlv->header.type = cpu_to_le16(WLAN_EID_SUPP_RATES);
+        rates_tlv->header.len = cpu_to_le16((u16) rates_size);
+        memcpy(rates_tlv->rates, rates, rates_size);
+        tlv_pos += sizeof(rates_tlv->header) + rates_size;
+
+        dev_dbg(adapter->dev, "info: SCAN_CMD: Rates size = %d\n", rates_size);
+
+        if (ISSUPP_11NENABLED(priv->adapter->fw_cap_info)
+            && (priv->adapter->config_bands & BAND_GN
+                || priv->adapter->config_bands & BAND_AN)) {
+                ht_cap = (struct mwifiex_ie_types_htcap *) tlv_pos;
+                memset(ht_cap, 0, sizeof(struct mwifiex_ie_types_htcap));
+                ht_cap->header.type = cpu_to_le16(WLAN_EID_HT_CAPABILITY);
+                ht_cap->header.len =
+                                cpu_to_le16(sizeof(struct ieee80211_ht_cap));
+                mwifiex_fill_cap_info(priv, ht_cap);
+                tlv_pos += sizeof(struct mwifiex_ie_types_htcap);
+        }
+
+        /* Append vendor specific IE TLV */
+        mwifiex_cmd_append_vsie_tlv(priv, MWIFIEX_VSIE_MASK_SCAN, &tlv_pos);
+
+        /*
+         * Set the output for the channel TLV to the address in the tlv buffer
+         *   past any TLVs that were added in this function (SSID, num_probes).
+         *   Channel TLVs will be added past this for each scan command,
+         *   preserving the TLVs that were previously added.
+         */
+        *chan_list_out =
+                (struct mwifiex_ie_types_chan_list_param_set *) tlv_pos;
+
+        if (user_scan_in && user_scan_in->chan_list[0].chan_number) {
+
+                dev_dbg(adapter->dev, "info: Scan: Using supplied channel list\n");
+
+                for (chan_idx = 0;
+                     chan_idx < MWIFIEX_USER_SCAN_CHAN_MAX
+                     && user_scan_in->chan_list[chan_idx].chan_number;
+                     chan_idx++) {
+
+                        channel = user_scan_in->chan_list[chan_idx].chan_number;
+                        (scan_chan_list + chan_idx)->chan_number = channel;
+
+                        radio_type =
+                                user_scan_in->chan_list[chan_idx].radio_type;
+                        (scan_chan_list + chan_idx)->radio_type = radio_type;
+
+                        scan_type = user_scan_in->chan_list[chan_idx].scan_type;
+
+                        if (scan_type == MWIFIEX_SCAN_TYPE_PASSIVE)
+                                (scan_chan_list +
+                                 chan_idx)->chan_scan_mode_bitmap
+                                        |= MWIFIEX_PASSIVE_SCAN;
+                        else
+                                (scan_chan_list +
+                                 chan_idx)->chan_scan_mode_bitmap
+                                        &= ~MWIFIEX_PASSIVE_SCAN;
+
+                        if (user_scan_in->chan_list[chan_idx].scan_time) {
+                                scan_dur = (u16) user_scan_in->
+                                        chan_list[chan_idx].scan_time;
+                        } else {
+                                if (scan_type == MWIFIEX_SCAN_TYPE_PASSIVE)
+                                        scan_dur = adapter->passive_scan_time;
+                                else if (*filtered_scan)
+                                        scan_dur = adapter->specific_scan_time;
+                                else
+                                        scan_dur = adapter->active_scan_time;
+                        }
+
+                        (scan_chan_list + chan_idx)->min_scan_time =
+                                cpu_to_le16(scan_dur);
+                        (scan_chan_list + chan_idx)->max_scan_time =
+                                cpu_to_le16(scan_dur);
+                }
+
+                /* Check if we are only scanning the current channel */
+                if ((chan_idx == 1)
+                    && (user_scan_in->chan_list[0].chan_number
+                        == priv->curr_bss_params.bss_descriptor.channel)) {
+                        *scan_current_only = true;
+                        dev_dbg(adapter->dev,
+                                "info: Scan: Scanning current channel only\n");
+                }
+
+        } 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);
+        }
+}
+
+/*
+ * This function inspects the scan response buffer for pointers to
+ * expected TLVs.
+ *
+ * TLVs can be included at the end of the scan response BSS information.
+ *
+ * Data in the buffer is parsed pointers to TLVs that can potentially
+ * be passed back in the response.
+ */
+static void
+mwifiex_ret_802_11_scan_get_tlv_ptrs(struct mwifiex_adapter *adapter,
+                                     struct mwifiex_ie_types_data *tlv,
+                                     u32 tlv_buf_size, u32 req_tlv_type,
+                                     struct mwifiex_ie_types_data **tlv_data)
+{
+        struct mwifiex_ie_types_data *current_tlv;
+        u32 tlv_buf_left;
+        u32 tlv_type;
+        u32 tlv_len;
+
+        current_tlv = tlv;
+        tlv_buf_left = tlv_buf_size;
+        *tlv_data = NULL;
+
+        dev_dbg(adapter->dev, "info: SCAN_RESP: tlv_buf_size = %d\n",
+                                                tlv_buf_size);
+
+        while (tlv_buf_left >= sizeof(struct mwifiex_ie_types_header)) {
+
+                tlv_type = le16_to_cpu(current_tlv->header.type);
+                tlv_len = le16_to_cpu(current_tlv->header.len);
+
+                if (sizeof(tlv->header) + tlv_len > tlv_buf_left) {
+                        dev_err(adapter->dev, "SCAN_RESP: TLV buffer corrupt\n");
+                        break;
+                }
+
+                if (req_tlv_type == tlv_type) {
+                        switch (tlv_type) {
+                        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;
+                                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;
+                                break;
+                        default:
+                                dev_err(adapter->dev,
+                                        "SCAN_RESP: unhandled TLV = %d\n",
+                                       tlv_type);
+                                /* Give up, this seems corrupted */
+                                return;
+                        }
+                }
+
+                if (*tlv_data)
+                        break;
+
+
+                tlv_buf_left -= (sizeof(tlv->header) + tlv_len);
+                current_tlv =
+                        (struct mwifiex_ie_types_data *) (current_tlv->data +
+                                                          tlv_len);
+
+        }                       /* while */
+}
+
+/*
+ * This function interprets a BSS scan response returned from the firmware.
+ *
+ * The various fixed fields and IEs are parsed and passed back for a BSS
+ * probe response or beacon from scan command. Information is recorded as
+ * needed in the scan table for that entry.
+ *
+ * The following IE types are recognized and parsed -
+ *      - SSID
+ *      - Supported rates
+ *      - FH parameters set
+ *      - DS parameters set
+ *      - CF parameters set
+ *      - IBSS parameters set
+ *      - ERP information
+ *      - Extended supported rates
+ *      - Vendor specific (221)
+ *      - RSN IE
+ *      - WAPI IE
+ *      - HT capability
+ *      - HT operation
+ *      - BSS Coexistence 20/40
+ *      - Extended capability
+ *      - Overlapping BSS scan parameters
+ */
+static int
+mwifiex_interpret_bss_desc_with_ie(struct mwifiex_adapter *adapter,
+                                   struct mwifiex_bssdescriptor *bss_entry,
+                                   u8 **beacon_info, u32 *bytes_left)
+{
+        int ret = 0;
+        u8 element_id;
+        struct ieee_types_fh_param_set *fh_param_set;
+        struct ieee_types_ds_param_set *ds_param_set;
+        struct ieee_types_cf_param_set *cf_param_set;
+        struct ieee_types_ibss_param_set *ibss_param_set;
+        struct mwifiex_802_11_fixed_ies fixed_ie;
+        u8 *current_ptr;
+        u8 *rate;
+        u8 element_len;
+        u16 total_ie_len;
+        u8 bytes_to_copy;
+        u8 rate_size;
+        u16 beacon_size;
+        u8 found_data_rate_ie;
+        u32 bytes_left_for_current_beacon;
+        struct ieee_types_vendor_specific *vendor_ie;
+        const u8 wpa_oui[4] = { 0x00, 0x50, 0xf2, 0x01 };
+        const u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 };
+
+        found_data_rate_ie = false;
+        rate_size = 0;
+        beacon_size = 0;
+
+        if (*bytes_left >= sizeof(beacon_size)) {
+                /* Extract & convert beacon size from the command buffer */
+                memcpy(&beacon_size, *beacon_info, sizeof(beacon_size));
+                *bytes_left -= sizeof(beacon_size);
+                *beacon_info += sizeof(beacon_size);
+        }
+
+        if (!beacon_size || beacon_size > *bytes_left) {
+                *beacon_info += *bytes_left;
+                *bytes_left = 0;
+                return -1;
+        }
+
+        /* Initialize the current working beacon pointer for this BSS
+           iteration */
+        current_ptr = *beacon_info;
+
+        /* Advance the return beacon pointer past the current beacon */
+        *beacon_info += beacon_size;
+        *bytes_left -= beacon_size;
+
+        bytes_left_for_current_beacon = beacon_size;
+
+        memcpy(bss_entry->mac_address, current_ptr, ETH_ALEN);
+        dev_dbg(adapter->dev, "info: InterpretIE: AP MAC Addr: %pM\n",
+                                                bss_entry->mac_address);
+
+        current_ptr += ETH_ALEN;
+        bytes_left_for_current_beacon -= ETH_ALEN;
+
+        if (bytes_left_for_current_beacon < 12) {
+                dev_err(adapter->dev, "InterpretIE: not enough bytes left\n");
+                return -1;
+        }
+
+        /*
+         * Next 4 fields are RSSI, time stamp, beacon interval,
+         *   and capability information
+         */
+
+        /* RSSI is 1 byte long */
+        bss_entry->rssi = (s32) (*current_ptr);
+        dev_dbg(adapter->dev, "info: InterpretIE: RSSI=%02X\n", *current_ptr);
+        current_ptr += 1;
+        bytes_left_for_current_beacon -= 1;
+
+        /*
+         *  The RSSI is not part of the beacon/probe response.  After we have
+         *    advanced current_ptr past the RSSI field, save the remaining
+         *    data for use at the application layer
+         */
+        bss_entry->beacon_buf = current_ptr;
+        bss_entry->beacon_buf_size = bytes_left_for_current_beacon;
+
+        /* Time stamp is 8 bytes long */
+        memcpy(fixed_ie.time_stamp, current_ptr, 8);
+        memcpy(bss_entry->time_stamp, current_ptr, 8);
+        current_ptr += 8;
+        bytes_left_for_current_beacon -= 8;
+
+        /* Beacon interval is 2 bytes long */
+        memcpy(&fixed_ie.beacon_interval, current_ptr, 2);
+        bss_entry->beacon_period = le16_to_cpu(fixed_ie.beacon_interval);
+        current_ptr += 2;
+        bytes_left_for_current_beacon -= 2;
+
+        /* Capability information is 2 bytes long */
+        memcpy(&fixed_ie.capabilities, current_ptr, 2);
+        dev_dbg(adapter->dev, "info: InterpretIE: fixed_ie.capabilities=0x%X\n",
+               fixed_ie.capabilities);
+        bss_entry->cap_info_bitmap = le16_to_cpu(fixed_ie.capabilities);
+        current_ptr += 2;
+        bytes_left_for_current_beacon -= 2;
+
+        /* Rest of the current buffer are IE's */
+        dev_dbg(adapter->dev, "info: InterpretIE: IELength for this AP = %d\n",
+               bytes_left_for_current_beacon);
+
+        if (bss_entry->cap_info_bitmap & WLAN_CAPABILITY_PRIVACY) {
+                dev_dbg(adapter->dev, "info: InterpretIE: AP WEP enabled\n");
+                bss_entry->privacy = MWIFIEX_802_11_PRIV_FILTER_8021X_WEP;
+        } else {
+                bss_entry->privacy = MWIFIEX_802_11_PRIV_FILTER_ACCEPT_ALL;
+        }
+
+        if (bss_entry->cap_info_bitmap & WLAN_CAPABILITY_IBSS)
+                bss_entry->bss_mode = MWIFIEX_BSS_MODE_IBSS;
+        else
+                bss_entry->bss_mode = MWIFIEX_BSS_MODE_INFRA;
+
+
+        /* Process variable IE */
+        while (bytes_left_for_current_beacon >= 2) {
+                element_id = *current_ptr;
+                element_len = *(current_ptr + 1);
+                total_ie_len = element_len + sizeof(struct ieee_types_header);
+
+                if (bytes_left_for_current_beacon < total_ie_len) {
+                        dev_err(adapter->dev, "err: InterpretIE: in processing"
+                                " IE, bytes left < IE length\n");
+                        bytes_left_for_current_beacon = 0;
+                        ret = -1;
+                        continue;
+                }
+                switch (element_id) {
+                case WLAN_EID_SSID:
+                        bss_entry->ssid.ssid_len = element_len;
+                        memcpy(bss_entry->ssid.ssid, (current_ptr + 2),
+                               element_len);
+                        dev_dbg(adapter->dev, "info: InterpretIE: ssid: %-32s\n",
+                               bss_entry->ssid.ssid);
+                        break;
+
+                case WLAN_EID_SUPP_RATES:
+                        memcpy(bss_entry->data_rates, current_ptr + 2,
+                               element_len);
+                        memcpy(bss_entry->supported_rates, current_ptr + 2,
+                               element_len);
+                        rate_size = element_len;
+                        found_data_rate_ie = true;
+                        break;
+
+                case WLAN_EID_FH_PARAMS:
+                        fh_param_set =
+                                (struct ieee_types_fh_param_set *) current_ptr;
+                        memcpy(&bss_entry->phy_param_set.fh_param_set,
+                               fh_param_set,
+                               sizeof(struct ieee_types_fh_param_set));
+                        break;
+
+                case WLAN_EID_DS_PARAMS:
+                        ds_param_set =
+                                (struct ieee_types_ds_param_set *) current_ptr;
+
+                        bss_entry->channel = ds_param_set->current_chan;
+
+                        memcpy(&bss_entry->phy_param_set.ds_param_set,
+                               ds_param_set,
+                               sizeof(struct ieee_types_ds_param_set));
+                        break;
+
+                case WLAN_EID_CF_PARAMS:
+                        cf_param_set =
+                                (struct ieee_types_cf_param_set *) current_ptr;
+                        memcpy(&bss_entry->ss_param_set.cf_param_set,
+                               cf_param_set,
+                               sizeof(struct ieee_types_cf_param_set));
+                        break;
+
+                case WLAN_EID_IBSS_PARAMS:
+                        ibss_param_set =
+                                (struct ieee_types_ibss_param_set *)
+                                current_ptr;
+                        memcpy(&bss_entry->ss_param_set.ibss_param_set,
+                               ibss_param_set,
+                               sizeof(struct ieee_types_ibss_param_set));
+                        break;
+
+                case WLAN_EID_ERP_INFO:
+                        bss_entry->erp_flags = *(current_ptr + 2);
+                        break;
+
+                case WLAN_EID_EXT_SUPP_RATES:
+                        /*
+                         * Only process extended supported rate
+                         * if data rate is already found.
+                         * Data rate IE should come before
+                         * extended supported rate IE
+                         */
+                        if (found_data_rate_ie) {
+                                if ((element_len + rate_size) >
+                                    MWIFIEX_SUPPORTED_RATES)
+                                        bytes_to_copy =
+                                                (MWIFIEX_SUPPORTED_RATES -
+                                                 rate_size);
+                                else
+                                        bytes_to_copy = element_len;
+
+                                rate = (u8 *) bss_entry->data_rates;
+                                rate += rate_size;
+                                memcpy(rate, current_ptr + 2, bytes_to_copy);
+
+                                rate = (u8 *) bss_entry->supported_rates;
+                                rate += rate_size;
+                                memcpy(rate, current_ptr + 2, bytes_to_copy);
+                        }
+                        break;
+
+                case WLAN_EID_VENDOR_SPECIFIC:
+                        vendor_ie = (struct ieee_types_vendor_specific *)
+                                        current_ptr;
+
+                        if (!memcmp
+                            (vendor_ie->vend_hdr.oui, wpa_oui,
+                             sizeof(wpa_oui))) {
+                                bss_entry->bcn_wpa_ie =
+                                        (struct ieee_types_vendor_specific *)
+                                        current_ptr;
+                                bss_entry->wpa_offset = (u16) (current_ptr -
+                                                        bss_entry->beacon_buf);
+                        } else if (!memcmp(vendor_ie->vend_hdr.oui, wmm_oui,
+                                    sizeof(wmm_oui))) {
+                                if (total_ie_len ==
+                                    sizeof(struct ieee_types_wmm_parameter)
+                                    || total_ie_len ==
+                                    sizeof(struct ieee_types_wmm_info))
+                                        /*
+                                         * Only accept and copy the WMM IE if
+                                         * it matches the size expected for the
+                                         * WMM Info IE or the WMM Parameter IE.
+                                         */
+                                        memcpy((u8 *) &bss_entry->wmm_ie,
+                                               current_ptr, total_ie_len);
+                        }
+                        break;
+                case WLAN_EID_RSN:
+                        bss_entry->bcn_rsn_ie =
+                                (struct ieee_types_generic *) current_ptr;
+                        bss_entry->rsn_offset = (u16) (current_ptr -
+                                                        bss_entry->beacon_buf);
+                        break;
+                case WLAN_EID_BSS_AC_ACCESS_DELAY:
+                        bss_entry->bcn_wapi_ie =
+                                (struct ieee_types_generic *) current_ptr;
+                        bss_entry->wapi_offset = (u16) (current_ptr -
+                                                        bss_entry->beacon_buf);
+                        break;
+                case WLAN_EID_HT_CAPABILITY:
+                        bss_entry->bcn_ht_cap = (struct ieee80211_ht_cap *)
+                                        (current_ptr +
+                                        sizeof(struct ieee_types_header));
+                        bss_entry->ht_cap_offset = (u16) (current_ptr +
+                                        sizeof(struct ieee_types_header) -
+                                        bss_entry->beacon_buf);
+                        break;
+                case WLAN_EID_HT_INFORMATION:
+                        bss_entry->bcn_ht_info = (struct ieee80211_ht_info *)
+                                        (current_ptr +
+                                        sizeof(struct ieee_types_header));
+                        bss_entry->ht_info_offset = (u16) (current_ptr +
+                                        sizeof(struct ieee_types_header) -
+                                        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->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->ext_cap_offset = (u16) (current_ptr +
+                                        sizeof(struct ieee_types_header) -
+                                        bss_entry->beacon_buf);
+                        break;
+                case WLAN_EID_OVERLAP_BSS_SCAN_PARAM:
+                        bss_entry->bcn_obss_scan =
+                                (struct ieee_types_obss_scan_param *)
+                                current_ptr;
+                        bss_entry->overlap_bss_offset = (u16) (current_ptr -
+                                                        bss_entry->beacon_buf);
+                        break;
+                default:
+                        break;
+                }
+
+                current_ptr += element_len + 2;
+
+                /* Need to account for IE ID and IE Len */
+                bytes_left_for_current_beacon -= (element_len + 2);
+
+        }       /* while (bytes_left_for_current_beacon > 2) */
+        return ret;
+}
+
+/*
+ * This function adjusts the pointers used in beacon buffers to reflect
+ * shifts.
+ *
+ * The memory allocated for beacon buffers is of fixed sizes where all the
+ * saved beacons must be stored. New beacons are added in the free portion
+ * of this memory, space permitting; while duplicate beacon buffers are
+ * placed at the same start location. However, since duplicate beacon
+ * buffers may not match the size of the old one, all the following buffers
+ * in the memory must be shifted to either make space, or to fill up freed
+ * up space.
+ *
+ * This function is used to update the beacon buffer pointers that are past
+ * an existing beacon buffer that is updated with a new one of different
+ * size. The pointers are shifted by a fixed amount, either forward or
+ * backward.
+ *
+ * the following pointers in every affected beacon buffers are changed, if
+ * present -
+ *      - WPA IE pointer
+ *      - RSN IE pointer
+ *      - WAPI IE pointer
+ *      - HT capability IE pointer
+ *      - HT information IE pointer
+ *      - BSS coexistence 20/40 IE pointer
+ *      - Extended capability IE pointer
+ *      - Overlapping BSS scan parameter IE pointer
+ */
+static void
+mwifiex_adjust_beacon_buffer_ptrs(struct mwifiex_private *priv, u8 advance,
+                                  u8 *bcn_store, u32 rem_bcn_size,
+                                  u32 num_of_ent)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        u32 adj_idx;
+        for (adj_idx = 0; adj_idx < num_of_ent; adj_idx++) {
+                if (adapter->scan_table[adj_idx].beacon_buf > bcn_store) {
+
+                        if (advance)
+                                adapter->scan_table[adj_idx].beacon_buf +=
+                                        rem_bcn_size;
+                        else
+                                adapter->scan_table[adj_idx].beacon_buf -=
+                                        rem_bcn_size;
+
+                        if (adapter->scan_table[adj_idx].bcn_wpa_ie)
+                                adapter->scan_table[adj_idx].bcn_wpa_ie =
+                                (struct ieee_types_vendor_specific *)
+                                (adapter->scan_table[adj_idx].beacon_buf +
+                                 adapter->scan_table[adj_idx].wpa_offset);
+                        if (adapter->scan_table[adj_idx].bcn_rsn_ie)
+                                adapter->scan_table[adj_idx].bcn_rsn_ie =
+                                (struct ieee_types_generic *)
+                                (adapter->scan_table[adj_idx].beacon_buf +
+                                 adapter->scan_table[adj_idx].rsn_offset);
+                        if (adapter->scan_table[adj_idx].bcn_wapi_ie)
+                                adapter->scan_table[adj_idx].bcn_wapi_ie =
+                                (struct ieee_types_generic *)
+                                (adapter->scan_table[adj_idx].beacon_buf +
+                                 adapter->scan_table[adj_idx].wapi_offset);
+                        if (adapter->scan_table[adj_idx].bcn_ht_cap)
+                                adapter->scan_table[adj_idx].bcn_ht_cap =
+                                (struct ieee80211_ht_cap *)
+                                (adapter->scan_table[adj_idx].beacon_buf +
+                                 adapter->scan_table[adj_idx].ht_cap_offset);
+
+                        if (adapter->scan_table[adj_idx].bcn_ht_info)
+                                adapter->scan_table[adj_idx].bcn_ht_info =
+                                (struct ieee80211_ht_info *)
+                                (adapter->scan_table[adj_idx].beacon_buf +
+                                 adapter->scan_table[adj_idx].ht_info_offset);
+                        if (adapter->scan_table[adj_idx].bcn_bss_co_2040)
+                                adapter->scan_table[adj_idx].bcn_bss_co_2040 =
+                                (u8 *)
+                                (adapter->scan_table[adj_idx].beacon_buf +
+                               adapter->scan_table[adj_idx].bss_co_2040_offset);
+                        if (adapter->scan_table[adj_idx].bcn_ext_cap)
+                                adapter->scan_table[adj_idx].bcn_ext_cap =
+                                (u8 *)
+                                (adapter->scan_table[adj_idx].beacon_buf +
+                                 adapter->scan_table[adj_idx].ext_cap_offset);
+                        if (adapter->scan_table[adj_idx].bcn_obss_scan)
+                                adapter->scan_table[adj_idx].bcn_obss_scan =
+                                (struct ieee_types_obss_scan_param *)
+                                (adapter->scan_table[adj_idx].beacon_buf +
+                               adapter->scan_table[adj_idx].overlap_bss_offset);
+                }
+        }
+}
+
+/*
+ * This function updates the pointers used in beacon buffer for given bss
+ * descriptor to reflect shifts
+ *
+ * Following pointers are updated
+ *      - WPA IE pointer
+ *      - RSN IE pointer
+ *      - WAPI IE pointer
+ *      - HT capability IE pointer
+ *      - HT information IE pointer
+ *      - BSS coexistence 20/40 IE pointer
+ *      - Extended capability IE pointer
+ *      - Overlapping BSS scan parameter IE pointer
+ */
+static void
+mwifiex_update_beacon_buffer_ptrs(struct mwifiex_bssdescriptor *beacon)
+{
+        if (beacon->bcn_wpa_ie)
+                beacon->bcn_wpa_ie = (struct ieee_types_vendor_specific *)
+                        (beacon->beacon_buf + beacon->wpa_offset);
+        if (beacon->bcn_rsn_ie)
+                beacon->bcn_rsn_ie = (struct ieee_types_generic *)
+                        (beacon->beacon_buf + beacon->rsn_offset);
+        if (beacon->bcn_wapi_ie)
+                beacon->bcn_wapi_ie = (struct ieee_types_generic *)
+                        (beacon->beacon_buf + beacon->wapi_offset);
+        if (beacon->bcn_ht_cap)
+                beacon->bcn_ht_cap = (struct ieee80211_ht_cap *)
+                        (beacon->beacon_buf + beacon->ht_cap_offset);
+        if (beacon->bcn_ht_info)
+                beacon->bcn_ht_info = (struct ieee80211_ht_info *)
+                        (beacon->beacon_buf + beacon->ht_info_offset);
+        if (beacon->bcn_bss_co_2040)
+                beacon->bcn_bss_co_2040 = (u8 *) (beacon->beacon_buf +
+                        beacon->bss_co_2040_offset);
+        if (beacon->bcn_ext_cap)
+                beacon->bcn_ext_cap = (u8 *) (beacon->beacon_buf +
+                        beacon->ext_cap_offset);
+        if (beacon->bcn_obss_scan)
+                beacon->bcn_obss_scan = (struct ieee_types_obss_scan_param *)
+                        (beacon->beacon_buf + beacon->overlap_bss_offset);
+}
+
+/*
+ * This function stores a beacon or probe response for a BSS returned
+ * in the scan.
+ *
+ * This stores a new scan response or an update for a previous scan response.
+ * New entries need to verify that they do not exceed the total amount of
+ * memory allocated for the table.
+ *
+ * Replacement entries need to take into consideration the amount of space
+ * currently allocated for the beacon/probe response and adjust the entry
+ * as needed.
+ *
+ * A small amount of extra pad (SCAN_BEACON_ENTRY_PAD) is generally reserved
+ * for an entry in case it is a beacon since a probe response for the
+ * network will by larger per the standard.  This helps to reduce the
+ * amount of memory copying to fit a new probe response into an entry
+ * already occupied by a network's previously stored beacon.
+ */
+static void
+mwifiex_ret_802_11_scan_store_beacon(struct mwifiex_private *priv,
+                                     u32 beacon_idx, u32 num_of_ent,
+                                     struct mwifiex_bssdescriptor *new_beacon)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        u8 *bcn_store;
+        u32 new_bcn_size;
+        u32 old_bcn_size;
+        u32 bcn_space;
+
+        if (adapter->scan_table[beacon_idx].beacon_buf) {
+
+                new_bcn_size = new_beacon->beacon_buf_size;
+                old_bcn_size = adapter->scan_table[beacon_idx].beacon_buf_size;
+                bcn_space = adapter->scan_table[beacon_idx].beacon_buf_size_max;
+                bcn_store = adapter->scan_table[beacon_idx].beacon_buf;
+
+                /* Set the max to be the same as current entry unless changed
+                   below */
+                new_beacon->beacon_buf_size_max = bcn_space;
+                if (new_bcn_size == old_bcn_size) {
+                        /*
+                         * Beacon is the same size as the previous entry.
+                         *   Replace the previous contents with the scan result
+                         */
+                        memcpy(bcn_store, new_beacon->beacon_buf,
+                               new_beacon->beacon_buf_size);
+
+                } else if (new_bcn_size <= bcn_space) {
+                        /*
+                         * New beacon size will fit in the amount of space
+                         *   we have previously allocated for it
+                         */
+
+                        /* Copy the new beacon buffer entry over the old one */
+                        memcpy(bcn_store, new_beacon->beacon_buf, new_bcn_size);
+
+                        /*
+                         *  If the old beacon size was less than the maximum
+                         *  we had alloted for the entry, and the new entry
+                         *  is even smaller, reset the max size to the old
+                         *  beacon entry and compress the storage space
+                         *  (leaving a new pad space of (old_bcn_size -
+                         *  new_bcn_size).
+                         */
+                        if (old_bcn_size < bcn_space
+                            && new_bcn_size <= old_bcn_size) {
+                                /*
+                                 * Old Beacon size is smaller than the alloted
+                                 * storage size. Shrink the alloted storage
+                                 * space.
+                                 */
+                                dev_dbg(adapter->dev, "info: AppControl:"
+                                        " smaller duplicate beacon "
+                                       "(%d), old = %d, new = %d, space = %d,"
+                                       "left = %d\n",
+                                       beacon_idx, old_bcn_size, new_bcn_size,
+                                       bcn_space,
+                                       (int)(sizeof(adapter->bcn_buf) -
+                                        (adapter->bcn_buf_end -
+                                         adapter->bcn_buf)));
+
+                                /*
+                                 *  memmove (since the memory overlaps) the
+                                 *  data after the beacon we just stored to the
+                                 *  end of the current beacon.  This cleans up
+                                 *  any unused space the old larger beacon was
+                                 *  using in the buffer
+                                 */
+                                memmove(bcn_store + old_bcn_size,
+                                        bcn_store + bcn_space,
+                                        adapter->bcn_buf_end - (bcn_store +
+                                                                   bcn_space));
+
+                                /*
+                                 * Decrement the end pointer by the difference
+                                 * between the old larger size and the new
+                                 * smaller size since we are using less space
+                                 * due to the new beacon being smaller
+                                 */
+                                adapter->bcn_buf_end -=
+                                        (bcn_space - old_bcn_size);
+
+                                /* Set the maximum storage size to the old
+                                   beacon size */
+                                new_beacon->beacon_buf_size_max = old_bcn_size;
+
+                                /* Adjust beacon buffer pointers that are past
+                                   the current */
+                                mwifiex_adjust_beacon_buffer_ptrs(priv, 0,
+                                        bcn_store, (bcn_space - old_bcn_size),
+                                        num_of_ent);
+                        }
+                } else if (adapter->bcn_buf_end + (new_bcn_size - bcn_space)
+                           < (adapter->bcn_buf + sizeof(adapter->bcn_buf))) {
+                        /*
+                         * Beacon is larger than space previously allocated
+                         * (bcn_space) and there is enough space left in the
+                         * beaconBuffer to store the additional data
+                         */
+                        dev_dbg(adapter->dev, "info: AppControl:"
+                                " larger duplicate beacon (%d), "
+                               "old = %d, new = %d, space = %d, left = %d\n",
+                               beacon_idx, old_bcn_size, new_bcn_size,
+                               bcn_space,
+                               (int)(sizeof(adapter->bcn_buf) -
+                                (adapter->bcn_buf_end -
+                                 adapter->bcn_buf)));
+
+                        /*
+                         * memmove (since the memory overlaps) the data
+                         *  after the beacon we just stored to the end of
+                         *  the current beacon.  This moves the data for
+                         *  the beacons after this further in memory to
+                         *  make space for the new larger beacon we are
+                         *  about to copy in.
+                         */
+                        memmove(bcn_store + new_bcn_size,
+                                bcn_store + bcn_space,
+                                adapter->bcn_buf_end - (bcn_store + bcn_space));
+
+                        /* Copy the new beacon buffer entry over the old one */
+                        memcpy(bcn_store, new_beacon->beacon_buf, new_bcn_size);
+
+                        /* Move the beacon end pointer by the amount of new
+                           beacon data we are adding */
+                        adapter->bcn_buf_end += (new_bcn_size - bcn_space);
+
+                        /*
+                         * This entry is bigger than the alloted max space
+                         *  previously reserved.  Increase the max space to
+                         *  be equal to the new beacon size
+                         */
+                        new_beacon->beacon_buf_size_max = new_bcn_size;
+
+                        /* Adjust beacon buffer pointers that are past the
+                           current */
+                        mwifiex_adjust_beacon_buffer_ptrs(priv, 1, bcn_store,
+                                                (new_bcn_size - bcn_space),
+                                                num_of_ent);
+                } else {
+                        /*
+                         * Beacon is larger than the previously allocated space,
+                         * but there is not enough free space to store the
+                         * additional data.
+                         */
+                        dev_err(adapter->dev, "AppControl: larger duplicate "
+                                " beacon (%d), old = %d new = %d, space = %d,"
+                                " left = %d\n", beacon_idx, old_bcn_size,
+                                new_bcn_size, bcn_space,
+                                (int)(sizeof(adapter->bcn_buf) -
+                                (adapter->bcn_buf_end - adapter->bcn_buf)));
+
+                        /* Storage failure, keep old beacon intact */
+                        new_beacon->beacon_buf_size = old_bcn_size;
+                        if (new_beacon->bcn_wpa_ie)
+                                new_beacon->wpa_offset =
+                                        adapter->scan_table[beacon_idx].
+                                        wpa_offset;
+                        if (new_beacon->bcn_rsn_ie)
+                                new_beacon->rsn_offset =
+                                        adapter->scan_table[beacon_idx].
+                                        rsn_offset;
+                        if (new_beacon->bcn_wapi_ie)
+                                new_beacon->wapi_offset =
+                                        adapter->scan_table[beacon_idx].
+                                        wapi_offset;
+                        if (new_beacon->bcn_ht_cap)
+                                new_beacon->ht_cap_offset =
+                                        adapter->scan_table[beacon_idx].
+                                        ht_cap_offset;
+                        if (new_beacon->bcn_ht_info)
+                                new_beacon->ht_info_offset =
+                                        adapter->scan_table[beacon_idx].
+                                        ht_info_offset;
+                        if (new_beacon->bcn_bss_co_2040)
+                                new_beacon->bss_co_2040_offset =
+                                        adapter->scan_table[beacon_idx].
+                                        bss_co_2040_offset;
+                        if (new_beacon->bcn_ext_cap)
+                                new_beacon->ext_cap_offset =
+                                        adapter->scan_table[beacon_idx].
+                                        ext_cap_offset;
+                        if (new_beacon->bcn_obss_scan)
+                                new_beacon->overlap_bss_offset =
+                                        adapter->scan_table[beacon_idx].
+                                        overlap_bss_offset;
+                }
+                /* Point the new entry to its permanent storage space */
+                new_beacon->beacon_buf = bcn_store;
+                mwifiex_update_beacon_buffer_ptrs(new_beacon);
+        } else {
+                /*
+                 * No existing beacon data exists for this entry, check to see
+                 *   if we can fit it in the remaining space
+                 */
+                if (adapter->bcn_buf_end + new_beacon->beacon_buf_size +
+                    SCAN_BEACON_ENTRY_PAD < (adapter->bcn_buf +
+                                             sizeof(adapter->bcn_buf))) {
+
+                        /*
+                         * Copy the beacon buffer data from the local entry to
+                         * the adapter dev struct buffer space used to store
+                         * the raw beacon data for each entry in the scan table
+                         */
+                        memcpy(adapter->bcn_buf_end, new_beacon->beacon_buf,
+                               new_beacon->beacon_buf_size);
+
+                        /* Update the beacon ptr to point to the table save
+                           area */
+                        new_beacon->beacon_buf = adapter->bcn_buf_end;
+                        new_beacon->beacon_buf_size_max =
+                                (new_beacon->beacon_buf_size +
+                                 SCAN_BEACON_ENTRY_PAD);
+
+                        mwifiex_update_beacon_buffer_ptrs(new_beacon);
+
+                        /* Increment the end pointer by the size reserved */
+                        adapter->bcn_buf_end += new_beacon->beacon_buf_size_max;
+
+                        dev_dbg(adapter->dev, "info: AppControl: beacon[%02d]"
+                                " sz=%03d, used = %04d, left = %04d\n",
+                               beacon_idx,
+                               new_beacon->beacon_buf_size,
+                               (int)(adapter->bcn_buf_end - adapter->bcn_buf),
+                               (int)(sizeof(adapter->bcn_buf) -
+                                (adapter->bcn_buf_end -
+                                 adapter->bcn_buf)));
+                } else {
+                        /* No space for new beacon */
+                        dev_dbg(adapter->dev, "info: AppControl: no space for"
+                                " beacon (%d): %pM sz=%03d, left=%03d\n",
+                               beacon_idx, new_beacon->mac_address,
+                               new_beacon->beacon_buf_size,
+                               (int)(sizeof(adapter->bcn_buf) -
+                                (adapter->bcn_buf_end -
+                                 adapter->bcn_buf)));
+
+                        /* Storage failure; clear storage records for this
+                           bcn */
+                        new_beacon->beacon_buf = NULL;
+                        new_beacon->beacon_buf_size = 0;
+                        new_beacon->beacon_buf_size_max = 0;
+                        new_beacon->bcn_wpa_ie = NULL;
+                        new_beacon->wpa_offset = 0;
+                        new_beacon->bcn_rsn_ie = NULL;
+                        new_beacon->rsn_offset = 0;
+                        new_beacon->bcn_wapi_ie = NULL;
+                        new_beacon->wapi_offset = 0;
+                        new_beacon->bcn_ht_cap = NULL;
+                        new_beacon->ht_cap_offset = 0;
+                        new_beacon->bcn_ht_info = NULL;
+                        new_beacon->ht_info_offset = 0;
+                        new_beacon->bcn_bss_co_2040 = NULL;
+                        new_beacon->bss_co_2040_offset = 0;
+                        new_beacon->bcn_ext_cap = NULL;
+                        new_beacon->ext_cap_offset = 0;
+                        new_beacon->bcn_obss_scan = NULL;
+                        new_beacon->overlap_bss_offset = 0;
+                }
+        }
+}
+
+/*
+ * This function restores a beacon buffer of the current BSS descriptor.
+ */
+static void mwifiex_restore_curr_bcn(struct mwifiex_private *priv)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct mwifiex_bssdescriptor *curr_bss =
+                &priv->curr_bss_params.bss_descriptor;
+        unsigned long flags;
+
+        if (priv->curr_bcn_buf &&
+            ((adapter->bcn_buf_end + priv->curr_bcn_size) <
+             (adapter->bcn_buf + sizeof(adapter->bcn_buf)))) {
+                spin_lock_irqsave(&priv->curr_bcn_buf_lock, flags);
+
+                /* restore the current beacon buffer */
+                memcpy(adapter->bcn_buf_end, priv->curr_bcn_buf,
+                       priv->curr_bcn_size);
+                curr_bss->beacon_buf = adapter->bcn_buf_end;
+                curr_bss->beacon_buf_size = priv->curr_bcn_size;
+                adapter->bcn_buf_end += priv->curr_bcn_size;
+
+                /* adjust the pointers in the current BSS descriptor */
+                if (curr_bss->bcn_wpa_ie)
+                        curr_bss->bcn_wpa_ie =
+                                (struct ieee_types_vendor_specific *)
+                                (curr_bss->beacon_buf +
+                                 curr_bss->wpa_offset);
+
+                if (curr_bss->bcn_rsn_ie)
+                        curr_bss->bcn_rsn_ie = (struct ieee_types_generic *)
+                                (curr_bss->beacon_buf +
+                                 curr_bss->rsn_offset);
+
+                if (curr_bss->bcn_ht_cap)
+                        curr_bss->bcn_ht_cap = (struct ieee80211_ht_cap *)
+                                (curr_bss->beacon_buf +
+                                 curr_bss->ht_cap_offset);
+
+                if (curr_bss->bcn_ht_info)
+                        curr_bss->bcn_ht_info = (struct ieee80211_ht_info *)
+                                (curr_bss->beacon_buf +
+                                 curr_bss->ht_info_offset);
+
+                if (curr_bss->bcn_bss_co_2040)
+                        curr_bss->bcn_bss_co_2040 =
+                                (u8 *) (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);
+
+                if (curr_bss->bcn_obss_scan)
+                        curr_bss->bcn_obss_scan =
+                                (struct ieee_types_obss_scan_param *)
+                                (curr_bss->beacon_buf +
+                                 curr_bss->overlap_bss_offset);
+
+                spin_unlock_irqrestore(&priv->curr_bcn_buf_lock, flags);
+
+                dev_dbg(adapter->dev, "info: current beacon restored %d\n",
+                       priv->curr_bcn_size);
+        } else {
+                dev_warn(adapter->dev,
+                        "curr_bcn_buf not saved or bcn_buf has no space\n");
+        }
+}
+
+/*
+ * This function post processes the scan table after a new scan command has
+ * completed.
+ *
+ * It inspects each entry of the scan table and tries to find an entry that
+ * matches with our current associated/joined network from the scan. If
+ * one is found, the stored copy of the BSS descriptor of our current network
+ * is updated.
+ *
+ * It also debug dumps the current scan table contents after processing is over.
+ */
+static void
+mwifiex_process_scan_results(struct mwifiex_private *priv)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        s32 j;
+        u32 i;
+        unsigned long flags;
+
+        if (priv->media_connected) {
+
+                j = mwifiex_find_ssid_in_list(priv, &priv->curr_bss_params.
+                                              bss_descriptor.ssid,
+                                              priv->curr_bss_params.
+                                              bss_descriptor.mac_address,
+                                              priv->bss_mode);
+
+                if (j >= 0) {
+                        spin_lock_irqsave(&priv->curr_bcn_buf_lock, flags);
+                        priv->curr_bss_params.bss_descriptor.bcn_wpa_ie = NULL;
+                        priv->curr_bss_params.bss_descriptor.wpa_offset = 0;
+                        priv->curr_bss_params.bss_descriptor.bcn_rsn_ie = NULL;
+                        priv->curr_bss_params.bss_descriptor.rsn_offset = 0;
+                        priv->curr_bss_params.bss_descriptor.bcn_wapi_ie = NULL;
+                        priv->curr_bss_params.bss_descriptor.wapi_offset = 0;
+                        priv->curr_bss_params.bss_descriptor.bcn_ht_cap = NULL;
+                        priv->curr_bss_params.bss_descriptor.ht_cap_offset =
+                                0;
+                        priv->curr_bss_params.bss_descriptor.bcn_ht_info = NULL;
+                        priv->curr_bss_params.bss_descriptor.ht_info_offset =
+                                0;
+                        priv->curr_bss_params.bss_descriptor.bcn_bss_co_2040 =
+                                NULL;
+                        priv->curr_bss_params.bss_descriptor.
+                                bss_co_2040_offset = 0;
+                        priv->curr_bss_params.bss_descriptor.bcn_ext_cap = NULL;
+                        priv->curr_bss_params.bss_descriptor.ext_cap_offset = 0;
+                        priv->curr_bss_params.bss_descriptor.
+                                bcn_obss_scan = NULL;
+                        priv->curr_bss_params.bss_descriptor.
+                                overlap_bss_offset = 0;
+                        priv->curr_bss_params.bss_descriptor.beacon_buf = NULL;
+                        priv->curr_bss_params.bss_descriptor.beacon_buf_size =
+                                0;
+                        priv->curr_bss_params.bss_descriptor.
+                                beacon_buf_size_max = 0;
+
+                        dev_dbg(adapter->dev, "info: Found current ssid/bssid"
+                                " in list @ index #%d\n", j);
+                        /* Make a copy of current BSSID descriptor */
+                        memcpy(&priv->curr_bss_params.bss_descriptor,
+                               &adapter->scan_table[j],
+                               sizeof(priv->curr_bss_params.bss_descriptor));
+
+                        mwifiex_save_curr_bcn(priv);
+                        spin_unlock_irqrestore(&priv->curr_bcn_buf_lock, flags);
+
+                } else {
+                        mwifiex_restore_curr_bcn(priv);
+                }
+        }
+
+        for (i = 0; i < adapter->num_in_scan_table; i++)
+                dev_dbg(adapter->dev, "info: scan:(%02d) %pM "
+                       "RSSI[%03d], SSID[%s]\n",
+                       i, adapter->scan_table[i].mac_address,
+                       (s32) adapter->scan_table[i].rssi,
+                       adapter->scan_table[i].ssid.ssid);
+}
+
+/*
+ * This function converts radio type scan parameter to a band configuration
+ * to be used in join command.
+ */
+static u8
+mwifiex_radio_type_to_band(u8 radio_type)
+{
+        u8 ret_band;
+
+        switch (radio_type) {
+        case HostCmd_SCAN_RADIO_TYPE_A:
+                ret_band = BAND_A;
+                break;
+        case HostCmd_SCAN_RADIO_TYPE_BG:
+        default:
+                ret_band = BAND_G;
+                break;
+        }
+
+        return ret_band;
+}
+
+/*
+ * This function deletes a specific indexed entry from the scan table.
+ *
+ * This also compacts the remaining entries and adjusts any buffering
+ * of beacon/probe response data if needed.
+ */
+static void
+mwifiex_scan_delete_table_entry(struct mwifiex_private *priv, s32 table_idx)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        u32 del_idx;
+        u32 beacon_buf_adj;
+        u8 *beacon_buf;
+
+        /*
+         * Shift the saved beacon buffer data for the scan table back over the
+         *   entry being removed.  Update the end of buffer pointer.  Save the
+         *   deleted buffer allocation size for pointer adjustments for entries
+         *   compacted after the deleted index.
+         */
+        beacon_buf_adj = adapter->scan_table[table_idx].beacon_buf_size_max;
+
+        dev_dbg(adapter->dev, "info: Scan: Delete Entry %d, beacon buffer "
+                "removal = %d bytes\n", table_idx, beacon_buf_adj);
+
+        /* Check if the table entry had storage allocated for its beacon */
+        if (beacon_buf_adj) {
+                beacon_buf = adapter->scan_table[table_idx].beacon_buf;
+
+                /*
+                 * Remove the entry's buffer space, decrement the table end
+                 * pointer by the amount we are removing
+                 */
+                adapter->bcn_buf_end -= beacon_buf_adj;
+
+                dev_dbg(adapter->dev, "info: scan: delete entry %d,"
+                        " compact data: %p <- %p (sz = %d)\n",
+                       table_idx, beacon_buf,
+                       beacon_buf + beacon_buf_adj,
+                       (int)(adapter->bcn_buf_end - beacon_buf));
+
+                /*
+                 * Compact data storage.  Copy all data after the deleted
+                 * entry's end address (beacon_buf + beacon_buf_adj) back
+                 * to the original start address (beacon_buf).
+                 *
+                 * Scan table entries affected by the move will have their
+                 * entry pointer adjusted below.
+                 *
+                 * Use memmove since the dest/src memory regions overlap.
+                 */
+                memmove(beacon_buf, beacon_buf + beacon_buf_adj,
+                        adapter->bcn_buf_end - beacon_buf);
+        }
+
+        dev_dbg(adapter->dev,
+                "info: Scan: Delete Entry %d, num_in_scan_table = %d\n",
+               table_idx, adapter->num_in_scan_table);
+
+        /* Shift all of the entries after the table_idx back by one, compacting
+           the table and removing the requested entry */
+        for (del_idx = table_idx; (del_idx + 1) < adapter->num_in_scan_table;
+             del_idx++) {
+                /* Copy the next entry over this one */
+                memcpy(adapter->scan_table + del_idx,
+                       adapter->scan_table + del_idx + 1,
+                       sizeof(struct mwifiex_bssdescriptor));
+
+                /*
+                 * Adjust this entry's pointer to its beacon buffer based on
+                 * the removed/compacted entry from the deleted index.  Don't
+                 * decrement if the buffer pointer is NULL (no data stored for
+                 * this entry).
+                 */
+                if (adapter->scan_table[del_idx].beacon_buf) {
+                        adapter->scan_table[del_idx].beacon_buf -=
+                                beacon_buf_adj;
+                        if (adapter->scan_table[del_idx].bcn_wpa_ie)
+                                adapter->scan_table[del_idx].bcn_wpa_ie =
+                                        (struct ieee_types_vendor_specific *)
+                                        (adapter->scan_table[del_idx].
+                                         beacon_buf +
+                                         adapter->scan_table[del_idx].
+                                         wpa_offset);
+                        if (adapter->scan_table[del_idx].bcn_rsn_ie)
+                                adapter->scan_table[del_idx].bcn_rsn_ie =
+                                        (struct ieee_types_generic *)
+                                        (adapter->scan_table[del_idx].
+                                         beacon_buf +
+                                         adapter->scan_table[del_idx].
+                                         rsn_offset);
+                        if (adapter->scan_table[del_idx].bcn_wapi_ie)
+                                adapter->scan_table[del_idx].bcn_wapi_ie =
+                                        (struct ieee_types_generic *)
+                                        (adapter->scan_table[del_idx].beacon_buf
+                                         + adapter->scan_table[del_idx].
+                                         wapi_offset);
+                        if (adapter->scan_table[del_idx].bcn_ht_cap)
+                                adapter->scan_table[del_idx].bcn_ht_cap =
+                                        (struct ieee80211_ht_cap *)
+                                        (adapter->scan_table[del_idx].beacon_buf
+                                         + adapter->scan_table[del_idx].
+                                          ht_cap_offset);
+
+                        if (adapter->scan_table[del_idx].bcn_ht_info)
+                                adapter->scan_table[del_idx].bcn_ht_info =
+                                        (struct ieee80211_ht_info *)
+                                        (adapter->scan_table[del_idx].beacon_buf
+                                         + adapter->scan_table[del_idx].
+                                          ht_info_offset);
+                        if (adapter->scan_table[del_idx].bcn_bss_co_2040)
+                                adapter->scan_table[del_idx].bcn_bss_co_2040 =
+                                        (u8 *)
+                                        (adapter->scan_table[del_idx].beacon_buf
+                                         + adapter->scan_table[del_idx].
+                                           bss_co_2040_offset);
+                        if (adapter->scan_table[del_idx].bcn_ext_cap)
+                                adapter->scan_table[del_idx].bcn_ext_cap =
+                                        (u8 *)
+                                        (adapter->scan_table[del_idx].beacon_buf
+                                         + adapter->scan_table[del_idx].
+                                             ext_cap_offset);
+                        if (adapter->scan_table[del_idx].bcn_obss_scan)
+                                adapter->scan_table[del_idx].
+                                        bcn_obss_scan =
+                                        (struct ieee_types_obss_scan_param *)
+                                        (adapter->scan_table[del_idx].beacon_buf
+                                         + adapter->scan_table[del_idx].
+                                             overlap_bss_offset);
+                }
+        }
+
+        /* The last entry is invalid now that it has been deleted or moved
+           back */
+        memset(adapter->scan_table + adapter->num_in_scan_table - 1,
+               0x00, sizeof(struct mwifiex_bssdescriptor));
+
+        adapter->num_in_scan_table--;
+}
+
+/*
+ * This function deletes all occurrences of a given SSID from the scan table.
+ *
+ * This iterates through the scan table and deletes all entries that match
+ * the given SSID. It also compacts the remaining scan table entries.
+ */
+static int
+mwifiex_scan_delete_ssid_table_entry(struct mwifiex_private *priv,
+                                     struct mwifiex_802_11_ssid *del_ssid)
+{
+        int ret = -1;
+        s32 table_idx;
+
+        dev_dbg(priv->adapter->dev, "info: scan: delete ssid entry: %-32s\n",
+                        del_ssid->ssid);
+
+        /* If the requested SSID is found in the table, delete it.  Then keep
+           searching the table for multiple entires for the SSID until no
+           more are found */
+        while ((table_idx = mwifiex_find_ssid_in_list(priv, del_ssid, NULL,
+                                                      MWIFIEX_BSS_MODE_AUTO)) >=
+               0) {
+                dev_dbg(priv->adapter->dev,
+                        "info: Scan: Delete SSID Entry: Found Idx = %d\n",
+                       table_idx);
+                ret = 0;
+                mwifiex_scan_delete_table_entry(priv, table_idx);
+        }
+
+        return ret;
+}
+
+/*
+ * This is an internal function used to start a scan based on an input
+ * configuration.
+ *
+ * This uses the input user scan configuration information when provided in
+ * order to send the appropriate scan commands to firmware to populate or
+ * update the internal driver scan table.
+ */
+int mwifiex_scan_networks(struct mwifiex_private *priv,
+                          void *wait_buf, u16 action,
+                          const struct mwifiex_user_scan_cfg *user_scan_in,
+                          struct mwifiex_scan_resp *scan_resp)
+{
+        int ret = 0;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct cmd_ctrl_node *cmd_node = NULL;
+        union mwifiex_scan_cmd_config_tlv *scan_cfg_out = NULL;
+        struct mwifiex_ie_types_chan_list_param_set *chan_list_out;
+        u32 buf_size;
+        struct mwifiex_chan_scan_param_set *scan_chan_list;
+        u8 keep_previous_scan;
+        u8 filtered_scan;
+        u8 scan_current_chan_only;
+        u8 max_chan_per_scan;
+        unsigned long flags;
+
+        if (action == HostCmd_ACT_GEN_GET) {
+                if (scan_resp) {
+                        scan_resp->scan_table = (u8 *) adapter->scan_table;
+                        scan_resp->num_in_scan_table =
+                                adapter->num_in_scan_table;
+                } else {
+                        ret = -1;
+                }
+                return ret;
+        }
+
+        if (adapter->scan_processing && action == HostCmd_ACT_GEN_SET) {
+                dev_dbg(adapter->dev, "cmd: Scan already in process...\n");
+                return ret;
+        }
+
+        spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
+        adapter->scan_processing = true;
+        spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
+
+        if (priv->scan_block && action == HostCmd_ACT_GEN_SET) {
+                dev_dbg(adapter->dev,
+                        "cmd: Scan is blocked during association...\n");
+                return ret;
+        }
+
+        scan_cfg_out = kzalloc(sizeof(union mwifiex_scan_cmd_config_tlv),
+                                        GFP_KERNEL);
+        if (!scan_cfg_out) {
+                dev_err(adapter->dev, "failed to alloc scan_cfg_out\n");
+                return -1;
+        }
+
+        buf_size = sizeof(struct mwifiex_chan_scan_param_set) *
+                        MWIFIEX_USER_SCAN_CHAN_MAX;
+        scan_chan_list = kzalloc(buf_size, GFP_KERNEL);
+        if (!scan_chan_list) {
+                dev_err(adapter->dev, "failed to alloc scan_chan_list\n");
+                kfree(scan_cfg_out);
+                return -1;
+        }
+
+        keep_previous_scan = false;
+
+        mwifiex_scan_setup_scan_config(priv, user_scan_in,
+                                       &scan_cfg_out->config, &chan_list_out,
+                                       scan_chan_list, &max_chan_per_scan,
+                                       &filtered_scan, &scan_current_chan_only);
+
+        if (user_scan_in)
+                keep_previous_scan = user_scan_in->keep_previous_scan;
+
+
+        if (!keep_previous_scan) {
+                memset(adapter->scan_table, 0x00,
+                       sizeof(struct mwifiex_bssdescriptor) * IW_MAX_AP);
+                adapter->num_in_scan_table = 0;
+                adapter->bcn_buf_end = adapter->bcn_buf;
+        }
+
+        ret = mwifiex_scan_channel_list(priv, wait_buf, max_chan_per_scan,
+                                        filtered_scan, &scan_cfg_out->config,
+                                        chan_list_out, scan_chan_list);
+
+        /* Get scan command from scan_pending_q and put to cmd_pending_q */
+        if (!ret) {
+                spin_lock_irqsave(&adapter->scan_pending_q_lock, flags);
+                if (!list_empty(&adapter->scan_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);
+                } else {
+                        spin_unlock_irqrestore(&adapter->scan_pending_q_lock,
+                                               flags);
+                }
+                ret = -EINPROGRESS;
+        } else {
+                spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
+                adapter->scan_processing = true;
+                spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
+        }
+
+        kfree(scan_cfg_out);
+        kfree(scan_chan_list);
+        return ret;
+}
+
+/*
+ * This function prepares a scan command to be sent to the firmware.
+ *
+ * This uses the scan command configuration sent to the command processing
+ * module in command preparation stage to configure a scan command structure
+ * to send to firmware.
+ *
+ * The fixed fields specifying the BSS type and BSSID filters as well as a
+ * variable number/length of TLVs are sent in the command to firmware.
+ *
+ * Preparation also includes -
+ *      - Setting command ID, and proper size
+ *      - Ensuring correct endian-ness
+ */
+int mwifiex_cmd_802_11_scan(struct mwifiex_private *priv,
+                            struct host_cmd_ds_command *cmd, void *data_buf)
+{
+        struct host_cmd_ds_802_11_scan *scan_cmd = &cmd->params.scan;
+        struct mwifiex_scan_cmd_config *scan_cfg;
+
+        scan_cfg = (struct mwifiex_scan_cmd_config *) data_buf;
+
+        /* Set fixed field variables in scan command */
+        scan_cmd->bss_mode = scan_cfg->bss_mode;
+        memcpy(scan_cmd->bssid, scan_cfg->specific_bssid,
+               sizeof(scan_cmd->bssid));
+        memcpy(scan_cmd->tlv_buffer, scan_cfg->tlv_buf, scan_cfg->tlv_buf_len);
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_SCAN);
+
+        /* Size is equal to the sizeof(fixed portions) + the TLV len + header */
+        cmd->size = cpu_to_le16((u16) (sizeof(scan_cmd->bss_mode)
+                                          + sizeof(scan_cmd->bssid)
+                                          + scan_cfg->tlv_buf_len + S_DS_GEN));
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of scan.
+ *
+ * The response buffer for the scan command has the following
+ * memory layout:
+ *
+ *      .-------------------------------------------------------------.
+ *      |  Header (4 * sizeof(t_u16)):  Standard command response hdr |
+ *      .-------------------------------------------------------------.
+ *      |  BufSize (t_u16) : sizeof the BSS Description data          |
+ *      .-------------------------------------------------------------.
+ *      |  NumOfSet (t_u8) : Number of BSS Descs returned             |
+ *      .-------------------------------------------------------------.
+ *      |  BSSDescription data (variable, size given in BufSize)      |
+ *      .-------------------------------------------------------------.
+ *      |  TLV data (variable, size calculated using Header->Size,    |
+ *      |            BufSize and sizeof the fixed fields above)       |
+ *      .-------------------------------------------------------------.
+ */
+int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
+                            struct host_cmd_ds_command *resp, void *wq_buf)
+{
+        int ret = 0;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct mwifiex_wait_queue *wait_queue = NULL;
+        struct cmd_ctrl_node *cmd_node = NULL;
+        struct host_cmd_ds_802_11_scan_rsp *scan_rsp = NULL;
+        struct mwifiex_bssdescriptor *bss_new_entry = NULL;
+        struct mwifiex_ie_types_data *tlv_data;
+        struct mwifiex_ie_types_tsf_timestamp *tsf_tlv;
+        u8 *bss_info;
+        u32 scan_resp_size;
+        u32 bytes_left;
+        u32 num_in_table;
+        u32 bss_idx;
+        u32 idx;
+        u32 tlv_buf_size;
+        long long tsf_val;
+        struct mwifiex_chan_freq_power *cfp;
+        struct mwifiex_ie_types_chan_band_list_param_set *chan_band_tlv;
+        struct chan_band_param_set *chan_band;
+        u8 band;
+        u8 is_bgscan_resp;
+        unsigned long flags;
+
+        is_bgscan_resp = (le16_to_cpu(resp->command)
+                == HostCmd_CMD_802_11_BG_SCAN_QUERY);
+        if (is_bgscan_resp)
+                scan_rsp = &resp->params.bg_scan_query_resp.scan_resp;
+        else
+                scan_rsp = &resp->params.scan_resp;
+
+
+        if (scan_rsp->number_of_sets > IW_MAX_AP) {
+                dev_err(adapter->dev, "SCAN_RESP: too many AP returned (%d)\n",
+                       scan_rsp->number_of_sets);
+                ret = -1;
+                goto done;
+        }
+
+        bytes_left = le16_to_cpu(scan_rsp->bss_descript_size);
+        dev_dbg(adapter->dev, "info: SCAN_RESP: bss_descript_size %d\n",
+                                                bytes_left);
+
+        scan_resp_size = le16_to_cpu(resp->size);
+
+        dev_dbg(adapter->dev,
+                "info: SCAN_RESP: returned %d APs before parsing\n",
+               scan_rsp->number_of_sets);
+
+        num_in_table = adapter->num_in_scan_table;
+        bss_info = scan_rsp->bss_desc_and_tlv_buffer;
+
+        /*
+         * The size of the TLV buffer is equal to the entire command response
+         *   size (scan_resp_size) minus the fixed fields (sizeof()'s), the
+         *   BSS Descriptions (bss_descript_size as bytesLef) and the command
+         *   response header (S_DS_GEN)
+         */
+        tlv_buf_size = scan_resp_size - (bytes_left
+                                         + sizeof(scan_rsp->bss_descript_size)
+                                         + sizeof(scan_rsp->number_of_sets)
+                                         + S_DS_GEN);
+
+        tlv_data = (struct mwifiex_ie_types_data *) (scan_rsp->
+                                                 bss_desc_and_tlv_buffer +
+                                                 bytes_left);
+
+        /* Search the TLV buffer space in the scan response for any valid
+           TLVs */
+        mwifiex_ret_802_11_scan_get_tlv_ptrs(adapter, tlv_data, tlv_buf_size,
+                                             TLV_TYPE_TSFTIMESTAMP,
+                                             (struct mwifiex_ie_types_data **)
+                                             &tsf_tlv);
+
+        /* Search the TLV buffer space in the scan response for any valid
+           TLVs */
+        mwifiex_ret_802_11_scan_get_tlv_ptrs(adapter, tlv_data, tlv_buf_size,
+                                             TLV_TYPE_CHANNELBANDLIST,
+                                             (struct mwifiex_ie_types_data **)
+                                             &chan_band_tlv);
+
+        /*
+         *  Process each scan response returned (scan_rsp->number_of_sets).
+         *  Save the information in the bss_new_entry and then insert into the
+         *  driver scan table either as an update to an existing entry
+         *  or as an addition at the end of the table
+         */
+        bss_new_entry = kzalloc(sizeof(struct mwifiex_bssdescriptor),
+                                GFP_KERNEL);
+        if (!bss_new_entry) {
+                dev_err(adapter->dev, " failed to alloc bss_new_entry\n");
+                return -1;
+        }
+
+        for (idx = 0; idx < scan_rsp->number_of_sets && bytes_left; idx++) {
+                /* Zero out the bss_new_entry we are about to store info in */
+                memset(bss_new_entry, 0x00,
+                       sizeof(struct mwifiex_bssdescriptor));
+
+                if (mwifiex_interpret_bss_desc_with_ie(adapter, bss_new_entry,
+                                                        &bss_info,
+                                                        &bytes_left)) {
+                        /* Error parsing/interpreting scan response, skipped */
+                        dev_err(adapter->dev, "SCAN_RESP: "
+                               "mwifiex_interpret_bss_desc_with_ie "
+                               "returned ERROR\n");
+                        continue;
+                }
+
+                /* Process the data fields and IEs returned for this BSS */
+                dev_dbg(adapter->dev, "info: SCAN_RESP: BSSID = %pM\n",
+                       bss_new_entry->mac_address);
+
+                /* Search the scan table for the same bssid */
+                for (bss_idx = 0; bss_idx < num_in_table; bss_idx++) {
+                        if (memcmp(bss_new_entry->mac_address,
+                                adapter->scan_table[bss_idx].mac_address,
+                                sizeof(bss_new_entry->mac_address))) {
+                                continue;
+                        }
+                        /*
+                         * If the SSID matches as well, it is a
+                         * duplicate of this entry.  Keep the bss_idx
+                         * set to this entry so we replace the old
+                         * contents in the table
+                         */
+                        if ((bss_new_entry->ssid.ssid_len
+                                == adapter->scan_table[bss_idx]. ssid.ssid_len)
+                                        && (!memcmp(bss_new_entry->ssid.ssid,
+                                        adapter->scan_table[bss_idx].ssid.ssid,
+                                        bss_new_entry->ssid.ssid_len))) {
+                                dev_dbg(adapter->dev, "info: SCAN_RESP:"
+                                        " duplicate of index: %d\n", bss_idx);
+                                break;
+                        }
+                }
+                /*
+                 * If the bss_idx is equal to the number of entries in
+                 * the table, the new entry was not a duplicate; append
+                 * it to the scan table
+                 */
+                if (bss_idx == num_in_table) {
+                        /* Range check the bss_idx, keep it limited to
+                           the last entry */
+                        if (bss_idx == IW_MAX_AP)
+                                bss_idx--;
+                        else
+                                num_in_table++;
+                }
+
+                /*
+                 * Save the beacon/probe response returned for later application
+                 * retrieval.  Duplicate beacon/probe responses are updated if
+                 * possible
+                 */
+                mwifiex_ret_802_11_scan_store_beacon(priv, bss_idx,
+                                                num_in_table, bss_new_entry);
+                /*
+                 * If the TSF TLV was appended to the scan results, save this
+                 * entry's TSF value in the networkTSF field.The networkTSF is
+                 * the firmware's TSF value at the time the beacon or probe
+                 * response was received.
+                 */
+                if (tsf_tlv) {
+                        memcpy(&tsf_val, &tsf_tlv->tsf_data[idx * TSF_DATA_SIZE]
+                                        , sizeof(tsf_val));
+                        memcpy(&bss_new_entry->network_tsf, &tsf_val,
+                                        sizeof(bss_new_entry->network_tsf));
+                }
+                band = BAND_G;
+                if (chan_band_tlv) {
+                        chan_band = &chan_band_tlv->chan_band_param[idx];
+                        band = mwifiex_radio_type_to_band(chan_band->radio_type
+                                        & (BIT(0) | BIT(1)));
+                }
+
+                /* Save the band designation for this entry for use in join */
+                bss_new_entry->bss_band = band;
+                cfp = mwifiex_get_cfp_by_band_and_channel_from_cfg80211(priv,
+                                        (u8) bss_new_entry->bss_band,
+                                        (u16)bss_new_entry->channel);
+
+                if (cfp)
+                        bss_new_entry->freq = cfp->freq;
+                else
+                        bss_new_entry->freq = 0;
+
+                /* Copy the locally created bss_new_entry to the scan table */
+                memcpy(&adapter->scan_table[bss_idx], bss_new_entry,
+                       sizeof(adapter->scan_table[bss_idx]));
+
+        }
+
+        dev_dbg(adapter->dev,
+                "info: SCAN_RESP: Scanned %2d APs, %d valid, %d total\n",
+               scan_rsp->number_of_sets,
+               num_in_table - adapter->num_in_scan_table, num_in_table);
+
+        /* Update the total number of BSSIDs in the scan table */
+        adapter->num_in_scan_table = num_in_table;
+
+        spin_lock_irqsave(&adapter->scan_pending_q_lock, flags);
+        if (list_empty(&adapter->scan_pending_q)) {
+                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);
+                /*
+                 * Process the resulting scan table:
+                 *   - Remove any bad ssids
+                 *   - Update our current BSS information from scan data
+                 */
+                mwifiex_process_scan_results(priv);
+
+                /* Need to indicate IOCTL complete */
+                wait_queue = (struct mwifiex_wait_queue *) wq_buf;
+                if (wait_queue) {
+                        wait_queue->status = MWIFIEX_ERROR_NO_ERROR;
+
+                        /* Indicate ioctl complete */
+                        mwifiex_ioctl_complete(adapter,
+                               (struct mwifiex_wait_queue *) wait_queue, 0);
+                }
+                if (priv->report_scan_result)
+                        priv->report_scan_result = false;
+                if (priv->scan_pending_on_block) {
+                        priv->scan_pending_on_block = false;
+                        up(&priv->async_sem);
+                }
+
+        } 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:
+        kfree((u8 *) bss_new_entry);
+        return ret;
+}
+
+/*
+ * This function prepares command for background scan query.
+ *
+ * Preparation includes -
+ *      - Setting command ID and proper size
+ *      - Setting background scan flush parameter
+ *      - Ensuring correct endian-ness
+ */
+int mwifiex_cmd_802_11_bg_scan_query(struct mwifiex_private *priv,
+                                     struct host_cmd_ds_command *cmd,
+                                     void *data_buf)
+{
+        struct host_cmd_ds_802_11_bg_scan_query *bg_query =
+                &cmd->params.bg_scan_query;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_BG_SCAN_QUERY);
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_802_11_bg_scan_query)
+                                + S_DS_GEN);
+
+        bg_query->flush = 1;
+
+        return 0;
+}
+
+/*
+ * This function finds a SSID in the scan table.
+ *
+ * A BSSID may optionally be provided to qualify the SSID.
+ * For non-Auto mode, further check is made to make sure the
+ * BSS found in the scan table is compatible with the current
+ * settings of the driver.
+ */
+s32
+mwifiex_find_ssid_in_list(struct mwifiex_private *priv,
+                          struct mwifiex_802_11_ssid *ssid, u8 *bssid,
+                          u32 mode)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        s32 net = -1, j;
+        u8 best_rssi = 0;
+        u32 i;
+
+        dev_dbg(adapter->dev, "info: num of entries in table = %d\n",
+               adapter->num_in_scan_table);
+
+        /*
+         * Loop through the table until the maximum is reached or until a match
+         *   is found based on the bssid field comparison
+         */
+        for (i = 0;
+             i < adapter->num_in_scan_table && (!bssid || (bssid && net < 0));
+             i++) {
+                if (!mwifiex_ssid_cmp(&adapter->scan_table[i].ssid, ssid) &&
+                    (!bssid
+                     || !memcmp(adapter->scan_table[i].mac_address, bssid,
+                                ETH_ALEN))
+                    &&
+                    (mwifiex_get_cfp_by_band_and_channel_from_cfg80211
+                     (priv, (u8) adapter->scan_table[i].bss_band,
+                      (u16) adapter->scan_table[i].channel))) {
+                        switch (mode) {
+                        case MWIFIEX_BSS_MODE_INFRA:
+                        case MWIFIEX_BSS_MODE_IBSS:
+                                j = mwifiex_is_network_compatible(priv, i,
+                                                                  mode);
+
+                                if (j >= 0) {
+                                        if (SCAN_RSSI
+                                            (adapter->scan_table[i].rssi) >
+                                            best_rssi) {
+                                                best_rssi = SCAN_RSSI(adapter->
+                                                                  scan_table
+                                                                  [i].rssi);
+                                                net = i;
+                                        }
+                                } else {
+                                        if (net == -1)
+                                                net = j;
+                                }
+                                break;
+                        case MWIFIEX_BSS_MODE_AUTO:
+                        default:
+                                /*
+                                 * Do not check compatibility if the mode
+                                 * requested is Auto/Unknown.  Allows generic
+                                 * find to work without verifying against the
+                                 * Adapter security settings
+                                 */
+                                if (SCAN_RSSI(adapter->scan_table[i].rssi) >
+                                    best_rssi) {
+                                        best_rssi = SCAN_RSSI(adapter->
+                                                          scan_table[i].rssi);
+                                        net = i;
+                                }
+                                break;
+                        }
+                }
+        }
+
+        return net;
+}
+
+/*
+ * This function finds a specific compatible BSSID in the scan list.
+ *
+ * This function loops through the scan table looking for a compatible
+ * match. If a BSSID matches, but the BSS is found to be not compatible
+ * the function ignores it and continues to search through the rest of
+ * the entries in case there is an AP with multiple SSIDs assigned to
+ * the same BSSID.
+ */
+s32
+mwifiex_find_bssid_in_list(struct mwifiex_private *priv, u8 *bssid,
+                           u32 mode)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        s32 net = -1;
+        u32 i;
+
+        if (!bssid)
+                return -1;
+
+        dev_dbg(adapter->dev, "info: FindBSSID: Num of BSSIDs = %d\n",
+               adapter->num_in_scan_table);
+
+        /*
+         * Look through the scan table for a compatible match. The ret return
+         *   variable will be equal to the index in the scan table (greater
+         *   than zero) if the network is compatible.  The loop will continue
+         *   past a matched bssid that is not compatible in case there is an
+         *   AP with multiple SSIDs assigned to the same BSSID
+         */
+        for (i = 0; net < 0 && i < adapter->num_in_scan_table; i++) {
+                if (!memcmp
+                    (adapter->scan_table[i].mac_address, bssid, ETH_ALEN)
+                        && mwifiex_get_cfp_by_band_and_channel_from_cfg80211
+                                                                (priv,
+                                                            (u8) adapter->
+                                                            scan_table[i].
+                                                            bss_band,
+                                                            (u16) adapter->
+                                                            scan_table[i].
+                                                            channel)) {
+                        switch (mode) {
+                        case MWIFIEX_BSS_MODE_INFRA:
+                        case MWIFIEX_BSS_MODE_IBSS:
+                                net = mwifiex_is_network_compatible(priv, i,
+                                                                    mode);
+                                break;
+                        default:
+                                net = i;
+                                break;
+                        }
+                }
+        }
+
+        return net;
+}
+
+/*
+ * This function inserts scan command node to the scan pending queue.
+ */
+void
+mwifiex_queue_scan_cmd(struct mwifiex_private *priv,
+                       struct cmd_ctrl_node *cmd_node)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        unsigned long flags;
+
+        spin_lock_irqsave(&adapter->scan_pending_q_lock, flags);
+        list_add_tail(&cmd_node->list, &adapter->scan_pending_q);
+        spin_unlock_irqrestore(&adapter->scan_pending_q_lock, flags);
+}
+
+/*
+ * This function finds an AP with specific ssid in the scan list.
+ */
+int mwifiex_find_best_network(struct mwifiex_private *priv,
+                              struct mwifiex_ssid_bssid *req_ssid_bssid)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct mwifiex_bssdescriptor *req_bss;
+        s32 i;
+
+        memset(req_ssid_bssid, 0, sizeof(struct mwifiex_ssid_bssid));
+
+        i = mwifiex_find_best_network_in_list(priv);
+
+        if (i >= 0) {
+                req_bss = &adapter->scan_table[i];
+                memcpy(&req_ssid_bssid->ssid, &req_bss->ssid,
+                       sizeof(struct mwifiex_802_11_ssid));
+                memcpy((u8 *) &req_ssid_bssid->bssid,
+                       (u8 *) &req_bss->mac_address, ETH_ALEN);
+
+                /* Make sure we are in the right mode */
+                if (priv->bss_mode == MWIFIEX_BSS_MODE_AUTO)
+                        priv->bss_mode = req_bss->bss_mode;
+        }
+
+        if (!req_ssid_bssid->ssid.ssid_len)
+                return -1;
+
+        dev_dbg(adapter->dev, "info: Best network found = [%s], "
+               "[%pM]\n", req_ssid_bssid->ssid.ssid,
+               req_ssid_bssid->bssid);
+
+        return 0;
+}
+
+/*
+ * This function sends a scan command for all available channels to the
+ * firmware, filtered on a specific SSID.
+ */
+static int mwifiex_scan_specific_ssid(struct mwifiex_private *priv,
+                                      void *wait_buf, u16 action,
+                                      struct mwifiex_802_11_ssid *req_ssid,
+                                      struct mwifiex_scan_resp *scan_resp)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        int ret = 0;
+        struct mwifiex_user_scan_cfg *scan_cfg;
+
+        if (!req_ssid)
+                return -1;
+
+        if (action == HostCmd_ACT_GEN_GET) {
+                if (scan_resp) {
+                        scan_resp->scan_table =
+                                (u8 *) &priv->curr_bss_params.bss_descriptor;
+                        scan_resp->num_in_scan_table =
+                                adapter->num_in_scan_table;
+                } else {
+                        ret = -1;
+                }
+                return ret;
+        }
+
+        if (adapter->scan_processing && action == HostCmd_ACT_GEN_SET) {
+                dev_dbg(adapter->dev, "cmd: Scan already in process...\n");
+                return ret;
+        }
+
+        if (priv->scan_block && action == HostCmd_ACT_GEN_SET) {
+                dev_dbg(adapter->dev,
+                        "cmd: Scan is blocked during association...\n");
+                return ret;
+        }
+
+        mwifiex_scan_delete_ssid_table_entry(priv, req_ssid);
+
+        scan_cfg = kzalloc(sizeof(struct mwifiex_user_scan_cfg), GFP_KERNEL);
+        if (!scan_cfg) {
+                dev_err(adapter->dev, "failed to alloc scan_cfg\n");
+                return -1;
+        }
+
+        memcpy(scan_cfg->ssid_list[0].ssid, req_ssid->ssid,
+               req_ssid->ssid_len);
+        scan_cfg->keep_previous_scan = true;
+
+        ret = mwifiex_scan_networks(priv, wait_buf, action, scan_cfg, NULL);
+
+        kfree(scan_cfg);
+        return ret;
+}
+
+/*
+ * Sends IOCTL request to start a scan.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ *
+ * Scan command can be issued for both normal scan and specific SSID
+ * scan, depending upon whether an SSID is provided or not.
+ */
+int mwifiex_request_scan(struct mwifiex_private *priv, u8 wait_option,
+                         struct mwifiex_802_11_ssid *req_ssid)
+{
+        int ret = 0;
+        struct mwifiex_wait_queue *wait = NULL;
+        int status = 0;
+
+        if (down_interruptible(&priv->async_sem)) {
+                dev_err(priv->adapter->dev, "%s: acquire semaphore\n",
+                                                __func__);
+                return -1;
+        }
+        priv->scan_pending_on_block = true;
+
+        /* Allocate wait request buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait) {
+                ret = -1;
+                goto done;
+        }
+
+        if (req_ssid && req_ssid->ssid_len != 0)
+                /* Specific SSID scan */
+                status = mwifiex_scan_specific_ssid(priv, wait,
+                                                    HostCmd_ACT_GEN_SET,
+                                                    req_ssid, NULL);
+        else
+                /* Normal scan */
+                status = mwifiex_scan_networks(priv, wait, HostCmd_ACT_GEN_SET,
+                                               NULL, NULL);
+        status = mwifiex_request_ioctl(priv, wait, status, wait_option);
+        if (status == -1)
+                ret = -1;
+done:
+        if ((wait) && (status != -EINPROGRESS))
+                kfree(wait);
+        if (ret == -1) {
+                priv->scan_pending_on_block = false;
+                up(&priv->async_sem);
+        }
+        return ret;
+}
+
+/*
+ * This function appends the vendor specific IE TLV to a buffer.
+ */
+int
+mwifiex_cmd_append_vsie_tlv(struct mwifiex_private *priv,
+                            u16 vsie_mask, u8 **buffer)
+{
+        int id, ret_len = 0;
+        struct mwifiex_ie_types_vendor_param_set *vs_param_set;
+
+        if (!buffer)
+                return 0;
+        if (!(*buffer))
+                return 0;
+
+        /*
+         * Traverse through the saved vendor specific IE array and append
+         * the selected(scan/assoc/adhoc) IE as TLV to the command
+         */
+        for (id = 0; id < MWIFIEX_MAX_VSIE_NUM; id++) {
+                if (priv->vs_ie[id].mask & vsie_mask) {
+                        vs_param_set =
+                                (struct mwifiex_ie_types_vendor_param_set *)
+                                *buffer;
+                        vs_param_set->header.type =
+                                cpu_to_le16(TLV_TYPE_PASSTHROUGH);
+                        vs_param_set->header.len =
+                                cpu_to_le16((((u16) priv->vs_ie[id].ie[1])
+                                & 0x00FF) + 2);
+                        memcpy(vs_param_set->ie, priv->vs_ie[id].ie,
+                               le16_to_cpu(vs_param_set->header.len));
+                        *buffer += le16_to_cpu(vs_param_set->header.len) +
+                                   sizeof(struct mwifiex_ie_types_header);
+                        ret_len += le16_to_cpu(vs_param_set->header.len) +
+                                   sizeof(struct mwifiex_ie_types_header);
+                }
+        }
+        return ret_len;
+}
+
+/*
+ * This function saves a beacon buffer of the current BSS descriptor.
+ *
+ * The current beacon buffer is saved so that it can be restored in the
+ * following cases that makes the beacon buffer not to contain the current
+ * ssid's beacon buffer.
+ *      - The current ssid was not found somehow in the last scan.
+ *      - The current ssid was the last entry of the scan table and overloaded.
+ */
+void
+mwifiex_save_curr_bcn(struct mwifiex_private *priv)
+{
+        struct mwifiex_bssdescriptor *curr_bss =
+                &priv->curr_bss_params.bss_descriptor;
+
+        /* save the beacon buffer if it is not saved or updated */
+        if ((priv->curr_bcn_buf == NULL) ||
+            (priv->curr_bcn_size != curr_bss->beacon_buf_size) ||
+            (memcmp(priv->curr_bcn_buf, curr_bss->beacon_buf,
+                    curr_bss->beacon_buf_size))) {
+
+                kfree(priv->curr_bcn_buf);
+                priv->curr_bcn_buf = NULL;
+
+                priv->curr_bcn_size = curr_bss->beacon_buf_size;
+                if (!priv->curr_bcn_size)
+                        return;
+
+                priv->curr_bcn_buf = kzalloc(curr_bss->beacon_buf_size,
+                                                GFP_KERNEL);
+                if (!priv->curr_bcn_buf) {
+                        dev_err(priv->adapter->dev,
+                                        "failed to alloc curr_bcn_buf\n");
+                } else {
+                        memcpy(priv->curr_bcn_buf, curr_bss->beacon_buf,
+                               curr_bss->beacon_buf_size);
+                        dev_dbg(priv->adapter->dev,
+                                "info: current beacon saved %d\n",
+                               priv->curr_bcn_size);
+                }
+        }
+}
+
+/*
+ * This function frees the current BSS descriptor beacon buffer.
+ */
+void
+mwifiex_free_curr_bcn(struct mwifiex_private *priv)
+{
+        kfree(priv->curr_bcn_buf);
+        priv->curr_bcn_buf = NULL;
+}
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
new file mode 100644
index 00000000000..f21e5cd1983
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -0,0 +1,1770 @@
+/*
+ * Marvell Wireless LAN device driver: SDIO specific handling
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include <linux/firmware.h>
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+#include "11n.h"
+#include "sdio.h"
+
+
+#define SDIO_VERSION    "1.0"
+
+static struct mwifiex_if_ops sdio_ops;
+
+static struct semaphore add_remove_card_sem;
+
+/*
+ * SDIO probe.
+ *
+ * This function probes an mwifiex device and registers it. It allocates
+ * the card structure, enables SDIO function number and initiates the
+ * device registration and initialization procedure by adding a logical
+ * interface.
+ */
+static int
+mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)
+{
+        int ret = 0;
+        struct sdio_mmc_card *card = NULL;
+
+        pr_debug("info: vendor=0x%4.04X device=0x%4.04X class=%d function=%d\n",
+               func->vendor, func->device, func->class, func->num);
+
+        card = kzalloc(sizeof(struct sdio_mmc_card), GFP_KERNEL);
+        if (!card) {
+                pr_err("%s: failed to alloc memory\n", __func__);
+                return -ENOMEM;
+        }
+
+        card->func = func;
+
+        func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE;
+
+        sdio_claim_host(func);
+        ret = sdio_enable_func(func);
+        sdio_release_host(func);
+
+        if (ret) {
+                pr_err("%s: failed to enable function\n", __func__);
+                return -EIO;
+        }
+
+        if (mwifiex_add_card(card, &add_remove_card_sem, &sdio_ops)) {
+                pr_err("%s: add card failed\n", __func__);
+                kfree(card);
+                sdio_claim_host(func);
+                ret = sdio_disable_func(func);
+                sdio_release_host(func);
+                ret = -1;
+        }
+
+        return ret;
+}
+
+/*
+ * SDIO remove.
+ *
+ * This function removes the interface and frees up the card structure.
+ */
+static void
+mwifiex_sdio_remove(struct sdio_func *func)
+{
+        struct sdio_mmc_card *card;
+
+        pr_debug("info: SDIO func num=%d\n", func->num);
+
+        if (func) {
+                card = sdio_get_drvdata(func);
+                if (card) {
+                        mwifiex_remove_card(card->adapter,
+                                        &add_remove_card_sem);
+                        kfree(card);
+                }
+        }
+}
+
+/*
+ * SDIO suspend.
+ *
+ * Kernel needs to suspend all functions separately. Therefore all
+ * registered functions must have drivers with suspend and resume
+ * methods. Failing that the kernel simply removes the whole card.
+ *
+ * If already not suspended, this function allocates and sends a host
+ * sleep activate request to the firmware and turns off the traffic.
+ */
+static int mwifiex_sdio_suspend(struct device *dev)
+{
+        struct sdio_func *func = dev_to_sdio_func(dev);
+        struct sdio_mmc_card *card;
+        struct mwifiex_adapter *adapter = NULL;
+        mmc_pm_flag_t pm_flag = 0;
+        int hs_actived = 0;
+        int i;
+        int ret = 0;
+
+        if (func) {
+                pm_flag = sdio_get_host_pm_caps(func);
+                pr_debug("cmd: %s: suspend: PM flag = 0x%x\n",
+                       sdio_func_id(func), pm_flag);
+                if (!(pm_flag & MMC_PM_KEEP_POWER)) {
+                        pr_err("%s: cannot remain alive while host is"
+                                " suspended\n", sdio_func_id(func));
+                        return -ENOSYS;
+                }
+
+                card = sdio_get_drvdata(func);
+                if (!card || !card->adapter) {
+                        pr_err("suspend: invalid card or adapter\n");
+                        return 0;
+                }
+        } else {
+                pr_err("suspend: sdio_func is not specified\n");
+                return 0;
+        }
+
+        adapter = card->adapter;
+
+        /* Enable the Host Sleep */
+        hs_actived = mwifiex_enable_hs(adapter);
+        if (hs_actived) {
+                pr_debug("cmd: suspend with MMC_PM_KEEP_POWER\n");
+                ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);
+        }
+
+        /* Indicate device suspended */
+        adapter->is_suspended = true;
+
+        for (i = 0; i < adapter->priv_num; i++)
+                netif_carrier_off(adapter->priv[i]->netdev);
+
+        return ret;
+}
+
+/*
+ * SDIO resume.
+ *
+ * Kernel needs to suspend all functions separately. Therefore all
+ * registered functions must have drivers with suspend and resume
+ * methods. Failing that the kernel simply removes the whole card.
+ *
+ * If already not resumed, this function turns on the traffic and
+ * sends a host sleep cancel request to the firmware.
+ */
+static int mwifiex_sdio_resume(struct device *dev)
+{
+        struct sdio_func *func = dev_to_sdio_func(dev);
+        struct sdio_mmc_card *card;
+        struct mwifiex_adapter *adapter = NULL;
+        mmc_pm_flag_t pm_flag = 0;
+        int i;
+
+        if (func) {
+                pm_flag = sdio_get_host_pm_caps(func);
+                card = sdio_get_drvdata(func);
+                if (!card || !card->adapter) {
+                        pr_err("resume: invalid card or adapter\n");
+                        return 0;
+                }
+        } else {
+                pr_err("resume: sdio_func is not specified\n");
+                return 0;
+        }
+
+        adapter = card->adapter;
+
+        if (!adapter->is_suspended) {
+                dev_warn(adapter->dev, "device already resumed\n");
+                return 0;
+        }
+
+        adapter->is_suspended = false;
+
+        for (i = 0; i < adapter->priv_num; i++)
+                if (adapter->priv[i]->media_connected)
+                        netif_carrier_on(adapter->priv[i]->netdev);
+
+        /* Disable Host Sleep */
+        mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA),
+                              MWIFIEX_NO_WAIT);
+
+        return 0;
+}
+
+/* Device ID for SD8787 */
+#define SDIO_DEVICE_ID_MARVELL_8787   (0x9119)
+
+/* WLAN IDs */
+static const struct sdio_device_id mwifiex_ids[] = {
+        {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8787)},
+        {},
+};
+
+MODULE_DEVICE_TABLE(sdio, mwifiex_ids);
+
+static const struct dev_pm_ops mwifiex_sdio_pm_ops = {
+        .suspend = mwifiex_sdio_suspend,
+        .resume = mwifiex_sdio_resume,
+};
+
+static struct sdio_driver mwifiex_sdio = {
+        .name = "mwifiex_sdio",
+        .id_table = mwifiex_ids,
+        .probe = mwifiex_sdio_probe,
+        .remove = mwifiex_sdio_remove,
+        .drv = {
+                .owner = THIS_MODULE,
+                .pm = &mwifiex_sdio_pm_ops,
+        }
+};
+
+/*
+ * This function writes data into SDIO card register.
+ */
+static int
+mwifiex_write_reg(struct mwifiex_adapter *adapter, u32 reg, u32 data)
+{
+        struct sdio_mmc_card *card = adapter->card;
+        int ret = -1;
+
+        sdio_claim_host(card->func);
+        sdio_writeb(card->func, (u8) data, reg, &ret);
+        sdio_release_host(card->func);
+
+        return ret;
+}
+
+/*
+ * This function reads data from SDIO card register.
+ */
+static int
+mwifiex_read_reg(struct mwifiex_adapter *adapter, u32 reg, u32 *data)
+{
+        struct sdio_mmc_card *card = adapter->card;
+        int ret = -1;
+        u8 val;
+
+        sdio_claim_host(card->func);
+        val = sdio_readb(card->func, reg, &ret);
+        sdio_release_host(card->func);
+
+        *data = val;
+
+        return ret;
+}
+
+/*
+ * This function writes multiple data into SDIO card memory.
+ *
+ * This does not work in suspended mode.
+ */
+static int
+mwifiex_write_data_sync(struct mwifiex_adapter *adapter,
+                        u8 *buffer, u32 pkt_len, u32 port, u32 timeout)
+{
+        struct sdio_mmc_card *card = adapter->card;
+        int ret = -1;
+        u8 blk_mode =
+                (port & MWIFIEX_SDIO_BYTE_MODE_MASK) ? BYTE_MODE : BLOCK_MODE;
+        u32 blk_size = (blk_mode == BLOCK_MODE) ? MWIFIEX_SDIO_BLOCK_SIZE : 1;
+        u32 blk_cnt =
+                (blk_mode ==
+                 BLOCK_MODE) ? (pkt_len /
+                                MWIFIEX_SDIO_BLOCK_SIZE) : pkt_len;
+        u32 ioport = (port & MWIFIEX_SDIO_IO_PORT_MASK);
+
+        if (adapter->is_suspended) {
+                dev_err(adapter->dev,
+                        "%s: not allowed while suspended\n", __func__);
+                return -1;
+        }
+
+        sdio_claim_host(card->func);
+
+        if (!sdio_writesb(card->func, ioport, buffer, blk_cnt * blk_size))
+                ret = 0;
+
+        sdio_release_host(card->func);
+
+        return ret;
+}
+
+/*
+ * This function reads multiple data from SDIO card memory.
+ */
+static int mwifiex_read_data_sync(struct mwifiex_adapter *adapter,
+                                  u8 *buffer, u32 len,
+                       u32 port, u32 timeout, u8 claim)
+{
+        struct sdio_mmc_card *card = adapter->card;
+        int ret = -1;
+        u8 blk_mode =
+                (port & MWIFIEX_SDIO_BYTE_MODE_MASK) ? BYTE_MODE : BLOCK_MODE;
+        u32 blk_size = (blk_mode == BLOCK_MODE) ? MWIFIEX_SDIO_BLOCK_SIZE : 1;
+        u32 blk_cnt =
+                (blk_mode ==
+                 BLOCK_MODE) ? (len / MWIFIEX_SDIO_BLOCK_SIZE) : len;
+        u32 ioport = (port & MWIFIEX_SDIO_IO_PORT_MASK);
+
+        if (claim)
+                sdio_claim_host(card->func);
+
+        if (!sdio_readsb(card->func, buffer, ioport, blk_cnt * blk_size))
+                ret = 0;
+
+        if (claim)
+                sdio_release_host(card->func);
+
+        return ret;
+}
+
+/*
+ * This function wakes up the card.
+ *
+ * A host power up command is written to the card configuration
+ * register to wake up the card.
+ */
+static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter)
+{
+        int ret;
+
+        dev_dbg(adapter->dev, "event: wakeup device...\n");
+        ret = mwifiex_write_reg(adapter, CONFIGURATION_REG, HOST_POWER_UP);
+
+        return ret;
+}
+
+/*
+ * This function is called after the card has woken up.
+ *
+ * The card configuration register is reset.
+ */
+static int mwifiex_pm_wakeup_card_complete(struct mwifiex_adapter *adapter)
+{
+        int ret;
+
+        dev_dbg(adapter->dev, "cmd: wakeup device completed\n");
+        ret = mwifiex_write_reg(adapter, CONFIGURATION_REG, 0);
+
+        return ret;
+}
+
+/*
+ * This function initializes the IO ports.
+ *
+ * The following operations are performed -
+ *      - Read the IO ports (0, 1 and 2)
+ *      - Set host interrupt Reset-To-Read to clear
+ *      - Set auto re-enable interrupt
+ */
+static int mwifiex_init_sdio_ioport(struct mwifiex_adapter *adapter)
+{
+        u32 reg;
+
+        adapter->ioport = 0;
+
+        /* Read the IO port */
+        if (!mwifiex_read_reg(adapter, IO_PORT_0_REG, &reg))
+                adapter->ioport |= (reg & 0xff);
+        else
+                return -1;
+
+        if (!mwifiex_read_reg(adapter, IO_PORT_1_REG, &reg))
+                adapter->ioport |= ((reg & 0xff) << 8);
+        else
+                return -1;
+
+        if (!mwifiex_read_reg(adapter, IO_PORT_2_REG, &reg))
+                adapter->ioport |= ((reg & 0xff) << 16);
+        else
+                return -1;
+
+        pr_debug("info: SDIO FUNC1 IO port: %#x\n", adapter->ioport);
+
+        /* Set Host interrupt reset to read to clear */
+        if (!mwifiex_read_reg(adapter, HOST_INT_RSR_REG, &reg))
+                mwifiex_write_reg(adapter, HOST_INT_RSR_REG,
+                                  reg | SDIO_INT_MASK);
+        else
+                return -1;
+
+        /* Dnld/Upld ready set to auto reset */
+        if (!mwifiex_read_reg(adapter, CARD_MISC_CFG_REG, &reg))
+                mwifiex_write_reg(adapter, CARD_MISC_CFG_REG,
+                                  reg | AUTO_RE_ENABLE_INT);
+        else
+                return -1;
+
+        return 0;
+}
+
+/*
+ * This function sends data to the card.
+ */
+static int mwifiex_write_data_to_card(struct mwifiex_adapter *adapter,
+                                      u8 *payload, u32 pkt_len, u32 port)
+{
+        u32 i = 0;
+        int ret = 0;
+
+        do {
+                ret = mwifiex_write_data_sync(adapter, payload, pkt_len,
+                                                                port, 0);
+                if (ret) {
+                        i++;
+                        dev_err(adapter->dev, "host_to_card, write iomem"
+                                        " (%d) failed: %d\n", i, ret);
+                        if (mwifiex_write_reg(adapter,
+                                        CONFIGURATION_REG, 0x04))
+                                dev_err(adapter->dev, "write CFG reg failed\n");
+
+                        ret = -1;
+                        if (i > MAX_WRITE_IOMEM_RETRY)
+                                return ret;
+                }
+        } while (ret == -1);
+
+        return ret;
+}
+
+/*
+ * This function gets the read port.
+ *
+ * If control port bit is set in MP read bitmap, the control port
+ * is returned, otherwise the current read port is returned and
+ * the value is increased (provided it does not reach the maximum
+ * limit, in which case it is reset to 1)
+ */
+static int mwifiex_get_rd_port(struct mwifiex_adapter *adapter, u8 *port)
+{
+        struct sdio_mmc_card *card = adapter->card;
+        u16 rd_bitmap = card->mp_rd_bitmap;
+
+        dev_dbg(adapter->dev, "data: mp_rd_bitmap=0x%04x\n", rd_bitmap);
+
+        if (!(rd_bitmap & (CTRL_PORT_MASK | DATA_PORT_MASK)))
+                return -1;
+
+        if (card->mp_rd_bitmap & CTRL_PORT_MASK) {
+                card->mp_rd_bitmap &= (u16) (~CTRL_PORT_MASK);
+                *port = CTRL_PORT;
+                dev_dbg(adapter->dev, "data: port=%d mp_rd_bitmap=0x%04x\n",
+                       *port, card->mp_rd_bitmap);
+        } else {
+                if (card->mp_rd_bitmap & (1 << card->curr_rd_port)) {
+                        card->mp_rd_bitmap &=
+                                (u16) (~(1 << card->curr_rd_port));
+                        *port = card->curr_rd_port;
+
+                        if (++card->curr_rd_port == MAX_PORT)
+                                card->curr_rd_port = 1;
+                } else {
+                        return -1;
+                }
+
+                dev_dbg(adapter->dev,
+                        "data: port=%d mp_rd_bitmap=0x%04x -> 0x%04x\n",
+                       *port, rd_bitmap, card->mp_rd_bitmap);
+        }
+        return 0;
+}
+
+/*
+ * This function gets the write port for data.
+ *
+ * The current write port is returned if available and the value is
+ * increased (provided it does not reach the maximum limit, in which
+ * case it is reset to 1)
+ */
+static int mwifiex_get_wr_port_data(struct mwifiex_adapter *adapter, u8 *port)
+{
+        struct sdio_mmc_card *card = adapter->card;
+        u16 wr_bitmap = card->mp_wr_bitmap;
+
+        dev_dbg(adapter->dev, "data: mp_wr_bitmap=0x%04x\n", wr_bitmap);
+
+        if (!(wr_bitmap & card->mp_data_port_mask))
+                return -1;
+
+        if (card->mp_wr_bitmap & (1 << card->curr_wr_port)) {
+                card->mp_wr_bitmap &= (u16) (~(1 << card->curr_wr_port));
+                *port = card->curr_wr_port;
+                if (++card->curr_wr_port == card->mp_end_port)
+                        card->curr_wr_port = 1;
+        } else {
+                adapter->data_sent = true;
+                return -EBUSY;
+        }
+
+        if (*port == CTRL_PORT) {
+                dev_err(adapter->dev, "invalid data port=%d cur port=%d"
+                                " mp_wr_bitmap=0x%04x -> 0x%04x\n",
+                                *port, card->curr_wr_port, wr_bitmap,
+                                card->mp_wr_bitmap);
+                return -1;
+        }
+
+        dev_dbg(adapter->dev, "data: port=%d mp_wr_bitmap=0x%04x -> 0x%04x\n",
+               *port, wr_bitmap, card->mp_wr_bitmap);
+
+        return 0;
+}
+
+/*
+ * This function polls the card status.
+ */
+static int
+mwifiex_sdio_poll_card_status(struct mwifiex_adapter *adapter, u8 bits)
+{
+        u32 tries;
+        u32 cs = 0;
+
+        for (tries = 0; tries < MAX_POLL_TRIES; tries++) {
+                if (mwifiex_read_reg(adapter, CARD_STATUS_REG, &cs))
+                        break;
+                else if ((cs & bits) == bits)
+                        return 0;
+
+                udelay(10);
+        }
+
+        dev_err(adapter->dev, "poll card status failed, tries = %d\n",
+               tries);
+        return -1;
+}
+
+/*
+ * This function reads the firmware status.
+ */
+static int
+mwifiex_sdio_read_fw_status(struct mwifiex_adapter *adapter, u16 *dat)
+{
+        u32 fws0 = 0, fws1 = 0;
+
+        if (mwifiex_read_reg(adapter, CARD_FW_STATUS0_REG, &fws0))
+                return -1;
+
+        if (mwifiex_read_reg(adapter, CARD_FW_STATUS1_REG, &fws1))
+                return -1;
+
+        *dat = (u16) ((fws1 << 8) | fws0);
+
+        return 0;
+}
+
+/*
+ * This function disables the host interrupt.
+ *
+ * The host interrupt mask is read, the disable bit is reset and
+ * written back to the card host interrupt mask register.
+ */
+static int mwifiex_sdio_disable_host_int(struct mwifiex_adapter *adapter)
+{
+        u32 host_int_mask = 0;
+
+        /* Read back the host_int_mask register */
+        if (mwifiex_read_reg(adapter, HOST_INT_MASK_REG, &host_int_mask))
+                return -1;
+
+        /* Update with the mask and write back to the register */
+        host_int_mask &= ~HOST_INT_DISABLE;
+
+        if (mwifiex_write_reg(adapter, HOST_INT_MASK_REG, host_int_mask)) {
+                dev_err(adapter->dev, "disable host interrupt failed\n");
+                return -1;
+        }
+
+        return 0;
+}
+
+/*
+ * This function enables the host interrupt.
+ *
+ * The host interrupt enable mask is written to the card
+ * host interrupt mask register.
+ */
+static int mwifiex_sdio_enable_host_int(struct mwifiex_adapter *adapter)
+{
+        /* Simply write the mask to the register */
+        if (mwifiex_write_reg(adapter, HOST_INT_MASK_REG, HOST_INT_ENABLE)) {
+                dev_err(adapter->dev, "enable host interrupt failed\n");
+                return -1;
+        }
+        return 0;
+}
+
+/*
+ * This function sends a data buffer to the card.
+ */
+static int mwifiex_sdio_card_to_host(struct mwifiex_adapter *adapter,
+                                     u32 *type, u8 *buffer,
+                                     u32 npayload, u32 ioport)
+{
+        int ret = 0;
+        u32 nb;
+
+        if (!buffer) {
+                dev_err(adapter->dev, "%s: buffer is NULL\n", __func__);
+                return -1;
+        }
+
+        ret = mwifiex_read_data_sync(adapter, buffer, npayload, ioport, 0, 1);
+
+        if (ret) {
+                dev_err(adapter->dev, "%s: read iomem failed: %d\n", __func__,
+                                ret);
+                return -1;
+        }
+
+        nb = le16_to_cpu(*(__le16 *) (buffer));
+        if (nb > npayload) {
+                dev_err(adapter->dev, "%s: invalid packet, nb=%d, npayload=%d\n",
+                                __func__, nb, npayload);
+                return -1;
+        }
+
+        *type = le16_to_cpu(*(__le16 *) (buffer + 2));
+
+        return ret;
+}
+
+/*
+ * This function downloads the firmware to the card.
+ *
+ * Firmware is downloaded to the card in blocks. Every block download
+ * is tested for CRC errors, and retried a number of times before
+ * returning failure.
+ */
+static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
+                                    struct mwifiex_fw_image *fw)
+{
+        int ret = 0;
+        u8 *firmware = fw->fw_buf;
+        u32 firmware_len = fw->fw_len;
+        u32 offset = 0;
+        u32 base0, base1;
+        u8 *fwbuf;
+        u16 len = 0;
+        u32 txlen = 0, tx_blocks = 0, tries = 0;
+        u32 i = 0;
+
+        if (!firmware_len) {
+                dev_err(adapter->dev, "firmware image not found!"
+                                " Terminating download\n");
+                return -1;
+        }
+
+        dev_dbg(adapter->dev, "info: downloading FW image (%d bytes)\n",
+                        firmware_len);
+
+        /* Assume that the allocated buffer is 8-byte aligned */
+        fwbuf = kzalloc(MWIFIEX_UPLD_SIZE, GFP_KERNEL);
+        if (!fwbuf) {
+                dev_err(adapter->dev, "unable to alloc buffer for firmware."
+                                " Terminating download\n");
+                return -1;
+        }
+
+        /* Perform firmware data transfer */
+        do {
+                /* The host polls for the DN_LD_CARD_RDY and CARD_IO_READY
+                   bits */
+                ret = mwifiex_sdio_poll_card_status(adapter, CARD_IO_READY |
+                                                    DN_LD_CARD_RDY);
+                if (ret) {
+                        dev_err(adapter->dev, "FW download with helper:"
+                                        " poll status timeout @ %d\n", offset);
+                        goto done;
+                }
+
+                /* More data? */
+                if (offset >= firmware_len)
+                        break;
+
+                for (tries = 0; tries < MAX_POLL_TRIES; tries++) {
+                        ret = mwifiex_read_reg(adapter, HOST_F1_RD_BASE_0,
+                                               &base0);
+                        if (ret) {
+                                dev_err(adapter->dev, "dev BASE0 register read"
+                                        " failed: base0=0x%04X(%d). Terminating "
+                                       "download\n", base0, base0);
+                                goto done;
+                        }
+                        ret = mwifiex_read_reg(adapter, HOST_F1_RD_BASE_1,
+                                               &base1);
+                        if (ret) {
+                                dev_err(adapter->dev, "dev BASE1 register read"
+                                        " failed: base1=0x%04X(%d). Terminating "
+                                       "download\n", base1, base1);
+                                goto done;
+                        }
+                        len = (u16) (((base1 & 0xff) << 8) | (base0 & 0xff));
+
+                        if (len)
+                                break;
+
+                        udelay(10);
+                }
+
+                if (!len) {
+                        break;
+                } else if (len > MWIFIEX_UPLD_SIZE) {
+                        dev_err(adapter->dev, "FW download failed @ %d,"
+                                " invalid length %d\n", offset, len);
+                        ret = -1;
+                        goto done;
+                }
+
+                txlen = len;
+
+                if (len & BIT(0)) {
+                        i++;
+                        if (i > MAX_WRITE_IOMEM_RETRY) {
+                                dev_err(adapter->dev, "FW download failed @"
+                                        " %d, over max retry count\n", offset);
+                                ret = -1;
+                                goto done;
+                        }
+                        dev_err(adapter->dev, "CRC indicated by the helper:"
+                               " len = 0x%04X, txlen = %d\n", len, txlen);
+                        len &= ~BIT(0);
+                        /* Setting this to 0 to resend from same offset */
+                        txlen = 0;
+                } else {
+                        i = 0;
+
+                        /* Set blocksize to transfer - checking for last
+                           block */
+                        if (firmware_len - offset < txlen)
+                                txlen = firmware_len - offset;
+
+                        tx_blocks = (txlen + MWIFIEX_SDIO_BLOCK_SIZE -
+                                        1) / MWIFIEX_SDIO_BLOCK_SIZE;
+
+                        /* Copy payload to buffer */
+                        memmove(fwbuf, &firmware[offset], txlen);
+                }
+
+                ret = mwifiex_write_data_sync(adapter, fwbuf, tx_blocks *
+                                              MWIFIEX_SDIO_BLOCK_SIZE,
+                                              adapter->ioport, 0);
+                if (ret) {
+                        dev_err(adapter->dev, "FW download, write iomem (%d)"
+                                        " failed @ %d\n", i, offset);
+                        if (mwifiex_write_reg(adapter, CONFIGURATION_REG, 0x04))
+                                dev_err(adapter->dev, "write CFG reg failed\n");
+
+                        ret = -1;
+                        goto done;
+                }
+
+                offset += txlen;
+        } while (true);
+
+        dev_dbg(adapter->dev, "info: FW download over, size %d bytes\n",
+                                                offset);
+
+        ret = 0;
+done:
+        kfree(fwbuf);
+        return ret;
+}
+
+/*
+ * This function checks the firmware status in card.
+ *
+ * The winner interface is also determined by this function.
+ */
+static int mwifiex_check_fw_status(struct mwifiex_adapter *adapter,
+                                   u32 poll_num, int *winner)
+{
+        int ret = 0;
+        u16 firmware_stat;
+        u32 tries;
+        u32 winner_status;
+
+        /* Wait for firmware initialization event */
+        for (tries = 0; tries < poll_num; tries++) {
+                ret = mwifiex_sdio_read_fw_status(adapter, &firmware_stat);
+                if (ret)
+                        continue;
+                if (firmware_stat == FIRMWARE_READY) {
+                        ret = 0;
+                        break;
+                } else {
+                        mdelay(100);
+                        ret = -1;
+                }
+        }
+
+        if (winner && ret) {
+                if (mwifiex_read_reg
+                    (adapter, CARD_FW_STATUS0_REG, &winner_status))
+                        winner_status = 0;
+
+                if (winner_status)
+                        *winner = 0;
+                else
+                        *winner = 1;
+        }
+        return ret;
+}
+
+/*
+ * This function reads the interrupt status from card.
+ */
+static void mwifiex_interrupt_status(struct mwifiex_adapter *adapter)
+{
+        struct sdio_mmc_card *card = adapter->card;
+        u32 sdio_ireg = 0;
+        unsigned long flags;
+
+        if (mwifiex_read_data_sync(adapter, card->mp_regs, MAX_MP_REGS,
+                                   REG_PORT | MWIFIEX_SDIO_BYTE_MODE_MASK, 0,
+                                   0)) {
+                dev_err(adapter->dev, "read mp_regs failed\n");
+                return;
+        }
+
+        sdio_ireg = card->mp_regs[HOST_INTSTATUS_REG];
+        if (sdio_ireg) {
+                /*
+                 * DN_LD_HOST_INT_STATUS and/or UP_LD_HOST_INT_STATUS
+                 * Clear the interrupt status register
+                 */
+                dev_dbg(adapter->dev, "int: sdio_ireg = %#x\n", sdio_ireg);
+                spin_lock_irqsave(&adapter->int_lock, flags);
+                adapter->int_status |= sdio_ireg;
+                spin_unlock_irqrestore(&adapter->int_lock, flags);
+        }
+
+        return;
+}
+
+/*
+ * SDIO interrupt handler.
+ *
+ * This function reads the interrupt status from firmware and assigns
+ * the main process in workqueue which will handle the interrupt.
+ */
+static void
+mwifiex_sdio_interrupt(struct sdio_func *func)
+{
+        struct mwifiex_adapter *adapter;
+        struct sdio_mmc_card *card;
+
+        card = sdio_get_drvdata(func);
+        if (!card || !card->adapter) {
+                pr_debug("int: func=%p card=%p adapter=%p\n",
+                       func, card, card ? card->adapter : NULL);
+                return;
+        }
+        adapter = card->adapter;
+
+        if (adapter->surprise_removed)
+                return;
+
+        if (!adapter->pps_uapsd_mode && adapter->ps_state == PS_STATE_SLEEP)
+                adapter->ps_state = PS_STATE_AWAKE;
+
+        mwifiex_interrupt_status(adapter);
+        queue_work(adapter->workqueue, &adapter->main_work);
+
+        return;
+}
+
+/*
+ * This function decodes a received packet.
+ *
+ * Based on the type, the packet is treated as either a data, or
+ * a command response, or an event, and the correct handler
+ * function is invoked.
+ */
+static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter,
+                                    struct sk_buff *skb, u32 upld_typ)
+{
+        u8 *cmd_buf;
+
+        skb_pull(skb, INTF_HEADER_LEN);
+
+        switch (upld_typ) {
+        case MWIFIEX_TYPE_DATA:
+                dev_dbg(adapter->dev, "info: --- Rx: Data packet ---\n");
+                mwifiex_handle_rx_packet(adapter, skb);
+                break;
+
+        case MWIFIEX_TYPE_CMD:
+                dev_dbg(adapter->dev, "info: --- Rx: Cmd Response ---\n");
+                /* take care of curr_cmd = NULL case */
+                if (!adapter->curr_cmd) {
+                        cmd_buf = adapter->upld_buf;
+
+                        if (adapter->ps_state == PS_STATE_SLEEP_CFM)
+                                mwifiex_process_sleep_confirm_resp(adapter,
+                                                        skb->data, skb->len);
+
+                        memcpy(cmd_buf, skb->data, min_t(u32,
+                                       MWIFIEX_SIZE_OF_CMD_BUFFER, skb->len));
+
+                        dev_kfree_skb_any(skb);
+                } else {
+                        adapter->cmd_resp_received = true;
+                        adapter->curr_cmd->resp_skb = skb;
+                }
+                break;
+
+        case MWIFIEX_TYPE_EVENT:
+                dev_dbg(adapter->dev, "info: --- Rx: Event ---\n");
+                adapter->event_cause = *(u32 *) skb->data;
+
+                skb_pull(skb, MWIFIEX_EVENT_HEADER_LEN);
+
+                if ((skb->len > 0) && (skb->len  < MAX_EVENT_SIZE))
+                        memcpy(adapter->event_body, skb->data, skb->len);
+
+                /* event cause has been saved to adapter->event_cause */
+                adapter->event_received = true;
+                adapter->event_skb = skb;
+
+                break;
+
+        default:
+                dev_err(adapter->dev, "unknown upload type %#x\n", upld_typ);
+                dev_kfree_skb_any(skb);
+                break;
+        }
+
+        return 0;
+}
+
+/*
+ * This function transfers received packets from card to driver, performing
+ * aggregation if required.
+ *
+ * For data received on control port, or if aggregation is disabled, the
+ * received buffers are uploaded as separate packets. However, if aggregation
+ * is enabled and required, the buffers are copied onto an aggregation buffer,
+ * provided there is space left, processed and finally uploaded.
+ */
+static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
+                                             struct sk_buff *skb, u8 port)
+{
+        struct sdio_mmc_card *card = adapter->card;
+        s32 f_do_rx_aggr = 0;
+        s32 f_do_rx_cur = 0;
+        s32 f_aggr_cur = 0;
+        struct sk_buff *skb_deaggr;
+        u32 pind = 0;
+        u32 pkt_len, pkt_type = 0;
+        u8 *curr_ptr;
+        u32 rx_len = skb->len;
+
+        if (port == CTRL_PORT) {
+                /* Read the command Resp without aggr */
+                dev_dbg(adapter->dev, "info: %s: no aggregation for cmd "
+                                "response\n", __func__);
+
+                f_do_rx_cur = 1;
+                goto rx_curr_single;
+        }
+
+        if (!card->mpa_rx.enabled) {
+                dev_dbg(adapter->dev, "info: %s: rx aggregation disabled\n",
+                                                __func__);
+
+                f_do_rx_cur = 1;
+                goto rx_curr_single;
+        }
+
+        if (card->mp_rd_bitmap & (~((u16) CTRL_PORT_MASK))) {
+                /* Some more data RX pending */
+                dev_dbg(adapter->dev, "info: %s: not last packet\n", __func__);
+
+                if (MP_RX_AGGR_IN_PROGRESS(card)) {
+                        if (MP_RX_AGGR_BUF_HAS_ROOM(card, skb->len)) {
+                                f_aggr_cur = 1;
+                        } else {
+                                /* No room in Aggr buf, do rx aggr now */
+                                f_do_rx_aggr = 1;
+                                f_do_rx_cur = 1;
+                        }
+                } else {
+                        /* Rx aggr not in progress */
+                        f_aggr_cur = 1;
+                }
+
+        } else {
+                /* No more data RX pending */
+                dev_dbg(adapter->dev, "info: %s: last packet\n", __func__);
+
+                if (MP_RX_AGGR_IN_PROGRESS(card)) {
+                        f_do_rx_aggr = 1;
+                        if (MP_RX_AGGR_BUF_HAS_ROOM(card, skb->len))
+                                f_aggr_cur = 1;
+                        else
+                                /* No room in Aggr buf, do rx aggr now */
+                                f_do_rx_cur = 1;
+                } else {
+                        f_do_rx_cur = 1;
+                }
+        }
+
+        if (f_aggr_cur) {
+                dev_dbg(adapter->dev, "info: current packet aggregation\n");
+                /* Curr pkt can be aggregated */
+                MP_RX_AGGR_SETUP(card, skb, port);
+
+                if (MP_RX_AGGR_PKT_LIMIT_REACHED(card) ||
+                    MP_RX_AGGR_PORT_LIMIT_REACHED(card)) {
+                        dev_dbg(adapter->dev, "info: %s: aggregated packet "
+                                        "limit reached\n", __func__);
+                        /* No more pkts allowed in Aggr buf, rx it */
+                        f_do_rx_aggr = 1;
+                }
+        }
+
+        if (f_do_rx_aggr) {
+                /* do aggr RX now */
+                dev_dbg(adapter->dev, "info: do_rx_aggr: num of packets: %d\n",
+                       card->mpa_rx.pkt_cnt);
+
+                if (mwifiex_read_data_sync(adapter, card->mpa_rx.buf,
+                                           card->mpa_rx.buf_len,
+                                           (adapter->ioport | 0x1000 |
+                                            (card->mpa_rx.ports << 4)) +
+                                           card->mpa_rx.start_port, 0, 1))
+                        return -1;
+
+                curr_ptr = card->mpa_rx.buf;
+
+                for (pind = 0; pind < card->mpa_rx.pkt_cnt; pind++) {
+
+                        /* get curr PKT len & type */
+                        pkt_len = *(u16 *) &curr_ptr[0];
+                        pkt_type = *(u16 *) &curr_ptr[2];
+
+                        /* copy pkt to deaggr buf */
+                        skb_deaggr = card->mpa_rx.skb_arr[pind];
+
+                        if ((pkt_type == MWIFIEX_TYPE_DATA) && (pkt_len <=
+                                         card->mpa_rx.len_arr[pind])) {
+
+                                memcpy(skb_deaggr->data, curr_ptr, pkt_len);
+
+                                skb_trim(skb_deaggr, pkt_len);
+
+                                /* Process de-aggr packet */
+                                mwifiex_decode_rx_packet(adapter, skb_deaggr,
+                                                         pkt_type);
+                        } else {
+                                dev_err(adapter->dev, "wrong aggr pkt:"
+                                        " type=%d len=%d max_len=%d\n",
+                                        pkt_type, pkt_len,
+                                        card->mpa_rx.len_arr[pind]);
+                                dev_kfree_skb_any(skb_deaggr);
+                        }
+                        curr_ptr += card->mpa_rx.len_arr[pind];
+                }
+                MP_RX_AGGR_BUF_RESET(card);
+        }
+
+rx_curr_single:
+        if (f_do_rx_cur) {
+                dev_dbg(adapter->dev, "info: RX: port: %d, rx_len: %d\n",
+                        port, rx_len);
+
+                if (mwifiex_sdio_card_to_host(adapter, &pkt_type,
+                                              skb->data, skb->len,
+                                              adapter->ioport + port))
+                        return -1;
+
+                mwifiex_decode_rx_packet(adapter, skb, pkt_type);
+        }
+
+        return 0;
+}
+
+/*
+ * This function checks the current interrupt status.
+ *
+ * The following interrupts are checked and handled by this function -
+ *      - Data sent
+ *      - Command sent
+ *      - Packets received
+ *
+ * Since the firmware does not generate download ready interrupt if the
+ * port updated is command port only, command sent interrupt checking
+ * should be done manually, and for every SDIO interrupt.
+ *
+ * In case of Rx packets received, the packets are uploaded from card to
+ * host and processed accordingly.
+ */
+static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
+{
+        struct sdio_mmc_card *card = adapter->card;
+        int ret = 0;
+        u8 sdio_ireg;
+        struct sk_buff *skb = NULL;
+        u8 port = CTRL_PORT;
+        u32 len_reg_l, len_reg_u;
+        u32 rx_blocks;
+        u16 rx_len;
+        unsigned long flags;
+
+        spin_lock_irqsave(&adapter->int_lock, flags);
+        sdio_ireg = adapter->int_status;
+        adapter->int_status = 0;
+        spin_unlock_irqrestore(&adapter->int_lock, flags);
+
+        if (!sdio_ireg)
+                return ret;
+
+        if (sdio_ireg & DN_LD_HOST_INT_STATUS) {
+                card->mp_wr_bitmap = ((u16) card->mp_regs[WR_BITMAP_U]) << 8;
+                card->mp_wr_bitmap |= (u16) card->mp_regs[WR_BITMAP_L];
+                dev_dbg(adapter->dev, "int: DNLD: wr_bitmap=0x%04x\n",
+                                card->mp_wr_bitmap);
+                if (adapter->data_sent &&
+                    (card->mp_wr_bitmap & card->mp_data_port_mask)) {
+                        dev_dbg(adapter->dev,
+                                "info:  <--- Tx DONE Interrupt --->\n");
+                        adapter->data_sent = false;
+                }
+        }
+
+        /* As firmware will not generate download ready interrupt if the port
+           updated is command port only, cmd_sent should be done for any SDIO
+           interrupt. */
+        if (adapter->cmd_sent) {
+                /* Check if firmware has attach buffer at command port and
+                   update just that in wr_bit_map. */
+                card->mp_wr_bitmap |=
+                        (u16) card->mp_regs[WR_BITMAP_L] & CTRL_PORT_MASK;
+                if (card->mp_wr_bitmap & CTRL_PORT_MASK)
+                        adapter->cmd_sent = false;
+        }
+
+        dev_dbg(adapter->dev, "info: cmd_sent=%d data_sent=%d\n",
+               adapter->cmd_sent, adapter->data_sent);
+        if (sdio_ireg & UP_LD_HOST_INT_STATUS) {
+                card->mp_rd_bitmap = ((u16) card->mp_regs[RD_BITMAP_U]) << 8;
+                card->mp_rd_bitmap |= (u16) card->mp_regs[RD_BITMAP_L];
+                dev_dbg(adapter->dev, "int: UPLD: rd_bitmap=0x%04x\n",
+                                card->mp_rd_bitmap);
+
+                while (true) {
+                        ret = mwifiex_get_rd_port(adapter, &port);
+                        if (ret) {
+                                dev_dbg(adapter->dev,
+                                        "info: no more rd_port available\n");
+                                break;
+                        }
+                        len_reg_l = RD_LEN_P0_L + (port << 1);
+                        len_reg_u = RD_LEN_P0_U + (port << 1);
+                        rx_len = ((u16) card->mp_regs[len_reg_u]) << 8;
+                        rx_len |= (u16) card->mp_regs[len_reg_l];
+                        dev_dbg(adapter->dev, "info: RX: port=%d rx_len=%u\n",
+                                        port, rx_len);
+                        rx_blocks =
+                                (rx_len + MWIFIEX_SDIO_BLOCK_SIZE -
+                                 1) / MWIFIEX_SDIO_BLOCK_SIZE;
+                        if (rx_len <= INTF_HEADER_LEN
+                            || (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE) >
+                            MWIFIEX_RX_DATA_BUF_SIZE) {
+                                dev_err(adapter->dev, "invalid rx_len=%d\n",
+                                                rx_len);
+                                return -1;
+                        }
+                        rx_len = (u16) (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE);
+
+                        skb = dev_alloc_skb(rx_len);
+
+                        if (!skb) {
+                                dev_err(adapter->dev, "%s: failed to alloc skb",
+                                                                __func__);
+                                return -1;
+                        }
+
+                        skb_put(skb, rx_len);
+
+                        dev_dbg(adapter->dev, "info: rx_len = %d skb->len = %d\n",
+                                        rx_len, skb->len);
+
+                        if (mwifiex_sdio_card_to_host_mp_aggr(adapter, skb,
+                                                              port)) {
+                                u32 cr = 0;
+
+                                dev_err(adapter->dev, "card_to_host_mpa failed:"
+                                                " int status=%#x\n", sdio_ireg);
+                                if (mwifiex_read_reg(adapter,
+                                                     CONFIGURATION_REG, &cr))
+                                        dev_err(adapter->dev,
+                                                        "read CFG reg failed\n");
+
+                                dev_dbg(adapter->dev,
+                                                "info: CFG reg val = %d\n", cr);
+                                if (mwifiex_write_reg(adapter,
+                                                      CONFIGURATION_REG,
+                                                      (cr | 0x04)))
+                                        dev_err(adapter->dev,
+                                                        "write CFG reg failed\n");
+
+                                dev_dbg(adapter->dev, "info: write success\n");
+                                if (mwifiex_read_reg(adapter,
+                                                     CONFIGURATION_REG, &cr))
+                                        dev_err(adapter->dev,
+                                                        "read CFG reg failed\n");
+
+                                dev_dbg(adapter->dev,
+                                                "info: CFG reg val =%x\n", cr);
+                                dev_kfree_skb_any(skb);
+                                return -1;
+                        }
+                }
+        }
+
+        return 0;
+}
+
+/*
+ * This function aggregates transmission buffers in driver and downloads
+ * the aggregated packet to card.
+ *
+ * The individual packets are aggregated by copying into an aggregation
+ * buffer and then downloaded to the card. Previous unsent packets in the
+ * aggregation buffer are pre-copied first before new packets are added.
+ * Aggregation is done till there is space left in the aggregation buffer,
+ * or till new packets are available.
+ *
+ * The function will only download the packet to the card when aggregation
+ * stops, otherwise it will just aggregate the packet in aggregation buffer
+ * and return.
+ */
+static int mwifiex_host_to_card_mp_aggr(struct mwifiex_adapter *adapter,
+                                        u8 *payload, u32 pkt_len, u8 port,
+                                        u32 next_pkt_len)
+{
+        struct sdio_mmc_card *card = adapter->card;
+        int ret = 0;
+        s32 f_send_aggr_buf = 0;
+        s32 f_send_cur_buf = 0;
+        s32 f_precopy_cur_buf = 0;
+        s32 f_postcopy_cur_buf = 0;
+
+        if ((!card->mpa_tx.enabled) || (port == CTRL_PORT)) {
+                dev_dbg(adapter->dev, "info: %s: tx aggregation disabled\n",
+                                                __func__);
+
+                f_send_cur_buf = 1;
+                goto tx_curr_single;
+        }
+
+        if (next_pkt_len) {
+                /* More pkt in TX queue */
+                dev_dbg(adapter->dev, "info: %s: more packets in queue.\n",
+                                                __func__);
+
+                if (MP_TX_AGGR_IN_PROGRESS(card)) {
+                        if (!MP_TX_AGGR_PORT_LIMIT_REACHED(card) &&
+                            MP_TX_AGGR_BUF_HAS_ROOM(card, pkt_len)) {
+                                f_precopy_cur_buf = 1;
+
+                                if (!(card->mp_wr_bitmap &
+                                                (1 << card->curr_wr_port))
+                                                || !MP_TX_AGGR_BUF_HAS_ROOM(
+                                                        card, next_pkt_len))
+                                        f_send_aggr_buf = 1;
+                        } else {
+                                /* No room in Aggr buf, send it */
+                                f_send_aggr_buf = 1;
+
+                                if (MP_TX_AGGR_PORT_LIMIT_REACHED(card) ||
+                                    !(card->mp_wr_bitmap &
+                                      (1 << card->curr_wr_port)))
+                                        f_send_cur_buf = 1;
+                                else
+                                        f_postcopy_cur_buf = 1;
+                        }
+                } else {
+                        if (MP_TX_AGGR_BUF_HAS_ROOM(card, pkt_len)
+                            && (card->mp_wr_bitmap & (1 << card->curr_wr_port)))
+                                f_precopy_cur_buf = 1;
+                        else
+                                f_send_cur_buf = 1;
+                }
+        } else {
+                /* Last pkt in TX queue */
+                dev_dbg(adapter->dev, "info: %s: Last packet in Tx Queue.\n",
+                                                __func__);
+
+                if (MP_TX_AGGR_IN_PROGRESS(card)) {
+                        /* some packs in Aggr buf already */
+                        f_send_aggr_buf = 1;
+
+                        if (MP_TX_AGGR_BUF_HAS_ROOM(card, pkt_len))
+                                f_precopy_cur_buf = 1;
+                        else
+                                /* No room in Aggr buf, send it */
+                                f_send_cur_buf = 1;
+                } else {
+                        f_send_cur_buf = 1;
+                }
+        }
+
+        if (f_precopy_cur_buf) {
+                dev_dbg(adapter->dev, "data: %s: precopy current buffer\n",
+                                                __func__);
+                MP_TX_AGGR_BUF_PUT(card, payload, pkt_len, port);
+
+                if (MP_TX_AGGR_PKT_LIMIT_REACHED(card) ||
+                    MP_TX_AGGR_PORT_LIMIT_REACHED(card))
+                        /* No more pkts allowed in Aggr buf, send it */
+                        f_send_aggr_buf = 1;
+        }
+
+        if (f_send_aggr_buf) {
+                dev_dbg(adapter->dev, "data: %s: send aggr buffer: %d %d\n",
+                                __func__,
+                                card->mpa_tx.start_port, card->mpa_tx.ports);
+                ret = mwifiex_write_data_to_card(adapter, card->mpa_tx.buf,
+                                                 card->mpa_tx.buf_len,
+                                                 (adapter->ioport | 0x1000 |
+                                                 (card->mpa_tx.ports << 4)) +
+                                                  card->mpa_tx.start_port);
+
+                MP_TX_AGGR_BUF_RESET(card);
+        }
+
+tx_curr_single:
+        if (f_send_cur_buf) {
+                dev_dbg(adapter->dev, "data: %s: send current buffer %d\n",
+                                                __func__, port);
+                ret = mwifiex_write_data_to_card(adapter, payload, pkt_len,
+                                                 adapter->ioport + port);
+        }
+
+        if (f_postcopy_cur_buf) {
+                dev_dbg(adapter->dev, "data: %s: postcopy current buffer\n",
+                                                __func__);
+                MP_TX_AGGR_BUF_PUT(card, payload, pkt_len, port);
+        }
+
+        return ret;
+}
+
+/*
+ * This function downloads data from driver to card.
+ *
+ * Both commands and data packets are transferred to the card by this
+ * function.
+ *
+ * This function adds the SDIO specific header to the front of the buffer
+ * before transferring. The header contains the length of the packet and
+ * the type. The firmware handles the packets based upon this set type.
+ */
+static int mwifiex_sdio_host_to_card(struct mwifiex_adapter *adapter,
+                                     u8 type, u8 *payload, u32 pkt_len,
+                                     struct mwifiex_tx_param *tx_param)
+{
+        struct sdio_mmc_card *card = adapter->card;
+        int ret = 0;
+        u32 buf_block_len;
+        u32 blk_size;
+        u8 port = CTRL_PORT;
+
+        /* Allocate buffer and copy payload */
+        blk_size = MWIFIEX_SDIO_BLOCK_SIZE;
+        buf_block_len = (pkt_len + blk_size - 1) / blk_size;
+        *(u16 *) &payload[0] = (u16) pkt_len;
+        *(u16 *) &payload[2] = type;
+
+        /*
+         * This is SDIO specific header
+         *  u16 length,
+         *  u16 type (MWIFIEX_TYPE_DATA = 0, MWIFIEX_TYPE_CMD = 1,
+         *  MWIFIEX_TYPE_EVENT = 3)
+         */
+        if (type == MWIFIEX_TYPE_DATA) {
+                ret = mwifiex_get_wr_port_data(adapter, &port);
+                if (ret) {
+                        dev_err(adapter->dev, "%s: no wr_port available\n",
+                                                __func__);
+                        return ret;
+                }
+        } else {
+                adapter->cmd_sent = true;
+                /* Type must be MWIFIEX_TYPE_CMD */
+
+                if (pkt_len <= INTF_HEADER_LEN ||
+                    pkt_len > MWIFIEX_UPLD_SIZE)
+                        dev_err(adapter->dev, "%s: payload=%p, nb=%d\n",
+                                        __func__, payload, pkt_len);
+        }
+
+        /* Transfer data to card */
+        pkt_len = buf_block_len * blk_size;
+
+        if (tx_param)
+                ret = mwifiex_host_to_card_mp_aggr(adapter, payload, pkt_len,
+                                port, tx_param->next_pkt_len);
+        else
+                ret = mwifiex_host_to_card_mp_aggr(adapter, payload, pkt_len,
+                                port, 0);
+
+        if (ret) {
+                if (type == MWIFIEX_TYPE_CMD)
+                        adapter->cmd_sent = false;
+                if (type == MWIFIEX_TYPE_DATA)
+                        adapter->data_sent = false;
+        } else {
+                if (type == MWIFIEX_TYPE_DATA) {
+                        if (!(card->mp_wr_bitmap & (1 << card->curr_wr_port)))
+                                adapter->data_sent = true;
+                        else
+                                adapter->data_sent = false;
+                }
+        }
+
+        return ret;
+}
+
+/*
+ * This function allocates the MPA Tx and Rx buffers.
+ */
+static int mwifiex_alloc_sdio_mpa_buffers(struct mwifiex_adapter *adapter,
+                                   u32 mpa_tx_buf_size, u32 mpa_rx_buf_size)
+{
+        struct sdio_mmc_card *card = adapter->card;
+        int ret = 0;
+
+        card->mpa_tx.buf = kzalloc(mpa_tx_buf_size, GFP_KERNEL);
+        if (!card->mpa_tx.buf) {
+                dev_err(adapter->dev, "could not alloc buffer for MP-A TX\n");
+                ret = -1;
+                goto error;
+        }
+
+        card->mpa_tx.buf_size = mpa_tx_buf_size;
+
+        card->mpa_rx.buf = kzalloc(mpa_rx_buf_size, GFP_KERNEL);
+        if (!card->mpa_rx.buf) {
+                dev_err(adapter->dev, "could not alloc buffer for MP-A RX\n");
+                ret = -1;
+                goto error;
+        }
+
+        card->mpa_rx.buf_size = mpa_rx_buf_size;
+
+error:
+        if (ret) {
+                kfree(card->mpa_tx.buf);
+                kfree(card->mpa_rx.buf);
+        }
+
+        return ret;
+}
+
+/*
+ * This function unregisters the SDIO device.
+ *
+ * The SDIO IRQ is released, the function is disabled and driver
+ * data is set to null.
+ */
+static void
+mwifiex_unregister_dev(struct mwifiex_adapter *adapter)
+{
+        struct sdio_mmc_card *card = adapter->card;
+
+        if (adapter->card) {
+                /* Release the SDIO IRQ */
+                sdio_claim_host(card->func);
+                sdio_release_irq(card->func);
+                sdio_disable_func(card->func);
+                sdio_release_host(card->func);
+                sdio_set_drvdata(card->func, NULL);
+        }
+}
+
+/*
+ * This function registers the SDIO device.
+ *
+ * SDIO IRQ is claimed, block size is set and driver data is initialized.
+ */
+static int mwifiex_register_dev(struct mwifiex_adapter *adapter)
+{
+        int ret = 0;
+        struct sdio_mmc_card *card = adapter->card;
+        struct sdio_func *func = card->func;
+
+        /* save adapter pointer in card */
+        card->adapter = adapter;
+
+        sdio_claim_host(func);
+
+        /* Request the SDIO IRQ */
+        ret = sdio_claim_irq(func, mwifiex_sdio_interrupt);
+        if (ret) {
+                pr_err("claim irq failed: ret=%d\n", ret);
+                goto disable_func;
+        }
+
+        /* Set block size */
+        ret = sdio_set_block_size(card->func, MWIFIEX_SDIO_BLOCK_SIZE);
+        if (ret) {
+                pr_err("cannot set SDIO block size\n");
+                ret = -1;
+                goto release_irq;
+        }
+
+        sdio_release_host(func);
+        sdio_set_drvdata(func, card);
+
+        adapter->dev = &func->dev;
+
+        return 0;
+
+release_irq:
+        sdio_release_irq(func);
+disable_func:
+        sdio_disable_func(func);
+        sdio_release_host(func);
+        adapter->card = NULL;
+
+        return -1;
+}
+
+/*
+ * This function initializes the SDIO driver.
+ *
+ * The following initializations steps are followed -
+ *      - Read the Host interrupt status register to acknowledge
+ *        the first interrupt got from bootloader
+ *      - Disable host interrupt mask register
+ *      - Get SDIO port
+ *      - Get revision ID
+ *      - Initialize SDIO variables in card
+ *      - Allocate MP registers
+ *      - Allocate MPA Tx and Rx buffers
+ */
+static int mwifiex_init_sdio(struct mwifiex_adapter *adapter)
+{
+        struct sdio_mmc_card *card = adapter->card;
+        int ret;
+        u32 sdio_ireg = 0;
+
+        /*
+         * Read the HOST_INT_STATUS_REG for ACK the first interrupt got
+         * from the bootloader. If we don't do this we get a interrupt
+         * as soon as we register the irq.
+         */
+        mwifiex_read_reg(adapter, HOST_INTSTATUS_REG, &sdio_ireg);
+
+        /* Disable host interrupt mask register for SDIO */
+        mwifiex_sdio_disable_host_int(adapter);
+
+        /* Get SDIO ioport */
+        mwifiex_init_sdio_ioport(adapter);
+
+        /* Get revision ID */
+#define REV_ID_REG      0x5c
+        mwifiex_read_reg(adapter, REV_ID_REG, &adapter->revision_id);
+
+        /* Initialize SDIO variables in card */
+        card->mp_rd_bitmap = 0;
+        card->mp_wr_bitmap = 0;
+        card->curr_rd_port = 1;
+        card->curr_wr_port = 1;
+
+        card->mp_data_port_mask = DATA_PORT_MASK;
+
+        card->mpa_tx.buf_len = 0;
+        card->mpa_tx.pkt_cnt = 0;
+        card->mpa_tx.start_port = 0;
+
+        card->mpa_tx.enabled = 0;
+        card->mpa_tx.pkt_aggr_limit = SDIO_MP_AGGR_DEF_PKT_LIMIT;
+
+        card->mpa_rx.buf_len = 0;
+        card->mpa_rx.pkt_cnt = 0;
+        card->mpa_rx.start_port = 0;
+
+        card->mpa_rx.enabled = 0;
+        card->mpa_rx.pkt_aggr_limit = SDIO_MP_AGGR_DEF_PKT_LIMIT;
+
+        /* Allocate buffers for SDIO MP-A */
+        card->mp_regs = kzalloc(MAX_MP_REGS, GFP_KERNEL);
+        if (!card->mp_regs) {
+                dev_err(adapter->dev, "failed to alloc mp_regs\n");
+                return -1;
+        }
+
+        ret = mwifiex_alloc_sdio_mpa_buffers(adapter,
+                                             SDIO_MP_TX_AGGR_DEF_BUF_SIZE,
+                                             SDIO_MP_RX_AGGR_DEF_BUF_SIZE);
+        if (ret) {
+                dev_err(adapter->dev, "failed to alloc sdio mp-a buffers\n");
+                kfree(card->mp_regs);
+                return -1;
+        }
+
+        return ret;
+}
+
+/*
+ * This function resets the MPA Tx and Rx buffers.
+ */
+static void mwifiex_cleanup_mpa_buf(struct mwifiex_adapter *adapter)
+{
+        struct sdio_mmc_card *card = adapter->card;
+
+        MP_TX_AGGR_BUF_RESET(card);
+        MP_RX_AGGR_BUF_RESET(card);
+}
+
+/*
+ * This function cleans up the allocated card buffers.
+ *
+ * The following are freed by this function -
+ *      - MP registers
+ *      - MPA Tx buffer
+ *      - MPA Rx buffer
+ */
+static void mwifiex_cleanup_sdio(struct mwifiex_adapter *adapter)
+{
+        struct sdio_mmc_card *card = adapter->card;
+
+        kfree(card->mp_regs);
+        kfree(card->mpa_tx.buf);
+        kfree(card->mpa_rx.buf);
+}
+
+/*
+ * This function updates the MP end port in card.
+ */
+static void
+mwifiex_update_mp_end_port(struct mwifiex_adapter *adapter, u16 port)
+{
+        struct sdio_mmc_card *card = adapter->card;
+        int i;
+
+        card->mp_end_port = port;
+
+        card->mp_data_port_mask = DATA_PORT_MASK;
+
+        for (i = 1; i <= MAX_PORT - card->mp_end_port; i++)
+                card->mp_data_port_mask &= ~(1 << (MAX_PORT - i));
+
+        card->curr_wr_port = 1;
+
+        dev_dbg(adapter->dev, "cmd: mp_end_port %d, data port mask 0x%x\n",
+               port, card->mp_data_port_mask);
+}
+
+static struct mwifiex_if_ops sdio_ops = {
+        .init_if = mwifiex_init_sdio,
+        .cleanup_if = mwifiex_cleanup_sdio,
+        .check_fw_status = mwifiex_check_fw_status,
+        .prog_fw = mwifiex_prog_fw_w_helper,
+        .register_dev = mwifiex_register_dev,
+        .unregister_dev = mwifiex_unregister_dev,
+        .enable_int = mwifiex_sdio_enable_host_int,
+        .process_int_status = mwifiex_process_int_status,
+        .host_to_card = mwifiex_sdio_host_to_card,
+        .wakeup = mwifiex_pm_wakeup_card,
+        .wakeup_complete = mwifiex_pm_wakeup_card_complete,
+
+        /* SDIO specific */
+        .update_mp_end_port = mwifiex_update_mp_end_port,
+        .cleanup_mpa_buf = mwifiex_cleanup_mpa_buf,
+};
+
+/*
+ * This function initializes the SDIO driver.
+ *
+ * This initiates the semaphore and registers the device with
+ * SDIO bus.
+ */
+static int
+mwifiex_sdio_init_module(void)
+{
+        int ret;
+
+        sema_init(&add_remove_card_sem, 1);
+
+        ret = sdio_register_driver(&mwifiex_sdio);
+
+        return ret;
+}
+
+/*
+ * This function cleans up the SDIO driver.
+ *
+ * The following major steps are followed for cleanup -
+ *      - Resume the device if its suspended
+ *      - Disconnect the device if connected
+ *      - Shutdown the firmware
+ *      - Unregister the device from SDIO bus.
+ */
+static void
+mwifiex_sdio_cleanup_module(void)
+{
+        struct mwifiex_adapter *adapter = g_adapter;
+        int i;
+
+        if (down_interruptible(&add_remove_card_sem))
+                goto exit_sem_err;
+
+        if (!adapter || !adapter->priv_num)
+                goto exit;
+
+        if (adapter->is_suspended)
+                mwifiex_sdio_resume(adapter->dev);
+
+        for (i = 0; i < adapter->priv_num; i++)
+                if ((GET_BSS_ROLE(adapter->priv[i]) == MWIFIEX_BSS_ROLE_STA) &&
+                    adapter->priv[i]->media_connected)
+                        mwifiex_disconnect(adapter->priv[i], MWIFIEX_CMD_WAIT,
+                                           NULL);
+
+        if (!adapter->surprise_removed)
+                mwifiex_shutdown_fw(mwifiex_get_priv
+                                    (adapter, MWIFIEX_BSS_ROLE_ANY),
+                                    MWIFIEX_CMD_WAIT);
+
+exit:
+        up(&add_remove_card_sem);
+
+exit_sem_err:
+        sdio_unregister_driver(&mwifiex_sdio);
+}
+
+module_init(mwifiex_sdio_init_module);
+module_exit(mwifiex_sdio_cleanup_module);
+
+MODULE_AUTHOR("Marvell International Ltd.");
+MODULE_DESCRIPTION("Marvell WiFi-Ex SDIO Driver version " SDIO_VERSION);
+MODULE_VERSION(SDIO_VERSION);
+MODULE_LICENSE("GPL v2");
+MODULE_FIRMWARE("sd8787.bin");
diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
new file mode 100644
index 00000000000..a0e9bc5253e
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/sdio.h
@@ -0,0 +1,305 @@
+/*
+ * Marvell Wireless LAN device driver: SDIO specific definitions
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#ifndef _MWIFIEX_SDIO_H
+#define _MWIFIEX_SDIO_H
+
+
+#include <linux/mmc/sdio.h>
+#include <linux/mmc/sdio_ids.h>
+#include <linux/mmc/sdio_func.h>
+#include <linux/mmc/card.h>
+
+#include "main.h"
+
+#define BLOCK_MODE      1
+#define BYTE_MODE       0
+
+#define REG_PORT                        0
+#define RD_BITMAP_L                     0x04
+#define RD_BITMAP_U                     0x05
+#define WR_BITMAP_L                     0x06
+#define WR_BITMAP_U                     0x07
+#define RD_LEN_P0_L                     0x08
+#define RD_LEN_P0_U                     0x09
+
+#define MWIFIEX_SDIO_IO_PORT_MASK               0xfffff
+
+#define MWIFIEX_SDIO_BYTE_MODE_MASK     0x80000000
+
+#define CTRL_PORT                       0
+#define CTRL_PORT_MASK                  0x0001
+#define DATA_PORT_MASK                  0xfffe
+
+#define MAX_MP_REGS                     64
+#define MAX_PORT                        16
+
+#define SDIO_MP_AGGR_DEF_PKT_LIMIT      8
+
+#define SDIO_MP_TX_AGGR_DEF_BUF_SIZE        (4096)      /* 4K */
+
+/* Multi port RX aggregation buffer size */
+#define SDIO_MP_RX_AGGR_DEF_BUF_SIZE        (4096)      /* 4K */
+
+/* Misc. Config Register : Auto Re-enable interrupts */
+#define AUTO_RE_ENABLE_INT              BIT(4)
+
+/* Host Control Registers */
+/* Host Control Registers : I/O port 0 */
+#define IO_PORT_0_REG                   0x78
+/* Host Control Registers : I/O port 1 */
+#define IO_PORT_1_REG                   0x79
+/* Host Control Registers : I/O port 2 */
+#define IO_PORT_2_REG                   0x7A
+
+/* Host Control Registers : Configuration */
+#define CONFIGURATION_REG               0x00
+/* Host Control Registers : Host without Command 53 finish host*/
+#define HOST_TO_CARD_EVENT       (0x1U << 3)
+/* Host Control Registers : Host without Command 53 finish host */
+#define HOST_WO_CMD53_FINISH_HOST       (0x1U << 2)
+/* Host Control Registers : Host power up */
+#define HOST_POWER_UP                   (0x1U << 1)
+/* Host Control Registers : Host power down */
+#define HOST_POWER_DOWN                 (0x1U << 0)
+
+/* Host Control Registers : Host interrupt mask */
+#define HOST_INT_MASK_REG               0x02
+/* Host Control Registers : Upload host interrupt mask */
+#define UP_LD_HOST_INT_MASK             (0x1U)
+/* Host Control Registers : Download host interrupt mask */
+#define DN_LD_HOST_INT_MASK             (0x2U)
+/* Enable Host interrupt mask */
+#define HOST_INT_ENABLE (UP_LD_HOST_INT_MASK | DN_LD_HOST_INT_MASK)
+/* Disable Host interrupt mask */
+#define HOST_INT_DISABLE                0xff
+
+/* Host Control Registers : Host interrupt status */
+#define HOST_INTSTATUS_REG              0x03
+/* Host Control Registers : Upload host interrupt status */
+#define UP_LD_HOST_INT_STATUS           (0x1U)
+/* Host Control Registers : Download host interrupt status */
+#define DN_LD_HOST_INT_STATUS           (0x2U)
+
+/* Host Control Registers : Host interrupt RSR */
+#define HOST_INT_RSR_REG                0x01
+/* Host Control Registers : Upload host interrupt RSR */
+#define UP_LD_HOST_INT_RSR              (0x1U)
+#define SDIO_INT_MASK                   0x3F
+
+/* Host Control Registers : Host interrupt status */
+#define HOST_INT_STATUS_REG             0x28
+/* Host Control Registers : Upload CRC error */
+#define UP_LD_CRC_ERR                   (0x1U << 2)
+/* Host Control Registers : Upload restart */
+#define UP_LD_RESTART                   (0x1U << 1)
+/* Host Control Registers : Download restart */
+#define DN_LD_RESTART                   (0x1U << 0)
+
+/* Card Control Registers : Card status register */
+#define CARD_STATUS_REG                 0x30
+/* Card Control Registers : Card I/O ready */
+#define CARD_IO_READY                   (0x1U << 3)
+/* Card Control Registers : CIS card ready */
+#define CIS_CARD_RDY                    (0x1U << 2)
+/* Card Control Registers : Upload card ready */
+#define UP_LD_CARD_RDY                  (0x1U << 1)
+/* Card Control Registers : Download card ready */
+#define DN_LD_CARD_RDY                  (0x1U << 0)
+
+/* Card Control Registers : Host interrupt mask register */
+#define HOST_INTERRUPT_MASK_REG         0x34
+/* Card Control Registers : Host power interrupt mask */
+#define HOST_POWER_INT_MASK             (0x1U << 3)
+/* Card Control Registers : Abort card interrupt mask */
+#define ABORT_CARD_INT_MASK             (0x1U << 2)
+/* Card Control Registers : Upload card interrupt mask */
+#define UP_LD_CARD_INT_MASK             (0x1U << 1)
+/* Card Control Registers : Download card interrupt mask */
+#define DN_LD_CARD_INT_MASK             (0x1U << 0)
+
+/* Card Control Registers : Card interrupt status register */
+#define CARD_INTERRUPT_STATUS_REG       0x38
+/* Card Control Registers : Power up interrupt */
+#define POWER_UP_INT                    (0x1U << 4)
+/* Card Control Registers : Power down interrupt */
+#define POWER_DOWN_INT                  (0x1U << 3)
+
+/* Card Control Registers : Card interrupt RSR register */
+#define CARD_INTERRUPT_RSR_REG          0x3c
+/* Card Control Registers : Power up RSR */
+#define POWER_UP_RSR                    (0x1U << 4)
+/* Card Control Registers : Power down RSR */
+#define POWER_DOWN_RSR                  (0x1U << 3)
+
+/* Card Control Registers : Miscellaneous Configuration Register */
+#define CARD_MISC_CFG_REG               0x6C
+
+/* Host F1 read base 0 */
+#define HOST_F1_RD_BASE_0               0x0040
+/* Host F1 read base 1 */
+#define HOST_F1_RD_BASE_1               0x0041
+/* Host F1 card ready */
+#define HOST_F1_CARD_RDY                0x0020
+
+/* Firmware status 0 register */
+#define CARD_FW_STATUS0_REG             0x60
+/* Firmware status 1 register */
+#define CARD_FW_STATUS1_REG             0x61
+/* Rx length register */
+#define CARD_RX_LEN_REG                 0x62
+/* Rx unit register */
+#define CARD_RX_UNIT_REG                0x63
+
+/* Event header Len*/
+#define MWIFIEX_EVENT_HEADER_LEN           8
+
+/* Max retry number of CMD53 write */
+#define MAX_WRITE_IOMEM_RETRY           2
+
+/* SDIO Tx aggregation in progress ? */
+#define MP_TX_AGGR_IN_PROGRESS(a) (a->mpa_tx.pkt_cnt > 0)
+
+/* SDIO Tx aggregation buffer room for next packet ? */
+#define MP_TX_AGGR_BUF_HAS_ROOM(a, len) ((a->mpa_tx.buf_len+len)        \
+                                                <= a->mpa_tx.buf_size)
+
+/* Copy current packet (SDIO Tx aggregation buffer) to SDIO buffer */
+#define MP_TX_AGGR_BUF_PUT(a, payload, pkt_len, port) do {              \
+        memmove(&a->mpa_tx.buf[a->mpa_tx.buf_len],                      \
+                        payload, pkt_len);                              \
+        a->mpa_tx.buf_len += pkt_len;                                   \
+        if (!a->mpa_tx.pkt_cnt)                                         \
+                a->mpa_tx.start_port = port;                            \
+        if (a->mpa_tx.start_port <= port)                               \
+                a->mpa_tx.ports |= (1<<(a->mpa_tx.pkt_cnt));            \
+        else                                                            \
+                a->mpa_tx.ports |= (1<<(a->mpa_tx.pkt_cnt+1+(MAX_PORT - \
+                                                a->mp_end_port)));      \
+        a->mpa_tx.pkt_cnt++;                                            \
+} while (0);
+
+/* SDIO Tx aggregation limit ? */
+#define MP_TX_AGGR_PKT_LIMIT_REACHED(a)                                 \
+                        (a->mpa_tx.pkt_cnt == a->mpa_tx.pkt_aggr_limit)
+
+/* SDIO Tx aggregation port limit ? */
+#define MP_TX_AGGR_PORT_LIMIT_REACHED(a) ((a->curr_wr_port <            \
+                        a->mpa_tx.start_port) && (((MAX_PORT -          \
+                        a->mpa_tx.start_port) + a->curr_wr_port) >=     \
+                                SDIO_MP_AGGR_DEF_PKT_LIMIT))
+
+/* Reset SDIO Tx aggregation buffer parameters */
+#define MP_TX_AGGR_BUF_RESET(a) do {                                    \
+        a->mpa_tx.pkt_cnt = 0;                                          \
+        a->mpa_tx.buf_len = 0;                                          \
+        a->mpa_tx.ports = 0;                                            \
+        a->mpa_tx.start_port = 0;                                       \
+} while (0);
+
+/* SDIO Rx aggregation limit ? */
+#define MP_RX_AGGR_PKT_LIMIT_REACHED(a)                                 \
+                        (a->mpa_rx.pkt_cnt == a->mpa_rx.pkt_aggr_limit)
+
+/* SDIO Tx aggregation port limit ? */
+#define MP_RX_AGGR_PORT_LIMIT_REACHED(a) ((a->curr_rd_port <            \
+                        a->mpa_rx.start_port) && (((MAX_PORT -          \
+                        a->mpa_rx.start_port) + a->curr_rd_port) >=     \
+                        SDIO_MP_AGGR_DEF_PKT_LIMIT))
+
+/* SDIO Rx aggregation in progress ? */
+#define MP_RX_AGGR_IN_PROGRESS(a) (a->mpa_rx.pkt_cnt > 0)
+
+/* SDIO Rx aggregation buffer room for next packet ? */
+#define MP_RX_AGGR_BUF_HAS_ROOM(a, rx_len)                              \
+                        ((a->mpa_rx.buf_len+rx_len) <= a->mpa_rx.buf_size)
+
+/* Prepare to copy current packet from card to SDIO Rx aggregation buffer */
+#define MP_RX_AGGR_SETUP(a, skb, port) do {                             \
+        a->mpa_rx.buf_len += skb->len;                                  \
+        if (!a->mpa_rx.pkt_cnt)                                         \
+                a->mpa_rx.start_port = port;                            \
+        if (a->mpa_rx.start_port <= port)                               \
+                a->mpa_rx.ports |= (1<<(a->mpa_rx.pkt_cnt));            \
+        else                                                            \
+                a->mpa_rx.ports |= (1<<(a->mpa_rx.pkt_cnt+1));          \
+        a->mpa_rx.skb_arr[a->mpa_rx.pkt_cnt] = skb;                     \
+        a->mpa_rx.len_arr[a->mpa_rx.pkt_cnt] = skb->len;                \
+        a->mpa_rx.pkt_cnt++;                                            \
+} while (0);
+
+/* Reset SDIO Rx aggregation buffer parameters */
+#define MP_RX_AGGR_BUF_RESET(a) do {                                    \
+        a->mpa_rx.pkt_cnt = 0;                                          \
+        a->mpa_rx.buf_len = 0;                                          \
+        a->mpa_rx.ports = 0;                                            \
+        a->mpa_rx.start_port = 0;                                       \
+} while (0);
+
+
+/* data structure for SDIO MPA TX */
+struct mwifiex_sdio_mpa_tx {
+        /* multiport tx aggregation buffer pointer */
+        u8 *buf;
+        u32 buf_len;
+        u32 pkt_cnt;
+        u16 ports;
+        u16 start_port;
+        u8 enabled;
+        u32 buf_size;
+        u32 pkt_aggr_limit;
+};
+
+struct mwifiex_sdio_mpa_rx {
+        u8 *buf;
+        u32 buf_len;
+        u32 pkt_cnt;
+        u16 ports;
+        u16 start_port;
+
+        struct sk_buff *skb_arr[SDIO_MP_AGGR_DEF_PKT_LIMIT];
+        u32 len_arr[SDIO_MP_AGGR_DEF_PKT_LIMIT];
+
+        u8 enabled;
+        u32 buf_size;
+        u32 pkt_aggr_limit;
+};
+
+int mwifiex_bus_register(void);
+void mwifiex_bus_unregister(void);
+
+struct sdio_mmc_card {
+        struct sdio_func *func;
+        struct mwifiex_adapter *adapter;
+
+        u16 mp_rd_bitmap;
+        u16 mp_wr_bitmap;
+
+        u16 mp_end_port;
+        u16 mp_data_port_mask;
+
+        u8 curr_rd_port;
+        u8 curr_wr_port;
+
+        u8 *mp_regs;
+
+        struct mwifiex_sdio_mpa_tx mpa_tx;
+        struct mwifiex_sdio_mpa_rx mpa_rx;
+};
+#endif /* _MWIFIEX_SDIO_H */
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
new file mode 100644
index 00000000000..795b1eae768
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -0,0 +1,1226 @@
+/*
+ * Marvell Wireless LAN device driver: station command handling
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+#include "11n.h"
+
+/*
+ * This function prepares command to set/get RSSI information.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting data/beacon average factors
+ *      - Resetting SNR/NF/RSSI values in private structure
+ *      - Ensuring correct endian-ness
+ */
+static int
+mwifiex_cmd_802_11_rssi_info(struct mwifiex_private *priv,
+                             struct host_cmd_ds_command *cmd, u16 cmd_action)
+{
+        cmd->command = cpu_to_le16(HostCmd_CMD_RSSI_INFO);
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_802_11_rssi_info) +
+                                S_DS_GEN);
+        cmd->params.rssi_info.action = cpu_to_le16(cmd_action);
+        cmd->params.rssi_info.ndata = cpu_to_le16(priv->data_avg_factor);
+        cmd->params.rssi_info.nbcn = cpu_to_le16(priv->bcn_avg_factor);
+
+        /* Reset SNR/NF/RSSI values in private structure */
+        priv->data_rssi_last = 0;
+        priv->data_nf_last = 0;
+        priv->data_rssi_avg = 0;
+        priv->data_nf_avg = 0;
+        priv->bcn_rssi_last = 0;
+        priv->bcn_nf_last = 0;
+        priv->bcn_rssi_avg = 0;
+        priv->bcn_nf_avg = 0;
+
+        return 0;
+}
+
+/*
+ * This function prepares command to set MAC control.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Ensuring correct endian-ness
+ */
+static int mwifiex_cmd_mac_control(struct mwifiex_private *priv,
+                                   struct host_cmd_ds_command *cmd,
+                                   u16 cmd_action, void *data_buf)
+{
+        struct host_cmd_ds_mac_control *mac_ctrl = &cmd->params.mac_ctrl;
+        u16 action = *((u16 *) data_buf);
+
+        if (cmd_action != HostCmd_ACT_GEN_SET) {
+                dev_err(priv->adapter->dev,
+                        "mac_control: only support set cmd\n");
+                return -1;
+        }
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_MAC_CONTROL);
+        cmd->size =
+                cpu_to_le16(sizeof(struct host_cmd_ds_mac_control) + S_DS_GEN);
+        mac_ctrl->action = cpu_to_le16(action);
+
+        return 0;
+}
+
+/*
+ * This function prepares command to set/get SNMP MIB.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting SNMP MIB OID number and value
+ *        (as required)
+ *      - Ensuring correct endian-ness
+ *
+ * The following SNMP MIB OIDs are supported -
+ *      - FRAG_THRESH_I     : Fragmentation threshold
+ *      - RTS_THRESH_I      : RTS threshold
+ *      - SHORT_RETRY_LIM_I : Short retry limit
+ *      - DOT11D_I          : 11d support
+ */
+static int mwifiex_cmd_802_11_snmp_mib(struct mwifiex_private *priv,
+                                       struct host_cmd_ds_command *cmd,
+                                       u16 cmd_action, u32 cmd_oid,
+                                       void *data_buf)
+{
+        struct host_cmd_ds_802_11_snmp_mib *snmp_mib = &cmd->params.smib;
+        u32 ul_temp;
+
+        dev_dbg(priv->adapter->dev, "cmd: SNMP_CMD: cmd_oid = 0x%x\n", cmd_oid);
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_SNMP_MIB);
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_802_11_snmp_mib)
+                - 1 + S_DS_GEN);
+
+        if (cmd_action == HostCmd_ACT_GEN_GET) {
+                snmp_mib->query_type = cpu_to_le16(HostCmd_ACT_GEN_GET);
+                snmp_mib->buf_size = cpu_to_le16(MAX_SNMP_BUF_SIZE);
+                cmd->size = cpu_to_le16(le16_to_cpu(cmd->size)
+                        + MAX_SNMP_BUF_SIZE);
+        }
+
+        switch (cmd_oid) {
+        case FRAG_THRESH_I:
+                snmp_mib->oid = cpu_to_le16((u16) FRAG_THRESH_I);
+                if (cmd_action == HostCmd_ACT_GEN_SET) {
+                        snmp_mib->query_type = cpu_to_le16(HostCmd_ACT_GEN_SET);
+                        snmp_mib->buf_size = cpu_to_le16(sizeof(u16));
+                        ul_temp = *((u32 *) data_buf);
+                        *((__le16 *) (snmp_mib->value)) =
+                                cpu_to_le16((u16) ul_temp);
+                        cmd->size = cpu_to_le16(le16_to_cpu(cmd->size)
+                                + sizeof(u16));
+                }
+                break;
+        case RTS_THRESH_I:
+                snmp_mib->oid = cpu_to_le16((u16) RTS_THRESH_I);
+                if (cmd_action == HostCmd_ACT_GEN_SET) {
+                        snmp_mib->query_type = cpu_to_le16(HostCmd_ACT_GEN_SET);
+                        snmp_mib->buf_size = cpu_to_le16(sizeof(u16));
+                        ul_temp = *((u32 *) data_buf);
+                        *(__le16 *) (snmp_mib->value) =
+                                cpu_to_le16((u16) ul_temp);
+                        cmd->size = cpu_to_le16(le16_to_cpu(cmd->size)
+                                + sizeof(u16));
+                }
+                break;
+
+        case SHORT_RETRY_LIM_I:
+                snmp_mib->oid = cpu_to_le16((u16) SHORT_RETRY_LIM_I);
+                if (cmd_action == HostCmd_ACT_GEN_SET) {
+                        snmp_mib->query_type = cpu_to_le16(HostCmd_ACT_GEN_SET);
+                        snmp_mib->buf_size = cpu_to_le16(sizeof(u16));
+                        ul_temp = (*(u32 *) data_buf);
+                        *((__le16 *) (snmp_mib->value)) =
+                                cpu_to_le16((u16) ul_temp);
+                        cmd->size = cpu_to_le16(le16_to_cpu(cmd->size)
+                                + sizeof(u16));
+                }
+                break;
+        case DOT11D_I:
+                snmp_mib->oid = cpu_to_le16((u16) DOT11D_I);
+                if (cmd_action == HostCmd_ACT_GEN_SET) {
+                        snmp_mib->query_type = cpu_to_le16(HostCmd_ACT_GEN_SET);
+                        snmp_mib->buf_size = cpu_to_le16(sizeof(u16));
+                        ul_temp = *(u32 *) data_buf;
+                        *((__le16 *) (snmp_mib->value)) =
+                                cpu_to_le16((u16) ul_temp);
+                        cmd->size = cpu_to_le16(le16_to_cpu(cmd->size)
+                                + sizeof(u16));
+                }
+                break;
+        default:
+                break;
+        }
+        dev_dbg(priv->adapter->dev,
+                "cmd: SNMP_CMD: Action=0x%x, OID=0x%x, OIDSize=0x%x,"
+                " Value=0x%x\n",
+               cmd_action, cmd_oid, le16_to_cpu(snmp_mib->buf_size),
+               le16_to_cpu(*(__le16 *) snmp_mib->value));
+        return 0;
+}
+
+/*
+ * This function prepares command to get log.
+ *
+ * Preparation includes -
+ *      - Setting command ID and proper size
+ *      - Ensuring correct endian-ness
+ */
+static int
+mwifiex_cmd_802_11_get_log(struct mwifiex_private *priv,
+                           struct host_cmd_ds_command *cmd)
+{
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_GET_LOG);
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_802_11_get_log) +
+                                S_DS_GEN);
+        return 0;
+}
+
+/*
+ * This function prepares command to set/get Tx data rate configuration.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting configuration index, rate scope and rate drop pattern
+ *        parameters (as required)
+ *      - Ensuring correct endian-ness
+ */
+static int mwifiex_cmd_tx_rate_cfg(struct mwifiex_private *priv,
+                                   struct host_cmd_ds_command *cmd,
+                                   u16 cmd_action, void *data_buf)
+{
+        struct host_cmd_ds_tx_rate_cfg *rate_cfg = &cmd->params.tx_rate_cfg;
+        struct mwifiex_rate_scope *rate_scope;
+        struct mwifiex_rate_drop_pattern *rate_drop;
+        u16 *pbitmap_rates = (u16 *) data_buf;
+
+        u32 i;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_TX_RATE_CFG);
+
+        rate_cfg->action = cpu_to_le16(cmd_action);
+        rate_cfg->cfg_index = 0;
+
+        rate_scope = (struct mwifiex_rate_scope *) ((u8 *) rate_cfg +
+                      sizeof(struct host_cmd_ds_tx_rate_cfg));
+        rate_scope->type = cpu_to_le16(TLV_TYPE_RATE_SCOPE);
+        rate_scope->length = cpu_to_le16(sizeof(struct mwifiex_rate_scope) -
+                        sizeof(struct mwifiex_ie_types_header));
+        if (pbitmap_rates != NULL) {
+                rate_scope->hr_dsss_rate_bitmap = cpu_to_le16(pbitmap_rates[0]);
+                rate_scope->ofdm_rate_bitmap = cpu_to_le16(pbitmap_rates[1]);
+                for (i = 0;
+                     i < sizeof(rate_scope->ht_mcs_rate_bitmap) / sizeof(u16);
+                     i++)
+                        rate_scope->ht_mcs_rate_bitmap[i] =
+                                cpu_to_le16(pbitmap_rates[2 + i]);
+        } else {
+                rate_scope->hr_dsss_rate_bitmap =
+                        cpu_to_le16(priv->bitmap_rates[0]);
+                rate_scope->ofdm_rate_bitmap =
+                        cpu_to_le16(priv->bitmap_rates[1]);
+                for (i = 0;
+                     i < sizeof(rate_scope->ht_mcs_rate_bitmap) / sizeof(u16);
+                     i++)
+                        rate_scope->ht_mcs_rate_bitmap[i] =
+                                cpu_to_le16(priv->bitmap_rates[2 + i]);
+        }
+
+        rate_drop = (struct mwifiex_rate_drop_pattern *) ((u8 *) rate_scope +
+                        sizeof(struct mwifiex_rate_scope));
+        rate_drop->type = cpu_to_le16(TLV_TYPE_RATE_DROP_CONTROL);
+        rate_drop->length = cpu_to_le16(sizeof(rate_drop->rate_drop_mode));
+        rate_drop->rate_drop_mode = 0;
+
+        cmd->size =
+                cpu_to_le16(S_DS_GEN + sizeof(struct host_cmd_ds_tx_rate_cfg) +
+                            sizeof(struct mwifiex_rate_scope) +
+                            sizeof(struct mwifiex_rate_drop_pattern));
+
+        return 0;
+}
+
+/*
+ * This function prepares command to set/get Tx power configuration.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting Tx power mode, power group TLV
+ *        (as required)
+ *      - Ensuring correct endian-ness
+ */
+static int mwifiex_cmd_tx_power_cfg(struct mwifiex_private *priv,
+                                    struct host_cmd_ds_command *cmd,
+                                    u16 cmd_action, void *data_buf)
+{
+        struct mwifiex_types_power_group *pg_tlv = NULL;
+        struct host_cmd_ds_txpwr_cfg *txp = NULL;
+        struct host_cmd_ds_txpwr_cfg *cmd_txp_cfg = &cmd->params.txp_cfg;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_TXPWR_CFG);
+        cmd->size =
+                cpu_to_le16(S_DS_GEN + sizeof(struct host_cmd_ds_txpwr_cfg));
+        switch (cmd_action) {
+        case HostCmd_ACT_GEN_SET:
+                txp = (struct host_cmd_ds_txpwr_cfg *) data_buf;
+                if (txp->mode) {
+                        pg_tlv = (struct mwifiex_types_power_group
+                                  *) ((unsigned long) data_buf +
+                                     sizeof(struct host_cmd_ds_txpwr_cfg));
+                        memmove(cmd_txp_cfg, data_buf,
+                                sizeof(struct host_cmd_ds_txpwr_cfg) +
+                                sizeof(struct mwifiex_types_power_group) +
+                                pg_tlv->length);
+
+                        pg_tlv = (struct mwifiex_types_power_group *) ((u8 *)
+                                  cmd_txp_cfg +
+                                  sizeof(struct host_cmd_ds_txpwr_cfg));
+                        cmd->size = cpu_to_le16(le16_to_cpu(cmd->size) +
+                                  sizeof(struct mwifiex_types_power_group) +
+                                  pg_tlv->length);
+                } else {
+                        memmove(cmd_txp_cfg, data_buf,
+                                sizeof(struct host_cmd_ds_txpwr_cfg));
+                }
+                cmd_txp_cfg->action = cpu_to_le16(cmd_action);
+                break;
+        case HostCmd_ACT_GEN_GET:
+                cmd_txp_cfg->action = cpu_to_le16(cmd_action);
+                break;
+        }
+
+        return 0;
+}
+
+/*
+ * This function prepares command to set Host Sleep configuration.
+ *
+ * Preparation includes -
+ *      - Setting command ID and proper size
+ *      - Setting Host Sleep action, conditions, ARP filters
+ *        (as required)
+ *      - Ensuring correct endian-ness
+ */
+static int mwifiex_cmd_802_11_hs_cfg(struct mwifiex_private *priv,
+                                     struct host_cmd_ds_command *cmd,
+                                     u16 cmd_action,
+                                     struct mwifiex_hs_config_param *data_buf)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct host_cmd_ds_802_11_hs_cfg_enh *hs_cfg = &cmd->params.opt_hs_cfg;
+        u16 hs_activate = false;
+
+        if (data_buf == NULL)
+                /* New Activate command */
+                hs_activate = true;
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_HS_CFG_ENH);
+
+        if (!hs_activate &&
+            (data_buf->conditions
+            != cpu_to_le32(HOST_SLEEP_CFG_CANCEL))
+            && ((adapter->arp_filter_size > 0)
+                && (adapter->arp_filter_size <= ARP_FILTER_MAX_BUF_SIZE))) {
+                dev_dbg(adapter->dev,
+                        "cmd: Attach %d bytes ArpFilter to HSCfg cmd\n",
+                       adapter->arp_filter_size);
+                memcpy(((u8 *) hs_cfg) +
+                       sizeof(struct host_cmd_ds_802_11_hs_cfg_enh),
+                       adapter->arp_filter, adapter->arp_filter_size);
+                cmd->size = cpu_to_le16(adapter->arp_filter_size +
+                                    sizeof(struct host_cmd_ds_802_11_hs_cfg_enh)
+                                    + S_DS_GEN);
+        } else {
+                cmd->size = cpu_to_le16(S_DS_GEN + sizeof(struct
+                                           host_cmd_ds_802_11_hs_cfg_enh));
+        }
+        if (hs_activate) {
+                hs_cfg->action = cpu_to_le16(HS_ACTIVATE);
+                hs_cfg->params.hs_activate.resp_ctrl = RESP_NEEDED;
+        } else {
+                hs_cfg->action = cpu_to_le16(HS_CONFIGURE);
+                hs_cfg->params.hs_config.conditions = data_buf->conditions;
+                hs_cfg->params.hs_config.gpio = data_buf->gpio;
+                hs_cfg->params.hs_config.gap = data_buf->gap;
+                dev_dbg(adapter->dev,
+                        "cmd: HS_CFG_CMD: condition:0x%x gpio:0x%x gap:0x%x\n",
+                       hs_cfg->params.hs_config.conditions,
+                       hs_cfg->params.hs_config.gpio,
+                       hs_cfg->params.hs_config.gap);
+        }
+
+        return 0;
+}
+
+/*
+ * This function prepares command to set/get MAC address.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting MAC address (for SET only)
+ *      - Ensuring correct endian-ness
+ */
+static int mwifiex_cmd_802_11_mac_address(struct mwifiex_private *priv,
+                                          struct host_cmd_ds_command *cmd,
+                                          u16 cmd_action)
+{
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_MAC_ADDRESS);
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_802_11_mac_address) +
+                                S_DS_GEN);
+        cmd->result = 0;
+
+        cmd->params.mac_addr.action = cpu_to_le16(cmd_action);
+
+        if (cmd_action == HostCmd_ACT_GEN_SET)
+                memcpy(cmd->params.mac_addr.mac_addr, priv->curr_addr,
+                       ETH_ALEN);
+        return 0;
+}
+
+/*
+ * This function prepares command to set MAC multicast address.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting MAC multicast address
+ *      - Ensuring correct endian-ness
+ */
+static int mwifiex_cmd_mac_multicast_adr(struct mwifiex_private *priv,
+                                         struct host_cmd_ds_command *cmd,
+                                         u16 cmd_action, void *data_buf)
+{
+        struct mwifiex_multicast_list *mcast_list =
+                (struct mwifiex_multicast_list *) data_buf;
+        struct host_cmd_ds_mac_multicast_adr *mcast_addr = &cmd->params.mc_addr;
+
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_mac_multicast_adr) +
+                                S_DS_GEN);
+        cmd->command = cpu_to_le16(HostCmd_CMD_MAC_MULTICAST_ADR);
+
+        mcast_addr->action = cpu_to_le16(cmd_action);
+        mcast_addr->num_of_adrs =
+                cpu_to_le16((u16) mcast_list->num_multicast_addr);
+        memcpy(mcast_addr->mac_list, mcast_list->mac_list,
+               mcast_list->num_multicast_addr * ETH_ALEN);
+
+        return 0;
+}
+
+/*
+ * This function prepares command to deauthenticate.
+ *
+ * Preparation includes -
+ *      - Setting command ID and proper size
+ *      - Setting AP MAC address and reason code
+ *      - Ensuring correct endian-ness
+ */
+static int mwifiex_cmd_802_11_deauthenticate(struct mwifiex_private *priv,
+                                             struct host_cmd_ds_command *cmd,
+                                             void *data_buf)
+{
+        struct host_cmd_ds_802_11_deauthenticate *deauth = &cmd->params.deauth;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_DEAUTHENTICATE);
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_802_11_deauthenticate)
+                                + S_DS_GEN);
+
+        /* Set AP MAC address */
+        memcpy(deauth->mac_addr, (u8 *) data_buf, ETH_ALEN);
+
+        dev_dbg(priv->adapter->dev, "cmd: Deauth: %pM\n", deauth->mac_addr);
+
+        deauth->reason_code = cpu_to_le16(WLAN_REASON_DEAUTH_LEAVING);
+
+        return 0;
+}
+
+/*
+ * This function prepares command to stop Ad-Hoc network.
+ *
+ * Preparation includes -
+ *      - Setting command ID and proper size
+ *      - Ensuring correct endian-ness
+ */
+static int mwifiex_cmd_802_11_ad_hoc_stop(struct mwifiex_private *priv,
+                                          struct host_cmd_ds_command *cmd)
+{
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_AD_HOC_STOP);
+        cmd->size = cpu_to_le16(S_DS_GEN);
+        return 0;
+}
+
+/*
+ * This function sets WEP key(s) to key parameter TLV(s).
+ *
+ * Multi-key parameter TLVs are supported, so we can send multiple
+ * WEP keys in a single buffer.
+ */
+static int
+mwifiex_set_keyparamset_wep(struct mwifiex_private *priv,
+                            struct mwifiex_ie_type_key_param_set *key_param_set,
+                            u16 *key_param_len)
+{
+        int cur_key_param_len = 0;
+        u8 i;
+
+        /* Multi-key_param_set TLV is supported */
+        for (i = 0; i < NUM_WEP_KEYS; i++) {
+                if ((priv->wep_key[i].key_length == WLAN_KEY_LEN_WEP40) ||
+                    (priv->wep_key[i].key_length == WLAN_KEY_LEN_WEP104)) {
+                        key_param_set->type =
+                                cpu_to_le16(TLV_TYPE_KEY_MATERIAL);
+/* Key_param_set WEP fixed length */
+#define KEYPARAMSET_WEP_FIXED_LEN 8
+                        key_param_set->length = cpu_to_le16((u16)
+                                        (priv->wep_key[i].
+                                         key_length +
+                                         KEYPARAMSET_WEP_FIXED_LEN));
+                        key_param_set->key_type_id =
+                                cpu_to_le16(KEY_TYPE_ID_WEP);
+                        key_param_set->key_info =
+                                cpu_to_le16(KEY_INFO_WEP_ENABLED |
+                                            KEY_INFO_WEP_UNICAST |
+                                            KEY_INFO_WEP_MCAST);
+                        key_param_set->key_len =
+                                cpu_to_le16(priv->wep_key[i].key_length);
+                        /* Set WEP key index */
+                        key_param_set->key[0] = i;
+                        /* Set default Tx key flag */
+                        if (i ==
+                            (priv->
+                             wep_key_curr_index & HostCmd_WEP_KEY_INDEX_MASK))
+                                key_param_set->key[1] = 1;
+                        else
+                                key_param_set->key[1] = 0;
+                        memmove(&key_param_set->key[2],
+                                priv->wep_key[i].key_material,
+                                priv->wep_key[i].key_length);
+
+                        cur_key_param_len = priv->wep_key[i].key_length +
+                                KEYPARAMSET_WEP_FIXED_LEN +
+                                sizeof(struct mwifiex_ie_types_header);
+                        *key_param_len += (u16) cur_key_param_len;
+                        key_param_set =
+                                (struct mwifiex_ie_type_key_param_set *)
+                                                ((u8 *)key_param_set +
+                                                cur_key_param_len);
+                } else if (!priv->wep_key[i].key_length) {
+                        continue;
+                } else {
+                        dev_err(priv->adapter->dev,
+                                "key%d Length = %d is incorrect\n",
+                               (i + 1), priv->wep_key[i].key_length);
+                        return -1;
+                }
+        }
+
+        return 0;
+}
+
+/*
+ * This function prepares command to set/get/reset network key(s).
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting WEP keys, WAPI keys or WPA keys along with required
+ *        encryption (TKIP, AES) (as required)
+ *      - Ensuring correct endian-ness
+ */
+static int mwifiex_cmd_802_11_key_material(struct mwifiex_private *priv,
+                                           struct host_cmd_ds_command *cmd,
+                                           u16 cmd_action,
+                                           u32 cmd_oid, void *data_buf)
+{
+        struct host_cmd_ds_802_11_key_material *key_material =
+                &cmd->params.key_material;
+        struct mwifiex_ds_encrypt_key *enc_key =
+                (struct mwifiex_ds_encrypt_key *) data_buf;
+        u16 key_param_len = 0;
+        int ret = 0;
+        const u8 bc_mac[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_KEY_MATERIAL);
+        key_material->action = cpu_to_le16(cmd_action);
+
+        if (cmd_action == HostCmd_ACT_GEN_GET) {
+                cmd->size =
+                        cpu_to_le16(sizeof(key_material->action) + S_DS_GEN);
+                return ret;
+        }
+
+        if (!enc_key) {
+                memset(&key_material->key_param_set, 0,
+                       (NUM_WEP_KEYS *
+                        sizeof(struct mwifiex_ie_type_key_param_set)));
+                ret = mwifiex_set_keyparamset_wep(priv,
+                                                  &key_material->key_param_set,
+                                                  &key_param_len);
+                cmd->size = cpu_to_le16(key_param_len +
+                                    sizeof(key_material->action) + S_DS_GEN);
+                return ret;
+        } else
+                memset(&key_material->key_param_set, 0,
+                       sizeof(struct mwifiex_ie_type_key_param_set));
+        if (enc_key->is_wapi_key) {
+                dev_dbg(priv->adapter->dev, "info: Set WAPI Key\n");
+                key_material->key_param_set.key_type_id =
+                        cpu_to_le16(KEY_TYPE_ID_WAPI);
+                if (cmd_oid == KEY_INFO_ENABLED)
+                        key_material->key_param_set.key_info =
+                                cpu_to_le16(KEY_INFO_WAPI_ENABLED);
+                else
+                        key_material->key_param_set.key_info =
+                                cpu_to_le16(!KEY_INFO_WAPI_ENABLED);
+
+                key_material->key_param_set.key[0] = enc_key->key_index;
+                if (!priv->sec_info.wapi_key_on)
+                        key_material->key_param_set.key[1] = 1;
+                else
+                        /* set 0 when re-key */
+                        key_material->key_param_set.key[1] = 0;
+
+                if (0 != memcmp(enc_key->mac_addr, bc_mac, sizeof(bc_mac))) {
+                        /* WAPI pairwise key: unicast */
+                        key_material->key_param_set.key_info |=
+                                cpu_to_le16(KEY_INFO_WAPI_UNICAST);
+                } else {        /* WAPI group key: multicast */
+                        key_material->key_param_set.key_info |=
+                                cpu_to_le16(KEY_INFO_WAPI_MCAST);
+                        priv->sec_info.wapi_key_on = true;
+                }
+
+                key_material->key_param_set.type =
+                        cpu_to_le16(TLV_TYPE_KEY_MATERIAL);
+                key_material->key_param_set.key_len =
+                        cpu_to_le16(WAPI_KEY_LEN);
+                memcpy(&key_material->key_param_set.key[2],
+                       enc_key->key_material, enc_key->key_len);
+                memcpy(&key_material->key_param_set.key[2 + enc_key->key_len],
+                       enc_key->wapi_rxpn, WAPI_RXPN_LEN);
+                key_material->key_param_set.length =
+                        cpu_to_le16(WAPI_KEY_LEN + KEYPARAMSET_FIXED_LEN);
+
+                key_param_len = (WAPI_KEY_LEN + KEYPARAMSET_FIXED_LEN) +
+                                 sizeof(struct mwifiex_ie_types_header);
+                cmd->size = cpu_to_le16(key_param_len +
+                                sizeof(key_material->action) + S_DS_GEN);
+                return ret;
+        }
+        if (enc_key->key_len == WLAN_KEY_LEN_CCMP) {
+                dev_dbg(priv->adapter->dev, "cmd: WPA_AES\n");
+                key_material->key_param_set.key_type_id =
+                        cpu_to_le16(KEY_TYPE_ID_AES);
+                if (cmd_oid == KEY_INFO_ENABLED)
+                        key_material->key_param_set.key_info =
+                                cpu_to_le16(KEY_INFO_AES_ENABLED);
+                else
+                        key_material->key_param_set.key_info =
+                                cpu_to_le16(!KEY_INFO_AES_ENABLED);
+
+                if (enc_key->key_index & MWIFIEX_KEY_INDEX_UNICAST)
+                                /* AES pairwise key: unicast */
+                        key_material->key_param_set.key_info |=
+                                cpu_to_le16(KEY_INFO_AES_UNICAST);
+                else            /* AES group key: multicast */
+                        key_material->key_param_set.key_info |=
+                                cpu_to_le16(KEY_INFO_AES_MCAST);
+        } else if (enc_key->key_len == WLAN_KEY_LEN_TKIP) {
+                dev_dbg(priv->adapter->dev, "cmd: WPA_TKIP\n");
+                key_material->key_param_set.key_type_id =
+                        cpu_to_le16(KEY_TYPE_ID_TKIP);
+                key_material->key_param_set.key_info =
+                        cpu_to_le16(KEY_INFO_TKIP_ENABLED);
+
+                if (enc_key->key_index & MWIFIEX_KEY_INDEX_UNICAST)
+                                /* TKIP pairwise key: unicast */
+                        key_material->key_param_set.key_info |=
+                                cpu_to_le16(KEY_INFO_TKIP_UNICAST);
+                else            /* TKIP group key: multicast */
+                        key_material->key_param_set.key_info |=
+                                cpu_to_le16(KEY_INFO_TKIP_MCAST);
+        }
+
+        if (key_material->key_param_set.key_type_id) {
+                key_material->key_param_set.type =
+                        cpu_to_le16(TLV_TYPE_KEY_MATERIAL);
+                key_material->key_param_set.key_len =
+                        cpu_to_le16((u16) enc_key->key_len);
+                memcpy(key_material->key_param_set.key, enc_key->key_material,
+                       enc_key->key_len);
+                key_material->key_param_set.length =
+                        cpu_to_le16((u16) enc_key->key_len +
+                                    KEYPARAMSET_FIXED_LEN);
+
+                key_param_len = (u16) (enc_key->key_len + KEYPARAMSET_FIXED_LEN)
+                                      + sizeof(struct mwifiex_ie_types_header);
+
+                cmd->size = cpu_to_le16(key_param_len +
+                                    sizeof(key_material->action) + S_DS_GEN);
+        }
+
+        return ret;
+}
+
+/*
+ * This function prepares command to set/get 11d domain information.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting domain information fields (for SET only)
+ *      - Ensuring correct endian-ness
+ */
+static int mwifiex_cmd_802_11d_domain_info(struct mwifiex_private *priv,
+                                           struct host_cmd_ds_command *cmd,
+                                           u16 cmd_action)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct host_cmd_ds_802_11d_domain_info *domain_info =
+                &cmd->params.domain_info;
+        struct mwifiex_ietypes_domain_param_set *domain =
+                &domain_info->domain;
+        u8 no_of_triplet = adapter->domain_reg.no_of_triplet;
+
+        dev_dbg(adapter->dev, "info: 11D: no_of_triplet=0x%x\n", no_of_triplet);
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11D_DOMAIN_INFO);
+        domain_info->action = cpu_to_le16(cmd_action);
+        if (cmd_action == HostCmd_ACT_GEN_GET) {
+                cmd->size = cpu_to_le16(sizeof(domain_info->action) + S_DS_GEN);
+                return 0;
+        }
+
+        /* Set domain info fields */
+        domain->header.type = cpu_to_le16(WLAN_EID_COUNTRY);
+        memcpy(domain->country_code, adapter->domain_reg.country_code,
+                        sizeof(domain->country_code));
+
+        domain->header.len = cpu_to_le16((no_of_triplet *
+                                sizeof(struct ieee80211_country_ie_triplet)) +
+                                sizeof(domain->country_code));
+
+        if (no_of_triplet) {
+                memcpy(domain->triplet, adapter->domain_reg.triplet,
+                                no_of_triplet *
+                                sizeof(struct ieee80211_country_ie_triplet));
+
+                cmd->size = cpu_to_le16(sizeof(domain_info->action) +
+                                le16_to_cpu(domain->header.len) +
+                                sizeof(struct mwifiex_ie_types_header)
+                                + S_DS_GEN);
+        } else {
+                cmd->size = cpu_to_le16(sizeof(domain_info->action) + S_DS_GEN);
+        }
+
+        return 0;
+}
+
+/*
+ * This function prepares command to set/get RF channel.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting RF type and current RF channel (for SET only)
+ *      - Ensuring correct endian-ness
+ */
+static int mwifiex_cmd_802_11_rf_channel(struct mwifiex_private *priv,
+                                         struct host_cmd_ds_command *cmd,
+                                         u16 cmd_action, void *data_buf)
+{
+        struct host_cmd_ds_802_11_rf_channel *rf_chan =
+                &cmd->params.rf_channel;
+        uint16_t rf_type = le16_to_cpu(rf_chan->rf_type);
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_RF_CHANNEL);
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_802_11_rf_channel)
+                                + S_DS_GEN);
+
+        if (cmd_action == HostCmd_ACT_GEN_SET) {
+                if ((priv->adapter->adhoc_start_band & BAND_A)
+                    || (priv->adapter->adhoc_start_band & BAND_AN))
+                        rf_chan->rf_type =
+                                cpu_to_le16(HostCmd_SCAN_RADIO_TYPE_A);
+
+                rf_type = le16_to_cpu(rf_chan->rf_type);
+                SET_SECONDARYCHAN(rf_type, priv->adapter->chan_offset);
+                rf_chan->current_channel = cpu_to_le16(*((u16 *) data_buf));
+        }
+        rf_chan->action = cpu_to_le16(cmd_action);
+        return 0;
+}
+
+/*
+ * This function prepares command to set/get IBSS coalescing status.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting status to enable or disable (for SET only)
+ *      - Ensuring correct endian-ness
+ */
+static int mwifiex_cmd_ibss_coalescing_status(struct mwifiex_private *priv,
+                                              struct host_cmd_ds_command *cmd,
+                                              u16 cmd_action, void *data_buf)
+{
+        struct host_cmd_ds_802_11_ibss_status *ibss_coal =
+                &(cmd->params.ibss_coalescing);
+        u16 enable = 0;
+
+        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_IBSS_COALESCING_STATUS);
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_802_11_ibss_status) +
+                                S_DS_GEN);
+        cmd->result = 0;
+        ibss_coal->action = cpu_to_le16(cmd_action);
+
+        switch (cmd_action) {
+        case HostCmd_ACT_GEN_SET:
+                if (data_buf != NULL)
+                        enable = *(u16 *) data_buf;
+                ibss_coal->enable = cpu_to_le16(enable);
+                break;
+
+                /* In other case.. Nothing to do */
+        case HostCmd_ACT_GEN_GET:
+        default:
+                break;
+        }
+
+        return 0;
+}
+
+/*
+ * This function prepares command to set/get register value.
+ *
+ * Preparation includes -
+ *      - Setting command ID, action and proper size
+ *      - Setting register offset (for both GET and SET) and
+ *        register value (for SET only)
+ *      - Ensuring correct endian-ness
+ *
+ * The following type of registers can be accessed with this function -
+ *      - MAC register
+ *      - BBP register
+ *      - RF register
+ *      - PMIC register
+ *      - CAU register
+ *      - EEPROM
+ */
+static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
+                                  u16 cmd_action, void *data_buf)
+{
+        struct mwifiex_ds_reg_rw *reg_rw;
+
+        reg_rw = (struct mwifiex_ds_reg_rw *) data_buf;
+        switch (le16_to_cpu(cmd->command)) {
+        case HostCmd_CMD_MAC_REG_ACCESS:
+        {
+                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->action = cpu_to_le16(cmd_action);
+                mac_reg->offset =
+                        cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
+                mac_reg->value = reg_rw->value;
+                break;
+        }
+        case HostCmd_CMD_BBP_REG_ACCESS:
+        {
+                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->action = cpu_to_le16(cmd_action);
+                bbp_reg->offset =
+                        cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
+                bbp_reg->value = (u8) le32_to_cpu(reg_rw->value);
+                break;
+        }
+        case HostCmd_CMD_RF_REG_ACCESS:
+        {
+                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->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);
+                break;
+        }
+        case HostCmd_CMD_PMIC_REG_ACCESS:
+        {
+                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->action = cpu_to_le16(cmd_action);
+                pmic_reg->offset =
+                        cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
+                pmic_reg->value = (u8) le32_to_cpu(reg_rw->value);
+                break;
+        }
+        case HostCmd_CMD_CAU_REG_ACCESS:
+        {
+                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->action = cpu_to_le16(cmd_action);
+                cau_reg->offset =
+                        cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
+                cau_reg->value = (u8) le32_to_cpu(reg_rw->value);
+                break;
+        }
+        case HostCmd_CMD_802_11_EEPROM_ACCESS:
+        {
+                struct mwifiex_ds_read_eeprom *rd_eeprom =
+                        (struct mwifiex_ds_read_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);
+                cmd_eeprom->action = cpu_to_le16(cmd_action);
+                cmd_eeprom->offset = rd_eeprom->offset;
+                cmd_eeprom->byte_count = rd_eeprom->byte_count;
+                cmd_eeprom->value = 0;
+                break;
+        }
+        default:
+                return -1;
+        }
+
+        return 0;
+}
+
+/*
+ * This function prepares the commands before sending them to the firmware.
+ *
+ * This is a generic function which calls specific command preparation
+ * routines based upon the command number.
+ */
+int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
+                            u16 cmd_action, u32 cmd_oid,
+                            void *data_buf, void *cmd_buf)
+{
+        struct host_cmd_ds_command *cmd_ptr =
+                (struct host_cmd_ds_command *) cmd_buf;
+        int ret = 0;
+
+        /* Prepare command */
+        switch (cmd_no) {
+        case HostCmd_CMD_GET_HW_SPEC:
+                ret = mwifiex_cmd_get_hw_spec(priv, cmd_ptr);
+                break;
+        case HostCmd_CMD_MAC_CONTROL:
+                ret = mwifiex_cmd_mac_control(priv, cmd_ptr, cmd_action,
+                                              data_buf);
+                break;
+        case HostCmd_CMD_802_11_MAC_ADDRESS:
+                ret = mwifiex_cmd_802_11_mac_address(priv, cmd_ptr,
+                                                     cmd_action);
+                break;
+        case HostCmd_CMD_MAC_MULTICAST_ADR:
+                ret = mwifiex_cmd_mac_multicast_adr(priv, cmd_ptr, cmd_action,
+                                                    data_buf);
+                break;
+        case HostCmd_CMD_TX_RATE_CFG:
+                ret = mwifiex_cmd_tx_rate_cfg(priv, cmd_ptr, cmd_action,
+                                              data_buf);
+                break;
+        case HostCmd_CMD_TXPWR_CFG:
+                ret = mwifiex_cmd_tx_power_cfg(priv, cmd_ptr, cmd_action,
+                                               data_buf);
+                break;
+        case HostCmd_CMD_802_11_PS_MODE_ENH:
+                ret = mwifiex_cmd_enh_power_mode(priv, cmd_ptr, cmd_action,
+                                                 (uint16_t)cmd_oid, data_buf);
+                break;
+        case HostCmd_CMD_802_11_HS_CFG_ENH:
+                ret = mwifiex_cmd_802_11_hs_cfg(priv, cmd_ptr, cmd_action,
+                                (struct mwifiex_hs_config_param *) data_buf);
+                break;
+        case HostCmd_CMD_802_11_SCAN:
+                ret = mwifiex_cmd_802_11_scan(priv, cmd_ptr, data_buf);
+                break;
+        case HostCmd_CMD_802_11_BG_SCAN_QUERY:
+                ret = mwifiex_cmd_802_11_bg_scan_query(priv, cmd_ptr,
+                                                       data_buf);
+                break;
+        case HostCmd_CMD_802_11_ASSOCIATE:
+                ret = mwifiex_cmd_802_11_associate(priv, cmd_ptr, data_buf);
+                break;
+        case HostCmd_CMD_802_11_DEAUTHENTICATE:
+                ret = mwifiex_cmd_802_11_deauthenticate(priv, cmd_ptr,
+                                                        data_buf);
+                break;
+        case HostCmd_CMD_802_11_AD_HOC_START:
+                ret = mwifiex_cmd_802_11_ad_hoc_start(priv, cmd_ptr,
+                                                      data_buf);
+                break;
+        case HostCmd_CMD_802_11_GET_LOG:
+                ret = mwifiex_cmd_802_11_get_log(priv, cmd_ptr);
+                break;
+        case HostCmd_CMD_802_11_AD_HOC_JOIN:
+                ret = mwifiex_cmd_802_11_ad_hoc_join(priv, cmd_ptr,
+                                                     data_buf);
+                break;
+        case HostCmd_CMD_802_11_AD_HOC_STOP:
+                ret = mwifiex_cmd_802_11_ad_hoc_stop(priv, cmd_ptr);
+                break;
+        case HostCmd_CMD_RSSI_INFO:
+                ret = mwifiex_cmd_802_11_rssi_info(priv, cmd_ptr, cmd_action);
+                break;
+        case HostCmd_CMD_802_11_SNMP_MIB:
+                ret = mwifiex_cmd_802_11_snmp_mib(priv, cmd_ptr, cmd_action,
+                                                  cmd_oid, data_buf);
+                break;
+        case HostCmd_CMD_802_11_TX_RATE_QUERY:
+                cmd_ptr->command =
+                        cpu_to_le16(HostCmd_CMD_802_11_TX_RATE_QUERY);
+                cmd_ptr->size =
+                        cpu_to_le16(sizeof(struct host_cmd_ds_tx_rate_query) +
+                                    S_DS_GEN);
+                priv->tx_rate = 0;
+                ret = 0;
+                break;
+        case HostCmd_CMD_VERSION_EXT:
+                cmd_ptr->command = cpu_to_le16(cmd_no);
+                cmd_ptr->params.verext.version_str_sel =
+                        (u8) (*((u32 *) data_buf));
+                memcpy(&cmd_ptr->params, data_buf,
+                       sizeof(struct host_cmd_ds_version_ext));
+                cmd_ptr->size =
+                        cpu_to_le16(sizeof(struct host_cmd_ds_version_ext) +
+                                    S_DS_GEN);
+                ret = 0;
+                break;
+        case HostCmd_CMD_802_11_RF_CHANNEL:
+                ret = mwifiex_cmd_802_11_rf_channel(priv, cmd_ptr, cmd_action,
+                                                    data_buf);
+                break;
+        case HostCmd_CMD_FUNC_INIT:
+                if (priv->adapter->hw_status == MWIFIEX_HW_STATUS_RESET)
+                        priv->adapter->hw_status = MWIFIEX_HW_STATUS_READY;
+                cmd_ptr->command = cpu_to_le16(cmd_no);
+                cmd_ptr->size = cpu_to_le16(S_DS_GEN);
+                break;
+        case HostCmd_CMD_FUNC_SHUTDOWN:
+                priv->adapter->hw_status = MWIFIEX_HW_STATUS_RESET;
+                cmd_ptr->command = cpu_to_le16(cmd_no);
+                cmd_ptr->size = cpu_to_le16(S_DS_GEN);
+                break;
+        case HostCmd_CMD_11N_ADDBA_REQ:
+                ret = mwifiex_cmd_11n_addba_req(priv, cmd_ptr, data_buf);
+                break;
+        case HostCmd_CMD_11N_DELBA:
+                ret = mwifiex_cmd_11n_delba(priv, cmd_ptr, data_buf);
+                break;
+        case HostCmd_CMD_11N_ADDBA_RSP:
+                ret = mwifiex_cmd_11n_addba_rsp_gen(priv, cmd_ptr, data_buf);
+                break;
+        case HostCmd_CMD_802_11_KEY_MATERIAL:
+                ret = mwifiex_cmd_802_11_key_material(priv, cmd_ptr,
+                                                cmd_action, cmd_oid,
+                                                data_buf);
+                break;
+        case HostCmd_CMD_802_11D_DOMAIN_INFO:
+                ret = mwifiex_cmd_802_11d_domain_info(priv, cmd_ptr,
+                                                cmd_action);
+                break;
+        case HostCmd_CMD_RECONFIGURE_TX_BUFF:
+                ret = mwifiex_cmd_recfg_tx_buf(priv, cmd_ptr, cmd_action,
+                                               data_buf);
+                break;
+        case HostCmd_CMD_AMSDU_AGGR_CTRL:
+                ret = mwifiex_cmd_amsdu_aggr_ctrl(priv, cmd_ptr, cmd_action,
+                                                  data_buf);
+                break;
+        case HostCmd_CMD_11N_CFG:
+                ret = mwifiex_cmd_11n_cfg(priv, cmd_ptr, cmd_action,
+                                          data_buf);
+                break;
+        case HostCmd_CMD_WMM_GET_STATUS:
+                dev_dbg(priv->adapter->dev,
+                        "cmd: WMM: WMM_GET_STATUS cmd sent\n");
+                cmd_ptr->command = cpu_to_le16(HostCmd_CMD_WMM_GET_STATUS);
+                cmd_ptr->size =
+                        cpu_to_le16(sizeof(struct host_cmd_ds_wmm_get_status) +
+                                    S_DS_GEN);
+                ret = 0;
+                break;
+        case HostCmd_CMD_802_11_IBSS_COALESCING_STATUS:
+                ret = mwifiex_cmd_ibss_coalescing_status(priv, cmd_ptr,
+                                                         cmd_action, data_buf);
+                break;
+        case HostCmd_CMD_MAC_REG_ACCESS:
+        case HostCmd_CMD_BBP_REG_ACCESS:
+        case HostCmd_CMD_RF_REG_ACCESS:
+        case HostCmd_CMD_PMIC_REG_ACCESS:
+        case HostCmd_CMD_CAU_REG_ACCESS:
+        case HostCmd_CMD_802_11_EEPROM_ACCESS:
+                ret = mwifiex_cmd_reg_access(cmd_ptr, cmd_action, data_buf);
+                break;
+        case HostCmd_CMD_SET_BSS_MODE:
+                cmd_ptr->command = cpu_to_le16(cmd_no);
+                if (priv->bss_mode == MWIFIEX_BSS_MODE_IBSS)
+                        cmd_ptr->params.bss_mode.con_type =
+                                CONNECTION_TYPE_ADHOC;
+                else if (priv->bss_mode == MWIFIEX_BSS_MODE_INFRA)
+                        cmd_ptr->params.bss_mode.con_type =
+                                CONNECTION_TYPE_INFRA;
+                cmd_ptr->size = cpu_to_le16(sizeof(struct
+                                host_cmd_ds_set_bss_mode) + S_DS_GEN);
+                ret = 0;
+                break;
+        default:
+                dev_err(priv->adapter->dev,
+                        "PREP_CMD: unknown cmd- %#x\n", cmd_no);
+                ret = -1;
+                break;
+        }
+        return ret;
+}
+
+/*
+ * This function issues commands to initialize firmware.
+ *
+ * This is called after firmware download to bring the card to
+ * working state.
+ *
+ * The following commands are issued sequentially -
+ *      - Function init (for first interface only)
+ *      - Read MAC address (for first interface only)
+ *      - Reconfigure Tx buffer size (for first interface only)
+ *      - Enable auto deep sleep (for first interface only)
+ *      - Get Tx rate
+ *      - Get Tx power
+ *      - Set IBSS coalescing status
+ *      - Set AMSDU aggregation control
+ *      - Set 11d control
+ *      - Set MAC control (this must be the last command to initialize firmware)
+ */
+int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)
+{
+        int ret = 0;
+        u16 enable = true;
+        struct mwifiex_ds_11n_amsdu_aggr_ctrl amsdu_aggr_ctrl;
+        struct mwifiex_ds_auto_ds auto_ds;
+        enum state_11d_t state_11d;
+
+        if (first_sta) {
+
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_FUNC_INIT,
+                                          HostCmd_ACT_GEN_SET, 0, NULL, NULL);
+                if (ret)
+                        return -1;
+                /* Read MAC address from HW */
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_GET_HW_SPEC,
+                                          HostCmd_ACT_GEN_GET, 0, NULL, NULL);
+                if (ret)
+                        return -1;
+
+                /* Reconfigure tx buf size */
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_RECONFIGURE_TX_BUFF,
+                                          HostCmd_ACT_GEN_SET, 0, NULL,
+                                          &priv->adapter->tx_buf_size);
+                if (ret)
+                        return -1;
+
+                /* Enable IEEE PS by default */
+                priv->adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_PSP;
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_PS_MODE_ENH,
+                                          EN_AUTO_PS, BITMAP_STA_PS, NULL,
+                                          NULL);
+                if (ret)
+                        return -1;
+        }
+
+        /* get tx rate */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_TX_RATE_CFG,
+                                  HostCmd_ACT_GEN_GET, 0, NULL, NULL);
+        if (ret)
+                return -1;
+        priv->data_rate = 0;
+
+        /* get tx power */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_TXPWR_CFG,
+                                  HostCmd_ACT_GEN_GET, 0, NULL, NULL);
+        if (ret)
+                return -1;
+
+        /* set ibss coalescing_status */
+        ret = mwifiex_prepare_cmd(priv,
+                                  HostCmd_CMD_802_11_IBSS_COALESCING_STATUS,
+                                  HostCmd_ACT_GEN_SET, 0, NULL, &enable);
+        if (ret)
+                return -1;
+
+        memset(&amsdu_aggr_ctrl, 0, sizeof(amsdu_aggr_ctrl));
+        amsdu_aggr_ctrl.enable = true;
+        /* Send request to firmware */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_AMSDU_AGGR_CTRL,
+                                  HostCmd_ACT_GEN_SET, 0, NULL,
+                                  (void *) &amsdu_aggr_ctrl);
+        if (ret)
+                return -1;
+        /* MAC Control must be the last command in init_fw */
+        /* set MAC Control */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_MAC_CONTROL,
+                                  HostCmd_ACT_GEN_SET, 0, NULL,
+                                  &priv->curr_pkt_filter);
+        if (ret)
+                return -1;
+
+        if (first_sta) {
+                /* Enable auto deep sleep */
+                auto_ds.auto_ds = DEEP_SLEEP_ON;
+                auto_ds.idle_time = DEEP_SLEEP_IDLE_TIME;
+                ret = mwifiex_prepare_cmd(priv,
+                                HostCmd_CMD_802_11_PS_MODE_ENH,
+                                EN_AUTO_PS, BITMAP_AUTO_DS, NULL,
+                                &auto_ds);
+                if (ret)
+                        return -1;
+        }
+
+        /* Send cmd to FW to enable/disable 11D function */
+        state_11d = ENABLE_11D;
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                                  HostCmd_ACT_GEN_SET, DOT11D_I,
+                                  NULL, &state_11d);
+        if (ret)
+                dev_err(priv->adapter->dev, "11D: failed to enable 11D\n");
+
+        /* set last_init_cmd */
+        priv->adapter->last_init_cmd = HostCmd_CMD_802_11_SNMP_MIB;
+        ret = -EINPROGRESS;
+
+        return ret;
+}
diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/mwifiex/sta_cmdresp.c
new file mode 100644
index 00000000000..ae960ddf2bd
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c
@@ -0,0 +1,986 @@
+/*
+ * Marvell Wireless LAN device driver: station command response handling
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+#include "11n.h"
+
+
+/*
+ * This function handles the command response error case.
+ *
+ * For scan response error, the function cancels all the pending
+ * scan commands and generates an event to inform the applications
+ * of the scan completion.
+ *
+ * For Power Save command failure, we do not retry enter PS
+ * command in case of Ad-hoc mode.
+ *
+ * For all other response errors, the current command buffer is freed
+ * and returned to the free command queue.
+ */
+static void
+mwifiex_process_cmdresp_error(struct mwifiex_private *priv,
+                              struct host_cmd_ds_command *resp,
+                              struct mwifiex_wait_queue *wq_buf)
+{
+        struct cmd_ctrl_node *cmd_node = NULL, *tmp_node = NULL;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        unsigned long flags;
+
+        dev_err(adapter->dev, "CMD_RESP: cmd %#x error, result=%#x\n",
+                        resp->command, resp->result);
+        if (wq_buf)
+                wq_buf->status = MWIFIEX_ERROR_FW_CMDRESP;
+
+        switch (le16_to_cpu(resp->command)) {
+        case HostCmd_CMD_802_11_PS_MODE_ENH:
+                {
+                        struct host_cmd_ds_802_11_ps_mode_enh *pm =
+                                &resp->params.psmode_enh;
+                        dev_err(adapter->dev, "PS_MODE_ENH cmd failed: "
+                                "result=0x%x action=0x%X\n",
+                                resp->result, le16_to_cpu(pm->action));
+                        /* We do not re-try enter-ps command in ad-hoc mode. */
+                        if (le16_to_cpu(pm->action) == EN_AUTO_PS &&
+                                (le16_to_cpu(pm->params.auto_ps.ps_bitmap) &
+                                 BITMAP_STA_PS)
+                                && priv->bss_mode == MWIFIEX_BSS_MODE_IBSS)
+                                adapter->ps_mode =
+                                        MWIFIEX_802_11_POWER_MODE_CAM;
+                }
+                break;
+        case HostCmd_CMD_802_11_SCAN:
+                /* Cancel 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);
+                        spin_unlock_irqrestore(&adapter->scan_pending_q_lock,
+                                               flags);
+                        mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
+                        spin_lock_irqsave(&adapter->scan_pending_q_lock, flags);
+                }
+                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->report_scan_result)
+                        priv->report_scan_result = false;
+                if (priv->scan_pending_on_block) {
+                        priv->scan_pending_on_block = false;
+                        up(&priv->async_sem);
+                }
+                break;
+
+        case HostCmd_CMD_MAC_CONTROL:
+                break;
+
+        default:
+                break;
+        }
+        /* Handling errors here */
+        mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
+
+        spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags);
+        adapter->curr_cmd = NULL;
+        spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
+
+        return;
+}
+
+/*
+ * This function handles the command response of get RSSI info.
+ *
+ * Handling includes changing the header fields into CPU format
+ * and saving the following parameters in driver -
+ *      - Last data and beacon RSSI value
+ *      - Average data and beacon RSSI value
+ *      - Last data and beacon NF value
+ *      - Average data and beacon NF value
+ *
+ * The parameters are send to the application as well, along with
+ * calculated SNR values.
+ */
+static int mwifiex_ret_802_11_rssi_info(struct mwifiex_private *priv,
+                                        struct host_cmd_ds_command *resp,
+                                        void *data_buf)
+{
+        struct host_cmd_ds_802_11_rssi_info_rsp *rssi_info_rsp =
+                &resp->params.rssi_info_rsp;
+        struct mwifiex_ds_get_signal *signal = NULL;
+
+        priv->data_rssi_last = le16_to_cpu(rssi_info_rsp->data_rssi_last);
+        priv->data_nf_last = le16_to_cpu(rssi_info_rsp->data_nf_last);
+
+        priv->data_rssi_avg = le16_to_cpu(rssi_info_rsp->data_rssi_avg);
+        priv->data_nf_avg = le16_to_cpu(rssi_info_rsp->data_nf_avg);
+
+        priv->bcn_rssi_last = le16_to_cpu(rssi_info_rsp->bcn_rssi_last);
+        priv->bcn_nf_last = le16_to_cpu(rssi_info_rsp->bcn_nf_last);
+
+        priv->bcn_rssi_avg = le16_to_cpu(rssi_info_rsp->bcn_rssi_avg);
+        priv->bcn_nf_avg = le16_to_cpu(rssi_info_rsp->bcn_nf_avg);
+
+        /* Need to indicate IOCTL complete */
+        if (data_buf) {
+                signal = (struct mwifiex_ds_get_signal *) data_buf;
+                memset(signal, 0, sizeof(struct mwifiex_ds_get_signal));
+
+                signal->selector = ALL_RSSI_INFO_MASK;
+
+                /* RSSI */
+                signal->bcn_rssi_last = priv->bcn_rssi_last;
+                signal->bcn_rssi_avg = priv->bcn_rssi_avg;
+                signal->data_rssi_last = priv->data_rssi_last;
+                signal->data_rssi_avg = priv->data_rssi_avg;
+
+                /* SNR */
+                signal->bcn_snr_last =
+                        CAL_SNR(priv->bcn_rssi_last, priv->bcn_nf_last);
+                signal->bcn_snr_avg =
+                        CAL_SNR(priv->bcn_rssi_avg, priv->bcn_nf_avg);
+                signal->data_snr_last =
+                        CAL_SNR(priv->data_rssi_last, priv->data_nf_last);
+                signal->data_snr_avg =
+                        CAL_SNR(priv->data_rssi_avg, priv->data_nf_avg);
+
+                /* NF */
+                signal->bcn_nf_last = priv->bcn_nf_last;
+                signal->bcn_nf_avg = priv->bcn_nf_avg;
+                signal->data_nf_last = priv->data_nf_last;
+                signal->data_nf_avg = priv->data_nf_avg;
+        }
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of set/get SNMP
+ * MIB parameters.
+ *
+ * Handling includes changing the header fields into CPU format
+ * and saving the parameter in driver.
+ *
+ * The following parameters are supported -
+ *      - Fragmentation threshold
+ *      - RTS threshold
+ *      - Short retry limit
+ */
+static int mwifiex_ret_802_11_snmp_mib(struct mwifiex_private *priv,
+                                       struct host_cmd_ds_command *resp,
+                                       void *data_buf)
+{
+        struct host_cmd_ds_802_11_snmp_mib *smib = &resp->params.smib;
+        u16 oid = le16_to_cpu(smib->oid);
+        u16 query_type = le16_to_cpu(smib->query_type);
+        u32 ul_temp;
+
+        dev_dbg(priv->adapter->dev, "info: SNMP_RESP: oid value = %#x,"
+                        " query_type = %#x, buf size = %#x\n",
+                        oid, query_type, le16_to_cpu(smib->buf_size));
+        if (query_type == HostCmd_ACT_GEN_GET) {
+                ul_temp = le16_to_cpu(*((__le16 *) (smib->value)));
+                if (data_buf)
+                        *(u32 *)data_buf = ul_temp;
+                switch (oid) {
+                case FRAG_THRESH_I:
+                        dev_dbg(priv->adapter->dev,
+                                "info: SNMP_RESP: FragThsd =%u\n", ul_temp);
+                        break;
+                case RTS_THRESH_I:
+                        dev_dbg(priv->adapter->dev,
+                                "info: SNMP_RESP: RTSThsd =%u\n", ul_temp);
+                        break;
+                case SHORT_RETRY_LIM_I:
+                        dev_dbg(priv->adapter->dev,
+                                "info: SNMP_RESP: TxRetryCount=%u\n", ul_temp);
+                        break;
+                default:
+                        break;
+                }
+        }
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of get log request
+ *
+ * Handling includes changing the header fields into CPU format
+ * and sending the received parameters to application.
+ */
+static int mwifiex_ret_get_log(struct mwifiex_private *priv,
+                               struct host_cmd_ds_command *resp,
+                               void *data_buf)
+{
+        struct host_cmd_ds_802_11_get_log *get_log =
+                (struct host_cmd_ds_802_11_get_log *) &resp->params.get_log;
+        struct mwifiex_ds_get_stats *stats = NULL;
+
+        if (data_buf) {
+                stats = (struct mwifiex_ds_get_stats *) data_buf;
+                stats->mcast_tx_frame = le32_to_cpu(get_log->mcast_tx_frame);
+                stats->failed = le32_to_cpu(get_log->failed);
+                stats->retry = le32_to_cpu(get_log->retry);
+                stats->multi_retry = le32_to_cpu(get_log->multi_retry);
+                stats->frame_dup = le32_to_cpu(get_log->frame_dup);
+                stats->rts_success = le32_to_cpu(get_log->rts_success);
+                stats->rts_failure = le32_to_cpu(get_log->rts_failure);
+                stats->ack_failure = le32_to_cpu(get_log->ack_failure);
+                stats->rx_frag = le32_to_cpu(get_log->rx_frag);
+                stats->mcast_rx_frame = le32_to_cpu(get_log->mcast_rx_frame);
+                stats->fcs_error = le32_to_cpu(get_log->fcs_error);
+                stats->tx_frame = le32_to_cpu(get_log->tx_frame);
+                stats->wep_icv_error[0] =
+                        le32_to_cpu(get_log->wep_icv_err_cnt[0]);
+                stats->wep_icv_error[1] =
+                        le32_to_cpu(get_log->wep_icv_err_cnt[1]);
+                stats->wep_icv_error[2] =
+                        le32_to_cpu(get_log->wep_icv_err_cnt[2]);
+                stats->wep_icv_error[3] =
+                        le32_to_cpu(get_log->wep_icv_err_cnt[3]);
+        }
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of set/get Tx rate
+ * configurations.
+ *
+ * Handling includes changing the header fields into CPU format
+ * and saving the following parameters in driver -
+ *      - DSSS rate bitmap
+ *      - OFDM rate bitmap
+ *      - HT MCS rate bitmaps
+ *
+ * Based on the new rate bitmaps, the function re-evaluates if
+ * auto data rate has been activated. If not, it sends another
+ * query to the firmware to get the current Tx data rate and updates
+ * the driver value.
+ */
+static int mwifiex_ret_tx_rate_cfg(struct mwifiex_private *priv,
+                                   struct host_cmd_ds_command *resp,
+                                   void *data_buf)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct mwifiex_rate_cfg *ds_rate = NULL;
+        struct host_cmd_ds_tx_rate_cfg *rate_cfg = &resp->params.tx_rate_cfg;
+        struct mwifiex_rate_scope *rate_scope;
+        struct mwifiex_ie_types_header *head = NULL;
+        u16 tlv, tlv_buf_len;
+        u8 *tlv_buf;
+        u32 i;
+        int ret = 0;
+
+        tlv_buf = (u8 *) ((u8 *) rate_cfg) +
+                        sizeof(struct host_cmd_ds_tx_rate_cfg);
+        tlv_buf_len = *(u16 *) (tlv_buf + sizeof(u16));
+
+        while (tlv_buf && tlv_buf_len > 0) {
+                tlv = (*tlv_buf);
+                tlv = tlv | (*(tlv_buf + 1) << 8);
+
+                switch (tlv) {
+                case TLV_TYPE_RATE_SCOPE:
+                        rate_scope = (struct mwifiex_rate_scope *) tlv_buf;
+                        priv->bitmap_rates[0] =
+                                le16_to_cpu(rate_scope->hr_dsss_rate_bitmap);
+                        priv->bitmap_rates[1] =
+                                le16_to_cpu(rate_scope->ofdm_rate_bitmap);
+                        for (i = 0;
+                             i <
+                             sizeof(rate_scope->ht_mcs_rate_bitmap) /
+                             sizeof(u16); i++)
+                                priv->bitmap_rates[2 + i] =
+                                        le16_to_cpu(rate_scope->
+                                                    ht_mcs_rate_bitmap[i]);
+                        break;
+                        /* Add RATE_DROP tlv here */
+                }
+
+                head = (struct mwifiex_ie_types_header *) tlv_buf;
+                tlv_buf += le16_to_cpu(head->len) + sizeof(*head);
+                tlv_buf_len -= le16_to_cpu(head->len);
+        }
+
+        priv->is_data_rate_auto = mwifiex_is_rate_auto(priv);
+
+        if (priv->is_data_rate_auto)
+                priv->data_rate = 0;
+        else
+                ret = mwifiex_prepare_cmd(priv,
+                                          HostCmd_CMD_802_11_TX_RATE_QUERY,
+                                          HostCmd_ACT_GEN_GET, 0, NULL, NULL);
+
+        if (data_buf) {
+                ds_rate = (struct mwifiex_rate_cfg *) data_buf;
+                if (le16_to_cpu(rate_cfg->action) == HostCmd_ACT_GEN_GET) {
+                        if (priv->is_data_rate_auto) {
+                                ds_rate->is_rate_auto = 1;
+                        } else {
+                                ds_rate->rate =
+                                        mwifiex_get_rate_index(adapter,
+                                                               priv->
+                                                               bitmap_rates,
+                                                               sizeof(priv->
+                                                               bitmap_rates));
+                                if (ds_rate->rate >=
+                                    MWIFIEX_RATE_BITMAP_OFDM0
+                                    && ds_rate->rate <=
+                                    MWIFIEX_RATE_BITMAP_OFDM7)
+                                        ds_rate->rate -=
+                                                (MWIFIEX_RATE_BITMAP_OFDM0 -
+                                                 MWIFIEX_RATE_INDEX_OFDM0);
+                                if (ds_rate->rate >=
+                                    MWIFIEX_RATE_BITMAP_MCS0
+                                    && ds_rate->rate <=
+                                    MWIFIEX_RATE_BITMAP_MCS127)
+                                        ds_rate->rate -=
+                                                (MWIFIEX_RATE_BITMAP_MCS0 -
+                                                 MWIFIEX_RATE_INDEX_MCS0);
+                        }
+                }
+        }
+
+        return ret;
+}
+
+/*
+ * This function handles the command response of get Tx power level.
+ *
+ * Handling includes saving the maximum and minimum Tx power levels
+ * in driver, as well as sending the values to user.
+ */
+static int mwifiex_get_power_level(struct mwifiex_private *priv, void *data_buf)
+{
+        int length = -1, max_power = -1, min_power = -1;
+        struct mwifiex_types_power_group *pg_tlv_hdr = NULL;
+        struct mwifiex_power_group *pg = NULL;
+
+        if (data_buf) {
+                pg_tlv_hdr =
+                        (struct mwifiex_types_power_group *) ((u8 *) data_buf
+                                        + sizeof(struct host_cmd_ds_txpwr_cfg));
+                pg = (struct mwifiex_power_group *) ((u8 *) pg_tlv_hdr +
+                                sizeof(struct mwifiex_types_power_group));
+                length = pg_tlv_hdr->length;
+                if (length > 0) {
+                        max_power = pg->power_max;
+                        min_power = pg->power_min;
+                        length -= sizeof(struct mwifiex_power_group);
+                }
+                while (length) {
+                        pg++;
+                        if (max_power < pg->power_max)
+                                max_power = pg->power_max;
+
+                        if (min_power > pg->power_min)
+                                min_power = pg->power_min;
+
+                        length -= sizeof(struct mwifiex_power_group);
+                }
+                if (pg_tlv_hdr->length > 0) {
+                        priv->min_tx_power_level = (u8) min_power;
+                        priv->max_tx_power_level = (u8) max_power;
+                }
+        } else {
+                return -1;
+        }
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of set/get Tx power
+ * configurations.
+ *
+ * Handling includes changing the header fields into CPU format
+ * and saving the current Tx power level in driver.
+ */
+static int mwifiex_ret_tx_power_cfg(struct mwifiex_private *priv,
+                                    struct host_cmd_ds_command *resp,
+                                    void *data_buf)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct host_cmd_ds_txpwr_cfg *txp_cfg = &resp->params.txp_cfg;
+        struct mwifiex_types_power_group *pg_tlv_hdr = NULL;
+        struct mwifiex_power_group *pg = NULL;
+        u16 action = le16_to_cpu(txp_cfg->action);
+
+        switch (action) {
+        case HostCmd_ACT_GEN_GET:
+                {
+                        pg_tlv_hdr =
+                                (struct mwifiex_types_power_group *) ((u8 *)
+                                                txp_cfg +
+                                                sizeof
+                                                (struct
+                                                 host_cmd_ds_txpwr_cfg));
+                        pg = (struct mwifiex_power_group *) ((u8 *)
+                                                pg_tlv_hdr +
+                                                sizeof(struct
+                                                mwifiex_types_power_group));
+                        if (adapter->hw_status ==
+                            MWIFIEX_HW_STATUS_INITIALIZING)
+                                mwifiex_get_power_level(priv, txp_cfg);
+                        priv->tx_power_level = (u16) pg->power_min;
+                        break;
+                }
+        case HostCmd_ACT_GEN_SET:
+                if (le32_to_cpu(txp_cfg->mode)) {
+                        pg_tlv_hdr =
+                                (struct mwifiex_types_power_group *) ((u8 *)
+                                                txp_cfg +
+                                                sizeof
+                                                (struct
+                                                 host_cmd_ds_txpwr_cfg));
+                        pg = (struct mwifiex_power_group *) ((u8 *) pg_tlv_hdr
+                                                +
+                                                sizeof(struct
+                                                mwifiex_types_power_group));
+                        if (pg->power_max == pg->power_min)
+                                priv->tx_power_level = (u16) pg->power_min;
+                }
+                break;
+        default:
+                dev_err(adapter->dev, "CMD_RESP: unknown cmd action %d\n",
+                                action);
+                return 0;
+        }
+        dev_dbg(adapter->dev,
+                "info: Current TxPower Level = %d, Max Power=%d, Min Power=%d\n",
+               priv->tx_power_level, priv->max_tx_power_level,
+               priv->min_tx_power_level);
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of set/get MAC address.
+ *
+ * Handling includes saving the MAC address in driver.
+ */
+static int mwifiex_ret_802_11_mac_address(struct mwifiex_private *priv,
+                                          struct host_cmd_ds_command *resp)
+{
+        struct host_cmd_ds_802_11_mac_address *cmd_mac_addr =
+                &resp->params.mac_addr;
+
+        memcpy(priv->curr_addr, cmd_mac_addr->mac_addr, ETH_ALEN);
+
+        dev_dbg(priv->adapter->dev,
+                "info: set mac address: %pM\n", priv->curr_addr);
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of set/get MAC multicast
+ * address.
+ */
+static int mwifiex_ret_mac_multicast_adr(struct mwifiex_private *priv,
+                                         struct host_cmd_ds_command *resp)
+{
+        return 0;
+}
+
+/*
+ * This function handles the command response of get Tx rate query.
+ *
+ * Handling includes changing the header fields into CPU format
+ * and saving the Tx rate and HT information parameters in driver.
+ *
+ * Both rate configuration and current data rate can be retrieved
+ * with this request.
+ */
+static int mwifiex_ret_802_11_tx_rate_query(struct mwifiex_private *priv,
+                                            struct host_cmd_ds_command *resp)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+
+        priv->tx_rate = resp->params.tx_rate.tx_rate;
+        priv->tx_htinfo = resp->params.tx_rate.ht_info;
+        if (!priv->is_data_rate_auto)
+                priv->data_rate =
+                        mwifiex_index_to_data_rate(adapter, priv->tx_rate,
+                                                   priv->tx_htinfo);
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of a deauthenticate
+ * command.
+ *
+ * If the deauthenticated MAC matches the current BSS MAC, the connection
+ * state is reset.
+ */
+static int mwifiex_ret_802_11_deauthenticate(struct mwifiex_private *priv,
+                                             struct host_cmd_ds_command *resp)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+
+        adapter->dbg.num_cmd_deauth++;
+        if (!memcmp(resp->params.deauth.mac_addr,
+                    &priv->curr_bss_params.bss_descriptor.mac_address,
+                    sizeof(resp->params.deauth.mac_addr)))
+                mwifiex_reset_connect_state(priv);
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of ad-hoc stop.
+ *
+ * The function resets the connection state in driver.
+ */
+static int mwifiex_ret_802_11_ad_hoc_stop(struct mwifiex_private *priv,
+                                          struct host_cmd_ds_command *resp)
+{
+        mwifiex_reset_connect_state(priv);
+        return 0;
+}
+
+/*
+ * This function handles the command response of set/get key material.
+ *
+ * Handling includes updating the driver parameters to reflect the
+ * changes.
+ */
+static int mwifiex_ret_802_11_key_material(struct mwifiex_private *priv,
+                                           struct host_cmd_ds_command *resp)
+{
+        struct host_cmd_ds_802_11_key_material *key =
+                &resp->params.key_material;
+
+        if (le16_to_cpu(key->action) == HostCmd_ACT_GEN_SET) {
+                if ((le16_to_cpu(key->key_param_set.key_info) &
+                     KEY_INFO_TKIP_MCAST)) {
+                        dev_dbg(priv->adapter->dev, "info: key: GTK is set\n");
+                        priv->wpa_is_gtk_set = true;
+                        priv->scan_block = false;
+                }
+        }
+
+        memset(priv->aes_key.key_param_set.key, 0,
+               sizeof(key->key_param_set.key));
+        priv->aes_key.key_param_set.key_len = key->key_param_set.key_len;
+        memcpy(priv->aes_key.key_param_set.key, key->key_param_set.key,
+               le16_to_cpu(priv->aes_key.key_param_set.key_len));
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of get 11d domain information.
+ */
+static int mwifiex_ret_802_11d_domain_info(struct mwifiex_private *priv,
+                                           struct host_cmd_ds_command *resp)
+{
+        struct host_cmd_ds_802_11d_domain_info_rsp *domain_info =
+                &resp->params.domain_info_resp;
+        struct mwifiex_ietypes_domain_param_set *domain = &domain_info->domain;
+        u16 action = le16_to_cpu(domain_info->action);
+        u8 no_of_triplet = 0;
+
+        no_of_triplet = (u8) ((le16_to_cpu(domain->header.len) -
+                                        IEEE80211_COUNTRY_STRING_LEN) /
+                                sizeof(struct ieee80211_country_ie_triplet));
+
+        dev_dbg(priv->adapter->dev, "info: 11D Domain Info Resp:"
+                        " no_of_triplet=%d\n", no_of_triplet);
+
+        if (no_of_triplet > MWIFIEX_MAX_TRIPLET_802_11D) {
+                dev_warn(priv->adapter->dev,
+                        "11D: invalid number of triplets %d "
+                        "returned!!\n", no_of_triplet);
+                return -1;
+        }
+
+        switch (action) {
+        case HostCmd_ACT_GEN_SET:  /* Proc Set Action */
+                break;
+        case HostCmd_ACT_GEN_GET:
+                break;
+        default:
+                dev_err(priv->adapter->dev,
+                        "11D: invalid action:%d\n", domain_info->action);
+                return -1;
+        }
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of get RF channel.
+ *
+ * Handling includes changing the header fields into CPU format
+ * and saving the new channel in driver.
+ */
+static int mwifiex_ret_802_11_rf_channel(struct mwifiex_private *priv,
+                                         struct host_cmd_ds_command *resp,
+                                         void *data_buf)
+{
+        struct host_cmd_ds_802_11_rf_channel *rf_channel =
+                &resp->params.rf_channel;
+        u16 new_channel = le16_to_cpu(rf_channel->current_channel);
+
+        if (priv->curr_bss_params.bss_descriptor.channel != new_channel) {
+                dev_dbg(priv->adapter->dev, "cmd: Channel Switch: %d to %d\n",
+                       priv->curr_bss_params.bss_descriptor.channel,
+                       new_channel);
+                /* Update the channel again */
+                priv->curr_bss_params.bss_descriptor.channel = new_channel;
+        }
+        if (data_buf)
+                *((u16 *)data_buf) = new_channel;
+
+        return 0;
+}
+
+/*
+ * This function handles the command response of get extended version.
+ *
+ * Handling includes forming the extended version string and sending it
+ * to application.
+ */
+static int mwifiex_ret_ver_ext(struct mwifiex_private *priv,
+                               struct host_cmd_ds_command *resp,
+                               void *data_buf)
+{
+        struct host_cmd_ds_version_ext *ver_ext = &resp->params.verext;
+        struct host_cmd_ds_version_ext *version_ext = NULL;
+
+        if (data_buf) {
+                version_ext = (struct host_cmd_ds_version_ext *)data_buf;
+                version_ext->version_str_sel = ver_ext->version_str_sel;
+                memcpy(version_ext->version_str, ver_ext->version_str,
+                       sizeof(char) * 128);
+                memcpy(priv->version_str, ver_ext->version_str, 128);
+        }
+        return 0;
+}
+
+/*
+ * This function handles the command response of register access.
+ *
+ * The register value and offset are returned to the user. For EEPROM
+ * access, the byte count is also returned.
+ */
+static int mwifiex_ret_reg_access(u16 type, struct host_cmd_ds_command *resp,
+                                  void *data_buf)
+{
+        struct mwifiex_ds_reg_rw *reg_rw = NULL;
+        struct mwifiex_ds_read_eeprom *eeprom = NULL;
+
+        if (data_buf) {
+                reg_rw = (struct mwifiex_ds_reg_rw *) data_buf;
+                eeprom = (struct mwifiex_ds_read_eeprom *) data_buf;
+                switch (type) {
+                case HostCmd_CMD_MAC_REG_ACCESS:
+                        {
+                                struct host_cmd_ds_mac_reg_access *reg;
+                                reg = (struct host_cmd_ds_mac_reg_access *)
+                                        &resp->params.mac_reg;
+                                reg_rw->offset = cpu_to_le32(
+                                        (u32) le16_to_cpu(reg->offset));
+                                reg_rw->value = reg->value;
+                                break;
+                        }
+                case HostCmd_CMD_BBP_REG_ACCESS:
+                        {
+                                struct host_cmd_ds_bbp_reg_access *reg;
+                                reg = (struct host_cmd_ds_bbp_reg_access *)
+                                        &resp->params.bbp_reg;
+                                reg_rw->offset = cpu_to_le32(
+                                        (u32) le16_to_cpu(reg->offset));
+                                reg_rw->value = cpu_to_le32((u32) reg->value);
+                                break;
+                        }
+
+                case HostCmd_CMD_RF_REG_ACCESS:
+                        {
+                                struct host_cmd_ds_rf_reg_access *reg;
+                                reg = (struct host_cmd_ds_rf_reg_access *)
+                                        &resp->params.rf_reg;
+                                reg_rw->offset = cpu_to_le32(
+                                        (u32) le16_to_cpu(reg->offset));
+                                reg_rw->value = cpu_to_le32((u32) reg->value);
+                                break;
+                        }
+                case HostCmd_CMD_PMIC_REG_ACCESS:
+                        {
+                                struct host_cmd_ds_pmic_reg_access *reg;
+                                reg = (struct host_cmd_ds_pmic_reg_access *)
+                                        &resp->params.pmic_reg;
+                                reg_rw->offset = cpu_to_le32(
+                                        (u32) le16_to_cpu(reg->offset));
+                                reg_rw->value = cpu_to_le32((u32) reg->value);
+                                break;
+                        }
+                case HostCmd_CMD_CAU_REG_ACCESS:
+                        {
+                                struct host_cmd_ds_rf_reg_access *reg;
+                                reg = (struct host_cmd_ds_rf_reg_access *)
+                                        &resp->params.rf_reg;
+                                reg_rw->offset = cpu_to_le32(
+                                        (u32) le16_to_cpu(reg->offset));
+                                reg_rw->value = cpu_to_le32((u32) reg->value);
+                                break;
+                        }
+                case HostCmd_CMD_802_11_EEPROM_ACCESS:
+                        {
+                                struct host_cmd_ds_802_11_eeprom_access
+                                        *cmd_eeprom =
+                                        (struct host_cmd_ds_802_11_eeprom_access
+                                         *) &resp->params.eeprom;
+                                pr_debug("info: EEPROM read len=%x\n",
+                                       cmd_eeprom->byte_count);
+                                if (le16_to_cpu(eeprom->byte_count) <
+                                                le16_to_cpu(
+                                                cmd_eeprom->byte_count)) {
+                                        eeprom->byte_count = cpu_to_le16(0);
+                                        pr_debug("info: EEPROM read "
+                                                        "length is too big\n");
+                                        return -1;
+                                }
+                                eeprom->offset = cmd_eeprom->offset;
+                                eeprom->byte_count = cmd_eeprom->byte_count;
+                                if (le16_to_cpu(eeprom->byte_count) > 0)
+                                        memcpy(&eeprom->value,
+                                               &cmd_eeprom->value,
+                                               le16_to_cpu(eeprom->byte_count));
+
+                                break;
+                        }
+                default:
+                        return -1;
+                }
+        }
+        return 0;
+}
+
+/*
+ * This function handles the command response of get IBSS coalescing status.
+ *
+ * If the received BSSID is different than the current one, the current BSSID,
+ * beacon interval, ATIM window and ERP information are updated, along with
+ * changing the ad-hoc state accordingly.
+ */
+static int mwifiex_ret_ibss_coalescing_status(struct mwifiex_private *priv,
+                                              struct host_cmd_ds_command *resp)
+{
+        struct host_cmd_ds_802_11_ibss_status *ibss_coal_resp =
+                &(resp->params.ibss_coalescing);
+        u8 zero_mac[ETH_ALEN] = { 0, 0, 0, 0, 0, 0 };
+
+        if (le16_to_cpu(ibss_coal_resp->action) == HostCmd_ACT_GEN_SET)
+                return 0;
+
+        dev_dbg(priv->adapter->dev,
+                "info: new BSSID %pM\n", ibss_coal_resp->bssid);
+
+        /* If rsp has NULL BSSID, Just return..... No Action */
+        if (!memcmp(ibss_coal_resp->bssid, zero_mac, ETH_ALEN)) {
+                dev_warn(priv->adapter->dev, "new BSSID is NULL\n");
+                return 0;
+        }
+
+        /* If BSSID is diff, modify current BSS parameters */
+        if (memcmp(priv->curr_bss_params.bss_descriptor.mac_address,
+                   ibss_coal_resp->bssid, ETH_ALEN)) {
+                /* BSSID */
+                memcpy(priv->curr_bss_params.bss_descriptor.mac_address,
+                       ibss_coal_resp->bssid, ETH_ALEN);
+
+                /* Beacon Interval */
+                priv->curr_bss_params.bss_descriptor.beacon_period
+                        = le16_to_cpu(ibss_coal_resp->beacon_interval);
+
+                /* ERP Information */
+                priv->curr_bss_params.bss_descriptor.erp_flags =
+                        (u8) le16_to_cpu(ibss_coal_resp->use_g_rate_protect);
+
+                priv->adhoc_state = ADHOC_COALESCED;
+        }
+
+        return 0;
+}
+
+/*
+ * This function handles the command responses.
+ *
+ * This is a generic function, which calls command specific
+ * response handlers based on the command ID.
+ */
+int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv,
+                                u16 cmdresp_no, void *cmd_buf, void *wq_buf)
+{
+        int ret = 0;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct host_cmd_ds_command *resp =
+                (struct host_cmd_ds_command *) cmd_buf;
+        struct mwifiex_wait_queue *wait_queue =
+                (struct mwifiex_wait_queue *) wq_buf;
+        void *data_buf = adapter->curr_cmd->data_buf;
+
+        /* If the command is not successful, cleanup and return failure */
+        if (resp->result != HostCmd_RESULT_OK) {
+                mwifiex_process_cmdresp_error(priv, resp, wait_queue);
+                return -1;
+        }
+        /* Command successful, handle response */
+        switch (cmdresp_no) {
+        case HostCmd_CMD_GET_HW_SPEC:
+                ret = mwifiex_ret_get_hw_spec(priv, resp);
+                break;
+        case HostCmd_CMD_MAC_CONTROL:
+                break;
+        case HostCmd_CMD_802_11_MAC_ADDRESS:
+                ret = mwifiex_ret_802_11_mac_address(priv, resp);
+                break;
+        case HostCmd_CMD_MAC_MULTICAST_ADR:
+                ret = mwifiex_ret_mac_multicast_adr(priv, resp);
+                break;
+        case HostCmd_CMD_TX_RATE_CFG:
+                ret = mwifiex_ret_tx_rate_cfg(priv, resp, data_buf);
+                break;
+        case HostCmd_CMD_802_11_SCAN:
+                ret = mwifiex_ret_802_11_scan(priv, resp, wait_queue);
+                wait_queue = NULL;
+                adapter->curr_cmd->wq_buf = NULL;
+                break;
+        case HostCmd_CMD_802_11_BG_SCAN_QUERY:
+                ret = mwifiex_ret_802_11_scan(priv, resp, wait_queue);
+                dev_dbg(adapter->dev,
+                        "info: CMD_RESP: BG_SCAN result is ready!\n");
+                break;
+        case HostCmd_CMD_TXPWR_CFG:
+                ret = mwifiex_ret_tx_power_cfg(priv, resp, data_buf);
+                break;
+        case HostCmd_CMD_802_11_PS_MODE_ENH:
+                ret = mwifiex_ret_enh_power_mode(priv, resp, data_buf);
+                break;
+        case HostCmd_CMD_802_11_HS_CFG_ENH:
+                ret = mwifiex_ret_802_11_hs_cfg(priv, resp);
+                break;
+        case HostCmd_CMD_802_11_ASSOCIATE:
+                ret = mwifiex_ret_802_11_associate(priv, resp, wait_queue);
+                break;
+        case HostCmd_CMD_802_11_DEAUTHENTICATE:
+                ret = mwifiex_ret_802_11_deauthenticate(priv, resp);
+                break;
+        case HostCmd_CMD_802_11_AD_HOC_START:
+        case HostCmd_CMD_802_11_AD_HOC_JOIN:
+                ret = mwifiex_ret_802_11_ad_hoc(priv, resp, wait_queue);
+                break;
+        case HostCmd_CMD_802_11_AD_HOC_STOP:
+                ret = mwifiex_ret_802_11_ad_hoc_stop(priv, resp);
+                break;
+        case HostCmd_CMD_802_11_GET_LOG:
+                ret = mwifiex_ret_get_log(priv, resp, data_buf);
+                break;
+        case HostCmd_CMD_RSSI_INFO:
+                ret = mwifiex_ret_802_11_rssi_info(priv, resp, data_buf);
+                break;
+        case HostCmd_CMD_802_11_SNMP_MIB:
+                ret = mwifiex_ret_802_11_snmp_mib(priv, resp, data_buf);
+                break;
+        case HostCmd_CMD_802_11_TX_RATE_QUERY:
+                ret = mwifiex_ret_802_11_tx_rate_query(priv, resp);
+                break;
+        case HostCmd_CMD_802_11_RF_CHANNEL:
+                ret = mwifiex_ret_802_11_rf_channel(priv, resp, data_buf);
+                break;
+        case HostCmd_CMD_VERSION_EXT:
+                ret = mwifiex_ret_ver_ext(priv, resp, data_buf);
+                break;
+        case HostCmd_CMD_FUNC_INIT:
+        case HostCmd_CMD_FUNC_SHUTDOWN:
+                break;
+        case HostCmd_CMD_802_11_KEY_MATERIAL:
+                ret = mwifiex_ret_802_11_key_material(priv, resp);
+                break;
+        case HostCmd_CMD_802_11D_DOMAIN_INFO:
+                ret = mwifiex_ret_802_11d_domain_info(priv, resp);
+                break;
+        case HostCmd_CMD_11N_ADDBA_REQ:
+                ret = mwifiex_ret_11n_addba_req(priv, resp);
+                break;
+        case HostCmd_CMD_11N_DELBA:
+                ret = mwifiex_ret_11n_delba(priv, resp);
+                break;
+        case HostCmd_CMD_11N_ADDBA_RSP:
+                ret = mwifiex_ret_11n_addba_resp(priv, resp);
+                break;
+        case HostCmd_CMD_RECONFIGURE_TX_BUFF:
+                adapter->tx_buf_size = (u16) le16_to_cpu(resp->params.
+                                                             tx_buf.buff_size);
+                adapter->tx_buf_size = (adapter->tx_buf_size /
+                                                MWIFIEX_SDIO_BLOCK_SIZE) *
+                                                MWIFIEX_SDIO_BLOCK_SIZE;
+                adapter->curr_tx_buf_size = adapter->tx_buf_size;
+                dev_dbg(adapter->dev,
+                        "cmd: max_tx_buf_size=%d, tx_buf_size=%d\n",
+                       adapter->max_tx_buf_size, adapter->tx_buf_size);
+
+                if (adapter->if_ops.update_mp_end_port)
+                        adapter->if_ops.update_mp_end_port(adapter,
+                                        le16_to_cpu(resp->
+                                                params.
+                                                tx_buf.
+                                                mp_end_port));
+                break;
+        case HostCmd_CMD_AMSDU_AGGR_CTRL:
+                ret = mwifiex_ret_amsdu_aggr_ctrl(priv, resp, data_buf);
+                break;
+        case HostCmd_CMD_WMM_GET_STATUS:
+                ret = mwifiex_ret_wmm_get_status(priv, resp);
+                break;
+        case HostCmd_CMD_802_11_IBSS_COALESCING_STATUS:
+                ret = mwifiex_ret_ibss_coalescing_status(priv, resp);
+                break;
+        case HostCmd_CMD_MAC_REG_ACCESS:
+        case HostCmd_CMD_BBP_REG_ACCESS:
+        case HostCmd_CMD_RF_REG_ACCESS:
+        case HostCmd_CMD_PMIC_REG_ACCESS:
+        case HostCmd_CMD_CAU_REG_ACCESS:
+        case HostCmd_CMD_802_11_EEPROM_ACCESS:
+                ret = mwifiex_ret_reg_access(cmdresp_no, resp, data_buf);
+                break;
+        case HostCmd_CMD_SET_BSS_MODE:
+                break;
+        case HostCmd_CMD_11N_CFG:
+                ret = mwifiex_ret_11n_cfg(priv, resp, data_buf);
+                break;
+        default:
+                dev_err(adapter->dev, "CMD_RESP: unknown cmd response %#x\n",
+                       resp->command);
+                break;
+        }
+
+        return ret;
+}
diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c
new file mode 100644
index 00000000000..d4a5c1fcefc
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/sta_event.c
@@ -0,0 +1,405 @@
+/*
+ * Marvell Wireless LAN device driver: station event handling
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+#include "11n.h"
+
+/*
+ * This function resets the connection state.
+ *
+ * The function is invoked after receiving a disconnect event from firmware,
+ * and performs the following actions -
+ *      - Set media status to disconnected
+ *      - Clean up Tx and Rx packets
+ *      - Resets SNR/NF/RSSI value in driver
+ *      - Resets security configurations in driver
+ *      - Enables auto data rate
+ *      - Saves the previous SSID and BSSID so that they can
+ *        be used for re-association, if required
+ *      - Erases current SSID and BSSID information
+ *      - Sends a disconnect event to upper layers/applications.
+ */
+void
+mwifiex_reset_connect_state(struct mwifiex_private *priv)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+
+        if (!priv->media_connected)
+                return;
+
+        dev_dbg(adapter->dev, "info: handles disconnect event\n");
+
+        priv->media_connected = false;
+
+        priv->scan_block = false;
+
+        /* Free Tx and Rx packets, report disconnect to upper layer */
+        mwifiex_clean_txrx(priv);
+
+        /* Reset SNR/NF/RSSI values */
+        priv->data_rssi_last = 0;
+        priv->data_nf_last = 0;
+        priv->data_rssi_avg = 0;
+        priv->data_nf_avg = 0;
+        priv->bcn_rssi_last = 0;
+        priv->bcn_nf_last = 0;
+        priv->bcn_rssi_avg = 0;
+        priv->bcn_nf_avg = 0;
+        priv->rxpd_rate = 0;
+        priv->rxpd_htinfo = 0;
+        priv->sec_info.wpa_enabled = false;
+        priv->sec_info.wpa2_enabled = false;
+        priv->wpa_ie_len = 0;
+
+        priv->sec_info.wapi_enabled = false;
+        priv->wapi_ie_len = 0;
+        priv->sec_info.wapi_key_on = false;
+
+        priv->sec_info.encryption_mode = MWIFIEX_ENCRYPTION_MODE_NONE;
+
+        /* Enable auto data rate */
+        priv->is_data_rate_auto = true;
+        priv->data_rate = 0;
+
+        if (priv->bss_mode == MWIFIEX_BSS_MODE_IBSS) {
+                priv->adhoc_state = ADHOC_IDLE;
+                priv->adhoc_is_link_sensed = false;
+        }
+
+        /*
+         * Memorize the previous SSID and BSSID so
+         * it could be used for re-assoc
+         */
+
+        dev_dbg(adapter->dev, "info: previous SSID=%s, SSID len=%u\n",
+               priv->prev_ssid.ssid, priv->prev_ssid.ssid_len);
+
+        dev_dbg(adapter->dev, "info: current SSID=%s, SSID len=%u\n",
+               priv->curr_bss_params.bss_descriptor.ssid.ssid,
+               priv->curr_bss_params.bss_descriptor.ssid.ssid_len);
+
+        memcpy(&priv->prev_ssid,
+               &priv->curr_bss_params.bss_descriptor.ssid,
+               sizeof(struct mwifiex_802_11_ssid));
+
+        memcpy(priv->prev_bssid,
+               priv->curr_bss_params.bss_descriptor.mac_address, ETH_ALEN);
+
+        /* Need to erase the current SSID and BSSID info */
+        memset(&priv->curr_bss_params, 0x00, sizeof(priv->curr_bss_params));
+
+        adapter->tx_lock_flag = false;
+        adapter->pps_uapsd_mode = false;
+
+        if (adapter->num_cmd_timeout && adapter->curr_cmd)
+                return;
+        priv->media_connected = false;
+        if (!priv->disconnect) {
+                priv->disconnect = 1;
+                dev_dbg(adapter->dev, "info: successfully disconnected from"
+                                " %pM: reason code %d\n", priv->cfg_bssid,
+                                WLAN_REASON_DEAUTH_LEAVING);
+                cfg80211_disconnected(priv->netdev,
+                                WLAN_REASON_DEAUTH_LEAVING, NULL, 0,
+                                GFP_KERNEL);
+                queue_work(priv->workqueue, &priv->cfg_workqueue);
+        }
+        if (!netif_queue_stopped(priv->netdev))
+                netif_stop_queue(priv->netdev);
+        if (netif_carrier_ok(priv->netdev))
+                netif_carrier_off(priv->netdev);
+        /* Reset wireless stats signal info */
+        priv->w_stats.qual.level = 0;
+        priv->w_stats.qual.noise = 0;
+}
+
+/*
+ * This function handles events generated by firmware.
+ *
+ * This is a generic function and handles all events.
+ *
+ * Event specific routines are called by this function based
+ * upon the generated event cause.
+ *
+ * For the following events, the function just forwards them to upper
+ * layers, optionally recording the change -
+ *      - EVENT_LINK_SENSED
+ *      - EVENT_MIC_ERR_UNICAST
+ *      - EVENT_MIC_ERR_MULTICAST
+ *      - EVENT_PORT_RELEASE
+ *      - EVENT_RSSI_LOW
+ *      - EVENT_SNR_LOW
+ *      - EVENT_MAX_FAIL
+ *      - EVENT_RSSI_HIGH
+ *      - EVENT_SNR_HIGH
+ *      - EVENT_DATA_RSSI_LOW
+ *      - EVENT_DATA_SNR_LOW
+ *      - EVENT_DATA_RSSI_HIGH
+ *      - EVENT_DATA_SNR_HIGH
+ *      - EVENT_LINK_QUALITY
+ *      - EVENT_PRE_BEACON_LOST
+ *      - EVENT_IBSS_COALESCED
+ *      - EVENT_WEP_ICV_ERR
+ *      - EVENT_BW_CHANGE
+ *      - EVENT_HOSTWAKE_STAIE
+  *
+ * For the following events, no action is taken -
+ *      - EVENT_MIB_CHANGED
+ *      - EVENT_INIT_DONE
+ *      - EVENT_DUMMY_HOST_WAKEUP_SIGNAL
+ *
+ * Rest of the supported events requires driver handling -
+ *      - EVENT_DEAUTHENTICATED
+ *      - EVENT_DISASSOCIATED
+ *      - EVENT_LINK_LOST
+ *      - EVENT_PS_SLEEP
+ *      - EVENT_PS_AWAKE
+ *      - EVENT_DEEP_SLEEP_AWAKE
+ *      - EVENT_HS_ACT_REQ
+ *      - EVENT_ADHOC_BCN_LOST
+ *      - EVENT_BG_SCAN_REPORT
+ *      - EVENT_WMM_STATUS_CHANGE
+ *      - EVENT_ADDBA
+ *      - EVENT_DELBA
+ *      - EVENT_BA_STREAM_TIEMOUT
+ *      - EVENT_AMSDU_AGGR_CTRL
+ */
+int mwifiex_process_sta_event(struct mwifiex_private *priv)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        int ret = 0;
+        u32 eventcause = adapter->event_cause;
+
+        switch (eventcause) {
+        case EVENT_DUMMY_HOST_WAKEUP_SIGNAL:
+                dev_err(adapter->dev, "invalid EVENT: DUMMY_HOST_WAKEUP_SIGNAL,"
+                                " ignoring it\n");
+                break;
+        case EVENT_LINK_SENSED:
+                dev_dbg(adapter->dev, "event: LINK_SENSED\n");
+                if (!netif_carrier_ok(priv->netdev))
+                        netif_carrier_on(priv->netdev);
+                if (netif_queue_stopped(priv->netdev))
+                        netif_wake_queue(priv->netdev);
+                break;
+
+        case EVENT_DEAUTHENTICATED:
+                dev_dbg(adapter->dev, "event: Deauthenticated\n");
+                adapter->dbg.num_event_deauth++;
+                if (priv->media_connected)
+                        mwifiex_reset_connect_state(priv);
+                break;
+
+        case EVENT_DISASSOCIATED:
+                dev_dbg(adapter->dev, "event: Disassociated\n");
+                adapter->dbg.num_event_disassoc++;
+                if (priv->media_connected)
+                        mwifiex_reset_connect_state(priv);
+                break;
+
+        case EVENT_LINK_LOST:
+                dev_dbg(adapter->dev, "event: Link lost\n");
+                adapter->dbg.num_event_link_lost++;
+                if (priv->media_connected)
+                        mwifiex_reset_connect_state(priv);
+                break;
+
+        case EVENT_PS_SLEEP:
+                dev_dbg(adapter->dev, "info: EVENT: SLEEP\n");
+
+                adapter->ps_state = PS_STATE_PRE_SLEEP;
+
+                mwifiex_check_ps_cond(adapter);
+                break;
+
+        case EVENT_PS_AWAKE:
+                dev_dbg(adapter->dev, "info: EVENT: AWAKE\n");
+                if (!adapter->pps_uapsd_mode &&
+                        priv->media_connected &&
+                        adapter->sleep_period.period) {
+                                adapter->pps_uapsd_mode = true;
+                                dev_dbg(adapter->dev,
+                                        "event: PPS/UAPSD mode activated\n");
+                }
+                adapter->tx_lock_flag = false;
+                if (adapter->pps_uapsd_mode && adapter->gen_null_pkt) {
+                        if (mwifiex_check_last_packet_indication(priv)) {
+                                if (!adapter->data_sent) {
+                                        if (!mwifiex_send_null_packet(priv,
+                                        MWIFIEX_TxPD_POWER_MGMT_NULL_PACKET
+                                        |
+                                        MWIFIEX_TxPD_POWER_MGMT_LAST_PACKET))
+                                                adapter->ps_state =
+                                                        PS_STATE_SLEEP;
+                                        return 0;
+                                }
+                        }
+                }
+                adapter->ps_state = PS_STATE_AWAKE;
+                adapter->pm_wakeup_card_req = false;
+                adapter->pm_wakeup_fw_try = false;
+
+                break;
+
+        case EVENT_DEEP_SLEEP_AWAKE:
+                adapter->if_ops.wakeup_complete(adapter);
+                dev_dbg(adapter->dev, "event: DS_AWAKE\n");
+                if (adapter->is_deep_sleep)
+                        adapter->is_deep_sleep = false;
+                break;
+
+        case EVENT_HS_ACT_REQ:
+                dev_dbg(adapter->dev, "event: HS_ACT_REQ\n");
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_HS_CFG_ENH,
+                                          0, 0, NULL, NULL);
+                break;
+
+        case EVENT_MIC_ERR_UNICAST:
+                dev_dbg(adapter->dev, "event: UNICAST MIC ERROR\n");
+                break;
+
+        case EVENT_MIC_ERR_MULTICAST:
+                dev_dbg(adapter->dev, "event: MULTICAST MIC ERROR\n");
+                break;
+        case EVENT_MIB_CHANGED:
+        case EVENT_INIT_DONE:
+                break;
+
+        case EVENT_ADHOC_BCN_LOST:
+                dev_dbg(adapter->dev, "event: ADHOC_BCN_LOST\n");
+                priv->adhoc_is_link_sensed = false;
+                mwifiex_clean_txrx(priv);
+                if (!netif_queue_stopped(priv->netdev))
+                        netif_stop_queue(priv->netdev);
+                if (netif_carrier_ok(priv->netdev))
+                        netif_carrier_off(priv->netdev);
+                break;
+
+        case EVENT_BG_SCAN_REPORT:
+                dev_dbg(adapter->dev, "event: BGS_REPORT\n");
+                /* Clear the previous scan result */
+                memset(adapter->scan_table, 0x00,
+                       sizeof(struct mwifiex_bssdescriptor) * IW_MAX_AP);
+                adapter->num_in_scan_table = 0;
+                adapter->bcn_buf_end = adapter->bcn_buf;
+                ret = mwifiex_prepare_cmd(priv,
+                                          HostCmd_CMD_802_11_BG_SCAN_QUERY,
+                                          HostCmd_ACT_GEN_GET, 0, NULL, NULL);
+                break;
+
+        case EVENT_PORT_RELEASE:
+                dev_dbg(adapter->dev, "event: PORT RELEASE\n");
+                break;
+
+        case EVENT_WMM_STATUS_CHANGE:
+                dev_dbg(adapter->dev, "event: WMM status changed\n");
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_WMM_GET_STATUS,
+                                          0, 0, NULL, NULL);
+                break;
+
+        case EVENT_RSSI_LOW:
+                dev_dbg(adapter->dev, "event: Beacon RSSI_LOW\n");
+                break;
+        case EVENT_SNR_LOW:
+                dev_dbg(adapter->dev, "event: Beacon SNR_LOW\n");
+                break;
+        case EVENT_MAX_FAIL:
+                dev_dbg(adapter->dev, "event: MAX_FAIL\n");
+                break;
+        case EVENT_RSSI_HIGH:
+                dev_dbg(adapter->dev, "event: Beacon RSSI_HIGH\n");
+                break;
+        case EVENT_SNR_HIGH:
+                dev_dbg(adapter->dev, "event: Beacon SNR_HIGH\n");
+                break;
+        case EVENT_DATA_RSSI_LOW:
+                dev_dbg(adapter->dev, "event: Data RSSI_LOW\n");
+                break;
+        case EVENT_DATA_SNR_LOW:
+                dev_dbg(adapter->dev, "event: Data SNR_LOW\n");
+                break;
+        case EVENT_DATA_RSSI_HIGH:
+                dev_dbg(adapter->dev, "event: Data RSSI_HIGH\n");
+                break;
+        case EVENT_DATA_SNR_HIGH:
+                dev_dbg(adapter->dev, "event: Data SNR_HIGH\n");
+                break;
+        case EVENT_LINK_QUALITY:
+                dev_dbg(adapter->dev, "event: Link Quality\n");
+                break;
+        case EVENT_PRE_BEACON_LOST:
+                dev_dbg(adapter->dev, "event: Pre-Beacon Lost\n");
+                break;
+        case EVENT_IBSS_COALESCED:
+                dev_dbg(adapter->dev, "event: IBSS_COALESCED\n");
+                ret = mwifiex_prepare_cmd(priv,
+                                HostCmd_CMD_802_11_IBSS_COALESCING_STATUS,
+                                HostCmd_ACT_GEN_GET, 0, NULL, NULL);
+                break;
+        case EVENT_ADDBA:
+                dev_dbg(adapter->dev, "event: ADDBA Request\n");
+                mwifiex_prepare_cmd(priv, HostCmd_CMD_11N_ADDBA_RSP,
+                                    HostCmd_ACT_GEN_SET, 0, NULL,
+                                    adapter->event_body);
+                break;
+        case EVENT_DELBA:
+                dev_dbg(adapter->dev, "event: DELBA Request\n");
+                mwifiex_11n_delete_ba_stream(priv, adapter->event_body);
+                break;
+        case EVENT_BA_STREAM_TIEMOUT:
+                dev_dbg(adapter->dev, "event:  BA Stream timeout\n");
+                mwifiex_11n_ba_stream_timeout(priv,
+                                              (struct host_cmd_ds_11n_batimeout
+                                               *)
+                                              adapter->event_body);
+                break;
+        case EVENT_AMSDU_AGGR_CTRL:
+                dev_dbg(adapter->dev, "event:  AMSDU_AGGR_CTRL %d\n",
+                       *(u16 *) adapter->event_body);
+                adapter->tx_buf_size =
+                        min(adapter->curr_tx_buf_size,
+                            le16_to_cpu(*(__le16 *) adapter->event_body));
+                dev_dbg(adapter->dev, "event: tx_buf_size %d\n",
+                                adapter->tx_buf_size);
+                break;
+
+        case EVENT_WEP_ICV_ERR:
+                dev_dbg(adapter->dev, "event: WEP ICV error\n");
+                break;
+
+        case EVENT_BW_CHANGE:
+                dev_dbg(adapter->dev, "event: BW Change\n");
+                break;
+
+        case EVENT_HOSTWAKE_STAIE:
+                dev_dbg(adapter->dev, "event: HOSTWAKE_STAIE %d\n", eventcause);
+                break;
+        default:
+                dev_dbg(adapter->dev, "event: unknown event id: %#x\n",
+                                                eventcause);
+                break;
+        }
+
+        return ret;
+}
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
new file mode 100644
index 00000000000..665a519b140
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -0,0 +1,2478 @@
+/*
+ * Marvell Wireless LAN device driver: functions for station ioctl
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+#include "11n.h"
+#include "cfg80211.h"
+
+/*
+ * Copies the multicast address list from device to driver.
+ *
+ * This function does not validate the destination memory for
+ * size, and the calling function must ensure enough memory is
+ * available.
+ */
+static int
+mwifiex_copy_mcast_addr(struct mwifiex_multicast_list *mlist,
+                        struct net_device *dev)
+{
+        int i = 0;
+        struct netdev_hw_addr *ha;
+
+        netdev_for_each_mc_addr(ha, dev)
+                memcpy(&mlist->mac_list[i++], ha->addr, ETH_ALEN);
+
+        return i;
+}
+
+/*
+ * Allocate and fills a wait queue with proper parameters.
+ *
+ * This function needs to be called before an IOCTL request can be made.
+ * It can handle the following wait options:
+ *      MWIFIEX_NO_WAIT     - Waiting is disabled
+ *      MWIFIEX_IOCTL_WAIT  - Waiting is done on IOCTL wait queue
+ *      MWIFIEX_CMD_WAIT    - Waiting is done on command wait queue
+ *      MWIFIEX_WSTATS_WAIT - Waiting is done on stats wait queue
+ */
+struct mwifiex_wait_queue *
+mwifiex_alloc_fill_wait_queue(struct mwifiex_private *priv,
+                              u8 wait_option)
+{
+        struct mwifiex_wait_queue *wait = NULL;
+
+        wait = (struct mwifiex_wait_queue *)
+                kzalloc(sizeof(struct mwifiex_wait_queue), GFP_ATOMIC);
+        if (!wait) {
+                dev_err(priv->adapter->dev, "%s: fail to alloc buffer\n",
+                                                __func__);
+                return wait;
+        }
+
+        wait->bss_index = priv->bss_index;
+
+        switch (wait_option) {
+        case MWIFIEX_NO_WAIT:
+                wait->enabled = 0;
+                break;
+        case MWIFIEX_IOCTL_WAIT:
+                priv->ioctl_wait_q_woken = false;
+                wait->start_time = jiffies;
+                wait->wait = &priv->ioctl_wait_q;
+                wait->condition = &priv->ioctl_wait_q_woken;
+                wait->enabled = 1;
+                break;
+        case MWIFIEX_CMD_WAIT:
+                priv->cmd_wait_q_woken = false;
+                wait->start_time = jiffies;
+                wait->wait = &priv->cmd_wait_q;
+                wait->condition = &priv->cmd_wait_q_woken;
+                wait->enabled = 1;
+                break;
+        case MWIFIEX_WSTATS_WAIT:
+                priv->w_stats_wait_q_woken = false;
+                wait->start_time = jiffies;
+                wait->wait = &priv->w_stats_wait_q;
+                wait->condition = &priv->w_stats_wait_q_woken;
+                wait->enabled = 1;
+                break;
+        }
+
+        return wait;
+}
+
+/*
+ * Wait queue completion handler.
+ *
+ * This function waits on a particular wait queue.
+ * For NO_WAIT option, it returns immediately. It also cancels the
+ * pending IOCTL request after waking up, in case of errors.
+ */
+static void
+mwifiex_wait_ioctl_complete(struct mwifiex_private *priv,
+                            struct mwifiex_wait_queue *wait,
+                            u8 wait_option)
+{
+        bool cancel_flag = false;
+
+        switch (wait_option) {
+        case MWIFIEX_NO_WAIT:
+                break;
+        case MWIFIEX_IOCTL_WAIT:
+                wait_event_interruptible(priv->ioctl_wait_q,
+                                         priv->ioctl_wait_q_woken);
+                if (!priv->ioctl_wait_q_woken)
+                        cancel_flag = true;
+                break;
+        case MWIFIEX_CMD_WAIT:
+                wait_event_interruptible(priv->cmd_wait_q,
+                                         priv->cmd_wait_q_woken);
+                if (!priv->cmd_wait_q_woken)
+                        cancel_flag = true;
+                break;
+        case MWIFIEX_WSTATS_WAIT:
+                wait_event_interruptible(priv->w_stats_wait_q,
+                                         priv->w_stats_wait_q_woken);
+                if (!priv->w_stats_wait_q_woken)
+                        cancel_flag = true;
+                break;
+        }
+        if (cancel_flag) {
+                mwifiex_cancel_pending_ioctl(priv->adapter, wait);
+                dev_dbg(priv->adapter->dev, "cmd: IOCTL cancel: wait=%p, wait_option=%d\n",
+                        wait, wait_option);
+        }
+
+        return;
+}
+
+/*
+ * The function waits for the request to complete and issues the
+ * completion handler, if required.
+ */
+int mwifiex_request_ioctl(struct mwifiex_private *priv,
+                          struct mwifiex_wait_queue *wait,
+                          int status, u8 wait_option)
+{
+        switch (status) {
+        case -EINPROGRESS:
+                dev_dbg(priv->adapter->dev, "cmd: IOCTL pending: wait=%p, wait_option=%d\n",
+                                wait, wait_option);
+                atomic_inc(&priv->adapter->ioctl_pending);
+                /* Status pending, wake up main process */
+                queue_work(priv->adapter->workqueue, &priv->adapter->main_work);
+
+                /* Wait for completion */
+                if (wait_option) {
+                        mwifiex_wait_ioctl_complete(priv, wait, wait_option);
+                        status = wait->status;
+                }
+                break;
+        case 0:
+        case -1:
+        case -EBUSY:
+        default:
+                break;
+        }
+        return status;
+}
+EXPORT_SYMBOL_GPL(mwifiex_request_ioctl);
+
+/*
+ * IOCTL request handler to set/get MAC address.
+ *
+ * This function prepares the correct firmware command and
+ * issues it to get the extended version information.
+ */
+static int mwifiex_bss_ioctl_mac_address(struct mwifiex_private *priv,
+                                         struct mwifiex_wait_queue *wait,
+                                         u8 action, u8 *mac)
+{
+        int ret = 0;
+
+        if ((action == HostCmd_ACT_GEN_GET) && mac) {
+                memcpy(mac, priv->curr_addr, ETH_ALEN);
+                return 0;
+        }
+
+        /* Send request to firmware */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_MAC_ADDRESS,
+                                  action, 0, wait, mac);
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * Sends IOCTL request to set MAC address.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int mwifiex_request_set_mac_address(struct mwifiex_private *priv)
+{
+        struct mwifiex_wait_queue *wait = NULL;
+        int status = 0;
+        u8 wait_option = MWIFIEX_CMD_WAIT;
+
+        /* Allocate wait buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        status = mwifiex_bss_ioctl_mac_address(priv, wait, HostCmd_ACT_GEN_SET,
+                                               NULL);
+
+        status = mwifiex_request_ioctl(priv, wait, status, wait_option);
+        if (!status)
+                memcpy(priv->netdev->dev_addr, priv->curr_addr, ETH_ALEN);
+        else
+                dev_err(priv->adapter->dev, "set mac address failed: status=%d"
+                                " error_code=%#x\n", status, wait->status);
+
+        kfree(wait);
+        return status;
+}
+
+/*
+ * IOCTL request handler to set multicast list.
+ *
+ * This function prepares the correct firmware command and
+ * issues it to set the multicast list.
+ *
+ * This function can be used to enable promiscuous mode, or enable all
+ * multicast packets, or to enable selective multicast.
+ */
+static int
+mwifiex_bss_ioctl_multicast_list(struct mwifiex_private *priv,
+                                 struct mwifiex_wait_queue *wait,
+                                 u16 action,
+                                 struct mwifiex_multicast_list *mcast_list)
+{
+        int ret = 0;
+        u16 old_pkt_filter;
+
+        old_pkt_filter = priv->curr_pkt_filter;
+        if (action == HostCmd_ACT_GEN_GET)
+                return -1;
+
+        if (mcast_list->mode == MWIFIEX_PROMISC_MODE) {
+                dev_dbg(priv->adapter->dev, "info: Enable Promiscuous mode\n");
+                priv->curr_pkt_filter |= HostCmd_ACT_MAC_PROMISCUOUS_ENABLE;
+                priv->curr_pkt_filter &=
+                        ~HostCmd_ACT_MAC_ALL_MULTICAST_ENABLE;
+        } else {
+                /* Multicast */
+                priv->curr_pkt_filter &= ~HostCmd_ACT_MAC_PROMISCUOUS_ENABLE;
+                if (mcast_list->mode == MWIFIEX_MULTICAST_MODE) {
+                        dev_dbg(priv->adapter->dev,
+                                "info: Enabling All Multicast!\n");
+                        priv->curr_pkt_filter |=
+                                HostCmd_ACT_MAC_ALL_MULTICAST_ENABLE;
+                } else {
+                        priv->curr_pkt_filter &=
+                                ~HostCmd_ACT_MAC_ALL_MULTICAST_ENABLE;
+                        if (mcast_list->num_multicast_addr) {
+                                dev_dbg(priv->adapter->dev,
+                                        "info: Set multicast list=%d\n",
+                                       mcast_list->num_multicast_addr);
+                                /* Set multicast addresses to firmware */
+                                if (old_pkt_filter == priv->curr_pkt_filter) {
+                                        /* Send request to firmware */
+                                        ret = mwifiex_prepare_cmd(priv,
+                                                HostCmd_CMD_MAC_MULTICAST_ADR,
+                                                action, 0, wait, mcast_list);
+                                        if (!ret)
+                                                ret = -EINPROGRESS;
+                                } else {
+                                        /* Send request to firmware */
+                                        ret = mwifiex_prepare_cmd(priv,
+                                                HostCmd_CMD_MAC_MULTICAST_ADR,
+                                                action, 0, NULL,
+                                                mcast_list);
+                                }
+                        }
+                }
+        }
+        dev_dbg(priv->adapter->dev,
+                "info: old_pkt_filter=%#x, curr_pkt_filter=%#x\n",
+               old_pkt_filter, priv->curr_pkt_filter);
+        if (old_pkt_filter != priv->curr_pkt_filter) {
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_MAC_CONTROL, action,
+                                          0, wait, &priv->curr_pkt_filter);
+                if (!ret)
+                        ret = -EINPROGRESS;
+        }
+
+        return ret;
+}
+
+/*
+ * Sends IOCTL request to set multicast list.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+void
+mwifiex_request_set_multicast_list(struct mwifiex_private *priv,
+                                   struct net_device *dev)
+{
+        struct mwifiex_wait_queue *wait = NULL;
+        struct mwifiex_multicast_list mcast_list;
+        u8 wait_option = MWIFIEX_NO_WAIT;
+        int status = 0;
+
+        /* Allocate wait buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return;
+
+        if (dev->flags & IFF_PROMISC) {
+                mcast_list.mode = MWIFIEX_PROMISC_MODE;
+        } else if (dev->flags & IFF_ALLMULTI ||
+                   netdev_mc_count(dev) > MWIFIEX_MAX_MULTICAST_LIST_SIZE) {
+                mcast_list.mode = MWIFIEX_ALL_MULTI_MODE;
+        } else {
+                mcast_list.mode = MWIFIEX_MULTICAST_MODE;
+                if (netdev_mc_count(dev))
+                        mcast_list.num_multicast_addr =
+                                mwifiex_copy_mcast_addr(&mcast_list, dev);
+        }
+        status = mwifiex_bss_ioctl_multicast_list(priv, wait,
+                                                  HostCmd_ACT_GEN_SET,
+                                                  &mcast_list);
+
+        status = mwifiex_request_ioctl(priv, wait, status, wait_option);
+        if (wait && status != -EINPROGRESS)
+                kfree(wait);
+
+        return;
+}
+
+/*
+ * IOCTL request handler to disconnect from a BSS/IBSS.
+ */
+static int mwifiex_bss_ioctl_stop(struct mwifiex_private *priv,
+                                  struct mwifiex_wait_queue *wait, u8 *mac)
+{
+        return mwifiex_deauthenticate(priv, wait, mac);
+}
+
+/*
+ * Sends IOCTL request to disconnect from a BSS.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int mwifiex_disconnect(struct mwifiex_private *priv, u8 wait_option, u8 *mac)
+{
+        struct mwifiex_wait_queue *wait = NULL;
+        int status = 0;
+
+        /* Allocate wait buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        status = mwifiex_bss_ioctl_stop(priv, wait, mac);
+
+        status = mwifiex_request_ioctl(priv, wait, status, wait_option);
+
+        kfree(wait);
+        return status;
+}
+EXPORT_SYMBOL_GPL(mwifiex_disconnect);
+
+/*
+ * IOCTL request handler to join a BSS/IBSS.
+ *
+ * In Ad-Hoc mode, the IBSS is created if not found in scan list.
+ * In both Ad-Hoc and infra mode, an deauthentication is performed
+ * first.
+ */
+static int mwifiex_bss_ioctl_start(struct mwifiex_private *priv,
+                                   struct mwifiex_wait_queue *wait,
+                                   struct mwifiex_ssid_bssid *ssid_bssid)
+{
+        int ret = 0;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        s32 i = -1;
+
+        priv->scan_block = false;
+        if (!ssid_bssid)
+                return -1;
+
+        if (priv->bss_mode == MWIFIEX_BSS_MODE_INFRA) {
+                /* Infra mode */
+                ret = mwifiex_deauthenticate(priv, NULL, NULL);
+                if (ret)
+                        return ret;
+
+                /* Search for the requested SSID in the scan table */
+                if (ssid_bssid->ssid.ssid_len)
+                        i = mwifiex_find_ssid_in_list(priv, &ssid_bssid->ssid,
+                                                NULL, MWIFIEX_BSS_MODE_INFRA);
+                else
+                        i = mwifiex_find_bssid_in_list(priv,
+                                                (u8 *) &ssid_bssid->bssid,
+                                                MWIFIEX_BSS_MODE_INFRA);
+                if (i < 0)
+                        return -1;
+
+                dev_dbg(adapter->dev,
+                        "info: SSID found in scan list ... associating...\n");
+
+                /* Clear any past association response stored for
+                 * application retrieval */
+                priv->assoc_rsp_size = 0;
+                ret = mwifiex_associate(priv, wait, &adapter->scan_table[i]);
+                if (ret)
+                        return ret;
+        } else {
+                /* Adhoc mode */
+                /* If the requested SSID matches current SSID, return */
+                if (ssid_bssid->ssid.ssid_len &&
+                    (!mwifiex_ssid_cmp
+                     (&priv->curr_bss_params.bss_descriptor.ssid,
+                      &ssid_bssid->ssid)))
+                        return 0;
+
+                /* Exit Adhoc mode first */
+                dev_dbg(adapter->dev, "info: Sending Adhoc Stop\n");
+                ret = mwifiex_deauthenticate(priv, NULL, NULL);
+                if (ret)
+                        return ret;
+
+                priv->adhoc_is_link_sensed = false;
+
+                /* Search for the requested network in the scan table */
+                if (ssid_bssid->ssid.ssid_len)
+                        i = mwifiex_find_ssid_in_list(priv,
+                                                      &ssid_bssid->ssid, NULL,
+                                                      MWIFIEX_BSS_MODE_IBSS);
+                else
+                        i = mwifiex_find_bssid_in_list(priv,
+                                                       (u8 *)&ssid_bssid->bssid,
+                                                       MWIFIEX_BSS_MODE_IBSS);
+
+                if (i >= 0) {
+                        dev_dbg(adapter->dev, "info: network found in scan"
+                                                        " list. Joining...\n");
+                        ret = mwifiex_adhoc_join(priv, wait,
+                                                 &adapter->scan_table[i]);
+                        if (ret)
+                                return ret;
+                } else {        /* i >= 0 */
+                        dev_dbg(adapter->dev, "info: Network not found in "
+                                "the list, creating adhoc with ssid = %s\n",
+                               ssid_bssid->ssid.ssid);
+                        ret = mwifiex_adhoc_start(priv, wait,
+                                                  &ssid_bssid->ssid);
+                        if (ret)
+                                return ret;
+                }
+        }
+
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * Sends IOCTL request to connect with a BSS.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int mwifiex_bss_start(struct mwifiex_private *priv, u8 wait_option,
+                      struct mwifiex_ssid_bssid *ssid_bssid)
+{
+        struct mwifiex_wait_queue *wait = NULL;
+        struct mwifiex_ssid_bssid tmp_ssid_bssid;
+        int status = 0;
+
+        /* Stop the O.S. TX queue if needed */
+        if (!netif_queue_stopped(priv->netdev))
+                netif_stop_queue(priv->netdev);
+
+        /* Allocate wait buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        if (ssid_bssid)
+                memcpy(&tmp_ssid_bssid, ssid_bssid,
+                       sizeof(struct mwifiex_ssid_bssid));
+        status = mwifiex_bss_ioctl_start(priv, wait, &tmp_ssid_bssid);
+
+        status = mwifiex_request_ioctl(priv, wait, status, wait_option);
+
+        kfree(wait);
+        return status;
+}
+
+/*
+ * IOCTL request handler to set host sleep configuration.
+ *
+ * This function prepares the correct firmware command and
+ * issues it.
+ */
+static int
+mwifiex_pm_ioctl_hs_cfg(struct mwifiex_private *priv,
+                        struct mwifiex_wait_queue *wait,
+                        u16 action, struct mwifiex_ds_hs_cfg *hs_cfg)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        int status = 0;
+        u32 prev_cond = 0;
+
+        switch (action) {
+        case HostCmd_ACT_GEN_SET:
+                if (adapter->pps_uapsd_mode) {
+                        dev_dbg(adapter->dev, "info: Host Sleep IOCTL"
+                                " is blocked in UAPSD/PPS mode\n");
+                        status = -1;
+                        break;
+                }
+                if (hs_cfg->is_invoke_hostcmd) {
+                        if (hs_cfg->conditions == HOST_SLEEP_CFG_CANCEL) {
+                                if (!adapter->is_hs_configured)
+                                        /* Already cancelled */
+                                        break;
+                                /* Save previous condition */
+                                prev_cond = le32_to_cpu(adapter->hs_cfg
+                                                        .conditions);
+                                adapter->hs_cfg.conditions =
+                                                cpu_to_le32(hs_cfg->conditions);
+                        } else if (hs_cfg->conditions) {
+                                adapter->hs_cfg.conditions =
+                                                cpu_to_le32(hs_cfg->conditions);
+                                adapter->hs_cfg.gpio = (u8)hs_cfg->gpio;
+                                if (hs_cfg->gap)
+                                        adapter->hs_cfg.gap = (u8)hs_cfg->gap;
+                        } else if (adapter->hs_cfg.conditions ==
+                                                cpu_to_le32(
+                                                HOST_SLEEP_CFG_CANCEL)) {
+                                /* Return failure if no parameters for HS
+                                   enable */
+                                status = -1;
+                                break;
+                        }
+                        status = mwifiex_prepare_cmd(priv,
+                                        HostCmd_CMD_802_11_HS_CFG_ENH,
+                                        HostCmd_ACT_GEN_SET,
+                                        0, wait, &adapter->hs_cfg);
+                        if (!status)
+                                status = -EINPROGRESS;
+                        if (hs_cfg->conditions == HOST_SLEEP_CFG_CANCEL)
+                                /* Restore previous condition */
+                                adapter->hs_cfg.conditions =
+                                                cpu_to_le32(prev_cond);
+                } else {
+                        adapter->hs_cfg.conditions =
+                                cpu_to_le32(hs_cfg->conditions);
+                        adapter->hs_cfg.gpio = (u8)hs_cfg->gpio;
+                        adapter->hs_cfg.gap = (u8)hs_cfg->gap;
+                }
+                break;
+        case HostCmd_ACT_GEN_GET:
+                hs_cfg->conditions = le32_to_cpu(adapter->hs_cfg.conditions);
+                hs_cfg->gpio = adapter->hs_cfg.gpio;
+                hs_cfg->gap = adapter->hs_cfg.gap;
+                break;
+        default:
+                status = -1;
+                break;
+        }
+
+        return status;
+}
+
+/*
+ * Sends IOCTL request to set Host Sleep parameters.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int mwifiex_set_hs_params(struct mwifiex_private *priv, u16 action,
+                              u8 wait_option,
+                              struct mwifiex_ds_hs_cfg *hscfg)
+{
+        int ret = 0;
+        struct mwifiex_wait_queue *wait = NULL;
+
+        if (!hscfg)
+                return -ENOMEM;
+
+        /* Allocate wait buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        ret = mwifiex_pm_ioctl_hs_cfg(priv, wait, action, hscfg);
+
+        ret = mwifiex_request_ioctl(priv, wait, ret, wait_option);
+
+        if (wait && (ret != -EINPROGRESS))
+                kfree(wait);
+        return ret;
+}
+
+/*
+ * Sends IOCTL request to cancel the existing Host Sleep configuration.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int mwifiex_cancel_hs(struct mwifiex_private *priv, u8 wait_option)
+{
+        int ret = 0;
+        struct mwifiex_ds_hs_cfg hscfg;
+
+        /* Cancel Host Sleep */
+        hscfg.conditions = HOST_SLEEP_CFG_CANCEL;
+        hscfg.is_invoke_hostcmd = true;
+        ret = mwifiex_set_hs_params(priv, HostCmd_ACT_GEN_SET,
+                                        wait_option, &hscfg);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(mwifiex_cancel_hs);
+
+/*
+ * Sends IOCTL request to cancel the existing Host Sleep configuration.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int mwifiex_enable_hs(struct mwifiex_adapter *adapter)
+{
+        struct mwifiex_ds_hs_cfg hscfg;
+
+        if (adapter->hs_activated) {
+                dev_dbg(adapter->dev, "cmd: HS Already actived\n");
+                return true;
+        }
+
+        /* Enable Host Sleep */
+        adapter->hs_activate_wait_q_woken = false;
+
+        memset(&hscfg, 0, sizeof(struct mwifiex_hs_config_param));
+        hscfg.is_invoke_hostcmd = true;
+
+        if (mwifiex_set_hs_params(mwifiex_get_priv(adapter,
+                                                       MWIFIEX_BSS_ROLE_STA),
+                                      HostCmd_ACT_GEN_SET,
+                                      MWIFIEX_IOCTL_WAIT, &hscfg)) {
+                dev_err(adapter->dev, "IOCTL request HS enable failed\n");
+                return false;
+        }
+
+        wait_event_interruptible(adapter->hs_activate_wait_q,
+                        adapter->hs_activate_wait_q_woken);
+
+        return true;
+}
+EXPORT_SYMBOL_GPL(mwifiex_enable_hs);
+
+/*
+ * IOCTL request handler to get signal information.
+ *
+ * This function prepares the correct firmware command and
+ * issues it to get the signal (RSSI) information.
+ *
+ * This only works in the connected mode.
+ */
+static int mwifiex_get_info_signal(struct mwifiex_private *priv,
+                                   struct mwifiex_wait_queue *wait,
+                                   struct mwifiex_ds_get_signal *signal)
+{
+        int ret = 0;
+
+        if (!wait) {
+                dev_err(priv->adapter->dev, "WAIT information is not present\n");
+                return -1;
+        }
+
+        /* Signal info can be obtained only if connected */
+        if (!priv->media_connected) {
+                dev_dbg(priv->adapter->dev,
+                        "info: Can not get signal in disconnected state\n");
+                return -1;
+        }
+
+        /* Send request to firmware */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_RSSI_INFO,
+                                  HostCmd_ACT_GEN_GET, 0, wait, signal);
+
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to get statistics.
+ *
+ * This function prepares the correct firmware command and
+ * issues it to get the statistics (RSSI) information.
+ */
+static int mwifiex_get_info_stats(struct mwifiex_private *priv,
+                           struct mwifiex_wait_queue *wait,
+                           struct mwifiex_ds_get_stats *log)
+{
+        int ret = 0;
+
+        if (!wait) {
+                dev_err(priv->adapter->dev, "MWIFIEX IOCTL information is not present\n");
+                return -1;
+        }
+
+        /* Send request to firmware */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_GET_LOG,
+                                  HostCmd_ACT_GEN_GET, 0, wait, log);
+
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to get BSS information.
+ *
+ * This function collates the information from different driver structures
+ * to send to the user.
+ */
+int mwifiex_get_bss_info(struct mwifiex_private *priv,
+                         struct mwifiex_bss_info *info)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct mwifiex_bssdescriptor *bss_desc;
+        s32 tbl_idx = 0;
+
+        if (!info)
+                return -1;
+
+        /* Get current BSS info */
+        bss_desc = &priv->curr_bss_params.bss_descriptor;
+
+        /* BSS mode */
+        info->bss_mode = priv->bss_mode;
+
+        /* SSID */
+        memcpy(&info->ssid, &bss_desc->ssid,
+               sizeof(struct mwifiex_802_11_ssid));
+
+        /* BSSID */
+        memcpy(&info->bssid, &bss_desc->mac_address, ETH_ALEN);
+
+        /* Channel */
+        info->bss_chan = bss_desc->channel;
+
+        /* Region code */
+        info->region_code = adapter->region_code;
+
+        /* Scan table index if connected */
+        info->scan_table_idx = 0;
+        if (priv->media_connected) {
+                tbl_idx =
+                        mwifiex_find_ssid_in_list(priv, &bss_desc->ssid,
+                                                  bss_desc->mac_address,
+                                                  priv->bss_mode);
+                if (tbl_idx >= 0)
+                        info->scan_table_idx = tbl_idx;
+        }
+
+        /* Connection status */
+        info->media_connected = priv->media_connected;
+
+        /* Radio status */
+        info->radio_on = adapter->radio_on;
+
+        /* Tx power information */
+        info->max_power_level = priv->max_tx_power_level;
+        info->min_power_level = priv->min_tx_power_level;
+
+        /* AdHoc state */
+        info->adhoc_state = priv->adhoc_state;
+
+        /* Last beacon NF */
+        info->bcn_nf_last = priv->bcn_nf_last;
+
+        /* wep status */
+        if (priv->sec_info.wep_status == MWIFIEX_802_11_WEP_ENABLED)
+                info->wep_status = true;
+        else
+                info->wep_status = false;
+
+        info->is_hs_configured = adapter->is_hs_configured;
+        info->is_deep_sleep = adapter->is_deep_sleep;
+
+        return 0;
+}
+
+/*
+ * IOCTL request handler to get extended version information.
+ *
+ * This function prepares the correct firmware command and
+ * issues it to get the extended version information.
+ */
+static int mwifiex_get_info_ver_ext(struct mwifiex_private *priv,
+                                    struct mwifiex_wait_queue *wait,
+                                    struct mwifiex_ver_ext *ver_ext)
+{
+        int ret = 0;
+
+        /* Send request to firmware */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_VERSION_EXT,
+                                  HostCmd_ACT_GEN_GET, 0, wait, ver_ext);
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to set/get SNMP MIB parameters.
+ *
+ * This function prepares the correct firmware command and
+ * issues it.
+ *
+ * Currently the following parameters are supported -
+ *      Set/get RTS Threshold
+ *      Set/get fragmentation threshold
+ *      Set/get retry count
+ */
+int mwifiex_snmp_mib_ioctl(struct mwifiex_private *priv,
+                           struct mwifiex_wait_queue *wait,
+                           u32 cmd_oid, u16 action, u32 *value)
+{
+        int ret = 0;
+
+        if (!value)
+                return -1;
+
+        /* Send request to firmware */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                                  action, cmd_oid, wait, value);
+
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to set/get band configurations.
+ *
+ * For SET operation, it performs extra checks to make sure the Ad-Hoc
+ * band and channel are compatible. Otherwise it returns an error.
+ *
+ * For GET operation, this function retrieves the following information -
+ *      - Infra bands
+ *      - Ad-hoc band
+ *      - Ad-hoc channel
+ *      - Secondary channel offset
+ */
+int mwifiex_radio_ioctl_band_cfg(struct mwifiex_private *priv,
+                                 u16 action,
+                                 struct mwifiex_ds_band_cfg *radio_cfg)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        u8 infra_band = 0;
+        u8 adhoc_band = 0;
+        u32 adhoc_channel = 0;
+
+        if (action == HostCmd_ACT_GEN_GET) {
+                /* Infra Bands */
+                radio_cfg->config_bands = adapter->config_bands;
+                /* Adhoc Band */
+                radio_cfg->adhoc_start_band = adapter->adhoc_start_band;
+                /* Adhoc channel */
+                radio_cfg->adhoc_channel = priv->adhoc_channel;
+                /* Secondary channel offset */
+                radio_cfg->sec_chan_offset = adapter->chan_offset;
+                return 0;
+        }
+
+        /* For action = SET */
+        infra_band = (u8) radio_cfg->config_bands;
+        adhoc_band = (u8) radio_cfg->adhoc_start_band;
+        adhoc_channel = radio_cfg->adhoc_channel;
+
+        /* SET Infra band */
+        if ((infra_band | adapter->fw_bands) & ~adapter->fw_bands)
+                return -1;
+
+        adapter->config_bands = infra_band;
+
+        /* SET Ad-hoc Band */
+        if ((adhoc_band | adapter->fw_bands) & ~adapter->fw_bands)
+                return -1;
+
+        if (adhoc_band)
+                adapter->adhoc_start_band = adhoc_band;
+        adapter->chan_offset = (u8) radio_cfg->sec_chan_offset;
+        /*
+         * If no adhoc_channel is supplied verify if the existing adhoc
+         * channel compiles with new adhoc_band
+         */
+        if (!adhoc_channel) {
+                if (!mwifiex_get_cfp_by_band_and_channel_from_cfg80211
+                     (priv, adapter->adhoc_start_band,
+                     priv->adhoc_channel)) {
+                        /* Pass back the default channel */
+                        radio_cfg->adhoc_channel = DEFAULT_AD_HOC_CHANNEL;
+                        if ((adapter->adhoc_start_band & BAND_A)
+                            || (adapter->adhoc_start_band & BAND_AN))
+                                radio_cfg->adhoc_channel =
+                                        DEFAULT_AD_HOC_CHANNEL_A;
+                }
+        } else {        /* Retrurn error if adhoc_band and
+                           adhoc_channel combination is invalid */
+                if (!mwifiex_get_cfp_by_band_and_channel_from_cfg80211
+                    (priv, adapter->adhoc_start_band, (u16) adhoc_channel))
+                        return -1;
+                priv->adhoc_channel = (u8) adhoc_channel;
+        }
+        if ((adhoc_band & BAND_GN) || (adhoc_band & BAND_AN))
+                adapter->adhoc_11n_enabled = true;
+        else
+                adapter->adhoc_11n_enabled = false;
+
+        return 0;
+}
+
+/*
+ * IOCTL request handler to set/get active channel.
+ *
+ * This function performs validity checking on channel/frequency
+ * compatibility and returns failure if not valid.
+ */
+int mwifiex_bss_ioctl_channel(struct mwifiex_private *priv, u16 action,
+                              struct mwifiex_chan_freq_power *chan)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct mwifiex_chan_freq_power *cfp = NULL;
+
+        if (!chan)
+                return -1;
+
+        if (action == HostCmd_ACT_GEN_GET) {
+                cfp = mwifiex_get_cfp_by_band_and_channel_from_cfg80211(priv,
+                                priv->curr_bss_params.band,
+                                (u16) priv->curr_bss_params.bss_descriptor.
+                                        channel);
+                chan->channel = cfp->channel;
+                chan->freq = cfp->freq;
+
+                return 0;
+        }
+        if (!chan->channel && !chan->freq)
+                return -1;
+        if (adapter->adhoc_start_band & BAND_AN)
+                adapter->adhoc_start_band = BAND_G | BAND_B | BAND_GN;
+        else if (adapter->adhoc_start_band & BAND_A)
+                adapter->adhoc_start_band = BAND_G | BAND_B;
+        if (chan->channel) {
+                if (chan->channel <= MAX_CHANNEL_BAND_BG)
+                        cfp = mwifiex_get_cfp_by_band_and_channel_from_cfg80211
+                                        (priv, 0, (u16) chan->channel);
+                if (!cfp) {
+                        cfp = mwifiex_get_cfp_by_band_and_channel_from_cfg80211
+                                        (priv, BAND_A, (u16) chan->channel);
+                        if (cfp) {
+                                if (adapter->adhoc_11n_enabled)
+                                        adapter->adhoc_start_band = BAND_A
+                                                | BAND_AN;
+                                else
+                                        adapter->adhoc_start_band = BAND_A;
+                        }
+                }
+        } else {
+                if (chan->freq <= MAX_FREQUENCY_BAND_BG)
+                        cfp = mwifiex_get_cfp_by_band_and_freq_from_cfg80211(
+                                                        priv, 0, chan->freq);
+                if (!cfp) {
+                        cfp = mwifiex_get_cfp_by_band_and_freq_from_cfg80211
+                                                  (priv, BAND_A, chan->freq);
+                        if (cfp) {
+                                if (adapter->adhoc_11n_enabled)
+                                        adapter->adhoc_start_band = BAND_A
+                                                | BAND_AN;
+                                else
+                                        adapter->adhoc_start_band = BAND_A;
+                        }
+                }
+        }
+        if (!cfp || !cfp->channel) {
+                dev_err(adapter->dev, "invalid channel/freq\n");
+                return -1;
+        }
+        priv->adhoc_channel = (u8) cfp->channel;
+        chan->channel = cfp->channel;
+        chan->freq = cfp->freq;
+
+        return 0;
+}
+
+/*
+ * IOCTL request handler to set/get BSS mode.
+ *
+ * This function prepares the correct firmware command and
+ * issues it to set or get the BSS mode.
+ *
+ * In case the mode is changed, a deauthentication is performed
+ * first by the function automatically.
+ */
+int mwifiex_bss_ioctl_mode(struct mwifiex_private *priv,
+                           struct mwifiex_wait_queue *wait,
+                           u16 action, int *mode)
+{
+        int ret = 0;
+
+        if (!mode)
+                return -1;
+
+        if (action == HostCmd_ACT_GEN_GET) {
+                *mode = priv->bss_mode;
+                return 0;
+        }
+
+        if ((priv->bss_mode == *mode) || (*mode == MWIFIEX_BSS_MODE_AUTO)) {
+                dev_dbg(priv->adapter->dev,
+                        "info: Already set to required mode! No change!\n");
+                priv->bss_mode = *mode;
+                return 0;
+        }
+
+        ret = mwifiex_deauthenticate(priv, wait, NULL);
+
+        priv->sec_info.authentication_mode = MWIFIEX_AUTH_MODE_OPEN;
+        priv->bss_mode = *mode;
+        if (priv->bss_mode != MWIFIEX_BSS_MODE_AUTO) {
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_SET_BSS_MODE,
+                                          HostCmd_ACT_GEN_SET, 0, wait, NULL);
+                if (!ret)
+                        ret = -EINPROGRESS;
+        }
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to set/get Ad-Hoc channel.
+ *
+ * This function prepares the correct firmware command and
+ * issues it to set or get the ad-hoc channel.
+ */
+static int mwifiex_bss_ioctl_ibss_channel(struct mwifiex_private *priv,
+                                          struct mwifiex_wait_queue *wait,
+                                          u16 action, u16 *channel)
+{
+        int ret = 0;
+
+        if (action == HostCmd_ACT_GEN_GET) {
+                if (!priv->media_connected) {
+                        *channel = priv->adhoc_channel;
+                        return ret;
+                }
+        } else {
+                priv->adhoc_channel = (u8) *channel;
+        }
+
+        /* Send request to firmware */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_RF_CHANNEL,
+                                  action, 0, wait, channel);
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to find a particular BSS.
+ *
+ * The BSS can be searched with either a BSSID or a SSID. If none of
+ * these are provided, just the best BSS (best RSSI) is returned.
+ */
+int mwifiex_bss_ioctl_find_bss(struct mwifiex_private *priv,
+                               struct mwifiex_wait_queue *wait,
+                               struct mwifiex_ssid_bssid *ssid_bssid)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        int ret = 0;
+        struct mwifiex_bssdescriptor *bss_desc;
+        u8 zero_mac[ETH_ALEN] = { 0, 0, 0, 0, 0, 0 };
+        u8 mac[ETH_ALEN];
+        int i = 0;
+
+        if (memcmp(ssid_bssid->bssid, zero_mac, sizeof(zero_mac))) {
+                i = mwifiex_find_bssid_in_list(priv,
+                                               (u8 *) ssid_bssid->bssid,
+                                               priv->bss_mode);
+                if (i < 0) {
+                        memcpy(mac, ssid_bssid->bssid, sizeof(mac));
+                        dev_err(adapter->dev, "cannot find bssid %pM\n", mac);
+                        return -1;
+                }
+                bss_desc = &adapter->scan_table[i];
+                memcpy(&ssid_bssid->ssid, &bss_desc->ssid,
+                                sizeof(struct mwifiex_802_11_ssid));
+        } else if (ssid_bssid->ssid.ssid_len) {
+                i = mwifiex_find_ssid_in_list(priv, &ssid_bssid->ssid, NULL,
+                                              priv->bss_mode);
+                if (i < 0) {
+                        dev_err(adapter->dev, "cannot find ssid %s\n",
+                                        ssid_bssid->ssid.ssid);
+                        return -1;
+                }
+                bss_desc = &adapter->scan_table[i];
+                memcpy(ssid_bssid->bssid, bss_desc->mac_address, ETH_ALEN);
+        } else {
+                ret = mwifiex_find_best_network(priv, ssid_bssid);
+        }
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to change Ad-Hoc channel.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ *
+ * The function follows the following steps to perform the change -
+ *      - Get current IBSS information
+ *      - Get current channel
+ *      - If no change is required, return
+ *      - If not connected, change channel and return
+ *      - If connected,
+ *          - Disconnect
+ *          - Change channel
+ *          - Perform specific SSID scan with same SSID
+ *          - Start/Join the IBSS
+ */
+int
+mwifiex_drv_change_adhoc_chan(struct mwifiex_private *priv, int channel)
+{
+        int ret = 0;
+        int status = 0;
+        struct mwifiex_bss_info bss_info;
+        struct mwifiex_wait_queue *wait = NULL;
+        u8 wait_option = MWIFIEX_IOCTL_WAIT;
+        struct mwifiex_ssid_bssid ssid_bssid;
+        u16 curr_chan = 0;
+
+        memset(&bss_info, 0, sizeof(bss_info));
+
+        /* Get BSS information */
+        if (mwifiex_get_bss_info(priv, &bss_info))
+                return -1;
+
+        /* Allocate wait buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        /* Get current channel */
+        status = mwifiex_bss_ioctl_ibss_channel(priv, wait, HostCmd_ACT_GEN_GET,
+                                                &curr_chan);
+
+        if (mwifiex_request_ioctl(priv, wait, status, wait_option)) {
+                ret = -1;
+                goto done;
+        }
+        if (curr_chan == channel) {
+                ret = 0;
+                goto done;
+        }
+        dev_dbg(priv->adapter->dev, "cmd: updating channel from %d to %d\n",
+                        curr_chan, channel);
+
+        if (!bss_info.media_connected) {
+                ret = 0;
+                goto done;
+        }
+
+        /* Do disonnect */
+        memset(&ssid_bssid, 0, ETH_ALEN);
+        status = mwifiex_bss_ioctl_stop(priv, wait, ssid_bssid.bssid);
+
+        if (mwifiex_request_ioctl(priv, wait, status, wait_option)) {
+                ret = -1;
+                goto done;
+        }
+
+        status = mwifiex_bss_ioctl_ibss_channel(priv, wait, HostCmd_ACT_GEN_SET,
+                                                (u16 *) &channel);
+
+        if (mwifiex_request_ioctl(priv, wait, status, wait_option)) {
+                ret = -1;
+                goto done;
+        }
+
+        /* Do specific SSID scanning */
+        if (mwifiex_request_scan(priv, wait_option, &bss_info.ssid)) {
+                ret = -1;
+                goto done;
+        }
+        /* Start/Join Adhoc network */
+        memset(&ssid_bssid, 0, sizeof(struct mwifiex_ssid_bssid));
+        memcpy(&ssid_bssid.ssid, &bss_info.ssid,
+               sizeof(struct mwifiex_802_11_ssid));
+
+        status = mwifiex_bss_ioctl_start(priv, wait, &ssid_bssid);
+
+        if (mwifiex_request_ioctl(priv, wait, status, wait_option))
+                ret = -1;
+
+done:
+        kfree(wait);
+        return ret;
+}
+
+/*
+ * IOCTL request handler to get current driver mode.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int
+mwifiex_drv_get_mode(struct mwifiex_private *priv, u8 wait_option)
+{
+        struct mwifiex_wait_queue *wait = NULL;
+        int status = 0;
+        int mode = -1;
+
+        /* Allocate wait buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -1;
+
+        status = mwifiex_bss_ioctl_mode(priv, wait, HostCmd_ACT_GEN_GET, &mode);
+
+        status = mwifiex_request_ioctl(priv, wait, status, wait_option);
+
+        if (wait && (status != -EINPROGRESS))
+                kfree(wait);
+        return mode;
+}
+
+/*
+ * IOCTL request handler to get rate.
+ *
+ * This function prepares the correct firmware command and
+ * issues it to get the current rate if it is connected,
+ * otherwise, the function returns the lowest supported rate
+ * for the band.
+ */
+static int mwifiex_rate_ioctl_get_rate_value(struct mwifiex_private *priv,
+                                             struct mwifiex_wait_queue *wait,
+                                             struct mwifiex_rate_cfg *rate_cfg)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        int ret = 0;
+
+        rate_cfg->is_rate_auto = priv->is_data_rate_auto;
+        if (!priv->media_connected) {
+                switch (adapter->config_bands) {
+                case BAND_B:
+                        /* Return the lowest supported rate for B band */
+                        rate_cfg->rate = supported_rates_b[0] & 0x7f;
+                        break;
+                case BAND_G:
+                case BAND_G | BAND_GN:
+                        /* Return the lowest supported rate for G band */
+                        rate_cfg->rate = supported_rates_g[0] & 0x7f;
+                        break;
+                case BAND_B | BAND_G:
+                case BAND_A | BAND_B | BAND_G:
+                case BAND_A | BAND_B:
+                case BAND_A | BAND_B | BAND_G | BAND_AN | BAND_GN:
+                case BAND_B | BAND_G | BAND_GN:
+                        /* Return the lowest supported rate for BG band */
+                        rate_cfg->rate = supported_rates_bg[0] & 0x7f;
+                        break;
+                case BAND_A:
+                case BAND_A | BAND_G:
+                case BAND_A | BAND_G | BAND_AN | BAND_GN:
+                case BAND_A | BAND_AN:
+                        /* Return the lowest supported rate for A band */
+                        rate_cfg->rate = supported_rates_a[0] & 0x7f;
+                        break;
+                case BAND_GN:
+                        /* Return the lowest supported rate for N band */
+                        rate_cfg->rate = supported_rates_n[0] & 0x7f;
+                        break;
+                default:
+                        dev_warn(adapter->dev, "invalid band %#x\n",
+                               adapter->config_bands);
+                        break;
+                }
+        } else {
+                /* Send request to firmware */
+                ret = mwifiex_prepare_cmd(priv,
+                                          HostCmd_CMD_802_11_TX_RATE_QUERY,
+                                          HostCmd_ACT_GEN_GET, 0, wait, NULL);
+                if (!ret)
+                        ret = -EINPROGRESS;
+        }
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to set rate.
+ *
+ * This function prepares the correct firmware command and
+ * issues it to set the current rate.
+ *
+ * The function also performs validation checking on the supplied value.
+ */
+static int mwifiex_rate_ioctl_set_rate_value(struct mwifiex_private *priv,
+                                             struct mwifiex_wait_queue *wait,
+                                             struct mwifiex_rate_cfg *rate_cfg)
+{
+        u8 rates[MWIFIEX_SUPPORTED_RATES];
+        u8 *rate = NULL;
+        int rate_index = 0;
+        u16 bitmap_rates[MAX_BITMAP_RATES_SIZE];
+        u32 i = 0;
+        int ret = 0;
+        struct mwifiex_adapter *adapter = priv->adapter;
+
+        if (rate_cfg->is_rate_auto) {
+                memset(bitmap_rates, 0, sizeof(bitmap_rates));
+                /* Support all HR/DSSS rates */
+                bitmap_rates[0] = 0x000F;
+                /* Support all OFDM rates */
+                bitmap_rates[1] = 0x00FF;
+                /* Support all HT-MCSs rate */
+                for (i = 0; i < ARRAY_SIZE(priv->bitmap_rates) - 3; i++)
+                        bitmap_rates[i + 2] = 0xFFFF;
+                bitmap_rates[9] = 0x3FFF;
+        } else {
+                memset(rates, 0, sizeof(rates));
+                mwifiex_get_active_data_rates(priv, rates);
+                rate = rates;
+                for (i = 0; (rate[i] && i < MWIFIEX_SUPPORTED_RATES); i++) {
+                        dev_dbg(adapter->dev, "info: rate=%#x wanted=%#x\n",
+                                rate[i], rate_cfg->rate);
+                        if ((rate[i] & 0x7f) == (rate_cfg->rate & 0x7f))
+                                break;
+                }
+                if (!rate[i] || (i == MWIFIEX_SUPPORTED_RATES)) {
+                        dev_err(adapter->dev, "fixed data rate %#x is out "
+                               "of range\n", rate_cfg->rate);
+                        return -1;
+                }
+                memset(bitmap_rates, 0, sizeof(bitmap_rates));
+
+                rate_index =
+                        mwifiex_data_rate_to_index(adapter, rate_cfg->rate);
+
+                /* Only allow b/g rates to be set */
+                if (rate_index >= MWIFIEX_RATE_INDEX_HRDSSS0 &&
+                    rate_index <= MWIFIEX_RATE_INDEX_HRDSSS3) {
+                        bitmap_rates[0] = 1 << rate_index;
+                } else {
+                        rate_index -= 1; /* There is a 0x00 in the table */
+                        if (rate_index >= MWIFIEX_RATE_INDEX_OFDM0 &&
+                            rate_index <= MWIFIEX_RATE_INDEX_OFDM7)
+                                bitmap_rates[1] = 1 << (rate_index -
+                                                   MWIFIEX_RATE_INDEX_OFDM0);
+                }
+        }
+
+        /* Send request to firmware */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_TX_RATE_CFG,
+                                  HostCmd_ACT_GEN_SET, 0, wait, bitmap_rates);
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to set/get rate.
+ *
+ * This function can be used to set/get either the rate value or the
+ * rate index.
+ */
+static int mwifiex_rate_ioctl_cfg(struct mwifiex_private *priv,
+                                  struct mwifiex_wait_queue *wait,
+                                  struct mwifiex_rate_cfg *rate_cfg)
+{
+        int status = 0;
+
+        if (!rate_cfg)
+                return -1;
+
+        if (rate_cfg->action == HostCmd_ACT_GEN_GET)
+                status = mwifiex_rate_ioctl_get_rate_value(
+                                priv, wait, rate_cfg);
+        else
+                status = mwifiex_rate_ioctl_set_rate_value(
+                                priv, wait, rate_cfg);
+
+        return status;
+}
+
+/*
+ * Sends IOCTL request to get the data rate.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int mwifiex_drv_get_data_rate(struct mwifiex_private *priv,
+                              struct mwifiex_rate_cfg *rate)
+{
+        int ret = 0;
+        struct mwifiex_wait_queue *wait = NULL;
+        u8 wait_option = MWIFIEX_IOCTL_WAIT;
+
+        /* Allocate wait buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        memset(rate, 0, sizeof(struct mwifiex_rate_cfg));
+        rate->action = HostCmd_ACT_GEN_GET;
+        ret = mwifiex_rate_ioctl_cfg(priv, wait, rate);
+
+        ret = mwifiex_request_ioctl(priv, wait, ret, wait_option);
+        if (!ret) {
+                if (rate && rate->is_rate_auto)
+                        rate->rate = mwifiex_index_to_data_rate(priv->adapter,
+                                        priv->tx_rate, priv->tx_htinfo);
+                else if (rate)
+                        rate->rate = priv->data_rate;
+        } else {
+                ret = -1;
+        }
+
+        kfree(wait);
+        return ret;
+}
+
+/*
+ * IOCTL request handler to set tx power configuration.
+ *
+ * This function prepares the correct firmware command and
+ * issues it.
+ *
+ * For non-auto power mode, all the following power groups are set -
+ *      - Modulation class HR/DSSS
+ *      - Modulation class OFDM
+ *      - Modulation class HTBW20
+ *      - Modulation class HTBW40
+ */
+static int mwifiex_power_ioctl_set_power(struct mwifiex_private *priv,
+                                         struct mwifiex_wait_queue *wait,
+                                         struct mwifiex_power_cfg *power_cfg)
+{
+        int ret = 0;
+        struct host_cmd_ds_txpwr_cfg *txp_cfg = NULL;
+        struct mwifiex_types_power_group *pg_tlv = NULL;
+        struct mwifiex_power_group *pg = NULL;
+        u8 *buf = NULL;
+        u16 dbm = 0;
+
+        if (!power_cfg->is_power_auto) {
+                dbm = (u16) power_cfg->power_level;
+                if ((dbm < priv->min_tx_power_level) ||
+                    (dbm > priv->max_tx_power_level)) {
+                        dev_err(priv->adapter->dev, "txpower value %d dBm"
+                                        " is out of range (%d dBm-%d dBm)\n",
+                                        dbm, priv->min_tx_power_level,
+                                        priv->max_tx_power_level);
+                        return -1;
+                }
+        }
+        buf = kzalloc(MWIFIEX_SIZE_OF_CMD_BUFFER, GFP_KERNEL);
+        if (!buf) {
+                dev_err(priv->adapter->dev, "%s: failed to alloc cmd buffer\n",
+                                __func__);
+                return -1;
+        }
+
+        txp_cfg = (struct host_cmd_ds_txpwr_cfg *) buf;
+        txp_cfg->action = cpu_to_le16(HostCmd_ACT_GEN_SET);
+        if (!power_cfg->is_power_auto) {
+                txp_cfg->mode = cpu_to_le32(1);
+                pg_tlv = (struct mwifiex_types_power_group *) (buf +
+                                sizeof(struct host_cmd_ds_txpwr_cfg));
+                pg_tlv->type = TLV_TYPE_POWER_GROUP;
+                pg_tlv->length = 4 * sizeof(struct mwifiex_power_group);
+                pg = (struct mwifiex_power_group *) (buf +
+                                sizeof(struct host_cmd_ds_txpwr_cfg) +
+                                sizeof(struct mwifiex_types_power_group));
+                /* Power group for modulation class HR/DSSS */
+                pg->first_rate_code = 0x00;
+                pg->last_rate_code = 0x03;
+                pg->modulation_class = MOD_CLASS_HR_DSSS;
+                pg->power_step = 0;
+                pg->power_min = (s8) dbm;
+                pg->power_max = (s8) dbm;
+                pg++;
+                /* Power group for modulation class OFDM */
+                pg->first_rate_code = 0x00;
+                pg->last_rate_code = 0x07;
+                pg->modulation_class = MOD_CLASS_OFDM;
+                pg->power_step = 0;
+                pg->power_min = (s8) dbm;
+                pg->power_max = (s8) dbm;
+                pg++;
+                /* Power group for modulation class HTBW20 */
+                pg->first_rate_code = 0x00;
+                pg->last_rate_code = 0x20;
+                pg->modulation_class = MOD_CLASS_HT;
+                pg->power_step = 0;
+                pg->power_min = (s8) dbm;
+                pg->power_max = (s8) dbm;
+                pg->ht_bandwidth = HT_BW_20;
+                pg++;
+                /* Power group for modulation class HTBW40 */
+                pg->first_rate_code = 0x00;
+                pg->last_rate_code = 0x20;
+                pg->modulation_class = MOD_CLASS_HT;
+                pg->power_step = 0;
+                pg->power_min = (s8) dbm;
+                pg->power_max = (s8) dbm;
+                pg->ht_bandwidth = HT_BW_40;
+        }
+        /* Send request to firmware */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_TXPWR_CFG,
+                                  HostCmd_ACT_GEN_SET, 0, wait, buf);
+        if (!ret)
+                ret = -EINPROGRESS;
+        kfree(buf);
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to get power save mode.
+ *
+ * This function prepares the correct firmware command and
+ * issues it.
+ */
+static int mwifiex_pm_ioctl_ps_mode(struct mwifiex_private *priv,
+                                    struct mwifiex_wait_queue *wait,
+                                    u32 *ps_mode, u16 action)
+{
+        int ret = 0;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        u16 sub_cmd;
+
+        if (action == HostCmd_ACT_GEN_SET) {
+                if (*ps_mode)
+                        adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_PSP;
+                else
+                        adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_CAM;
+                sub_cmd = (*ps_mode) ? EN_AUTO_PS : DIS_AUTO_PS;
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_PS_MODE_ENH,
+                                          sub_cmd, BITMAP_STA_PS, wait, NULL);
+                if ((!ret) && (sub_cmd == DIS_AUTO_PS))
+                        ret = mwifiex_prepare_cmd(priv,
+                                        HostCmd_CMD_802_11_PS_MODE_ENH, GET_PS,
+                                        0, NULL, NULL);
+        } else {
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_PS_MODE_ENH,
+                                          GET_PS, 0, wait, NULL);
+        }
+
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to set/reset WPA IE.
+ *
+ * The supplied WPA IE is treated as a opaque buffer. Only the first field
+ * is checked to determine WPA version. If buffer length is zero, the existing
+ * WPA IE is reset.
+ */
+static int mwifiex_set_wpa_ie_helper(struct mwifiex_private *priv,
+                                     u8 *ie_data_ptr, u16 ie_len)
+{
+        if (ie_len) {
+                if (ie_len > sizeof(priv->wpa_ie)) {
+                        dev_err(priv->adapter->dev,
+                                "failed to copy WPA IE, too big\n");
+                        return -1;
+                }
+                memcpy(priv->wpa_ie, ie_data_ptr, ie_len);
+                priv->wpa_ie_len = (u8) ie_len;
+                dev_dbg(priv->adapter->dev, "cmd: Set Wpa_ie_len=%d IE=%#x\n",
+                                priv->wpa_ie_len, priv->wpa_ie[0]);
+
+                if (priv->wpa_ie[0] == WLAN_EID_WPA) {
+                        priv->sec_info.wpa_enabled = true;
+                } else if (priv->wpa_ie[0] == WLAN_EID_RSN) {
+                        priv->sec_info.wpa2_enabled = true;
+                } else {
+                        priv->sec_info.wpa_enabled = false;
+                        priv->sec_info.wpa2_enabled = false;
+                }
+        } else {
+                memset(priv->wpa_ie, 0, sizeof(priv->wpa_ie));
+                priv->wpa_ie_len = 0;
+                dev_dbg(priv->adapter->dev, "info: reset wpa_ie_len=%d IE=%#x\n",
+                        priv->wpa_ie_len, priv->wpa_ie[0]);
+                priv->sec_info.wpa_enabled = false;
+                priv->sec_info.wpa2_enabled = false;
+        }
+
+        return 0;
+}
+
+/*
+ * IOCTL request handler to set/reset WAPI IE.
+ *
+ * The supplied WAPI IE is treated as a opaque buffer. Only the first field
+ * is checked to internally enable WAPI. If buffer length is zero, the existing
+ * WAPI IE is reset.
+ */
+static int mwifiex_set_wapi_ie(struct mwifiex_private *priv,
+                               u8 *ie_data_ptr, u16 ie_len)
+{
+        if (ie_len) {
+                if (ie_len > sizeof(priv->wapi_ie)) {
+                        dev_dbg(priv->adapter->dev,
+                                "info: failed to copy WAPI IE, too big\n");
+                        return -1;
+                }
+                memcpy(priv->wapi_ie, ie_data_ptr, ie_len);
+                priv->wapi_ie_len = ie_len;
+                dev_dbg(priv->adapter->dev, "cmd: Set wapi_ie_len=%d IE=%#x\n",
+                                priv->wapi_ie_len, priv->wapi_ie[0]);
+
+                if (priv->wapi_ie[0] == WLAN_EID_BSS_AC_ACCESS_DELAY)
+                        priv->sec_info.wapi_enabled = true;
+        } else {
+                memset(priv->wapi_ie, 0, sizeof(priv->wapi_ie));
+                priv->wapi_ie_len = ie_len;
+                dev_dbg(priv->adapter->dev,
+                        "info: Reset wapi_ie_len=%d IE=%#x\n",
+                       priv->wapi_ie_len, priv->wapi_ie[0]);
+                priv->sec_info.wapi_enabled = false;
+        }
+        return 0;
+}
+
+/*
+ * IOCTL request handler to set WAPI key.
+ *
+ * This function prepares the correct firmware command and
+ * issues it.
+ */
+static int mwifiex_sec_ioctl_set_wapi_key(struct mwifiex_adapter *adapter,
+                               struct mwifiex_wait_queue *wait,
+                               struct mwifiex_ds_encrypt_key *encrypt_key)
+{
+        int ret = 0;
+        struct mwifiex_private *priv = adapter->priv[wait->bss_index];
+
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_KEY_MATERIAL,
+                                  HostCmd_ACT_GEN_SET, KEY_INFO_ENABLED,
+                                  wait, encrypt_key);
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to set/get authentication mode.
+ */
+static int mwifiex_set_auth_mode(struct mwifiex_private *priv, u32 auth_mode)
+{
+        int ret = 0;
+
+        priv->sec_info.authentication_mode = auth_mode;
+        if (priv->sec_info.authentication_mode == MWIFIEX_AUTH_MODE_NETWORKEAP)
+                ret = mwifiex_set_wpa_ie_helper(priv, NULL, 0);
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to set WEP network key.
+ *
+ * This function prepares the correct firmware command and
+ * issues it, after validation checks.
+ */
+static int mwifiex_sec_ioctl_set_wep_key(struct mwifiex_adapter *adapter,
+                              struct mwifiex_wait_queue *wait,
+                              struct mwifiex_ds_encrypt_key *encrypt_key)
+{
+        int ret = 0;
+        struct mwifiex_private *priv = adapter->priv[wait->bss_index];
+        struct mwifiex_wep_key *wep_key = NULL;
+        int index;
+
+        if (priv->wep_key_curr_index >= NUM_WEP_KEYS)
+                priv->wep_key_curr_index = 0;
+        wep_key = &priv->wep_key[priv->wep_key_curr_index];
+        index = encrypt_key->key_index;
+        if (encrypt_key->key_disable) {
+                priv->sec_info.wep_status = MWIFIEX_802_11_WEP_DISABLED;
+        } else if (!encrypt_key->key_len) {
+                /* Copy the required key as the current key */
+                wep_key = &priv->wep_key[index];
+                if (!wep_key->key_length) {
+                        dev_err(adapter->dev,
+                                "key not set, so cannot enable it\n");
+                        return -1;
+                }
+                priv->wep_key_curr_index = (u16) index;
+                priv->sec_info.wep_status = MWIFIEX_802_11_WEP_ENABLED;
+        } else {
+                wep_key = &priv->wep_key[index];
+                /* Cleanup */
+                memset(wep_key, 0, sizeof(struct mwifiex_wep_key));
+                /* Copy the key in the driver */
+                memcpy(wep_key->key_material,
+                       encrypt_key->key_material,
+                       encrypt_key->key_len);
+                wep_key->key_index = index;
+                wep_key->key_length = encrypt_key->key_len;
+                priv->sec_info.wep_status = MWIFIEX_802_11_WEP_ENABLED;
+        }
+        if (wep_key->key_length) {
+                /* Send request to firmware */
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_KEY_MATERIAL,
+                                          HostCmd_ACT_GEN_SET, 0, NULL, NULL);
+                if (ret)
+                        return ret;
+        }
+        if (priv->sec_info.wep_status == MWIFIEX_802_11_WEP_ENABLED)
+                priv->curr_pkt_filter |= HostCmd_ACT_MAC_WEP_ENABLE;
+        else
+                priv->curr_pkt_filter &= ~HostCmd_ACT_MAC_WEP_ENABLE;
+
+        /* Send request to firmware */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_MAC_CONTROL,
+                                  HostCmd_ACT_GEN_SET, 0, wait,
+                                  &priv->curr_pkt_filter);
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to set WPA key.
+ *
+ * This function prepares the correct firmware command and
+ * issues it, after validation checks.
+ *
+ * Current driver only supports key length of up to 32 bytes.
+ *
+ * This function can also be used to disable a currently set key.
+ */
+static int mwifiex_sec_ioctl_set_wpa_key(struct mwifiex_adapter *adapter,
+                              struct mwifiex_wait_queue *wait,
+                              struct mwifiex_ds_encrypt_key *encrypt_key)
+{
+        int ret = 0;
+        struct mwifiex_private *priv = adapter->priv[wait->bss_index];
+        u8 remove_key = false;
+        struct host_cmd_ds_802_11_key_material *ibss_key;
+
+        /* Current driver only supports key length of up to 32 bytes */
+        if (encrypt_key->key_len > MWIFIEX_MAX_KEY_LENGTH) {
+                dev_err(adapter->dev, "key length too long\n");
+                return -1;
+        }
+
+        if (priv->bss_mode == MWIFIEX_BSS_MODE_IBSS) {
+                /*
+                 * IBSS/WPA-None uses only one key (Group) for both receiving
+                 * and sending unicast and multicast packets.
+                 */
+                /* Send the key as PTK to firmware */
+                encrypt_key->key_index = MWIFIEX_KEY_INDEX_UNICAST;
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_KEY_MATERIAL,
+                                          HostCmd_ACT_GEN_SET, KEY_INFO_ENABLED,
+                                          NULL, encrypt_key);
+                if (ret)
+                        return ret;
+
+                ibss_key = &priv->aes_key;
+                memset(ibss_key, 0,
+                       sizeof(struct host_cmd_ds_802_11_key_material));
+                /* Copy the key in the driver */
+                memcpy(ibss_key->key_param_set.key, encrypt_key->key_material,
+                       encrypt_key->key_len);
+                memcpy(&ibss_key->key_param_set.key_len, &encrypt_key->key_len,
+                       sizeof(ibss_key->key_param_set.key_len));
+                ibss_key->key_param_set.key_type_id
+                        = cpu_to_le16(KEY_TYPE_ID_TKIP);
+                ibss_key->key_param_set.key_info
+                        = cpu_to_le16(KEY_INFO_TKIP_ENABLED);
+
+                /* Send the key as GTK to firmware */
+                encrypt_key->key_index = ~MWIFIEX_KEY_INDEX_UNICAST;
+        }
+
+        if (!encrypt_key->key_index)
+                encrypt_key->key_index = MWIFIEX_KEY_INDEX_UNICAST;
+
+        if (remove_key)
+                /* Send request to firmware */
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_KEY_MATERIAL,
+                                          HostCmd_ACT_GEN_SET,
+                                          !(KEY_INFO_ENABLED),
+                                          wait, encrypt_key);
+        else
+                /* Send request to firmware */
+                ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_KEY_MATERIAL,
+                                          HostCmd_ACT_GEN_SET, KEY_INFO_ENABLED,
+                                          wait, encrypt_key);
+
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to set/get network keys.
+ *
+ * This is a generic key handling function which supports WEP, WPA
+ * and WAPI.
+ */
+static int
+mwifiex_sec_ioctl_encrypt_key(struct mwifiex_private *priv,
+                              struct mwifiex_wait_queue *wait,
+                              struct mwifiex_ds_encrypt_key *encrypt_key)
+{
+        int status = 0;
+        struct mwifiex_adapter *adapter = priv->adapter;
+
+        if (encrypt_key->is_wapi_key)
+                status = mwifiex_sec_ioctl_set_wapi_key(adapter, wait,
+                                                        encrypt_key);
+        else if (encrypt_key->key_len > WLAN_KEY_LEN_WEP104)
+                status = mwifiex_sec_ioctl_set_wpa_key(adapter, wait,
+                                                       encrypt_key);
+        else
+                status = mwifiex_sec_ioctl_set_wep_key(adapter, wait,
+                                                       encrypt_key);
+        return status;
+}
+
+/*
+ * This function returns the driver version.
+ */
+int
+mwifiex_drv_get_driver_version(struct mwifiex_adapter *adapter, char *version,
+                               int max_len)
+{
+        union {
+                u32 l;
+                u8 c[4];
+        } ver;
+        char fw_ver[32];
+
+        ver.l = adapter->fw_release_number;
+        sprintf(fw_ver, "%u.%u.%u.p%u", ver.c[2], ver.c[1], ver.c[0], ver.c[3]);
+
+        snprintf(version, max_len, driver_version, fw_ver);
+
+        dev_dbg(adapter->dev, "info: MWIFIEX VERSION: %s\n", version);
+
+        return 0;
+}
+
+/*
+ * Sends IOCTL request to set Tx power. It can be set to either auto
+ * or a fixed value.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int
+mwifiex_set_tx_power(struct mwifiex_private *priv, int type, int dbm)
+{
+        struct mwifiex_power_cfg power_cfg;
+        struct mwifiex_wait_queue *wait = NULL;
+        int status = 0;
+        int ret = 0;
+
+        wait = mwifiex_alloc_fill_wait_queue(priv, MWIFIEX_IOCTL_WAIT);
+        if (!wait)
+                return -ENOMEM;
+
+        if (type == NL80211_TX_POWER_FIXED) {
+                power_cfg.is_power_auto = 0;
+                power_cfg.power_level = dbm;
+        } else {
+                power_cfg.is_power_auto = 1;
+        }
+        status = mwifiex_power_ioctl_set_power(priv, wait, &power_cfg);
+
+        ret = mwifiex_request_ioctl(priv, wait, status, MWIFIEX_IOCTL_WAIT);
+
+        kfree(wait);
+        return ret;
+}
+
+/*
+ * Sends IOCTL request to get scan table.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int mwifiex_get_scan_table(struct mwifiex_private *priv, u8 wait_option,
+                           struct mwifiex_scan_resp *scan_resp)
+{
+        struct mwifiex_wait_queue *wait = NULL;
+        struct mwifiex_scan_resp scan;
+        int status = 0;
+
+        /* Allocate wait buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        status = mwifiex_scan_networks(priv, wait, HostCmd_ACT_GEN_GET,
+                                       NULL, &scan);
+
+        status = mwifiex_request_ioctl(priv, wait, status, wait_option);
+        if (!status) {
+                if (scan_resp)
+                        memcpy(scan_resp, &scan,
+                               sizeof(struct mwifiex_scan_resp));
+        }
+
+        if (wait && (status != -EINPROGRESS))
+                kfree(wait);
+        return status;
+}
+
+/*
+ * Sends IOCTL request to get signal information.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int mwifiex_get_signal_info(struct mwifiex_private *priv, u8 wait_option,
+                            struct mwifiex_ds_get_signal *signal)
+{
+        struct mwifiex_ds_get_signal info;
+        struct mwifiex_wait_queue *wait = NULL;
+        int status = 0;
+
+        /* Allocate wait buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        info.selector = ALL_RSSI_INFO_MASK;
+
+        status = mwifiex_get_info_signal(priv, wait, &info);
+
+        status = mwifiex_request_ioctl(priv, wait, status, wait_option);
+        if (!status) {
+                if (signal)
+                        memcpy(signal, &info,
+                               sizeof(struct mwifiex_ds_get_signal));
+                if (info.selector & BCN_RSSI_AVG_MASK)
+                        priv->w_stats.qual.level = info.bcn_rssi_avg;
+                if (info.selector & BCN_NF_AVG_MASK)
+                        priv->w_stats.qual.noise = info.bcn_nf_avg;
+        }
+
+        if (wait && (status != -EINPROGRESS))
+                kfree(wait);
+        return status;
+}
+
+/*
+ * Sends IOCTL request to set encryption mode.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+static int mwifiex_set_encrypt_mode(struct mwifiex_private *priv,
+                                    u8 wait_option, u32 encrypt_mode)
+{
+        priv->sec_info.encryption_mode = encrypt_mode;
+        return 0;
+}
+
+/*
+ * This function set the authentication parameters. It sets both encryption
+ * mode and authentication mode, and also enables WPA if required.
+ */
+int
+mwifiex_set_auth(struct mwifiex_private *priv, int encrypt_mode,
+                 int auth_mode, int wpa_enabled)
+{
+        if (mwifiex_set_encrypt_mode(priv, MWIFIEX_IOCTL_WAIT, encrypt_mode))
+                return -EFAULT;
+
+        if (mwifiex_set_auth_mode(priv, auth_mode))
+                return -EFAULT;
+
+        return 0;
+}
+
+/*
+ * Sends IOCTL request to set encoding parameters.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int mwifiex_set_encode(struct mwifiex_private *priv, const u8 *key,
+                        int key_len, u8 key_index, int disable)
+{
+        struct mwifiex_wait_queue *wait = NULL;
+        struct mwifiex_ds_encrypt_key encrypt_key;
+        int status = 0;
+        int ret = 0;
+
+        wait = mwifiex_alloc_fill_wait_queue(priv, MWIFIEX_IOCTL_WAIT);
+        if (!wait)
+                return -ENOMEM;
+
+        memset(&encrypt_key, 0, sizeof(struct mwifiex_ds_encrypt_key));
+        encrypt_key.key_len = key_len;
+        if (!disable) {
+                encrypt_key.key_index = key_index;
+                if (key_len)
+                        memcpy(encrypt_key.key_material, key, key_len);
+        } else {
+                encrypt_key.key_disable = true;
+        }
+
+        status = mwifiex_sec_ioctl_encrypt_key(priv, wait, &encrypt_key);
+
+        if (mwifiex_request_ioctl(priv, wait, status, MWIFIEX_IOCTL_WAIT))
+                ret = -EFAULT;
+
+        kfree(wait);
+        return ret;
+}
+
+/*
+ * Sends IOCTL request to set power management parameters.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int
+mwifiex_drv_set_power(struct mwifiex_private *priv, bool power_on)
+{
+        int ret = 0;
+        int status = 0;
+        struct mwifiex_wait_queue *wait = NULL;
+        u32 ps_mode;
+
+        wait = mwifiex_alloc_fill_wait_queue(priv, MWIFIEX_IOCTL_WAIT);
+        if (!wait)
+                return -ENOMEM;
+
+        ps_mode = power_on;
+        status = mwifiex_pm_ioctl_ps_mode(priv, wait, &ps_mode,
+                                          HostCmd_ACT_GEN_SET);
+
+        ret = mwifiex_request_ioctl(priv, wait, status, MWIFIEX_IOCTL_WAIT);
+
+        kfree(wait);
+        return ret;
+}
+
+/*
+ * Sends IOCTL request to get extended version.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int
+mwifiex_get_ver_ext(struct mwifiex_private *priv)
+{
+        struct mwifiex_ver_ext ver_ext;
+        struct mwifiex_wait_queue *wait = NULL;
+        int status = 0;
+        int ret = 0;
+        u8 wait_option = MWIFIEX_IOCTL_WAIT;
+
+        /* Allocate wait buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        /* get fw version */
+        memset(&ver_ext, 0, sizeof(struct host_cmd_ds_version_ext));
+        status = mwifiex_get_info_ver_ext(priv, wait, &ver_ext);
+
+        ret = mwifiex_request_ioctl(priv, wait, status, wait_option);
+
+        if (ret)
+                ret = -1;
+
+        kfree(wait);
+        return ret;
+}
+
+/*
+ * Sends IOCTL request to get statistics information.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int
+mwifiex_get_stats_info(struct mwifiex_private *priv,
+                       struct mwifiex_ds_get_stats *log)
+{
+        int ret = 0;
+        int status = 0;
+        struct mwifiex_wait_queue *wait = NULL;
+        struct mwifiex_ds_get_stats get_log;
+        u8 wait_option = MWIFIEX_IOCTL_WAIT;
+
+        /* Allocate wait buffer */
+        wait = mwifiex_alloc_fill_wait_queue(priv, wait_option);
+        if (!wait)
+                return -ENOMEM;
+
+        memset(&get_log, 0, sizeof(struct mwifiex_ds_get_stats));
+        status = mwifiex_get_info_stats(priv, wait, &get_log);
+
+        /* Send IOCTL request to MWIFIEX */
+        ret = mwifiex_request_ioctl(priv, wait, status, wait_option);
+        if (!ret) {
+                if (log)
+                        memcpy(log, &get_log, sizeof(struct
+                                        mwifiex_ds_get_stats));
+                priv->w_stats.discard.fragment = get_log.fcs_error;
+                priv->w_stats.discard.retries = get_log.retry;
+                priv->w_stats.discard.misc = get_log.ack_failure;
+        }
+
+        kfree(wait);
+        return ret;
+}
+
+/*
+ * IOCTL request handler to read/write register.
+ *
+ * This function prepares the correct firmware command and
+ * issues it.
+ *
+ * Access to the following registers are supported -
+ *      - MAC
+ *      - BBP
+ *      - RF
+ *      - PMIC
+ *      - CAU
+ */
+static int mwifiex_reg_mem_ioctl_reg_rw(struct mwifiex_private *priv,
+                                        struct mwifiex_wait_queue *wait,
+                                        struct mwifiex_ds_reg_rw *reg_rw,
+                                        u16 action)
+{
+        int ret = 0;
+        u16 cmd_no;
+
+        switch (le32_to_cpu(reg_rw->type)) {
+        case MWIFIEX_REG_MAC:
+                cmd_no = HostCmd_CMD_MAC_REG_ACCESS;
+                break;
+        case MWIFIEX_REG_BBP:
+                cmd_no = HostCmd_CMD_BBP_REG_ACCESS;
+                break;
+        case MWIFIEX_REG_RF:
+                cmd_no = HostCmd_CMD_RF_REG_ACCESS;
+                break;
+        case MWIFIEX_REG_PMIC:
+                cmd_no = HostCmd_CMD_PMIC_REG_ACCESS;
+                break;
+        case MWIFIEX_REG_CAU:
+                cmd_no = HostCmd_CMD_CAU_REG_ACCESS;
+                break;
+        default:
+                return -1;
+        }
+
+        /* Send request to firmware */
+        ret = mwifiex_prepare_cmd(priv, cmd_no, action, 0, wait, reg_rw);
+
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * Sends IOCTL request to write to a register.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int
+mwifiex_reg_write(struct mwifiex_private *priv, u32 reg_type,
+                  u32 reg_offset, u32 reg_value)
+{
+        int ret = 0;
+        int status = 0;
+        struct mwifiex_wait_queue *wait = NULL;
+        struct mwifiex_ds_reg_rw reg_rw;
+
+        wait = mwifiex_alloc_fill_wait_queue(priv, MWIFIEX_IOCTL_WAIT);
+        if (!wait)
+                return -ENOMEM;
+
+        reg_rw.type = cpu_to_le32(reg_type);
+        reg_rw.offset = cpu_to_le32(reg_offset);
+        reg_rw.value = cpu_to_le32(reg_value);
+        status = mwifiex_reg_mem_ioctl_reg_rw(priv, wait, &reg_rw,
+                                              HostCmd_ACT_GEN_SET);
+
+        ret = mwifiex_request_ioctl(priv, wait, status, MWIFIEX_IOCTL_WAIT);
+
+        kfree(wait);
+        return ret;
+}
+
+/*
+ * Sends IOCTL request to read from a register.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int
+mwifiex_reg_read(struct mwifiex_private *priv, u32 reg_type,
+                 u32 reg_offset, u32 *value)
+{
+        int ret = 0;
+        int status = 0;
+        struct mwifiex_wait_queue *wait = NULL;
+        struct mwifiex_ds_reg_rw reg_rw;
+
+        wait = mwifiex_alloc_fill_wait_queue(priv, MWIFIEX_IOCTL_WAIT);
+        if (!wait)
+                return -ENOMEM;
+
+        reg_rw.type = cpu_to_le32(reg_type);
+        reg_rw.offset = cpu_to_le32(reg_offset);
+        status = mwifiex_reg_mem_ioctl_reg_rw(priv, wait, &reg_rw,
+                                              HostCmd_ACT_GEN_GET);
+
+        ret = mwifiex_request_ioctl(priv, wait, status, MWIFIEX_IOCTL_WAIT);
+        if (ret)
+                goto done;
+
+        *value = le32_to_cpu(reg_rw.value);
+
+done:
+        kfree(wait);
+        return ret;
+}
+
+/*
+ * IOCTL request handler to read EEPROM.
+ *
+ * This function prepares the correct firmware command and
+ * issues it.
+ */
+static int
+mwifiex_reg_mem_ioctl_read_eeprom(struct mwifiex_private *priv,
+                                  struct mwifiex_wait_queue *wait,
+                                  struct mwifiex_ds_read_eeprom *rd_eeprom)
+{
+        int ret = 0;
+
+        /* Send request to firmware */
+        ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_EEPROM_ACCESS,
+                                  HostCmd_ACT_GEN_GET, 0, wait, rd_eeprom);
+
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * Sends IOCTL request to read from EEPROM.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int
+mwifiex_eeprom_read(struct mwifiex_private *priv, u16 offset, u16 bytes,
+                    u8 *value)
+{
+        int ret = 0;
+        int status = 0;
+        struct mwifiex_wait_queue *wait = NULL;
+        struct mwifiex_ds_read_eeprom rd_eeprom;
+
+        wait = mwifiex_alloc_fill_wait_queue(priv, MWIFIEX_IOCTL_WAIT);
+        if (!wait)
+                return -ENOMEM;
+
+        rd_eeprom.offset = cpu_to_le16((u16) offset);
+        rd_eeprom.byte_count = cpu_to_le16((u16) bytes);
+        status = mwifiex_reg_mem_ioctl_read_eeprom(priv, wait, &rd_eeprom);
+
+        ret = mwifiex_request_ioctl(priv, wait, status, MWIFIEX_IOCTL_WAIT);
+        if (ret)
+                goto done;
+
+        memcpy(value, rd_eeprom.value, MAX_EEPROM_DATA);
+done:
+        kfree(wait);
+        return ret;
+}
+
+/*
+ * This function sets a generic IE. In addition to generic IE, it can
+ * also handle WPA, WPA2 and WAPI IEs.
+ */
+static int
+mwifiex_set_gen_ie_helper(struct mwifiex_private *priv, u8 *ie_data_ptr,
+                          u16 ie_len)
+{
+        int ret = 0;
+        struct ieee_types_vendor_header *pvendor_ie;
+        const u8 wpa_oui[] = { 0x00, 0x50, 0xf2, 0x01 };
+        const u8 wps_oui[] = { 0x00, 0x50, 0xf2, 0x04 };
+
+        /* If the passed length is zero, reset the buffer */
+        if (!ie_len) {
+                priv->gen_ie_buf_len = 0;
+                priv->wps.session_enable = false;
+
+                return 0;
+        } else if (!ie_data_ptr) {
+                return -1;
+        }
+        pvendor_ie = (struct ieee_types_vendor_header *) ie_data_ptr;
+        /* Test to see if it is a WPA IE, if not, then it is a gen IE */
+        if (((pvendor_ie->element_id == WLAN_EID_WPA)
+             && (!memcmp(pvendor_ie->oui, wpa_oui, sizeof(wpa_oui))))
+                        || (pvendor_ie->element_id == WLAN_EID_RSN)) {
+
+                /* IE is a WPA/WPA2 IE so call set_wpa function */
+                ret = mwifiex_set_wpa_ie_helper(priv, ie_data_ptr, ie_len);
+                priv->wps.session_enable = false;
+
+                return ret;
+        } else if (pvendor_ie->element_id == WLAN_EID_BSS_AC_ACCESS_DELAY) {
+                /* IE is a WAPI IE so call set_wapi function */
+                ret = mwifiex_set_wapi_ie(priv, ie_data_ptr, ie_len);
+
+                return ret;
+        }
+        /*
+         * Verify that the passed length is not larger than the
+         * available space remaining in the buffer
+         */
+        if (ie_len < (sizeof(priv->gen_ie_buf) - priv->gen_ie_buf_len)) {
+
+                /* Test to see if it is a WPS IE, if so, enable
+                 * wps session flag
+                 */
+                pvendor_ie = (struct ieee_types_vendor_header *) ie_data_ptr;
+                if ((pvendor_ie->element_id == WLAN_EID_VENDOR_SPECIFIC)
+                                && (!memcmp(pvendor_ie->oui, wps_oui,
+                                                sizeof(wps_oui)))) {
+                        priv->wps.session_enable = true;
+                        dev_dbg(priv->adapter->dev,
+                                "info: WPS Session Enabled.\n");
+                }
+
+                /* Append the passed data to the end of the
+                   genIeBuffer */
+                memcpy(priv->gen_ie_buf + priv->gen_ie_buf_len, ie_data_ptr,
+                                                                        ie_len);
+                /* Increment the stored buffer length by the
+                   size passed */
+                priv->gen_ie_buf_len += ie_len;
+        } else {
+                /* Passed data does not fit in the remaining
+                   buffer space */
+                ret = -1;
+        }
+
+        /* Return 0, or -1 for error case */
+        return ret;
+}
+
+/*
+ * IOCTL request handler to set/get generic IE.
+ *
+ * In addition to various generic IEs, this function can also be
+ * used to set the ARP filter.
+ */
+static int mwifiex_misc_ioctl_gen_ie(struct mwifiex_private *priv,
+                                     struct mwifiex_ds_misc_gen_ie *gen_ie,
+                                     u16 action)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+
+        switch (gen_ie->type) {
+        case MWIFIEX_IE_TYPE_GEN_IE:
+                if (action == HostCmd_ACT_GEN_GET) {
+                        gen_ie->len = priv->wpa_ie_len;
+                        memcpy(gen_ie->ie_data, priv->wpa_ie, gen_ie->len);
+                } else {
+                        mwifiex_set_gen_ie_helper(priv, gen_ie->ie_data,
+                                                  (u16) gen_ie->len);
+                }
+                break;
+        case MWIFIEX_IE_TYPE_ARP_FILTER:
+                memset(adapter->arp_filter, 0, sizeof(adapter->arp_filter));
+                if (gen_ie->len > ARP_FILTER_MAX_BUF_SIZE) {
+                        adapter->arp_filter_size = 0;
+                        dev_err(adapter->dev, "invalid ARP filter size\n");
+                        return -1;
+                } else {
+                        memcpy(adapter->arp_filter, gen_ie->ie_data,
+                                                                gen_ie->len);
+                        adapter->arp_filter_size = gen_ie->len;
+                }
+                break;
+        default:
+                dev_err(adapter->dev, "invalid IE type\n");
+                return -1;
+        }
+        return 0;
+}
+
+/*
+ * Sends IOCTL request to set a generic IE.
+ *
+ * This function allocates the IOCTL request buffer, fills it
+ * with requisite parameters and calls the IOCTL handler.
+ */
+int
+mwifiex_set_gen_ie(struct mwifiex_private *priv, u8 *ie, int ie_len)
+{
+        struct mwifiex_ds_misc_gen_ie gen_ie;
+        int status = 0;
+
+        if (ie_len > IW_CUSTOM_MAX)
+                return -EFAULT;
+
+        gen_ie.type = MWIFIEX_IE_TYPE_GEN_IE;
+        gen_ie.len = ie_len;
+        memcpy(gen_ie.ie_data, ie, ie_len);
+        status = mwifiex_misc_ioctl_gen_ie(priv, &gen_ie, HostCmd_ACT_GEN_SET);
+        if (status)
+                return -EFAULT;
+
+        return 0;
+}
diff --git a/drivers/net/wireless/mwifiex/sta_rx.c b/drivers/net/wireless/mwifiex/sta_rx.c
new file mode 100644
index 00000000000..8282679e64f
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/sta_rx.c
@@ -0,0 +1,182 @@
+/*
+ * Marvell Wireless LAN device driver: station RX data handling
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "11n_aggr.h"
+#include "11n_rxreorder.h"
+
+/*
+ * This function processes the received packet and forwards it
+ * to kernel/upper layer.
+ *
+ * This function parses through the received packet and determines
+ * if it is a debug packet or normal packet.
+ *
+ * For non-debug packets, the function chops off unnecessary leading
+ * header bytes, reconstructs the packet as an ethernet frame or
+ * 802.2/llc/snap frame as required, and sends it to kernel/upper layer.
+ *
+ * The completion callback is called after processing in complete.
+ */
+int mwifiex_process_rx_packet(struct mwifiex_adapter *adapter,
+                              struct sk_buff *skb)
+{
+        int ret = 0;
+        struct mwifiex_rxinfo *rx_info = MWIFIEX_SKB_RXCB(skb);
+        struct mwifiex_private *priv = adapter->priv[rx_info->bss_index];
+        struct rx_packet_hdr *rx_pkt_hdr;
+        struct rxpd *local_rx_pd;
+        int hdr_chop;
+        struct ethhdr *eth_hdr;
+        u8 rfc1042_eth_hdr[ETH_ALEN] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
+
+        local_rx_pd = (struct rxpd *) (skb->data);
+
+        rx_pkt_hdr = (struct rx_packet_hdr *) ((u8 *) local_rx_pd +
+                                local_rx_pd->rx_pkt_offset);
+
+        if (!memcmp(&rx_pkt_hdr->rfc1042_hdr,
+                    rfc1042_eth_hdr, sizeof(rfc1042_eth_hdr))) {
+                /*
+                 *  Replace the 803 header and rfc1042 header (llc/snap) with an
+                 *    EthernetII header, keep the src/dst and snap_type
+                 *    (ethertype).
+                 *  The firmware only passes up SNAP frames converting
+                 *    all RX Data from 802.11 to 802.2/LLC/SNAP frames.
+                 *  To create the Ethernet II, just move the src, dst address
+                 *    right before the snap_type.
+                 */
+                eth_hdr = (struct ethhdr *)
+                        ((u8 *) &rx_pkt_hdr->eth803_hdr
+                         + sizeof(rx_pkt_hdr->eth803_hdr) +
+                         sizeof(rx_pkt_hdr->rfc1042_hdr)
+                         - sizeof(rx_pkt_hdr->eth803_hdr.h_dest)
+                         - sizeof(rx_pkt_hdr->eth803_hdr.h_source)
+                         - sizeof(rx_pkt_hdr->rfc1042_hdr.snap_type));
+
+                memcpy(eth_hdr->h_source, rx_pkt_hdr->eth803_hdr.h_source,
+                       sizeof(eth_hdr->h_source));
+                memcpy(eth_hdr->h_dest, rx_pkt_hdr->eth803_hdr.h_dest,
+                       sizeof(eth_hdr->h_dest));
+
+                /* Chop off the rxpd + the excess memory from the 802.2/llc/snap
+                   header that was removed. */
+                hdr_chop = (u8 *) eth_hdr - (u8 *) local_rx_pd;
+        } else {
+                /* Chop off the rxpd */
+                hdr_chop = (u8 *) &rx_pkt_hdr->eth803_hdr -
+                        (u8 *) local_rx_pd;
+        }
+
+        /* Chop off the leading header bytes so the it points to the start of
+           either the reconstructed EthII frame or the 802.2/llc/snap frame */
+        skb_pull(skb, hdr_chop);
+
+        priv->rxpd_rate = local_rx_pd->rx_rate;
+
+        priv->rxpd_htinfo = local_rx_pd->ht_info;
+
+        ret = mwifiex_recv_packet(adapter, skb);
+        if (ret == -1)
+                dev_err(adapter->dev, "recv packet failed\n");
+
+        return ret;
+}
+
+/*
+ * This function processes the received buffer.
+ *
+ * The function looks into the RxPD and performs sanity tests on the
+ * received buffer to ensure its a valid packet, before processing it
+ * further. If the packet is determined to be aggregated, it is
+ * de-aggregated accordingly. Non-unicast packets are sent directly to
+ * the kernel/upper layers. Unicast packets are handed over to the
+ * Rx reordering routine if 11n is enabled.
+ *
+ * The completion callback is called after processing in complete.
+ */
+int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *adapter,
+                                  struct sk_buff *skb)
+{
+        int ret = 0;
+        struct rxpd *local_rx_pd;
+        struct mwifiex_rxinfo *rx_info = MWIFIEX_SKB_RXCB(skb);
+        struct rx_packet_hdr *rx_pkt_hdr;
+        u8 ta[ETH_ALEN];
+        u16 rx_pkt_type = 0;
+        struct mwifiex_private *priv = adapter->priv[rx_info->bss_index];
+
+        local_rx_pd = (struct rxpd *) (skb->data);
+        rx_pkt_type = local_rx_pd->rx_pkt_type;
+
+        rx_pkt_hdr = (struct rx_packet_hdr *) ((u8 *) local_rx_pd +
+                                        local_rx_pd->rx_pkt_offset);
+
+        if ((local_rx_pd->rx_pkt_offset + local_rx_pd->rx_pkt_length) >
+            (u16) skb->len) {
+                dev_err(adapter->dev, "wrong rx packet: len=%d,"
+                        " rx_pkt_offset=%d, rx_pkt_length=%d\n", skb->len,
+                       local_rx_pd->rx_pkt_offset, local_rx_pd->rx_pkt_length);
+                priv->stats.rx_dropped++;
+                dev_kfree_skb_any(skb);
+                return ret;
+        }
+        if (local_rx_pd->rx_pkt_type == PKT_TYPE_AMSDU) {
+                mwifiex_11n_deaggregate_pkt(priv, skb);
+                return ret;
+        }
+        /*
+         * If the packet is not an unicast packet then send the packet
+         * directly to os. Don't pass thru rx reordering
+         */
+        if (!IS_11N_ENABLED(priv) ||
+            memcmp(priv->curr_addr, rx_pkt_hdr->eth803_hdr.h_dest, ETH_ALEN)) {
+                mwifiex_process_rx_packet(adapter, skb);
+                return ret;
+        }
+
+        if (mwifiex_queuing_ra_based(priv)) {
+                memcpy(ta, rx_pkt_hdr->eth803_hdr.h_source, ETH_ALEN);
+        } else {
+                if (rx_pkt_type != PKT_TYPE_BAR)
+                        priv->rx_seq[local_rx_pd->priority] =
+                                                local_rx_pd->seq_num;
+                memcpy(ta, priv->curr_bss_params.bss_descriptor.mac_address,
+                       ETH_ALEN);
+        }
+
+        /* Reorder and send to OS */
+        ret = mwifiex_11n_rx_reorder_pkt(priv, local_rx_pd->seq_num,
+                                             local_rx_pd->priority, ta,
+                                             (u8) local_rx_pd->rx_pkt_type,
+                                                (void *) skb);
+
+        if (ret || (rx_pkt_type == PKT_TYPE_BAR)) {
+                if (priv && (ret == -1))
+                        priv->stats.rx_dropped++;
+
+                dev_kfree_skb_any(skb);
+        }
+
+        return ret;
+}
diff --git a/drivers/net/wireless/mwifiex/sta_tx.c b/drivers/net/wireless/mwifiex/sta_tx.c
new file mode 100644
index 00000000000..e8db6bd021c
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/sta_tx.c
@@ -0,0 +1,202 @@
+/*
+ * Marvell Wireless LAN device driver: station TX data handling
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+
+/*
+ * This function fills the TxPD for tx packets.
+ *
+ * The Tx buffer received by this function should already have the
+ * header space allocated for TxPD.
+ *
+ * This function inserts the TxPD in between interface header and actual
+ * data and adjusts the buffer pointers accordingly.
+ *
+ * The following TxPD fields are set by this function, as required -
+ *      - BSS number
+ *      - Tx packet length and offset
+ *      - Priority
+ *      - Packet delay
+ *      - Priority specific Tx control
+ *      - Flags
+ */
+void *mwifiex_process_sta_txpd(struct mwifiex_private *priv,
+                                struct sk_buff *skb)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct txpd *local_tx_pd;
+        struct mwifiex_txinfo *tx_info = MWIFIEX_SKB_TXCB(skb);
+
+        if (!skb->len) {
+                dev_err(adapter->dev, "Tx: bad packet length: %d\n",
+                       skb->len);
+                tx_info->status_code = MWIFIEX_ERROR_PKT_SIZE_INVALID;
+                return skb->data;
+        }
+
+        BUG_ON(skb_headroom(skb) < (sizeof(*local_tx_pd) + INTF_HEADER_LEN));
+        skb_push(skb, sizeof(*local_tx_pd));
+
+        local_tx_pd = (struct txpd *) skb->data;
+        memset(local_tx_pd, 0, sizeof(struct txpd));
+        local_tx_pd->bss_num = priv->bss_num;
+        local_tx_pd->bss_type = priv->bss_type;
+        local_tx_pd->tx_pkt_length = cpu_to_le16((u16) (skb->len -
+                                                        sizeof(struct txpd)));
+
+        local_tx_pd->priority = (u8) skb->priority;
+        local_tx_pd->pkt_delay_2ms =
+                mwifiex_wmm_compute_drv_pkt_delay(priv, skb);
+
+        if (local_tx_pd->priority <
+            ARRAY_SIZE(priv->wmm.user_pri_pkt_tx_ctrl))
+                /*
+                 * Set the priority specific tx_control field, setting of 0 will
+                 *   cause the default value to be used later in this function
+                 */
+                local_tx_pd->tx_control =
+                        cpu_to_le32(priv->wmm.user_pri_pkt_tx_ctrl[local_tx_pd->
+                                                         priority]);
+
+        if (adapter->pps_uapsd_mode) {
+                if (mwifiex_check_last_packet_indication(priv)) {
+                        adapter->tx_lock_flag = true;
+                        local_tx_pd->flags =
+                                MWIFIEX_TxPD_POWER_MGMT_LAST_PACKET;
+                }
+        }
+
+        /* Offset of actual data */
+        local_tx_pd->tx_pkt_offset = cpu_to_le16(sizeof(struct txpd));
+
+        /* make space for INTF_HEADER_LEN */
+        skb_push(skb, INTF_HEADER_LEN);
+
+        if (!local_tx_pd->tx_control)
+                /* TxCtrl set by user or default */
+                local_tx_pd->tx_control = cpu_to_le32(priv->pkt_tx_ctrl);
+
+        return skb->data;
+}
+
+/*
+ * This function tells firmware to send a NULL data packet.
+ *
+ * The function creates a NULL data packet with TxPD and sends to the
+ * firmware for transmission, with highest priority setting.
+ */
+int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct txpd *local_tx_pd;
+/* sizeof(struct txpd) + Interface specific header */
+#define NULL_PACKET_HDR 64
+        u32 data_len = NULL_PACKET_HDR;
+        struct sk_buff *skb = NULL;
+        int ret = 0;
+        struct mwifiex_txinfo *tx_info = NULL;
+
+        if (adapter->surprise_removed)
+                return -1;
+
+        if (!priv->media_connected)
+                return -1;
+
+        if (adapter->data_sent)
+                return -1;
+
+        skb = dev_alloc_skb(data_len);
+        if (!skb)
+                return -1;
+
+        tx_info = MWIFIEX_SKB_TXCB(skb);
+        tx_info->bss_index = priv->bss_index;
+        skb_reserve(skb, sizeof(struct txpd) + INTF_HEADER_LEN);
+        skb_push(skb, sizeof(struct txpd));
+
+        local_tx_pd = (struct txpd *) skb->data;
+        local_tx_pd->tx_control = cpu_to_le32(priv->pkt_tx_ctrl);
+        local_tx_pd->flags = flags;
+        local_tx_pd->priority = WMM_HIGHEST_PRIORITY;
+        local_tx_pd->tx_pkt_offset = cpu_to_le16(sizeof(struct txpd));
+        local_tx_pd->bss_num = priv->bss_num;
+        local_tx_pd->bss_type = priv->bss_type;
+
+        skb_push(skb, INTF_HEADER_LEN);
+
+        ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA,
+                                             skb->data, skb->len, NULL);
+        switch (ret) {
+        case -EBUSY:
+                adapter->data_sent = true;
+                /* Fall through FAILURE handling */
+        case -1:
+                dev_kfree_skb_any(skb);
+                dev_err(adapter->dev, "%s: host_to_card failed: ret=%d\n",
+                                                __func__, ret);
+                adapter->dbg.num_tx_host_to_card_failure++;
+                break;
+        case 0:
+                dev_kfree_skb_any(skb);
+                dev_dbg(adapter->dev, "data: %s: host_to_card succeeded\n",
+                                                __func__);
+                adapter->tx_lock_flag = true;
+                break;
+        case -EINPROGRESS:
+                break;
+        default:
+                break;
+        }
+
+        return ret;
+}
+
+/*
+ * This function checks if we need to send last packet indication.
+ */
+u8
+mwifiex_check_last_packet_indication(struct mwifiex_private *priv)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        u8 ret = false;
+        u8 prop_ps = true;
+
+        if (!adapter->sleep_period.period)
+                return ret;
+        if (mwifiex_wmm_lists_empty(adapter)) {
+                if ((priv->curr_bss_params.wmm_uapsd_enabled &&
+                     priv->wmm_qosinfo) || prop_ps)
+                        ret = true;
+        }
+
+        if (ret && !adapter->cmd_sent && !adapter->curr_cmd
+            && !is_command_pending(adapter)) {
+                adapter->delay_null_pkt = false;
+                ret = true;
+        } else {
+                ret = false;
+                adapter->delay_null_pkt = true;
+        }
+        return ret;
+}
diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c
new file mode 100644
index 00000000000..f06923cb1c4
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/txrx.c
@@ -0,0 +1,202 @@
+/*
+ * Marvell Wireless LAN device driver: generic TX/RX data handling
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+
+/*
+ * This function processes the received buffer.
+ *
+ * Main responsibility of this function is to parse the RxPD to
+ * identify the correct interface this packet is headed for and
+ * forwarding it to the associated handling function, where the
+ * packet will be further processed and sent to kernel/upper layer
+ * if required.
+ */
+int mwifiex_handle_rx_packet(struct mwifiex_adapter *adapter,
+                             struct sk_buff *skb)
+{
+        int ret = 0;
+        struct mwifiex_private *priv =
+                mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
+        struct rxpd *local_rx_pd;
+        struct mwifiex_rxinfo *rx_info = MWIFIEX_SKB_RXCB(skb);
+
+        local_rx_pd = (struct rxpd *) (skb->data);
+        /* Get the BSS number from rxpd, get corresponding priv */
+        priv = mwifiex_get_priv_by_id(adapter, local_rx_pd->bss_num &
+                                      BSS_NUM_MASK, local_rx_pd->bss_type);
+        if (!priv)
+                priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);
+
+        rx_info->bss_index = priv->bss_index;
+        ret = mwifiex_process_sta_rx_packet(adapter, skb);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(mwifiex_handle_rx_packet);
+
+/*
+ * This function sends a packet to device.
+ *
+ * It processes the packet to add the TxPD, checks condition and
+ * sends the processed packet to firmware for transmission.
+ *
+ * On successful completion, the function calls the completion callback
+ * and logs the time.
+ */
+int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,
+                       struct mwifiex_tx_param *tx_param)
+{
+        int ret = -1;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        u8 *head_ptr = NULL;
+        struct txpd *local_tx_pd = NULL;
+
+        head_ptr = (u8 *) mwifiex_process_sta_txpd(priv, skb);
+        if (head_ptr) {
+                if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA)
+                        local_tx_pd =
+                                (struct txpd *) (head_ptr + INTF_HEADER_LEN);
+
+                ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA,
+                                             skb->data, skb->len, tx_param);
+        }
+
+        switch (ret) {
+        case -EBUSY:
+                if ((GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) &&
+                        (adapter->pps_uapsd_mode) &&
+                        (adapter->tx_lock_flag)) {
+                                priv->adapter->tx_lock_flag = false;
+                                local_tx_pd->flags = 0;
+                }
+                dev_dbg(adapter->dev, "data: -EBUSY is returned\n");
+                break;
+        case -1:
+                adapter->data_sent = false;
+                dev_err(adapter->dev, "mwifiex_write_data_async failed: 0x%X\n",
+                       ret);
+                adapter->dbg.num_tx_host_to_card_failure++;
+                mwifiex_write_data_complete(adapter, skb, ret);
+                break;
+        case -EINPROGRESS:
+                adapter->data_sent = false;
+                break;
+        case 0:
+                mwifiex_write_data_complete(adapter, skb, ret);
+                break;
+        default:
+                break;
+        }
+
+        return ret;
+}
+
+/*
+ * Packet send completion callback handler.
+ *
+ * It either frees the buffer directly or forwards it to another
+ * completion callback which checks conditions, updates statistics,
+ * wakes up stalled traffic queue if required, and then frees the buffer.
+ */
+int mwifiex_write_data_complete(struct mwifiex_adapter *adapter,
+                                struct sk_buff *skb, int status)
+{
+        struct mwifiex_private *priv = NULL, *tpriv = NULL;
+        struct mwifiex_txinfo *tx_info = NULL;
+        int i;
+
+        if (!skb)
+                return 0;
+
+        tx_info = MWIFIEX_SKB_TXCB(skb);
+        priv = mwifiex_bss_index_to_priv(adapter, tx_info->bss_index);
+        if (!priv)
+                goto done;
+
+        priv->netdev->trans_start = jiffies;
+        if (!status) {
+                priv->stats.tx_packets++;
+                priv->stats.tx_bytes += skb->len;
+        } else {
+                priv->stats.tx_errors++;
+        }
+        atomic_dec(&adapter->tx_pending);
+
+        for (i = 0; i < adapter->priv_num; i++) {
+
+                tpriv = adapter->priv[i];
+
+                if ((GET_BSS_ROLE(tpriv) == MWIFIEX_BSS_ROLE_STA)
+                                && (tpriv->media_connected)) {
+                        if (netif_queue_stopped(tpriv->netdev))
+                                netif_wake_queue(tpriv->netdev);
+                }
+        }
+done:
+        dev_kfree_skb_any(skb);
+
+        return 0;
+}
+
+/*
+ * Packet receive completion callback handler.
+ *
+ * This function calls another completion callback handler which
+ * updates the statistics, and optionally updates the parent buffer
+ * use count before freeing the received packet.
+ */
+int mwifiex_recv_packet_complete(struct mwifiex_adapter *adapter,
+                                 struct sk_buff *skb, int status)
+{
+        struct mwifiex_rxinfo *rx_info = MWIFIEX_SKB_RXCB(skb);
+        struct mwifiex_rxinfo *rx_info_parent = NULL;
+        struct mwifiex_private *priv;
+        struct sk_buff *skb_parent = NULL;
+        unsigned long flags;
+
+        priv = adapter->priv[rx_info->bss_index];
+
+        if (priv && (status == -1))
+                priv->stats.rx_dropped++;
+
+        if (rx_info->parent) {
+                skb_parent = rx_info->parent;
+                rx_info_parent = MWIFIEX_SKB_RXCB(skb_parent);
+
+                spin_lock_irqsave(&priv->rx_pkt_lock, flags);
+                --rx_info_parent->use_count;
+
+                if (!rx_info_parent->use_count) {
+                        spin_unlock_irqrestore(&priv->rx_pkt_lock, flags);
+                        dev_kfree_skb_any(skb_parent);
+                } else {
+                        spin_unlock_irqrestore(&priv->rx_pkt_lock, flags);
+                }
+        } else {
+                dev_kfree_skb_any(skb);
+        }
+
+        return 0;
+}
diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c
new file mode 100644
index 00000000000..205022aa52f
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/util.c
@@ -0,0 +1,252 @@
+/*
+ * Marvell Wireless LAN device driver: utility functions
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+#include "11n.h"
+
+/*
+ * Firmware initialization complete callback handler.
+ *
+ * This function wakes up the function waiting on the init
+ * wait queue for the firmware initialization to complete.
+ */
+int mwifiex_init_fw_complete(struct mwifiex_adapter *adapter)
+{
+
+        adapter->init_wait_q_woken = true;
+        wake_up_interruptible(&adapter->init_wait_q);
+        return 0;
+}
+
+/*
+ * Firmware shutdown complete callback handler.
+ *
+ * This function sets the hardware status to not ready and wakes up
+ * the function waiting on the init wait queue for the firmware
+ * shutdown to complete.
+ */
+int mwifiex_shutdown_fw_complete(struct mwifiex_adapter *adapter)
+{
+        adapter->hw_status = MWIFIEX_HW_STATUS_NOT_READY;
+        adapter->init_wait_q_woken = true;
+        wake_up_interruptible(&adapter->init_wait_q);
+        return 0;
+}
+
+/*
+ * IOCTL request handler to send function init/shutdown command
+ * to firmware.
+ *
+ * This function prepares the correct firmware command and
+ * issues it.
+ */
+int mwifiex_misc_ioctl_init_shutdown(struct mwifiex_adapter *adapter,
+                                     struct mwifiex_wait_queue *wait,
+                                     u32 func_init_shutdown)
+{
+        struct mwifiex_private *priv = adapter->priv[wait->bss_index];
+        int ret;
+        u16 cmd;
+
+        if (func_init_shutdown == MWIFIEX_FUNC_INIT) {
+                cmd = HostCmd_CMD_FUNC_INIT;
+        } else if (func_init_shutdown == MWIFIEX_FUNC_SHUTDOWN) {
+                cmd = HostCmd_CMD_FUNC_SHUTDOWN;
+        } else {
+                dev_err(adapter->dev, "unsupported parameter\n");
+                return -1;
+        }
+
+        /* Send command to firmware */
+        ret = mwifiex_prepare_cmd(priv, cmd, HostCmd_ACT_GEN_SET,
+                                  0, wait, NULL);
+
+        if (!ret)
+                ret = -EINPROGRESS;
+
+        return ret;
+}
+
+/*
+ * IOCTL request handler to set/get debug information.
+ *
+ * This function collates/sets the information from/to different driver
+ * structures.
+ */
+int mwifiex_get_debug_info(struct mwifiex_private *priv,
+                           struct mwifiex_debug_info *info)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+
+        if (info) {
+                memcpy(info->packets_out,
+                       priv->wmm.packets_out,
+                       sizeof(priv->wmm.packets_out));
+                info->max_tx_buf_size = (u32) adapter->max_tx_buf_size;
+                info->tx_buf_size = (u32) adapter->tx_buf_size;
+                info->rx_tbl_num = mwifiex_get_rx_reorder_tbl(
+                                        priv, info->rx_tbl);
+                info->tx_tbl_num = mwifiex_get_tx_ba_stream_tbl(
+                                        priv, info->tx_tbl);
+                info->ps_mode = adapter->ps_mode;
+                info->ps_state = adapter->ps_state;
+                info->is_deep_sleep = adapter->is_deep_sleep;
+                info->pm_wakeup_card_req = adapter->pm_wakeup_card_req;
+                info->pm_wakeup_fw_try = adapter->pm_wakeup_fw_try;
+                info->is_hs_configured = adapter->is_hs_configured;
+                info->hs_activated = adapter->hs_activated;
+                info->num_cmd_host_to_card_failure
+                        = adapter->dbg.num_cmd_host_to_card_failure;
+                info->num_cmd_sleep_cfm_host_to_card_failure
+                        = adapter->dbg.num_cmd_sleep_cfm_host_to_card_failure;
+                info->num_tx_host_to_card_failure
+                        = adapter->dbg.num_tx_host_to_card_failure;
+                info->num_event_deauth = adapter->dbg.num_event_deauth;
+                info->num_event_disassoc = adapter->dbg.num_event_disassoc;
+                info->num_event_link_lost = adapter->dbg.num_event_link_lost;
+                info->num_cmd_deauth = adapter->dbg.num_cmd_deauth;
+                info->num_cmd_assoc_success =
+                        adapter->dbg.num_cmd_assoc_success;
+                info->num_cmd_assoc_failure =
+                        adapter->dbg.num_cmd_assoc_failure;
+                info->num_tx_timeout = adapter->dbg.num_tx_timeout;
+                info->num_cmd_timeout = adapter->dbg.num_cmd_timeout;
+                info->timeout_cmd_id = adapter->dbg.timeout_cmd_id;
+                info->timeout_cmd_act = adapter->dbg.timeout_cmd_act;
+                memcpy(info->last_cmd_id, adapter->dbg.last_cmd_id,
+                       sizeof(adapter->dbg.last_cmd_id));
+                memcpy(info->last_cmd_act, adapter->dbg.last_cmd_act,
+                       sizeof(adapter->dbg.last_cmd_act));
+                info->last_cmd_index = adapter->dbg.last_cmd_index;
+                memcpy(info->last_cmd_resp_id, adapter->dbg.last_cmd_resp_id,
+                       sizeof(adapter->dbg.last_cmd_resp_id));
+                info->last_cmd_resp_index = adapter->dbg.last_cmd_resp_index;
+                memcpy(info->last_event, adapter->dbg.last_event,
+                       sizeof(adapter->dbg.last_event));
+                info->last_event_index = adapter->dbg.last_event_index;
+                info->data_sent = adapter->data_sent;
+                info->cmd_sent = adapter->cmd_sent;
+                info->cmd_resp_received = adapter->cmd_resp_received;
+        }
+
+        return 0;
+}
+
+/*
+ * This function processes the received packet before sending it to the
+ * kernel.
+ *
+ * It extracts the SKB from the received buffer and sends it to kernel.
+ * In case the received buffer does not contain the data in SKB format,
+ * the function creates a blank SKB, fills it with the data from the
+ * received buffer and then sends this new SKB to the kernel.
+ */
+int mwifiex_recv_packet(struct mwifiex_adapter *adapter, struct sk_buff *skb)
+{
+        struct mwifiex_rxinfo *rx_info = NULL;
+        struct mwifiex_private *priv = NULL;
+
+        if (!skb)
+                return -1;
+
+        rx_info = MWIFIEX_SKB_RXCB(skb);
+        priv = mwifiex_bss_index_to_priv(adapter, rx_info->bss_index);
+        if (!priv)
+                return -1;
+
+        skb->dev = priv->netdev;
+        skb->protocol = eth_type_trans(skb, priv->netdev);
+        skb->ip_summed = CHECKSUM_NONE;
+        priv->stats.rx_bytes += skb->len;
+        priv->stats.rx_packets++;
+        if (in_interrupt())
+                netif_rx(skb);
+        else
+                netif_rx_ni(skb);
+
+        return 0;
+}
+
+/*
+ * Receive packet completion callback handler.
+ *
+ * This function updates the statistics and frees the buffer SKB.
+ */
+int mwifiex_recv_complete(struct mwifiex_adapter *adapter,
+                          struct sk_buff *skb, int status)
+{
+        struct mwifiex_private *priv = NULL;
+        struct mwifiex_rxinfo *rx_info = NULL;
+
+        if (!skb)
+                return 0;
+
+        rx_info = MWIFIEX_SKB_RXCB(skb);
+        priv = mwifiex_bss_index_to_priv(adapter, rx_info->bss_index);
+
+        if (priv && (status == -1))
+                priv->stats.rx_dropped++;
+
+        dev_kfree_skb_any(skb);
+
+        return 0;
+}
+
+/*
+ * IOCTL completion callback handler.
+ *
+ * This function is called when a pending IOCTL is completed.
+ *
+ * If work queue support is enabled, the function wakes up the
+ * corresponding waiting function. Otherwise, it processes the
+ * IOCTL response and frees the response buffer.
+ */
+int mwifiex_ioctl_complete(struct mwifiex_adapter *adapter,
+                           struct mwifiex_wait_queue *wait_queue,
+                           int status)
+{
+        enum mwifiex_error_code status_code =
+                (enum mwifiex_error_code) wait_queue->status;
+
+        atomic_dec(&adapter->ioctl_pending);
+
+        dev_dbg(adapter->dev, "cmd: IOCTL completed: status=%d,"
+                        " status_code=%#x\n", status, status_code);
+
+        if (wait_queue->enabled) {
+                *wait_queue->condition = true;
+                wait_queue->status = status;
+                if (status && (status_code == MWIFIEX_ERROR_CMD_TIMEOUT))
+                        dev_err(adapter->dev, "cmd timeout\n");
+                else
+                        wake_up_interruptible(wait_queue->wait);
+        } else {
+                if (status)
+                        dev_err(adapter->dev, "cmd failed: status_code=%#x\n",
+                               status_code);
+                kfree(wait_queue);
+        }
+
+        return 0;
+}
diff --git a/drivers/net/wireless/mwifiex/util.h b/drivers/net/wireless/mwifiex/util.h
new file mode 100644
index 00000000000..9506afc6c0e
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/util.h
@@ -0,0 +1,32 @@
+/*
+ * Marvell Wireless LAN device driver: utility functions
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#ifndef _MWIFIEX_UTIL_H_
+#define _MWIFIEX_UTIL_H_
+
+static inline struct mwifiex_rxinfo *MWIFIEX_SKB_RXCB(struct sk_buff *skb)
+{
+        return (struct mwifiex_rxinfo *)skb->cb;
+}
+
+static inline struct mwifiex_txinfo *MWIFIEX_SKB_TXCB(struct sk_buff *skb)
+{
+        return (struct mwifiex_txinfo *)skb->cb;
+}
+#endif /* !_MWIFIEX_UTIL_H_ */
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c
new file mode 100644
index 00000000000..1cfbc6bed69
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -0,0 +1,1237 @@
+/*
+ * Marvell Wireless LAN device driver: WMM
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#include "decl.h"
+#include "ioctl.h"
+#include "util.h"
+#include "fw.h"
+#include "main.h"
+#include "wmm.h"
+#include "11n.h"
+
+
+/* Maximum value FW can accept for driver delay in packet transmission */
+#define DRV_PKT_DELAY_TO_FW_MAX   512
+
+
+#define WMM_QUEUED_PACKET_LOWER_LIMIT   180
+
+#define WMM_QUEUED_PACKET_UPPER_LIMIT   200
+
+/* Offset for TOS field in the IP header */
+#define IPTOS_OFFSET 5
+
+/* WMM information IE */
+static const u8 wmm_info_ie[] = { WLAN_EID_VENDOR_SPECIFIC, 0x07,
+        0x00, 0x50, 0xf2, 0x02,
+        0x00, 0x01, 0x00
+};
+
+static const u8 wmm_aci_to_qidx_map[] = { WMM_AC_BE,
+        WMM_AC_BK,
+        WMM_AC_VI,
+        WMM_AC_VO
+};
+
+static u8 tos_to_tid[] = {
+        /* TID DSCP_P2 DSCP_P1 DSCP_P0 WMM_AC */
+        0x01,                   /* 0 1 0 AC_BK */
+        0x02,                   /* 0 0 0 AC_BK */
+        0x00,                   /* 0 0 1 AC_BE */
+        0x03,                   /* 0 1 1 AC_BE */
+        0x04,                   /* 1 0 0 AC_VI */
+        0x05,                   /* 1 0 1 AC_VI */
+        0x06,                   /* 1 1 0 AC_VO */
+        0x07                    /* 1 1 1 AC_VO */
+};
+
+/*
+ * This table inverses the tos_to_tid operation to get a priority
+ * which is in sequential order, and can be compared.
+ * Use this to compare the priority of two different TIDs.
+ */
+static u8 tos_to_tid_inv[] = {
+        0x02,  /* from tos_to_tid[2] = 0 */
+        0x00,  /* from tos_to_tid[0] = 1 */
+        0x01,  /* from tos_to_tid[1] = 2 */
+        0x03,
+        0x04,
+        0x05,
+        0x06,
+        0x07};
+
+static u8 ac_to_tid[4][2] = { {1, 2}, {0, 3}, {4, 5}, {6, 7} };
+
+/*
+ * This function debug prints the priority parameters for a WMM AC.
+ */
+static void
+mwifiex_wmm_ac_debug_print(const struct ieee_types_wmm_ac_parameters *ac_param)
+{
+        const char *ac_str[] = { "BK", "BE", "VI", "VO" };
+
+        pr_debug("info: WMM AC_%s: ACI=%d, ACM=%d, Aifsn=%d, "
+               "EcwMin=%d, EcwMax=%d, TxopLimit=%d\n",
+               ac_str[wmm_aci_to_qidx_map[(ac_param->aci_aifsn_bitmap
+               & MWIFIEX_ACI) >> 5]],
+               (ac_param->aci_aifsn_bitmap & MWIFIEX_ACI) >> 5,
+               (ac_param->aci_aifsn_bitmap & MWIFIEX_ACM) >> 4,
+               ac_param->aci_aifsn_bitmap & MWIFIEX_AIFSN,
+               ac_param->ecw_bitmap & MWIFIEX_ECW_MIN,
+               (ac_param->ecw_bitmap & MWIFIEX_ECW_MAX) >> 4,
+               le16_to_cpu(ac_param->tx_op_limit));
+}
+
+/*
+ * This function allocates a route address list.
+ *
+ * The function also initializes the list with the provided RA.
+ */
+static struct mwifiex_ra_list_tbl *
+mwifiex_wmm_allocate_ralist_node(struct mwifiex_adapter *adapter, u8 *ra)
+{
+        struct mwifiex_ra_list_tbl *ra_list;
+
+        ra_list = kzalloc(sizeof(struct mwifiex_ra_list_tbl), GFP_ATOMIC);
+
+        if (!ra_list) {
+                dev_err(adapter->dev, "%s: failed to alloc ra_list\n",
+                                                __func__);
+                return NULL;
+        }
+        INIT_LIST_HEAD(&ra_list->list);
+        skb_queue_head_init(&ra_list->skb_head);
+
+        memcpy(ra_list->ra, ra, ETH_ALEN);
+
+        ra_list->total_pkts_size = 0;
+
+        dev_dbg(adapter->dev, "info: allocated ra_list %p\n", ra_list);
+
+        return ra_list;
+}
+
+/*
+ * This function allocates and adds a RA list for all TIDs
+ * with the given RA.
+ */
+void
+mwifiex_ralist_add(struct mwifiex_private *priv, u8 *ra)
+{
+        int i;
+        struct mwifiex_ra_list_tbl *ra_list;
+        struct mwifiex_adapter *adapter = priv->adapter;
+
+        for (i = 0; i < MAX_NUM_TID; ++i) {
+                ra_list = mwifiex_wmm_allocate_ralist_node(adapter, ra);
+                dev_dbg(adapter->dev, "info: created ra_list %p\n", ra_list);
+
+                if (!ra_list)
+                        break;
+
+                if (!mwifiex_queuing_ra_based(priv))
+                        ra_list->is_11n_enabled = IS_11N_ENABLED(priv);
+                else
+                        ra_list->is_11n_enabled = false;
+
+                dev_dbg(adapter->dev, "data: ralist %p: is_11n_enabled=%d\n",
+                        ra_list, ra_list->is_11n_enabled);
+
+                list_add_tail(&ra_list->list,
+                                &priv->wmm.tid_tbl_ptr[i].ra_list);
+
+                if (!priv->wmm.tid_tbl_ptr[i].ra_list_curr)
+                        priv->wmm.tid_tbl_ptr[i].ra_list_curr = ra_list;
+        }
+}
+
+/*
+ * This function sets the WMM queue priorities to their default values.
+ */
+static void mwifiex_wmm_default_queue_priorities(struct mwifiex_private *priv)
+{
+        /* Default queue priorities: VO->VI->BE->BK */
+        priv->wmm.queue_priority[0] = WMM_AC_VO;
+        priv->wmm.queue_priority[1] = WMM_AC_VI;
+        priv->wmm.queue_priority[2] = WMM_AC_BE;
+        priv->wmm.queue_priority[3] = WMM_AC_BK;
+}
+
+/*
+ * This function map ACs to TIDs.
+ */
+static void
+mwifiex_wmm_queue_priorities_tid(struct mwifiex_private *priv,
+                                 u8 queue_priority[])
+{
+        int i;
+
+        for (i = 0; i < 4; ++i) {
+                tos_to_tid[7 - (i * 2)] = ac_to_tid[queue_priority[i]][1];
+                tos_to_tid[6 - (i * 2)] = ac_to_tid[queue_priority[i]][0];
+        }
+}
+
+/*
+ * This function initializes WMM priority queues.
+ */
+void
+mwifiex_wmm_setup_queue_priorities(struct mwifiex_private *priv,
+                                   struct ieee_types_wmm_parameter *wmm_ie)
+{
+        u16 cw_min, avg_back_off, tmp[4];
+        u32 i, j, num_ac;
+        u8 ac_idx;
+
+        if (!wmm_ie || !priv->wmm_enabled) {
+                /* WMM is not enabled, just set the defaults and return */
+                mwifiex_wmm_default_queue_priorities(priv);
+                return;
+        }
+
+        dev_dbg(priv->adapter->dev, "info: WMM Parameter IE: version=%d, "
+                "qos_info Parameter Set Count=%d, Reserved=%#x\n",
+                wmm_ie->vend_hdr.version, wmm_ie->qos_info_bitmap &
+                IEEE80211_WMM_IE_AP_QOSINFO_PARAM_SET_CNT_MASK,
+                wmm_ie->reserved);
+
+        for (num_ac = 0; num_ac < ARRAY_SIZE(wmm_ie->ac_params); num_ac++) {
+                cw_min = (1 << (wmm_ie->ac_params[num_ac].ecw_bitmap &
+                        MWIFIEX_ECW_MIN)) - 1;
+                avg_back_off = (cw_min >> 1) +
+                        (wmm_ie->ac_params[num_ac].aci_aifsn_bitmap &
+                        MWIFIEX_AIFSN);
+
+                ac_idx = wmm_aci_to_qidx_map[(wmm_ie->ac_params[num_ac].
+                                             aci_aifsn_bitmap &
+                                             MWIFIEX_ACI) >> 5];
+                priv->wmm.queue_priority[ac_idx] = ac_idx;
+                tmp[ac_idx] = avg_back_off;
+
+                dev_dbg(priv->adapter->dev, "info: WMM: CWmax=%d CWmin=%d Avg Back-off=%d\n",
+                       (1 << ((wmm_ie->ac_params[num_ac].ecw_bitmap &
+                       MWIFIEX_ECW_MAX) >> 4)) - 1,
+                       cw_min, avg_back_off);
+                mwifiex_wmm_ac_debug_print(&wmm_ie->ac_params[num_ac]);
+        }
+
+        /* Bubble sort */
+        for (i = 0; i < num_ac; i++) {
+                for (j = 1; j < num_ac - i; j++) {
+                        if (tmp[j - 1] > tmp[j]) {
+                                swap(tmp[j - 1], tmp[j]);
+                                swap(priv->wmm.queue_priority[j - 1],
+                                     priv->wmm.queue_priority[j]);
+                        } else if (tmp[j - 1] == tmp[j]) {
+                                if (priv->wmm.queue_priority[j - 1]
+                                    < priv->wmm.queue_priority[j])
+                                        swap(priv->wmm.queue_priority[j - 1],
+                                             priv->wmm.queue_priority[j]);
+                        }
+                }
+        }
+
+        mwifiex_wmm_queue_priorities_tid(priv, priv->wmm.queue_priority);
+}
+
+/*
+ * This function evaluates whether or not an AC is to be downgraded.
+ *
+ * In case the AC is not enabled, the highest AC is returned that is
+ * enabled and does not require admission control.
+ */
+static enum mwifiex_wmm_ac_e
+mwifiex_wmm_eval_downgrade_ac(struct mwifiex_private *priv,
+                              enum mwifiex_wmm_ac_e eval_ac)
+{
+        int down_ac;
+        enum mwifiex_wmm_ac_e ret_ac;
+        struct mwifiex_wmm_ac_status *ac_status;
+
+        ac_status = &priv->wmm.ac_status[eval_ac];
+
+        if (!ac_status->disabled)
+                /* Okay to use this AC, its enabled */
+                return eval_ac;
+
+        /* Setup a default return value of the lowest priority */
+        ret_ac = WMM_AC_BK;
+
+        /*
+         *  Find the highest AC that is enabled and does not require
+         *  admission control. The spec disallows downgrading to an AC,
+         *  which is enabled due to a completed admission control.
+         *  Unadmitted traffic is not to be sent on an AC with admitted
+         *  traffic.
+         */
+        for (down_ac = WMM_AC_BK; down_ac < eval_ac; down_ac++) {
+                ac_status = &priv->wmm.ac_status[down_ac];
+
+                if (!ac_status->disabled && !ac_status->flow_required)
+                        /* AC is enabled and does not require admission
+                           control */
+                        ret_ac = (enum mwifiex_wmm_ac_e) down_ac;
+        }
+
+        return ret_ac;
+}
+
+/*
+ * This function downgrades WMM priority queue.
+ */
+void
+mwifiex_wmm_setup_ac_downgrade(struct mwifiex_private *priv)
+{
+        int ac_val;
+
+        dev_dbg(priv->adapter->dev, "info: WMM: AC Priorities:"
+                        "BK(0), BE(1), VI(2), VO(3)\n");
+
+        if (!priv->wmm_enabled) {
+                /* WMM is not enabled, default priorities */
+                for (ac_val = WMM_AC_BK; ac_val <= WMM_AC_VO; ac_val++)
+                        priv->wmm.ac_down_graded_vals[ac_val] =
+                                (enum mwifiex_wmm_ac_e) ac_val;
+        } else {
+                for (ac_val = WMM_AC_BK; ac_val <= WMM_AC_VO; ac_val++) {
+                        priv->wmm.ac_down_graded_vals[ac_val]
+                                = mwifiex_wmm_eval_downgrade_ac(priv,
+                                                (enum mwifiex_wmm_ac_e) ac_val);
+                        dev_dbg(priv->adapter->dev, "info: WMM: AC PRIO %d maps to %d\n",
+                                ac_val, priv->wmm.ac_down_graded_vals[ac_val]);
+                }
+        }
+}
+
+/*
+ * This function converts the IP TOS field to an WMM AC
+ * Queue assignment.
+ */
+static enum mwifiex_wmm_ac_e
+mwifiex_wmm_convert_tos_to_ac(struct mwifiex_adapter *adapter, u32 tos)
+{
+        /* Map of TOS UP values to WMM AC */
+        const enum mwifiex_wmm_ac_e tos_to_ac[] = { WMM_AC_BE,
+                WMM_AC_BK,
+                WMM_AC_BK,
+                WMM_AC_BE,
+                WMM_AC_VI,
+                WMM_AC_VI,
+                WMM_AC_VO,
+                WMM_AC_VO
+        };
+
+        if (tos >= ARRAY_SIZE(tos_to_ac))
+                return WMM_AC_BE;
+
+        return tos_to_ac[tos];
+}
+
+/*
+ * This function evaluates a given TID and downgrades it to a lower
+ * TID if the WMM Parameter IE received from the AP indicates that the
+ * AP is disabled (due to call admission control (ACM bit). Mapping
+ * of TID to AC is taken care of internally.
+ */
+static u8
+mwifiex_wmm_downgrade_tid(struct mwifiex_private *priv, u32 tid)
+{
+        enum mwifiex_wmm_ac_e ac, ac_down;
+        u8 new_tid;
+
+        ac = mwifiex_wmm_convert_tos_to_ac(priv->adapter, tid);
+        ac_down = priv->wmm.ac_down_graded_vals[ac];
+
+        /* Send the index to tid array, picking from the array will be
+         * taken care by dequeuing function
+         */
+        new_tid = ac_to_tid[ac_down][tid % 2];
+
+        return new_tid;
+}
+
+/*
+ * This function initializes the WMM state information and the
+ * WMM data path queues.
+ */
+void
+mwifiex_wmm_init(struct mwifiex_adapter *adapter)
+{
+        int i, j;
+        struct mwifiex_private *priv;
+
+        for (j = 0; j < adapter->priv_num; ++j) {
+                priv = adapter->priv[j];
+                if (!priv)
+                        continue;
+
+                for (i = 0; i < MAX_NUM_TID; ++i) {
+                        priv->aggr_prio_tbl[i].amsdu = tos_to_tid_inv[i];
+                        priv->aggr_prio_tbl[i].ampdu_ap = tos_to_tid_inv[i];
+                        priv->aggr_prio_tbl[i].ampdu_user = tos_to_tid_inv[i];
+                        priv->wmm.tid_tbl_ptr[i].ra_list_curr = NULL;
+                }
+
+                priv->aggr_prio_tbl[6].amsdu
+                        = priv->aggr_prio_tbl[6].ampdu_ap
+                        = priv->aggr_prio_tbl[6].ampdu_user
+                        = BA_STREAM_NOT_ALLOWED;
+
+                priv->aggr_prio_tbl[7].amsdu = priv->aggr_prio_tbl[7].ampdu_ap
+                        = priv->aggr_prio_tbl[7].ampdu_user
+                        = BA_STREAM_NOT_ALLOWED;
+
+                priv->add_ba_param.timeout = MWIFIEX_DEFAULT_BLOCK_ACK_TIMEOUT;
+                priv->add_ba_param.tx_win_size = MWIFIEX_AMPDU_DEF_TXWINSIZE;
+                priv->add_ba_param.rx_win_size = MWIFIEX_AMPDU_DEF_RXWINSIZE;
+        }
+}
+
+/*
+ * This function checks if WMM Tx queue is empty.
+ */
+int
+mwifiex_wmm_lists_empty(struct mwifiex_adapter *adapter)
+{
+        int i, j;
+        struct mwifiex_private *priv;
+
+        for (j = 0; j < adapter->priv_num; ++j) {
+                priv = adapter->priv[j];
+                if (priv) {
+                        for (i = 0; i < MAX_NUM_TID; i++)
+                                if (!mwifiex_wmm_is_ra_list_empty(adapter,
+                                             &priv->wmm.tid_tbl_ptr[i].ra_list))
+                                        return false;
+                }
+        }
+
+        return true;
+}
+
+/*
+ * This function deletes all packets in an RA list node.
+ *
+ * The packet sent completion callback handler are called with
+ * status failure, after they are dequeued to ensure proper
+ * cleanup. The RA list node itself is freed at the end.
+ */
+static void
+mwifiex_wmm_del_pkts_in_ralist_node(struct mwifiex_private *priv,
+                                    struct mwifiex_ra_list_tbl *ra_list)
+{
+        struct mwifiex_adapter *adapter = priv->adapter;
+        struct sk_buff *skb, *tmp;
+
+        skb_queue_walk_safe(&ra_list->skb_head, skb, tmp)
+                mwifiex_write_data_complete(adapter, skb, -1);
+}
+
+/*
+ * This function deletes all packets in an RA list.
+ *
+ * Each nodes in the RA list are freed individually first, and then
+ * the RA list itself is freed.
+ */
+static void
+mwifiex_wmm_del_pkts_in_ralist(struct mwifiex_private *priv,
+                               struct list_head *ra_list_head)
+{
+        struct mwifiex_ra_list_tbl *ra_list;
+
+        list_for_each_entry(ra_list, ra_list_head, list)
+                mwifiex_wmm_del_pkts_in_ralist_node(priv, ra_list);
+}
+
+/*
+ * This function deletes all packets in all RA lists.
+ */
+static void mwifiex_wmm_cleanup_queues(struct mwifiex_private *priv)
+{
+        int i;
+
+        for (i = 0; i < MAX_NUM_TID; i++)
+                mwifiex_wmm_del_pkts_in_ralist(priv, &priv->wmm.tid_tbl_ptr[i].
+                                                     ra_list);
+}
+
+/*
+ * This function deletes all route addresses from all RA lists.
+ */
+static void mwifiex_wmm_delete_all_ralist(struct mwifiex_private *priv)
+{
+        struct mwifiex_ra_list_tbl *ra_list, *tmp_node;
+        int i;
+
+        for (i = 0; i < MAX_NUM_TID; ++i) {
+                dev_dbg(priv->adapter->dev,
+                                "info: ra_list: freeing buf for tid %d\n", i);
+                list_for_each_entry_safe(ra_list, tmp_node,
+                                &priv->wmm.tid_tbl_ptr[i].ra_list, list) {
+                        list_del(&ra_list->list);
+                        kfree(ra_list);
+                }
+
+                INIT_LIST_HEAD(&priv->wmm.tid_tbl_ptr[i].ra_list);
+
+                priv->wmm.tid_tbl_ptr[i].ra_list_curr = NULL;
+        }
+}
+
+/*
+ * This function cleans up the Tx and Rx queues.
+ *
+ * Cleanup includes -
+ *      - All packets in RA lists
+ *      - All entries in Rx reorder table
+ *      - All entries in Tx BA stream table
+ *      - MPA buffer (if required)
+ *      - All RA lists
+ */
+void
+mwifiex_clean_txrx(struct mwifiex_private *priv)
+{
+        unsigned long flags;
+
+        mwifiex_11n_cleanup_reorder_tbl(priv);
+        spin_lock_irqsave(&priv->wmm.ra_list_spinlock, flags);
+
+        mwifiex_wmm_cleanup_queues(priv);
+        mwifiex_11n_delete_all_tx_ba_stream_tbl(priv);
+
+        if (priv->adapter->if_ops.cleanup_mpa_buf)
+                priv->adapter->if_ops.cleanup_mpa_buf(priv->adapter);
+
+        mwifiex_wmm_delete_all_ralist(priv);
+        memcpy(tos_to_tid, ac_to_tid, sizeof(tos_to_tid));
+
+        spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, flags);
+}
+
+/*
+ * This function retrieves a particular RA list node, matching with the
+ * given TID and RA address.
+ */
+static struct mwifiex_ra_list_tbl *
+mwifiex_wmm_get_ralist_node(struct mwifiex_private *priv, u8 tid,
+                            u8 *ra_addr)
+{
+        struct mwifiex_ra_list_tbl *ra_list;
+
+        list_for_each_entry(ra_list, &priv->wmm.tid_tbl_ptr[tid].ra_list,
+                            list) {
+                if (!memcmp(ra_list->ra, ra_addr, ETH_ALEN))
+                        return ra_list;
+        }
+
+        return NULL;
+}
+
+/*
+ * This function retrieves an RA list node for a given TID and
+ * RA address pair.
+ *
+ * If no such node is found, a new node is added first and then
+ * retrieved.
+ */
+static struct mwifiex_ra_list_tbl *
+mwifiex_wmm_get_queue_raptr(struct mwifiex_private *priv, u8 tid, u8 *ra_addr)
+{
+        struct mwifiex_ra_list_tbl *ra_list;
+
+        ra_list = mwifiex_wmm_get_ralist_node(priv, tid, ra_addr);
+        if (ra_list)
+                return ra_list;
+        mwifiex_ralist_add(priv, ra_addr);
+
+        return mwifiex_wmm_get_ralist_node(priv, tid, ra_addr);
+}
+
+/*
+ * This function checks if a particular RA list node exists in a given TID
+ * table index.
+ */
+int
+mwifiex_is_ralist_valid(struct mwifiex_private *priv,
+                        struct mwifiex_ra_list_tbl *ra_list, int ptr_index)
+{
+        struct mwifiex_ra_list_tbl *rlist;
+
+        list_for_each_entry(rlist, &priv->wmm.tid_tbl_ptr[ptr_index].ra_list,
+                            list) {
+                if (rlist == ra_list)
+                        return true;
+        }
+
+        return false;
+}
+
+/*
+ * This function adds a packet to WMM queue.
+ *
+ * In disconnected state the packet is immediately dropped and the
+ * packet send completion callback is called with status failure.
+ *
+ * Otherwise, the correct RA list node is located and the packet
+ * is queued at the list tail.
+ */
+void
+mwifiex_wmm_add_buf_txqueue(struct mwifiex_adapter *adapter,
+                            struct sk_buff *skb)
+{
+        struct mwifiex_txinfo *tx_info = MWIFIEX_SKB_TXCB(skb);
+        struct mwifiex_private *priv = adapter->priv[tx_info->bss_index];
+        u32 tid;
+        struct mwifiex_ra_list_tbl *ra_list;
+        u8 ra[ETH_ALEN], tid_down;
+        unsigned long flags;
+
+        if (!priv->media_connected) {
+                dev_dbg(adapter->dev, "data: drop packet in disconnect\n");
+                mwifiex_write_data_complete(adapter, skb, -1);
+                return;
+        }
+
+        tid = skb->priority;
+
+        spin_lock_irqsave(&priv->wmm.ra_list_spinlock, flags);
+
+        tid_down = mwifiex_wmm_downgrade_tid(priv, tid);
+
+        /* In case of infra as we have already created the list during
+           association we just don't have to call get_queue_raptr, we will
+           have only 1 raptr for a tid in case of infra */
+        if (!mwifiex_queuing_ra_based(priv)) {
+                if (!list_empty(&priv->wmm.tid_tbl_ptr[tid_down].ra_list))
+                        ra_list = list_first_entry(
+                                &priv->wmm.tid_tbl_ptr[tid_down].ra_list,
+                                struct mwifiex_ra_list_tbl, list);
+                else
+                        ra_list = NULL;
+        } else {
+                memcpy(ra, skb->data, ETH_ALEN);
+                ra_list = mwifiex_wmm_get_queue_raptr(priv, tid_down, ra);
+        }
+
+        if (!ra_list) {
+                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, flags);
+                mwifiex_write_data_complete(adapter, skb, -1);
+                return;
+        }
+
+        skb_queue_tail(&ra_list->skb_head, skb);
+
+        ra_list->total_pkts_size += skb->len;
+
+        spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, flags);
+}
+
+/*
+ * This function processes the get WMM status command response from firmware.
+ *
+ * The response may contain multiple TLVs -
+ *      - AC Queue status TLVs
+ *      - Current WMM Parameter IE TLV
+ *      - Admission Control action frame TLVs
+ *
+ * This function parses the TLVs and then calls further specific functions
+ * to process any changes in the queue prioritize or state.
+ */
+int mwifiex_ret_wmm_get_status(struct mwifiex_private *priv,
+                               const struct host_cmd_ds_command *resp)
+{
+        u8 *curr = (u8 *) &resp->params.get_wmm_status;
+        uint16_t resp_len = le16_to_cpu(resp->size), tlv_len;
+        int valid = true;
+
+        struct mwifiex_ie_types_data *tlv_hdr;
+        struct mwifiex_ie_types_wmm_queue_status *tlv_wmm_qstatus;
+        struct ieee_types_wmm_parameter *wmm_param_ie = NULL;
+        struct mwifiex_wmm_ac_status *ac_status;
+
+        dev_dbg(priv->adapter->dev, "info: WMM: WMM_GET_STATUS cmdresp received: %d\n",
+                        resp_len);
+
+        while ((resp_len >= sizeof(tlv_hdr->header)) && valid) {
+                tlv_hdr = (struct mwifiex_ie_types_data *) curr;
+                tlv_len = le16_to_cpu(tlv_hdr->header.len);
+
+                switch (le16_to_cpu(tlv_hdr->header.type)) {
+                case TLV_TYPE_WMMQSTATUS:
+                        tlv_wmm_qstatus =
+                                (struct mwifiex_ie_types_wmm_queue_status *)
+                                tlv_hdr;
+                        dev_dbg(priv->adapter->dev,
+                                "info: CMD_RESP: WMM_GET_STATUS:"
+                                " QSTATUS TLV: %d, %d, %d\n",
+                               tlv_wmm_qstatus->queue_index,
+                               tlv_wmm_qstatus->flow_required,
+                               tlv_wmm_qstatus->disabled);
+
+                        ac_status = &priv->wmm.ac_status[tlv_wmm_qstatus->
+                                                         queue_index];
+                        ac_status->disabled = tlv_wmm_qstatus->disabled;
+                        ac_status->flow_required =
+                                tlv_wmm_qstatus->flow_required;
+                        ac_status->flow_created = tlv_wmm_qstatus->flow_created;
+                        break;
+
+                case WLAN_EID_VENDOR_SPECIFIC:
+                        /*
+                         * Point the regular IEEE IE 2 bytes into the Marvell IE
+                         *   and setup the IEEE IE type and length byte fields
+                         */
+
+                        wmm_param_ie =
+                                (struct ieee_types_wmm_parameter *) (curr +
+                                                                    2);
+                        wmm_param_ie->vend_hdr.len = (u8) tlv_len;
+                        wmm_param_ie->vend_hdr.element_id =
+                                                WLAN_EID_VENDOR_SPECIFIC;
+
+                        dev_dbg(priv->adapter->dev,
+                                "info: CMD_RESP: WMM_GET_STATUS:"
+                                " WMM Parameter Set Count: %d\n",
+                                wmm_param_ie->qos_info_bitmap &
+                                IEEE80211_WMM_IE_AP_QOSINFO_PARAM_SET_CNT_MASK);
+
+                        memcpy((u8 *) &priv->curr_bss_params.bss_descriptor.
+                               wmm_ie, wmm_param_ie,
+                               wmm_param_ie->vend_hdr.len + 2);
+
+                        break;
+
+                default:
+                        valid = false;
+                        break;
+                }
+
+                curr += (tlv_len + sizeof(tlv_hdr->header));
+                resp_len -= (tlv_len + sizeof(tlv_hdr->header));
+        }
+
+        mwifiex_wmm_setup_queue_priorities(priv, wmm_param_ie);
+        mwifiex_wmm_setup_ac_downgrade(priv);
+
+        return 0;
+}
+
+/*
+ * Callback handler from the command module to allow insertion of a WMM TLV.
+ *
+ * If the BSS we are associating to supports WMM, this function adds the
+ * required WMM Information IE to the association request command buffer in
+ * the form of a Marvell extended IEEE IE.
+ */
+u32
+mwifiex_wmm_process_association_req(struct mwifiex_private *priv,
+                                    u8 **assoc_buf,
+                                    struct ieee_types_wmm_parameter *wmm_ie,
+                                    struct ieee80211_ht_cap *ht_cap)
+{
+        struct mwifiex_ie_types_wmm_param_set *wmm_tlv;
+        u32 ret_len = 0;
+
+        /* Null checks */
+        if (!assoc_buf)
+                return 0;
+        if (!(*assoc_buf))
+                return 0;
+
+        if (!wmm_ie)
+                return 0;
+
+        dev_dbg(priv->adapter->dev, "info: WMM: process assoc req:"
+                        "bss->wmmIe=0x%x\n",
+                        wmm_ie->vend_hdr.element_id);
+
+        if ((priv->wmm_required
+             || (ht_cap && (priv->adapter->config_bands & BAND_GN
+                     || priv->adapter->config_bands & BAND_AN))
+            )
+            && wmm_ie->vend_hdr.element_id == WLAN_EID_VENDOR_SPECIFIC) {
+                wmm_tlv = (struct mwifiex_ie_types_wmm_param_set *) *assoc_buf;
+                wmm_tlv->header.type = cpu_to_le16((u16) wmm_info_ie[0]);
+                wmm_tlv->header.len = cpu_to_le16((u16) wmm_info_ie[1]);
+                memcpy(wmm_tlv->wmm_ie, &wmm_info_ie[2],
+                        le16_to_cpu(wmm_tlv->header.len));
+                if (wmm_ie->qos_info_bitmap & IEEE80211_WMM_IE_AP_QOSINFO_UAPSD)
+                        memcpy((u8 *) (wmm_tlv->wmm_ie
+                                        + le16_to_cpu(wmm_tlv->header.len)
+                                         - sizeof(priv->wmm_qosinfo)),
+                                        &priv->wmm_qosinfo,
+                                        sizeof(priv->wmm_qosinfo));
+
+                ret_len = sizeof(wmm_tlv->header)
+                        + le16_to_cpu(wmm_tlv->header.len);
+
+                *assoc_buf += ret_len;
+        }
+
+        return ret_len;
+}
+
+/*
+ * This function computes the time delay in the driver queues for a
+ * given packet.
+ *
+ * When the packet is received at the OS/Driver interface, the current
+ * time is set in the packet structure. The difference between the present
+ * time and that received time is computed in this function and limited
+ * based on pre-compiled limits in the driver.
+ */
+u8
+mwifiex_wmm_compute_drv_pkt_delay(struct mwifiex_private *priv,
+                                        const struct sk_buff *skb)
+{
+        u8 ret_val = 0;
+        struct timeval out_tstamp, in_tstamp;
+        u32 queue_delay;
+
+        do_gettimeofday(&out_tstamp);
+        in_tstamp = ktime_to_timeval(skb->tstamp);
+
+        queue_delay = (out_tstamp.tv_sec - in_tstamp.tv_sec) * 1000;
+        queue_delay += (out_tstamp.tv_usec - in_tstamp.tv_usec) / 1000;
+
+        /*
+         * Queue delay is passed as a uint8 in units of 2ms (ms shifted
+         *  by 1). Min value (other than 0) is therefore 2ms, max is 510ms.
+         *
+         * Pass max value if queue_delay is beyond the uint8 range
+         */
+        ret_val = (u8) (min(queue_delay, priv->wmm.drv_pkt_delay_max) >> 1);
+
+        dev_dbg(priv->adapter->dev, "data: WMM: Pkt Delay: %d ms,"
+                                " %d ms sent to FW\n", queue_delay, ret_val);
+
+        return ret_val;
+}
+
+/*
+ * This function retrieves the highest priority RA list table pointer.
+ */
+static struct mwifiex_ra_list_tbl *
+mwifiex_wmm_get_highest_priolist_ptr(struct mwifiex_adapter *adapter,
+                                     struct mwifiex_private **priv, int *tid)
+{
+        struct mwifiex_private *priv_tmp;
+        struct mwifiex_ra_list_tbl *ptr, *head;
+        struct mwifiex_bss_prio_node *bssprio_node, *bssprio_head;
+        struct mwifiex_tid_tbl *tid_ptr;
+        int is_list_empty;
+        unsigned long flags;
+        int i, j;
+
+        for (j = adapter->priv_num - 1; j >= 0; --j) {
+                spin_lock_irqsave(&adapter->bss_prio_tbl[j].bss_prio_lock,
+                                flags);
+                is_list_empty = list_empty(&adapter->bss_prio_tbl[j]
+                                .bss_prio_head);
+                spin_unlock_irqrestore(&adapter->bss_prio_tbl[j].bss_prio_lock,
+                                flags);
+                if (is_list_empty)
+                        continue;
+
+                if (adapter->bss_prio_tbl[j].bss_prio_cur ==
+                    (struct mwifiex_bss_prio_node *)
+                    &adapter->bss_prio_tbl[j].bss_prio_head) {
+                        bssprio_node =
+                                list_first_entry(&adapter->bss_prio_tbl[j]
+                                                 .bss_prio_head,
+                                                 struct mwifiex_bss_prio_node,
+                                                 list);
+                        bssprio_head = bssprio_node;
+                } else {
+                        bssprio_node = adapter->bss_prio_tbl[j].bss_prio_cur;
+                        bssprio_head = bssprio_node;
+                }
+
+                do {
+                        priv_tmp = bssprio_node->priv;
+
+                        for (i = HIGH_PRIO_TID; i >= LOW_PRIO_TID; --i) {
+
+                                tid_ptr = &(priv_tmp)->wmm.
+                                        tid_tbl_ptr[tos_to_tid[i]];
+
+                                spin_lock_irqsave(&tid_ptr->tid_tbl_lock,
+                                                  flags);
+                                is_list_empty =
+                                        list_empty(&adapter->bss_prio_tbl[j]
+                                                   .bss_prio_head);
+                                spin_unlock_irqrestore(&tid_ptr->tid_tbl_lock,
+                                                       flags);
+                                if (is_list_empty)
+                                        continue;
+
+                                /*
+                                 * Always choose the next ra we transmitted
+                                 * last time, this way we pick the ra's in
+                                 * round robin fashion.
+                                 */
+                                ptr = list_first_entry(
+                                                &tid_ptr->ra_list_curr->list,
+                                                struct mwifiex_ra_list_tbl,
+                                                list);
+
+                                head = ptr;
+                                if (ptr == (struct mwifiex_ra_list_tbl *)
+                                                &tid_ptr->ra_list) {
+                                        /* Get next ra */
+                                        ptr = list_first_entry(&ptr->list,
+                                            struct mwifiex_ra_list_tbl, list);
+                                        head = ptr;
+                                }
+
+                                do {
+                                        is_list_empty =
+                                                skb_queue_empty(&ptr->skb_head);
+                                        if (!is_list_empty) {
+                                                *priv = priv_tmp;
+                                                *tid = tos_to_tid[i];
+                                                return ptr;
+                                        }
+                                        /* Get next ra */
+                                        ptr = list_first_entry(&ptr->list,
+                                                 struct mwifiex_ra_list_tbl,
+                                                 list);
+                                        if (ptr ==
+                                            (struct mwifiex_ra_list_tbl *)
+                                            &tid_ptr->ra_list)
+                                                ptr = list_first_entry(
+                                                    &ptr->list,
+                                                    struct mwifiex_ra_list_tbl,
+                                                    list);
+                                } while (ptr != head);
+                        }
+
+                        /* Get next bss priority node */
+                        bssprio_node = list_first_entry(&bssprio_node->list,
+                                                struct mwifiex_bss_prio_node,
+                                                list);
+
+                        if (bssprio_node ==
+                            (struct mwifiex_bss_prio_node *)
+                            &adapter->bss_prio_tbl[j].bss_prio_head)
+                                /* Get next bss priority node */
+                                bssprio_node = list_first_entry(
+                                                &bssprio_node->list,
+                                                struct mwifiex_bss_prio_node,
+                                                list);
+                } while (bssprio_node != bssprio_head);
+        }
+        return NULL;
+}
+
+/*
+ * This function gets the number of packets in the Tx queue of a
+ * particular RA list.
+ */
+static int
+mwifiex_num_pkts_in_txq(struct mwifiex_private *priv,
+                        struct mwifiex_ra_list_tbl *ptr, int max_buf_size)
+{
+        int count = 0, total_size = 0;
+        struct sk_buff *skb, *tmp;
+
+        skb_queue_walk_safe(&ptr->skb_head, skb, tmp) {
+                total_size += skb->len;
+                if (total_size < max_buf_size)
+                        ++count;
+                else
+                        break;
+        }
+
+        return count;
+}
+
+/*
+ * This function sends a single packet to firmware for transmission.
+ */
+static void
+mwifiex_send_single_packet(struct mwifiex_private *priv,
+                           struct mwifiex_ra_list_tbl *ptr, int ptr_index,
+                           unsigned long ra_list_flags)
+                           __releases(&priv->wmm.ra_list_spinlock)
+{
+        struct sk_buff *skb, *skb_next;
+        struct mwifiex_tx_param tx_param;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        int status = 0;
+        struct mwifiex_txinfo *tx_info;
+
+        if (skb_queue_empty(&ptr->skb_head)) {
+                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                       ra_list_flags);
+                dev_dbg(adapter->dev, "data: nothing to send\n");
+                return;
+        }
+
+        skb = skb_dequeue(&ptr->skb_head);
+
+        tx_info = MWIFIEX_SKB_TXCB(skb);
+        dev_dbg(adapter->dev, "data: dequeuing the packet %p %p\n", ptr, skb);
+
+        ptr->total_pkts_size -= skb->len;
+
+        if (!skb_queue_empty(&ptr->skb_head))
+                skb_next = skb_peek(&ptr->skb_head);
+        else
+                skb_next = NULL;
+
+        spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, ra_list_flags);
+
+        tx_param.next_pkt_len = ((skb_next) ? skb_next->len +
+                                sizeof(struct txpd) : 0);
+
+        status = mwifiex_process_tx(priv, skb, &tx_param);
+
+        if (status == -EBUSY) {
+                /* Queue the packet back at the head */
+                spin_lock_irqsave(&priv->wmm.ra_list_spinlock, ra_list_flags);
+
+                if (!mwifiex_is_ralist_valid(priv, ptr, ptr_index)) {
+                        spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                               ra_list_flags);
+                        mwifiex_write_data_complete(adapter, skb, -1);
+                        return;
+                }
+
+                skb_queue_tail(&ptr->skb_head, skb);
+
+                ptr->total_pkts_size += skb->len;
+                tx_info->flags |= MWIFIEX_BUF_FLAG_REQUEUED_PKT;
+                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                       ra_list_flags);
+        } else {
+                spin_lock_irqsave(&priv->wmm.ra_list_spinlock, ra_list_flags);
+                if (mwifiex_is_ralist_valid(priv, ptr, ptr_index)) {
+                        priv->wmm.packets_out[ptr_index]++;
+                        priv->wmm.tid_tbl_ptr[ptr_index].ra_list_curr = ptr;
+                }
+                adapter->bss_prio_tbl[priv->bss_priority].bss_prio_cur =
+                        list_first_entry(
+                                &adapter->bss_prio_tbl[priv->bss_priority]
+                                .bss_prio_cur->list,
+                                struct mwifiex_bss_prio_node,
+                                list);
+                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                       ra_list_flags);
+        }
+}
+
+/*
+ * This function checks if the first packet in the given RA list
+ * is already processed or not.
+ */
+static int
+mwifiex_is_ptr_processed(struct mwifiex_private *priv,
+                         struct mwifiex_ra_list_tbl *ptr)
+{
+        struct sk_buff *skb;
+        struct mwifiex_txinfo *tx_info;
+
+        if (skb_queue_empty(&ptr->skb_head))
+                return false;
+
+        skb = skb_peek(&ptr->skb_head);
+
+        tx_info = MWIFIEX_SKB_TXCB(skb);
+        if (tx_info->flags & MWIFIEX_BUF_FLAG_REQUEUED_PKT)
+                return true;
+
+        return false;
+}
+
+/*
+ * This function sends a single processed packet to firmware for
+ * transmission.
+ */
+static void
+mwifiex_send_processed_packet(struct mwifiex_private *priv,
+                              struct mwifiex_ra_list_tbl *ptr, int ptr_index,
+                              unsigned long ra_list_flags)
+                                __releases(&priv->wmm.ra_list_spinlock)
+{
+        struct mwifiex_tx_param tx_param;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        int ret = -1;
+        struct sk_buff *skb, *skb_next;
+        struct mwifiex_txinfo *tx_info;
+
+        if (skb_queue_empty(&ptr->skb_head)) {
+                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                       ra_list_flags);
+                return;
+        }
+
+        skb = skb_dequeue(&ptr->skb_head);
+
+        if (!skb_queue_empty(&ptr->skb_head))
+                skb_next = skb_peek(&ptr->skb_head);
+        else
+                skb_next = NULL;
+
+        tx_info = MWIFIEX_SKB_TXCB(skb);
+
+        spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, ra_list_flags);
+        tx_param.next_pkt_len =
+                ((skb_next) ? skb_next->len +
+                 sizeof(struct txpd) : 0);
+        ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA,
+                                           skb->data, skb->len, &tx_param);
+        switch (ret) {
+        case -EBUSY:
+                dev_dbg(adapter->dev, "data: -EBUSY is returned\n");
+                spin_lock_irqsave(&priv->wmm.ra_list_spinlock, ra_list_flags);
+
+                if (!mwifiex_is_ralist_valid(priv, ptr, ptr_index)) {
+                        spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                               ra_list_flags);
+                        mwifiex_write_data_complete(adapter, skb, -1);
+                        return;
+                }
+
+                skb_queue_tail(&ptr->skb_head, skb);
+
+                tx_info->flags |= MWIFIEX_BUF_FLAG_REQUEUED_PKT;
+                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                       ra_list_flags);
+                break;
+        case -1:
+                adapter->data_sent = false;
+                dev_err(adapter->dev, "host_to_card failed: %#x\n", ret);
+                adapter->dbg.num_tx_host_to_card_failure++;
+                mwifiex_write_data_complete(adapter, skb, ret);
+                break;
+        case -EINPROGRESS:
+                adapter->data_sent = false;
+        default:
+                break;
+        }
+        if (ret != -EBUSY) {
+                spin_lock_irqsave(&priv->wmm.ra_list_spinlock, ra_list_flags);
+                if (mwifiex_is_ralist_valid(priv, ptr, ptr_index)) {
+                        priv->wmm.packets_out[ptr_index]++;
+                        priv->wmm.tid_tbl_ptr[ptr_index].ra_list_curr = ptr;
+                }
+                adapter->bss_prio_tbl[priv->bss_priority].bss_prio_cur =
+                        list_first_entry(
+                                &adapter->bss_prio_tbl[priv->bss_priority]
+                                .bss_prio_cur->list,
+                                struct mwifiex_bss_prio_node,
+                                list);
+                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
+                                       ra_list_flags);
+        }
+}
+
+/*
+ * This function dequeues a packet from the highest priority list
+ * and transmits it.
+ */
+static int
+mwifiex_dequeue_tx_packet(struct mwifiex_adapter *adapter)
+{
+        struct mwifiex_ra_list_tbl *ptr;
+        struct mwifiex_private *priv = NULL;
+        int ptr_index = 0;
+        u8 ra[ETH_ALEN];
+        int tid_del = 0, tid = 0;
+        unsigned long flags;
+
+        ptr = mwifiex_wmm_get_highest_priolist_ptr(adapter, &priv, &ptr_index);
+        if (!ptr)
+                return -1;
+
+        tid = mwifiex_get_tid(priv->adapter, ptr);
+
+        dev_dbg(adapter->dev, "data: tid=%d\n", tid);
+
+        spin_lock_irqsave(&priv->wmm.ra_list_spinlock, flags);
+        if (!mwifiex_is_ralist_valid(priv, ptr, ptr_index)) {
+                spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, flags);
+                return -1;
+        }
+
+        if (mwifiex_is_ptr_processed(priv, ptr)) {
+                mwifiex_send_processed_packet(priv, ptr, ptr_index, flags);
+                /* ra_list_spinlock has been freed in
+                   mwifiex_send_processed_packet() */
+                return 0;
+        }
+
+        if (!ptr->is_11n_enabled || mwifiex_is_ba_stream_setup(priv, ptr, tid)
+            || ((priv->sec_info.wpa_enabled
+                  || priv->sec_info.wpa2_enabled) && !priv->wpa_is_gtk_set)
+                ) {
+                mwifiex_send_single_packet(priv, ptr, ptr_index, flags);
+                /* ra_list_spinlock has been freed in
+                   mwifiex_send_single_packet() */
+        } else {
+                if (mwifiex_is_ampdu_allowed(priv, ptr, tid)) {
+                        if (mwifiex_is_ba_stream_avail(priv)) {
+                                mwifiex_11n_create_tx_ba_stream_tbl(priv,
+                                                ptr->ra, tid,
+                                                BA_STREAM_SETUP_INPROGRESS);
+                                mwifiex_send_addba(priv, tid, ptr->ra);
+                        } else if (mwifiex_find_stream_to_delete
+                                   (priv, ptr, tid, &tid_del, ra)) {
+                                mwifiex_11n_create_tx_ba_stream_tbl(priv,
+                                                ptr->ra, tid,
+                                                BA_STREAM_SETUP_INPROGRESS);
+                                mwifiex_send_delba(priv, tid_del, ra, 1);
+                        }
+                }
+/* Minimum number of AMSDU */
+#define MIN_NUM_AMSDU 2
+                if (mwifiex_is_amsdu_allowed(priv, ptr, tid) &&
+                    (mwifiex_num_pkts_in_txq(priv, ptr, adapter->tx_buf_size) >=
+                     MIN_NUM_AMSDU))
+                        mwifiex_11n_aggregate_pkt(priv, ptr, INTF_HEADER_LEN,
+                                                  ptr_index, flags);
+                        /* ra_list_spinlock has been freed in
+                           mwifiex_11n_aggregate_pkt() */
+                else
+                        mwifiex_send_single_packet(priv, ptr, ptr_index, flags);
+                        /* ra_list_spinlock has been freed in
+                           mwifiex_send_single_packet() */
+        }
+        return 0;
+}
+
+/*
+ * This function transmits the highest priority packet awaiting in the
+ * WMM Queues.
+ */
+void
+mwifiex_wmm_process_tx(struct mwifiex_adapter *adapter)
+{
+        do {
+                /* Check if busy */
+                if (adapter->data_sent || adapter->tx_lock_flag)
+                        break;
+
+                if (mwifiex_dequeue_tx_packet(adapter))
+                        break;
+        } while (true);
+
+        return;
+}
diff --git a/drivers/net/wireless/mwifiex/wmm.h b/drivers/net/wireless/mwifiex/wmm.h
new file mode 100644
index 00000000000..241f1b0b77f
--- /dev/null
+++ b/drivers/net/wireless/mwifiex/wmm.h
@@ -0,0 +1,112 @@
+/*
+ * Marvell Wireless LAN device driver: WMM
+ *
+ * Copyright (C) 2011, Marvell International Ltd.
+ *
+ * This software file (the "File") is distributed by Marvell International
+ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
+ * (the "License").  You may use, redistribute and/or modify this File in
+ * accordance with the terms and conditions of the License, a copy of which
+ * is available by writing to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the
+ * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
+ * this warranty disclaimer.
+ */
+
+#ifndef _MWIFIEX_WMM_H_
+#define _MWIFIEX_WMM_H_
+
+enum ieee_types_wmm_aciaifsn_bitmasks {
+        MWIFIEX_AIFSN = (BIT(0) | BIT(1) | BIT(2) | BIT(3)),
+        MWIFIEX_ACM = BIT(4),
+        MWIFIEX_ACI = (BIT(5) | BIT(6)),
+};
+
+enum ieee_types_wmm_ecw_bitmasks {
+        MWIFIEX_ECW_MIN = (BIT(0) | BIT(1) | BIT(2) | BIT(3)),
+        MWIFIEX_ECW_MAX = (BIT(4) | BIT(5) | BIT(6) | BIT(7)),
+};
+
+/*
+ * This function retrieves the TID of the given RA list.
+ */
+static inline int
+mwifiex_get_tid(struct mwifiex_adapter *adapter,
+                struct mwifiex_ra_list_tbl *ptr)
+{
+        struct sk_buff *skb;
+
+        if (skb_queue_empty(&ptr->skb_head))
+                return 0;
+
+        skb = skb_peek(&ptr->skb_head);
+
+        return skb->priority;
+}
+
+/*
+ * This function gets the length of a list.
+ */
+static inline int
+mwifiex_wmm_list_len(struct mwifiex_adapter *adapter, struct list_head *head)
+{
+        struct list_head *pos;
+        int count = 0;
+
+        list_for_each(pos, head)
+                ++count;
+
+        return count;
+}
+
+/*
+ * This function checks if a RA list is empty or not.
+ */
+static inline u8
+mwifiex_wmm_is_ra_list_empty(struct mwifiex_adapter *adapter,
+                             struct list_head *ra_list_hhead)
+{
+        struct mwifiex_ra_list_tbl *ra_list;
+        int is_list_empty;
+
+        list_for_each_entry(ra_list, ra_list_hhead, list) {
+                is_list_empty = skb_queue_empty(&ra_list->skb_head);
+                if (!is_list_empty)
+                        return false;
+        }
+
+        return true;
+}
+
+void mwifiex_wmm_add_buf_txqueue(struct mwifiex_adapter *adapter,
+                                 struct sk_buff *skb);
+void mwifiex_ralist_add(struct mwifiex_private *priv, u8 *ra);
+
+int mwifiex_wmm_lists_empty(struct mwifiex_adapter *adapter);
+void mwifiex_wmm_process_tx(struct mwifiex_adapter *adapter);
+int mwifiex_is_ralist_valid(struct mwifiex_private *priv,
+                            struct mwifiex_ra_list_tbl *ra_list, int tid);
+
+u8 mwifiex_wmm_compute_drv_pkt_delay(struct mwifiex_private *priv,
+                                             const struct sk_buff *skb);
+void mwifiex_wmm_init(struct mwifiex_adapter *adapter);
+
+extern u32 mwifiex_wmm_process_association_req(struct mwifiex_private *priv,
+                                                 u8 **assoc_buf,
+                                                 struct ieee_types_wmm_parameter
+                                                 *wmmie,
+                                                 struct ieee80211_ht_cap
+                                                 *htcap);
+
+void mwifiex_wmm_setup_queue_priorities(struct mwifiex_private *priv,
+                                        struct ieee_types_wmm_parameter
+                                        *wmm_ie);
+void mwifiex_wmm_setup_ac_downgrade(struct mwifiex_private *priv);
+extern int mwifiex_ret_wmm_get_status(struct mwifiex_private *priv,
+                                      const struct host_cmd_ds_command *resp);
+
+#endif /* !_MWIFIEX_WMM_H_ */
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 36952274950..ae56d2f32b2 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -63,6 +63,7 @@ MODULE_PARM_DESC(ap_mode_default,
 #define MWL8K_HIU_A2H_INTERRUPT_CLEAR_SEL       0x00000c38
 #define MWL8K_HIU_A2H_INTERRUPT_STATUS_MASK     0x00000c3c
 #define  MWL8K_A2H_INT_DUMMY                     (1 << 20)
+#define  MWL8K_A2H_INT_BA_WATCHDOG               (1 << 14)
 #define  MWL8K_A2H_INT_CHNL_SWITCHED             (1 << 11)
 #define  MWL8K_A2H_INT_QUEUE_EMPTY               (1 << 10)
 #define  MWL8K_A2H_INT_RADAR_DETECT              (1 << 7)
@@ -82,10 +83,14 @@ MODULE_PARM_DESC(ap_mode_default,
                                  MWL8K_A2H_INT_MAC_EVENT | \
                                  MWL8K_A2H_INT_OPC_DONE | \
                                  MWL8K_A2H_INT_RX_READY | \
-                                 MWL8K_A2H_INT_TX_DONE)
+                                 MWL8K_A2H_INT_TX_DONE | \
+                                 MWL8K_A2H_INT_BA_WATCHDOG)
 
 #define MWL8K_RX_QUEUES         1
-#define MWL8K_TX_QUEUES         4
+#define MWL8K_TX_WMM_QUEUES     4
+#define MWL8K_MAX_AMPDU_QUEUES  8
+#define MWL8K_MAX_TX_QUEUES     (MWL8K_TX_WMM_QUEUES + MWL8K_MAX_AMPDU_QUEUES)
+#define mwl8k_tx_queues(priv)   (MWL8K_TX_WMM_QUEUES + (priv)->num_ampdu_queues)
 
 struct rxd_ops {
         int rxd_size;
@@ -134,6 +139,21 @@ struct mwl8k_tx_queue {
         struct sk_buff **skb;
 };
 
+enum {
+        AMPDU_NO_STREAM,
+        AMPDU_STREAM_NEW,
+        AMPDU_STREAM_IN_PROGRESS,
+        AMPDU_STREAM_ACTIVE,
+};
+
+struct mwl8k_ampdu_stream {
+        struct ieee80211_sta *sta;
+        u8 tid;
+        u8 state;
+        u8 idx;
+        u8 txq_idx; /* index of this stream in priv->txq */
+};
+
 struct mwl8k_priv {
         struct ieee80211_hw *hw;
         struct pci_dev *pdev;
@@ -159,6 +179,12 @@ struct mwl8k_priv {
         u32 ap_macids_supported;
         u32 sta_macids_supported;
 
+        /* Ampdu stream information */
+        u8 num_ampdu_queues;
+        spinlock_t stream_lock;
+        struct mwl8k_ampdu_stream ampdu[MWL8K_MAX_AMPDU_QUEUES];
+        struct work_struct watchdog_ba_handle;
+
         /* firmware access */
         struct mutex fw_mutex;
         struct task_struct *fw_mutex_owner;
@@ -190,7 +216,8 @@ struct mwl8k_priv {
         int pending_tx_pkts;
 
         struct mwl8k_rx_queue rxq[MWL8K_RX_QUEUES];
-        struct mwl8k_tx_queue txq[MWL8K_TX_QUEUES];
+        struct mwl8k_tx_queue txq[MWL8K_MAX_TX_QUEUES];
+        u32 txq_offset[MWL8K_MAX_TX_QUEUES];
 
         bool radio_on;
         bool radio_short_preamble;
@@ -223,7 +250,7 @@ struct mwl8k_priv {
          * preserve the queue configurations so they can be restored if/when
          * the firmware image is swapped.
          */
-        struct ieee80211_tx_queue_params wmm_params[MWL8K_TX_QUEUES];
+        struct ieee80211_tx_queue_params wmm_params[MWL8K_TX_WMM_QUEUES];
 
         /* async firmware loading state */
         unsigned fw_state;
@@ -264,6 +291,7 @@ struct mwl8k_vif {
 struct mwl8k_sta {
         /* Index into station database. Returned by UPDATE_STADB.  */
         u8 peer_id;
+        u8 is_ampdu_allowed;
 };
 #define MWL8K_STA(_sta) ((struct mwl8k_sta *)&((_sta)->drv_priv))
 
@@ -351,10 +379,12 @@ static const struct ieee80211_rate mwl8k_rates_50[] = {
 #define MWL8K_CMD_ENABLE_SNIFFER        0x0150
 #define MWL8K_CMD_SET_MAC_ADDR          0x0202          /* per-vif */
 #define MWL8K_CMD_SET_RATEADAPT_MODE    0x0203
+#define MWL8K_CMD_GET_WATCHDOG_BITMAP   0x0205
 #define MWL8K_CMD_BSS_START             0x1100          /* per-vif */
 #define MWL8K_CMD_SET_NEW_STN           0x1111          /* per-vif */
 #define MWL8K_CMD_UPDATE_ENCRYPTION     0x1122          /* per-vif */
 #define MWL8K_CMD_UPDATE_STADB          0x1123
+#define MWL8K_CMD_BASTREAM              0x1125
 
 static const char *mwl8k_cmd_name(__le16 cmd, char *buf, int bufsize)
 {
@@ -394,6 +424,8 @@ static const char *mwl8k_cmd_name(__le16 cmd, char *buf, int bufsize)
                 MWL8K_CMDNAME(SET_NEW_STN);
                 MWL8K_CMDNAME(UPDATE_ENCRYPTION);
                 MWL8K_CMDNAME(UPDATE_STADB);
+                MWL8K_CMDNAME(BASTREAM);
+                MWL8K_CMDNAME(GET_WATCHDOG_BITMAP);
         default:
                 snprintf(buf, bufsize, "0x%x", cmd);
         }
@@ -1126,6 +1158,9 @@ static void mwl8k_rxq_deinit(struct ieee80211_hw *hw, int index)
         struct mwl8k_rx_queue *rxq = priv->rxq + index;
         int i;
 
+        if (rxq->rxd == NULL)
+                return;
+
         for (i = 0; i < MWL8K_RX_DESCS; i++) {
                 if (rxq->buf[i].skb != NULL) {
                         pci_unmap_single(priv->pdev,
@@ -1318,7 +1353,7 @@ struct mwl8k_tx_desc {
         __le16 pkt_len;
         __u8 dest_MAC_addr[ETH_ALEN];
         __le32 next_txd_phys_addr;
-        __le32 reserved;
+        __le32 timestamp;
         __le16 rate_info;
         __u8 peer_id;
         __u8 tx_frag_cnt;
@@ -1382,7 +1417,7 @@ static void mwl8k_dump_tx_rings(struct ieee80211_hw *hw)
         struct mwl8k_priv *priv = hw->priv;
         int i;
 
-        for (i = 0; i < MWL8K_TX_QUEUES; i++) {
+        for (i = 0; i < mwl8k_tx_queues(priv); i++) {
                 struct mwl8k_tx_queue *txq = priv->txq + i;
                 int fw_owned = 0;
                 int drv_owned = 0;
@@ -1483,6 +1518,54 @@ static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw)
                      MWL8K_TXD_STATUS_OK_RETRY |                \
                      MWL8K_TXD_STATUS_OK_MORE_RETRY))
 
+static int mwl8k_tid_queue_mapping(u8 tid)
+{
+        BUG_ON(tid > 7);
+
+        switch (tid) {
+        case 0:
+        case 3:
+                return IEEE80211_AC_BE;
+                break;
+        case 1:
+        case 2:
+                return IEEE80211_AC_BK;
+                break;
+        case 4:
+        case 5:
+                return IEEE80211_AC_VI;
+                break;
+        case 6:
+        case 7:
+                return IEEE80211_AC_VO;
+                break;
+        default:
+                return -1;
+                break;
+        }
+}
+
+/* The firmware will fill in the rate information
+ * for each packet that gets queued in the hardware
+ * in this structure
+ */
+
+struct rateinfo {
+        __le16  format:1;
+        __le16  short_gi:1;
+        __le16  band_width:1;
+        __le16  rate_id_mcs:6;
+        __le16  adv_coding:2;
+        __le16  antenna:2;
+        __le16  act_sub_chan:2;
+        __le16  preamble_type:1;
+        __le16  power_id:4;
+        __le16  antenna2:1;
+        __le16  reserved:1;
+        __le16  tx_bf_frame:1;
+        __le16  green_field:1;
+} __packed;
+
 static int
 mwl8k_txq_reclaim(struct ieee80211_hw *hw, int index, int limit, int force)
 {
@@ -1499,6 +1582,11 @@ mwl8k_txq_reclaim(struct ieee80211_hw *hw, int index, int limit, int force)
                 struct sk_buff *skb;
                 struct ieee80211_tx_info *info;
                 u32 status;
+                struct ieee80211_sta *sta;
+                struct mwl8k_sta *sta_info = NULL;
+                u16 rate_info;
+                struct rateinfo *rate;
+                struct ieee80211_hdr *wh;
 
                 tx = txq->head;
                 tx_desc = txq->txd + tx;
@@ -1527,11 +1615,34 @@ mwl8k_txq_reclaim(struct ieee80211_hw *hw, int index, int limit, int force)
 
                 mwl8k_remove_dma_header(skb, tx_desc->qos_control);
 
+                wh = (struct ieee80211_hdr *) skb->data;
+
                 /* Mark descriptor as unused */
                 tx_desc->pkt_phys_addr = 0;
                 tx_desc->pkt_len = 0;
 
                 info = IEEE80211_SKB_CB(skb);
+                if (ieee80211_is_data(wh->frame_control)) {
+                        sta = info->control.sta;
+                        if (sta) {
+                                sta_info = MWL8K_STA(sta);
+                                BUG_ON(sta_info == NULL);
+                                rate_info = le16_to_cpu(tx_desc->rate_info);
+                                rate = (struct rateinfo *)&rate_info;
+                                /* If rate is < 6.5 Mpbs for an ht station
+                                 * do not form an ampdu. If the station is a
+                                 * legacy station (format = 0), do not form an
+                                 * ampdu
+                                 */
+                                if (rate->rate_id_mcs < 1 ||
+                                    rate->format == 0) {
+                                        sta_info->is_ampdu_allowed = false;
+                                } else {
+                                        sta_info->is_ampdu_allowed = true;
+                                }
+                        }
+                }
+
                 ieee80211_tx_info_clear_status(info);
 
                 /* Rate control is happening in the firmware.
@@ -1548,7 +1659,8 @@ mwl8k_txq_reclaim(struct ieee80211_hw *hw, int index, int limit, int force)
                 processed++;
         }
 
-        if (processed && priv->radio_on && !mutex_is_locked(&priv->fw_mutex))
+        if (index < MWL8K_TX_WMM_QUEUES && processed && priv->radio_on &&
+            !mutex_is_locked(&priv->fw_mutex))
                 ieee80211_wake_queue(hw, index);
 
         return processed;
@@ -1560,6 +1672,9 @@ static void mwl8k_txq_deinit(struct ieee80211_hw *hw, int index)
         struct mwl8k_priv *priv = hw->priv;
         struct mwl8k_tx_queue *txq = priv->txq + index;
 
+        if (txq->txd == NULL)
+                return;
+
         mwl8k_txq_reclaim(hw, index, INT_MAX, 1);
 
         kfree(txq->skb);
@@ -1571,12 +1686,81 @@ static void mwl8k_txq_deinit(struct ieee80211_hw *hw, int index)
         txq->txd = NULL;
 }
 
+/* caller must hold priv->stream_lock when calling the stream functions */
+struct mwl8k_ampdu_stream *
+mwl8k_add_stream(struct ieee80211_hw *hw, struct ieee80211_sta *sta, u8 tid)
+{
+        struct mwl8k_ampdu_stream *stream;
+        struct mwl8k_priv *priv = hw->priv;
+        int i;
+
+        for (i = 0; i < priv->num_ampdu_queues; i++) {
+                stream = &priv->ampdu[i];
+                if (stream->state == AMPDU_NO_STREAM) {
+                        stream->sta = sta;
+                        stream->state = AMPDU_STREAM_NEW;
+                        stream->tid = tid;
+                        stream->idx = i;
+                        stream->txq_idx = MWL8K_TX_WMM_QUEUES + i;
+                        wiphy_debug(hw->wiphy, "Added a new stream for %pM %d",
+                                    sta->addr, tid);
+                        return stream;
+                }
+        }
+        return NULL;
+}
+
+static int
+mwl8k_start_stream(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream)
+{
+        int ret;
+
+        /* if the stream has already been started, don't start it again */
+        if (stream->state != AMPDU_STREAM_NEW)
+                return 0;
+        ret = ieee80211_start_tx_ba_session(stream->sta, stream->tid, 0);
+        if (ret)
+                wiphy_debug(hw->wiphy, "Failed to start stream for %pM %d: "
+                            "%d\n", stream->sta->addr, stream->tid, ret);
+        else
+                wiphy_debug(hw->wiphy, "Started stream for %pM %d\n",
+                            stream->sta->addr, stream->tid);
+        return ret;
+}
+
+static void
+mwl8k_remove_stream(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream)
+{
+        wiphy_debug(hw->wiphy, "Remove stream for %pM %d\n", stream->sta->addr,
+                    stream->tid);
+        memset(stream, 0, sizeof(*stream));
+}
+
+static struct mwl8k_ampdu_stream *
+mwl8k_lookup_stream(struct ieee80211_hw *hw, u8 *addr, u8 tid)
+{
+        struct mwl8k_priv *priv = hw->priv;
+        int i;
+
+        for (i = 0 ; i < priv->num_ampdu_queues; i++) {
+                struct mwl8k_ampdu_stream *stream;
+                stream = &priv->ampdu[i];
+                if (stream->state == AMPDU_NO_STREAM)
+                        continue;
+                if (!memcmp(stream->sta->addr, addr, ETH_ALEN) &&
+                    stream->tid == tid)
+                        return stream;
+        }
+        return NULL;
+}
+
 static void
 mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb)
 {
         struct mwl8k_priv *priv = hw->priv;
         struct ieee80211_tx_info *tx_info;
         struct mwl8k_vif *mwl8k_vif;
+        struct ieee80211_sta *sta;
         struct ieee80211_hdr *wh;
         struct mwl8k_tx_queue *txq;
         struct mwl8k_tx_desc *tx;
@@ -1584,6 +1768,11 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb)
         u32 txstatus;
         u8 txdatarate;
         u16 qos;
+        int txpriority;
+        u8 tid = 0;
+        struct mwl8k_ampdu_stream *stream = NULL;
+        bool start_ba_session = false;
+        struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data;
 
         wh = (struct ieee80211_hdr *)skb->data;
         if (ieee80211_is_data_qos(wh->frame_control))
@@ -1599,6 +1788,7 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb)
         wh = &((struct mwl8k_dma_data *)skb->data)->wh;
 
         tx_info = IEEE80211_SKB_CB(skb);
+        sta = tx_info->control.sta;
         mwl8k_vif = MWL8K_VIF(tx_info->control.vif);
 
         if (tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
@@ -1626,12 +1816,90 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb)
                         qos |= MWL8K_QOS_ACK_POLICY_NORMAL;
         }
 
+        /* Queue ADDBA request in the respective data queue.  While setting up
+         * the ampdu stream, mac80211 queues further packets for that
+         * particular ra/tid pair.  However, packets piled up in the hardware
+         * for that ra/tid pair will still go out. ADDBA request and the
+         * related data packets going out from different queues asynchronously
+         * will cause a shift in the receiver window which might result in
+         * ampdu packets getting dropped at the receiver after the stream has
+         * been setup.
+         */
+        if (unlikely(ieee80211_is_action(wh->frame_control) &&
+            mgmt->u.action.category == WLAN_CATEGORY_BACK &&
+            mgmt->u.action.u.addba_req.action_code == WLAN_ACTION_ADDBA_REQ &&
+            priv->ap_fw)) {
+                u16 capab = le16_to_cpu(mgmt->u.action.u.addba_req.capab);
+                tid = (capab & IEEE80211_ADDBA_PARAM_TID_MASK) >> 2;
+                index = mwl8k_tid_queue_mapping(tid);
+        }
+
+        txpriority = index;
+
+        if (ieee80211_is_data_qos(wh->frame_control) &&
+            skb->protocol != cpu_to_be16(ETH_P_PAE) &&
+            sta->ht_cap.ht_supported && priv->ap_fw) {
+                tid = qos & 0xf;
+                spin_lock(&priv->stream_lock);
+                stream = mwl8k_lookup_stream(hw, sta->addr, tid);
+                if (stream != NULL) {
+                        if (stream->state == AMPDU_STREAM_ACTIVE) {
+                                txpriority = stream->txq_idx;
+                                index = stream->txq_idx;
+                        } else if (stream->state == AMPDU_STREAM_NEW) {
+                                /* We get here if the driver sends us packets
+                                 * after we've initiated a stream, but before
+                                 * our ampdu_action routine has been called
+                                 * with IEEE80211_AMPDU_TX_START to get the SSN
+                                 * for the ADDBA request.  So this packet can
+                                 * go out with no risk of sequence number
+                                 * mismatch.  No special handling is required.
+                                 */
+                        } else {
+                                /* Drop packets that would go out after the
+                                 * ADDBA request was sent but before the ADDBA
+                                 * response is received.  If we don't do this,
+                                 * the recipient would probably receive it
+                                 * after the ADDBA request with SSN 0.  This
+                                 * will cause the recipient's BA receive window
+                                 * to shift, which would cause the subsequent
+                                 * packets in the BA stream to be discarded.
+                                 * mac80211 queues our packets for us in this
+                                 * case, so this is really just a safety check.
+                                 */
+                                wiphy_warn(hw->wiphy,
+                                           "Cannot send packet while ADDBA "
+                                           "dialog is underway.\n");
+                                spin_unlock(&priv->stream_lock);
+                                dev_kfree_skb(skb);
+                                return;
+                        }
+                } else {
+                        /* Defer calling mwl8k_start_stream so that the current
+                         * skb can go out before the ADDBA request.  This
+                         * prevents sequence number mismatch at the recepient
+                         * as described above.
+                         */
+                        if (MWL8K_STA(sta)->is_ampdu_allowed) {
+                                stream = mwl8k_add_stream(hw, sta, tid);
+                                if (stream != NULL)
+                                        start_ba_session = true;
+                        }
+                }
+                spin_unlock(&priv->stream_lock);
+        }
+
         dma = pci_map_single(priv->pdev, skb->data,
                                 skb->len, PCI_DMA_TODEVICE);
 
         if (pci_dma_mapping_error(priv->pdev, dma)) {
                 wiphy_debug(hw->wiphy,
                             "failed to dma map skb, dropping TX frame.\n");
+                if (start_ba_session) {
+                        spin_lock(&priv->stream_lock);
+                        mwl8k_remove_stream(hw, stream);
+                        spin_unlock(&priv->stream_lock);
+                }
                 dev_kfree_skb(skb);
                 return;
         }
@@ -1640,12 +1908,22 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb)
 
         txq = priv->txq + index;
 
+        if (index >= MWL8K_TX_WMM_QUEUES && txq->len >= MWL8K_TX_DESCS) {
+                /* This is the case in which the tx packet is destined for an
+                 * AMPDU queue and that AMPDU queue is full.  Because we don't
+                 * start and stop the AMPDU queues, we must drop these packets.
+                 */
+                dev_kfree_skb(skb);
+                spin_unlock_bh(&priv->tx_lock);
+                return;
+        }
+
         BUG_ON(txq->skb[txq->tail] != NULL);
         txq->skb[txq->tail] = skb;
 
         tx = txq->txd + txq->tail;
         tx->data_rate = txdatarate;
-        tx->tx_priority = index;
+        tx->tx_priority = txpriority;
         tx->qos_control = cpu_to_le16(qos);
         tx->pkt_phys_addr = cpu_to_le32(dma);
         tx->pkt_len = cpu_to_le16(skb->len);
@@ -1664,12 +1942,20 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb)
         if (txq->tail == MWL8K_TX_DESCS)
                 txq->tail = 0;
 
-        if (txq->head == txq->tail)
+        if (txq->head == txq->tail && index < MWL8K_TX_WMM_QUEUES)
                 ieee80211_stop_queue(hw, index);
 
         mwl8k_tx_start(priv);
 
         spin_unlock_bh(&priv->tx_lock);
+
+        /* Initiate the ampdu session here */
+        if (start_ba_session) {
+                spin_lock(&priv->stream_lock);
+                if (mwl8k_start_stream(hw, stream))
+                        mwl8k_remove_stream(hw, stream);
+                spin_unlock(&priv->stream_lock);
+        }
 }
 
 
@@ -1867,7 +2153,7 @@ struct mwl8k_cmd_get_hw_spec_sta {
         __u8 mcs_bitmap[16];
         __le32 rx_queue_ptr;
         __le32 num_tx_queues;
-        __le32 tx_queue_ptrs[MWL8K_TX_QUEUES];
+        __le32 tx_queue_ptrs[MWL8K_TX_WMM_QUEUES];
         __le32 caps2;
         __le32 num_tx_desc_per_queue;
         __le32 total_rxd;
@@ -1973,8 +2259,8 @@ static int mwl8k_cmd_get_hw_spec_sta(struct ieee80211_hw *hw)
         memset(cmd->perm_addr, 0xff, sizeof(cmd->perm_addr));
         cmd->ps_cookie = cpu_to_le32(priv->cookie_dma);
         cmd->rx_queue_ptr = cpu_to_le32(priv->rxq[0].rxd_dma);
-        cmd->num_tx_queues = cpu_to_le32(MWL8K_TX_QUEUES);
-        for (i = 0; i < MWL8K_TX_QUEUES; i++)
+        cmd->num_tx_queues = cpu_to_le32(mwl8k_tx_queues(priv));
+        for (i = 0; i < mwl8k_tx_queues(priv); i++)
                 cmd->tx_queue_ptrs[i] = cpu_to_le32(priv->txq[i].txd_dma);
         cmd->num_tx_desc_per_queue = cpu_to_le32(MWL8K_TX_DESCS);
         cmd->total_rxd = cpu_to_le32(MWL8K_RX_DESCS);
@@ -2016,13 +2302,16 @@ struct mwl8k_cmd_get_hw_spec_ap {
         __le32 wcbbase2;
         __le32 wcbbase3;
         __le32 fw_api_version;
+        __le32 caps;
+        __le32 num_of_ampdu_queues;
+        __le32 wcbbase_ampdu[MWL8K_MAX_AMPDU_QUEUES];
 } __packed;
 
 static int mwl8k_cmd_get_hw_spec_ap(struct ieee80211_hw *hw)
 {
         struct mwl8k_priv *priv = hw->priv;
         struct mwl8k_cmd_get_hw_spec_ap *cmd;
-        int rc;
+        int rc, i;
         u32 api_version;
 
         cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
@@ -2054,27 +2343,31 @@ static int mwl8k_cmd_get_hw_spec_ap(struct ieee80211_hw *hw)
                 priv->num_mcaddrs = le16_to_cpu(cmd->num_mcaddrs);
                 priv->fw_rev = le32_to_cpu(cmd->fw_rev);
                 priv->hw_rev = cmd->hw_rev;
-                mwl8k_setup_2ghz_band(hw);
+                mwl8k_set_caps(hw, le32_to_cpu(cmd->caps));
                 priv->ap_macids_supported = 0x000000ff;
                 priv->sta_macids_supported = 0x00000000;
-
-                off = le32_to_cpu(cmd->wcbbase0) & 0xffff;
-                iowrite32(priv->txq[0].txd_dma, priv->sram + off);
-
+                priv->num_ampdu_queues = le32_to_cpu(cmd->num_of_ampdu_queues);
+                if (priv->num_ampdu_queues > MWL8K_MAX_AMPDU_QUEUES) {
+                        wiphy_warn(hw->wiphy, "fw reported %d ampdu queues"
+                                   " but we only support %d.\n",
+                                   priv->num_ampdu_queues,
+                                   MWL8K_MAX_AMPDU_QUEUES);
+                        priv->num_ampdu_queues = MWL8K_MAX_AMPDU_QUEUES;
+                }
                 off = le32_to_cpu(cmd->rxwrptr) & 0xffff;
                 iowrite32(priv->rxq[0].rxd_dma, priv->sram + off);
 
                 off = le32_to_cpu(cmd->rxrdptr) & 0xffff;
                 iowrite32(priv->rxq[0].rxd_dma, priv->sram + off);
 
-                off = le32_to_cpu(cmd->wcbbase1) & 0xffff;
-                iowrite32(priv->txq[1].txd_dma, priv->sram + off);
+                priv->txq_offset[0] = le32_to_cpu(cmd->wcbbase0) & 0xffff;
+                priv->txq_offset[1] = le32_to_cpu(cmd->wcbbase1) & 0xffff;
+                priv->txq_offset[2] = le32_to_cpu(cmd->wcbbase2) & 0xffff;
+                priv->txq_offset[3] = le32_to_cpu(cmd->wcbbase3) & 0xffff;
 
-                off = le32_to_cpu(cmd->wcbbase2) & 0xffff;
-                iowrite32(priv->txq[2].txd_dma, priv->sram + off);
-
-                off = le32_to_cpu(cmd->wcbbase3) & 0xffff;
-                iowrite32(priv->txq[3].txd_dma, priv->sram + off);
+                for (i = 0; i < priv->num_ampdu_queues; i++)
+                        priv->txq_offset[i + MWL8K_TX_WMM_QUEUES] =
+                                le32_to_cpu(cmd->wcbbase_ampdu[i]) & 0xffff;
         }
 
 done:
@@ -2097,12 +2390,20 @@ struct mwl8k_cmd_set_hw_spec {
         __le32 caps;
         __le32 rx_queue_ptr;
         __le32 num_tx_queues;
-        __le32 tx_queue_ptrs[MWL8K_TX_QUEUES];
+        __le32 tx_queue_ptrs[MWL8K_MAX_TX_QUEUES];
         __le32 flags;
         __le32 num_tx_desc_per_queue;
         __le32 total_rxd;
 } __packed;
 
+/* If enabled, MWL8K_SET_HW_SPEC_FLAG_ENABLE_LIFE_TIME_EXPIRY will cause
+ * packets to expire 500 ms after the timestamp in the tx descriptor.  That is,
+ * the packets that are queued for more than 500ms, will be dropped in the
+ * hardware. This helps minimizing the issues caused due to head-of-line
+ * blocking where a slow client can hog the bandwidth and affect traffic to a
+ * faster client.
+ */
+#define MWL8K_SET_HW_SPEC_FLAG_ENABLE_LIFE_TIME_EXPIRY  0x00000400
 #define MWL8K_SET_HW_SPEC_FLAG_HOST_DECR_MGMT           0x00000080
 #define MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_PROBERESP       0x00000020
 #define MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_BEACON          0x00000010
@@ -2123,7 +2424,7 @@ static int mwl8k_cmd_set_hw_spec(struct ieee80211_hw *hw)
 
         cmd->ps_cookie = cpu_to_le32(priv->cookie_dma);
         cmd->rx_queue_ptr = cpu_to_le32(priv->rxq[0].rxd_dma);
-        cmd->num_tx_queues = cpu_to_le32(MWL8K_TX_QUEUES);
+        cmd->num_tx_queues = cpu_to_le32(mwl8k_tx_queues(priv));
 
         /*
          * Mac80211 stack has Q0 as highest priority and Q3 as lowest in
@@ -2131,8 +2432,8 @@ static int mwl8k_cmd_set_hw_spec(struct ieee80211_hw *hw)
          * in that order. Map Q3 of mac80211 to Q0 of firmware so that the
          * priority is interpreted the right way in firmware.
          */
-        for (i = 0; i < MWL8K_TX_QUEUES; i++) {
-                int j = MWL8K_TX_QUEUES - 1 - i;
+        for (i = 0; i < mwl8k_tx_queues(priv); i++) {
+                int j = mwl8k_tx_queues(priv) - 1 - i;
                 cmd->tx_queue_ptrs[i] = cpu_to_le32(priv->txq[j].txd_dma);
         }
 
@@ -3122,6 +3423,65 @@ static int mwl8k_cmd_set_rateadapt_mode(struct ieee80211_hw *hw, __u16 mode)
 }
 
 /*
+ * CMD_GET_WATCHDOG_BITMAP.
+ */
+struct mwl8k_cmd_get_watchdog_bitmap {
+        struct mwl8k_cmd_pkt header;
+        u8      bitmap;
+} __packed;
+
+static int mwl8k_cmd_get_watchdog_bitmap(struct ieee80211_hw *hw, u8 *bitmap)
+{
+        struct mwl8k_cmd_get_watchdog_bitmap *cmd;
+        int rc;
+
+        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
+        if (cmd == NULL)
+                return -ENOMEM;
+
+        cmd->header.code = cpu_to_le16(MWL8K_CMD_GET_WATCHDOG_BITMAP);
+        cmd->header.length = cpu_to_le16(sizeof(*cmd));
+
+        rc = mwl8k_post_cmd(hw, &cmd->header);
+        if (!rc)
+                *bitmap = cmd->bitmap;
+
+        kfree(cmd);
+
+        return rc;
+}
+
+#define INVALID_BA      0xAA
+static void mwl8k_watchdog_ba_events(struct work_struct *work)
+{
+        int rc;
+        u8 bitmap = 0, stream_index;
+        struct mwl8k_ampdu_stream *streams;
+        struct mwl8k_priv *priv =
+                container_of(work, struct mwl8k_priv, watchdog_ba_handle);
+
+        rc = mwl8k_cmd_get_watchdog_bitmap(priv->hw, &bitmap);
+        if (rc)
+                return;
+
+        if (bitmap == INVALID_BA)
+                return;
+
+        /* the bitmap is the hw queue number.  Map it to the ampdu queue. */
+        stream_index = bitmap - MWL8K_TX_WMM_QUEUES;
+
+        BUG_ON(stream_index >= priv->num_ampdu_queues);
+
+        streams = &priv->ampdu[stream_index];
+
+        if (streams->state == AMPDU_STREAM_ACTIVE)
+                ieee80211_stop_tx_ba_session(streams->sta, streams->tid);
+
+        return;
+}
+
+
+/*
  * CMD_BSS_START.
  */
 struct mwl8k_cmd_bss_start {
@@ -3150,6 +3510,152 @@ static int mwl8k_cmd_bss_start(struct ieee80211_hw *hw,
 }
 
 /*
+ * CMD_BASTREAM.
+ */
+
+/*
+ * UPSTREAM is tx direction
+ */
+#define BASTREAM_FLAG_DIRECTION_UPSTREAM        0x00
+#define BASTREAM_FLAG_IMMEDIATE_TYPE            0x01
+
+enum {
+        MWL8K_BA_CREATE,
+        MWL8K_BA_UPDATE,
+        MWL8K_BA_DESTROY,
+        MWL8K_BA_FLUSH,
+        MWL8K_BA_CHECK,
+} ba_stream_action_type;
+
+
+struct mwl8k_create_ba_stream {
+        __le32  flags;
+        __le32  idle_thrs;
+        __le32  bar_thrs;
+        __le32  window_size;
+        u8      peer_mac_addr[6];
+        u8      dialog_token;
+        u8      tid;
+        u8      queue_id;
+        u8      param_info;
+        __le32  ba_context;
+        u8      reset_seq_no_flag;
+        __le16  curr_seq_no;
+        u8      sta_src_mac_addr[6];
+} __packed;
+
+struct mwl8k_destroy_ba_stream {
+        __le32  flags;
+        __le32  ba_context;
+} __packed;
+
+struct mwl8k_cmd_bastream {
+        struct mwl8k_cmd_pkt    header;
+        __le32  action;
+        union {
+                struct mwl8k_create_ba_stream   create_params;
+                struct mwl8k_destroy_ba_stream  destroy_params;
+        };
+} __packed;
+
+static int
+mwl8k_check_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream)
+{
+        struct mwl8k_cmd_bastream *cmd;
+        int rc;
+
+        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
+        if (cmd == NULL)
+                return -ENOMEM;
+
+        cmd->header.code = cpu_to_le16(MWL8K_CMD_BASTREAM);
+        cmd->header.length = cpu_to_le16(sizeof(*cmd));
+
+        cmd->action = cpu_to_le32(MWL8K_BA_CHECK);
+
+        cmd->create_params.queue_id = stream->idx;
+        memcpy(&cmd->create_params.peer_mac_addr[0], stream->sta->addr,
+               ETH_ALEN);
+        cmd->create_params.tid = stream->tid;
+
+        cmd->create_params.flags =
+                cpu_to_le32(BASTREAM_FLAG_IMMEDIATE_TYPE) |
+                cpu_to_le32(BASTREAM_FLAG_DIRECTION_UPSTREAM);
+
+        rc = mwl8k_post_cmd(hw, &cmd->header);
+
+        kfree(cmd);
+
+        return rc;
+}
+
+static int
+mwl8k_create_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream,
+                u8 buf_size)
+{
+        struct mwl8k_cmd_bastream *cmd;
+        int rc;
+
+        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
+        if (cmd == NULL)
+                return -ENOMEM;
+
+
+        cmd->header.code = cpu_to_le16(MWL8K_CMD_BASTREAM);
+        cmd->header.length = cpu_to_le16(sizeof(*cmd));
+
+        cmd->action = cpu_to_le32(MWL8K_BA_CREATE);
+
+        cmd->create_params.bar_thrs = cpu_to_le32((u32)buf_size);
+        cmd->create_params.window_size = cpu_to_le32((u32)buf_size);
+        cmd->create_params.queue_id = stream->idx;
+
+        memcpy(cmd->create_params.peer_mac_addr, stream->sta->addr, ETH_ALEN);
+        cmd->create_params.tid = stream->tid;
+        cmd->create_params.curr_seq_no = cpu_to_le16(0);
+        cmd->create_params.reset_seq_no_flag = 1;
+
+        cmd->create_params.param_info =
+                (stream->sta->ht_cap.ampdu_factor &
+                 IEEE80211_HT_AMPDU_PARM_FACTOR) |
+                ((stream->sta->ht_cap.ampdu_density << 2) &
+                 IEEE80211_HT_AMPDU_PARM_DENSITY);
+
+        cmd->create_params.flags =
+                cpu_to_le32(BASTREAM_FLAG_IMMEDIATE_TYPE |
+                                        BASTREAM_FLAG_DIRECTION_UPSTREAM);
+
+        rc = mwl8k_post_cmd(hw, &cmd->header);
+
+        wiphy_debug(hw->wiphy, "Created a BA stream for %pM : tid %d\n",
+                stream->sta->addr, stream->tid);
+        kfree(cmd);
+
+        return rc;
+}
+
+static void mwl8k_destroy_ba(struct ieee80211_hw *hw,
+                             struct mwl8k_ampdu_stream *stream)
+{
+        struct mwl8k_cmd_bastream *cmd;
+
+        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
+        if (cmd == NULL)
+                return;
+
+        cmd->header.code = cpu_to_le16(MWL8K_CMD_BASTREAM);
+        cmd->header.length = cpu_to_le16(sizeof(*cmd));
+        cmd->action = cpu_to_le32(MWL8K_BA_DESTROY);
+
+        cmd->destroy_params.ba_context = cpu_to_le32(stream->idx);
+        mwl8k_post_cmd(hw, &cmd->header);
+
+        wiphy_debug(hw->wiphy, "Deleted BA stream index %d\n", stream->idx);
+
+        kfree(cmd);
+}
+
+/*
  * CMD_SET_NEW_STN.
  */
 struct mwl8k_cmd_set_new_stn {
@@ -3670,6 +4176,11 @@ static irqreturn_t mwl8k_interrupt(int irq, void *dev_id)
                 tasklet_schedule(&priv->poll_rx_task);
         }
 
+        if (status & MWL8K_A2H_INT_BA_WATCHDOG) {
+                status &= ~MWL8K_A2H_INT_BA_WATCHDOG;
+                ieee80211_queue_work(hw, &priv->watchdog_ba_handle);
+        }
+
         if (status)
                 iowrite32(~status, priv->regs + MWL8K_HIU_A2H_INTERRUPT_STATUS);
 
@@ -3698,7 +4209,7 @@ static void mwl8k_tx_poll(unsigned long data)
 
         spin_lock_bh(&priv->tx_lock);
 
-        for (i = 0; i < MWL8K_TX_QUEUES; i++)
+        for (i = 0; i < mwl8k_tx_queues(priv); i++)
                 limit -= mwl8k_txq_reclaim(hw, i, limit, 0);
 
         if (!priv->pending_tx_pkts && priv->tx_wait != NULL) {
@@ -3822,6 +4333,7 @@ static void mwl8k_stop(struct ieee80211_hw *hw)
 
         /* Stop finalize join worker */
         cancel_work_sync(&priv->finalize_join_worker);
+        cancel_work_sync(&priv->watchdog_ba_handle);
         if (priv->beacon_skb != NULL)
                 dev_kfree_skb(priv->beacon_skb);
 
@@ -3830,7 +4342,7 @@ static void mwl8k_stop(struct ieee80211_hw *hw)
         tasklet_disable(&priv->poll_rx_task);
 
         /* Return all skbs to mac80211 */
-        for (i = 0; i < MWL8K_TX_QUEUES; i++)
+        for (i = 0; i < mwl8k_tx_queues(priv); i++)
                 mwl8k_txq_reclaim(hw, i, INT_MAX, 1);
 }
 
@@ -4305,6 +4817,8 @@ static int mwl8k_sta_add(struct ieee80211_hw *hw,
                 ret = mwl8k_cmd_update_stadb_add(hw, vif, sta);
                 if (ret >= 0) {
                         MWL8K_STA(sta)->peer_id = ret;
+                        if (sta->ht_cap.ht_supported)
+                                MWL8K_STA(sta)->is_ampdu_allowed = true;
                         ret = 0;
                 }
 
@@ -4328,14 +4842,14 @@ static int mwl8k_conf_tx(struct ieee80211_hw *hw, u16 queue,
 
         rc = mwl8k_fw_lock(hw);
         if (!rc) {
-                BUG_ON(queue > MWL8K_TX_QUEUES - 1);
+                BUG_ON(queue > MWL8K_TX_WMM_QUEUES - 1);
                 memcpy(&priv->wmm_params[queue], params, sizeof(*params));
 
                 if (!priv->wmm_enabled)
                         rc = mwl8k_cmd_set_wmm_mode(hw, 1);
 
                 if (!rc) {
-                        int q = MWL8K_TX_QUEUES - 1 - queue;
+                        int q = MWL8K_TX_WMM_QUEUES - 1 - queue;
                         rc = mwl8k_cmd_set_edca_params(hw, q,
                                                        params->cw_min,
                                                        params->cw_max,
@@ -4371,21 +4885,118 @@ static int mwl8k_get_survey(struct ieee80211_hw *hw, int idx,
         return 0;
 }
 
+#define MAX_AMPDU_ATTEMPTS 5
+
 static int
 mwl8k_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 i, rc = 0;
+        struct mwl8k_priv *priv = hw->priv;
+        struct mwl8k_ampdu_stream *stream;
+        u8 *addr = sta->addr;
+
+        if (!(hw->flags & IEEE80211_HW_AMPDU_AGGREGATION))
+                return -ENOTSUPP;
+
+        spin_lock(&priv->stream_lock);
+        stream = mwl8k_lookup_stream(hw, addr, tid);
+
         switch (action) {
         case IEEE80211_AMPDU_RX_START:
         case IEEE80211_AMPDU_RX_STOP:
-                if (!(hw->flags & IEEE80211_HW_AMPDU_AGGREGATION))
-                        return -ENOTSUPP;
-                return 0;
+                break;
+        case IEEE80211_AMPDU_TX_START:
+                /* By the time we get here the hw queues may contain outgoing
+                 * packets for this RA/TID that are not part of this BA
+                 * session.  The hw will assign sequence numbers to these
+                 * packets as they go out.  So if we query the hw for its next
+                 * sequence number and use that for the SSN here, it may end up
+                 * being wrong, which will lead to sequence number mismatch at
+                 * the recipient.  To avoid this, we reset the sequence number
+                 * to O for the first MPDU in this BA stream.
+                 */
+                *ssn = 0;
+                if (stream == NULL) {
+                        /* This means that somebody outside this driver called
+                         * ieee80211_start_tx_ba_session.  This is unexpected
+                         * because we do our own rate control.  Just warn and
+                         * move on.
+                         */
+                        wiphy_warn(hw->wiphy, "Unexpected call to %s.  "
+                                   "Proceeding anyway.\n", __func__);
+                        stream = mwl8k_add_stream(hw, sta, tid);
+                }
+                if (stream == NULL) {
+                        wiphy_debug(hw->wiphy, "no free AMPDU streams\n");
+                        rc = -EBUSY;
+                        break;
+                }
+                stream->state = AMPDU_STREAM_IN_PROGRESS;
+
+                /* Release the lock before we do the time consuming stuff */
+                spin_unlock(&priv->stream_lock);
+                for (i = 0; i < MAX_AMPDU_ATTEMPTS; i++) {
+                        rc = mwl8k_check_ba(hw, stream);
+
+                        if (!rc)
+                                break;
+                        /*
+                         * HW queues take time to be flushed, give them
+                         * sufficient time
+                         */
+
+                        msleep(1000);
+                }
+                spin_lock(&priv->stream_lock);
+                if (rc) {
+                        wiphy_err(hw->wiphy, "Stream for tid %d busy after %d"
+                                " attempts\n", tid, MAX_AMPDU_ATTEMPTS);
+                        mwl8k_remove_stream(hw, stream);
+                        rc = -EBUSY;
+                        break;
+                }
+                ieee80211_start_tx_ba_cb_irqsafe(vif, addr, tid);
+                break;
+        case IEEE80211_AMPDU_TX_STOP:
+                if (stream == NULL)
+                        break;
+                if (stream->state == AMPDU_STREAM_ACTIVE) {
+                        spin_unlock(&priv->stream_lock);
+                        mwl8k_destroy_ba(hw, stream);
+                        spin_lock(&priv->stream_lock);
+                }
+                mwl8k_remove_stream(hw, stream);
+                ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid);
+                break;
+        case IEEE80211_AMPDU_TX_OPERATIONAL:
+                BUG_ON(stream == NULL);
+                BUG_ON(stream->state != AMPDU_STREAM_IN_PROGRESS);
+                spin_unlock(&priv->stream_lock);
+                rc = mwl8k_create_ba(hw, stream, buf_size);
+                spin_lock(&priv->stream_lock);
+                if (!rc)
+                        stream->state = AMPDU_STREAM_ACTIVE;
+                else {
+                        spin_unlock(&priv->stream_lock);
+                        mwl8k_destroy_ba(hw, stream);
+                        spin_lock(&priv->stream_lock);
+                        wiphy_debug(hw->wiphy,
+                                "Failed adding stream for sta %pM tid %d\n",
+                                addr, tid);
+                        mwl8k_remove_stream(hw, stream);
+                }
+                break;
+
         default:
-                return -ENOTSUPP;
+                rc = -ENOTSUPP;
         }
+
+        spin_unlock(&priv->stream_lock);
+        return rc;
 }
 
 static const struct ieee80211_ops mwl8k_ops = {
@@ -4434,7 +5045,7 @@ enum {
         MWL8366,
 };
 
-#define MWL8K_8366_AP_FW_API 1
+#define MWL8K_8366_AP_FW_API 2
 #define _MWL8K_8366_AP_FW(api) "mwl8k/fmimage_8366_ap-" #api ".fw"
 #define MWL8K_8366_AP_FW(api) _MWL8K_8366_AP_FW(api)
 
@@ -4600,6 +5211,23 @@ static int mwl8k_init_firmware(struct ieee80211_hw *hw, char *fw_image,
         return rc;
 }
 
+static int mwl8k_init_txqs(struct ieee80211_hw *hw)
+{
+        struct mwl8k_priv *priv = hw->priv;
+        int rc = 0;
+        int i;
+
+        for (i = 0; i < mwl8k_tx_queues(priv); i++) {
+                rc = mwl8k_txq_init(hw, i);
+                if (rc)
+                        break;
+                if (priv->ap_fw)
+                        iowrite32(priv->txq[i].txd_dma,
+                                  priv->sram + priv->txq_offset[i]);
+        }
+        return rc;
+}
+
 /* initialize hw after successfully loading a firmware image */
 static int mwl8k_probe_hw(struct ieee80211_hw *hw)
 {
@@ -4627,15 +5255,23 @@ static int mwl8k_probe_hw(struct ieee80211_hw *hw)
                 goto err_stop_firmware;
         rxq_refill(hw, 0, INT_MAX);
 
-        for (i = 0; i < MWL8K_TX_QUEUES; i++) {
-                rc = mwl8k_txq_init(hw, i);
+        /* For the sta firmware, we need to know the dma addresses of tx queues
+         * before sending MWL8K_CMD_GET_HW_SPEC.  So we must initialize them
+         * prior to issuing this command.  But for the AP case, we learn the
+         * total number of queues from the result CMD_GET_HW_SPEC, so for this
+         * case we must initialize the tx queues after.
+         */
+        priv->num_ampdu_queues = 0;
+        if (!priv->ap_fw) {
+                rc = mwl8k_init_txqs(hw);
                 if (rc)
                         goto err_free_queues;
         }
 
         iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_STATUS);
         iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK);
-        iowrite32(MWL8K_A2H_INT_TX_DONE | MWL8K_A2H_INT_RX_READY,
+        iowrite32(MWL8K_A2H_INT_TX_DONE|MWL8K_A2H_INT_RX_READY|
+                  MWL8K_A2H_INT_BA_WATCHDOG,
                   priv->regs + MWL8K_HIU_A2H_INTERRUPT_CLEAR_SEL);
         iowrite32(0xffffffff, priv->regs + MWL8K_HIU_A2H_INTERRUPT_STATUS_MASK);
 
@@ -4646,6 +5282,8 @@ static int mwl8k_probe_hw(struct ieee80211_hw *hw)
                 goto err_free_queues;
         }
 
+        memset(priv->ampdu, 0, sizeof(priv->ampdu));
+
         /*
          * Temporarily enable interrupts.  Initial firmware host
          * commands use interrupts and avoid polling.  Disable
@@ -4657,6 +5295,8 @@ static int mwl8k_probe_hw(struct ieee80211_hw *hw)
         if (priv->ap_fw) {
                 rc = mwl8k_cmd_get_hw_spec_ap(hw);
                 if (!rc)
+                        rc = mwl8k_init_txqs(hw);
+                if (!rc)
                         rc = mwl8k_cmd_set_hw_spec(hw);
         } else {
                 rc = mwl8k_cmd_get_hw_spec_sta(hw);
@@ -4698,7 +5338,7 @@ err_free_irq:
         free_irq(priv->pdev->irq, hw);
 
 err_free_queues:
-        for (i = 0; i < MWL8K_TX_QUEUES; i++)
+        for (i = 0; i < mwl8k_tx_queues(priv); i++)
                 mwl8k_txq_deinit(hw, i);
         mwl8k_rxq_deinit(hw, 0);
 
@@ -4720,7 +5360,7 @@ static int mwl8k_reload_firmware(struct ieee80211_hw *hw, char *fw_image)
         mwl8k_stop(hw);
         mwl8k_rxq_deinit(hw, 0);
 
-        for (i = 0; i < MWL8K_TX_QUEUES; i++)
+        for (i = 0; i < mwl8k_tx_queues(priv); i++)
                 mwl8k_txq_deinit(hw, i);
 
         rc = mwl8k_init_firmware(hw, fw_image, false);
@@ -4739,7 +5379,7 @@ static int mwl8k_reload_firmware(struct ieee80211_hw *hw, char *fw_image)
         if (rc)
                 goto fail;
 
-        for (i = 0; i < MWL8K_TX_QUEUES; i++) {
+        for (i = 0; i < MWL8K_TX_WMM_QUEUES; i++) {
                 rc = mwl8k_conf_tx(hw, i, &priv->wmm_params[i]);
                 if (rc)
                         goto fail;
@@ -4773,7 +5413,7 @@ static int mwl8k_firmware_load_success(struct mwl8k_priv *priv)
 
         hw->channel_change_time = 10;
 
-        hw->queues = MWL8K_TX_QUEUES;
+        hw->queues = MWL8K_TX_WMM_QUEUES;
 
         /* Set rssi values to dBm */
         hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_HAS_RATE_CONTROL;
@@ -4789,6 +5429,8 @@ static int mwl8k_firmware_load_success(struct mwl8k_priv *priv)
 
         /* Finalize join worker */
         INIT_WORK(&priv->finalize_join_worker, mwl8k_finalize_join_worker);
+        /* Handle watchdog ba events */
+        INIT_WORK(&priv->watchdog_ba_handle, mwl8k_watchdog_ba_events);
 
         /* TX reclaim and RX tasklets.  */
         tasklet_init(&priv->poll_tx_task, mwl8k_tx_poll, (unsigned long)hw);
@@ -4808,6 +5450,8 @@ static int mwl8k_firmware_load_success(struct mwl8k_priv *priv)
 
         spin_lock_init(&priv->tx_lock);
 
+        spin_lock_init(&priv->stream_lock);
+
         priv->tx_wait = NULL;
 
         rc = mwl8k_probe_hw(hw);
@@ -4829,7 +5473,7 @@ static int mwl8k_firmware_load_success(struct mwl8k_priv *priv)
         return 0;
 
 err_unprobe_hw:
-        for (i = 0; i < MWL8K_TX_QUEUES; i++)
+        for (i = 0; i < mwl8k_tx_queues(priv); i++)
                 mwl8k_txq_deinit(hw, i);
         mwl8k_rxq_deinit(hw, 0);
 
@@ -4988,10 +5632,10 @@ static void __devexit mwl8k_remove(struct pci_dev *pdev)
         mwl8k_hw_reset(priv);
 
         /* Return all skbs to mac80211 */
-        for (i = 0; i < MWL8K_TX_QUEUES; i++)
+        for (i = 0; i < mwl8k_tx_queues(priv); i++)
                 mwl8k_txq_reclaim(hw, i, INT_MAX, 1);
 
-        for (i = 0; i < MWL8K_TX_QUEUES; i++)
+        for (i = 0; i < mwl8k_tx_queues(priv); i++)
                 mwl8k_txq_deinit(hw, i);
 
         mwl8k_rxq_deinit(hw, 0);
diff --git a/drivers/net/wireless/orinoco/cfg.c b/drivers/net/wireless/orinoco/cfg.c
index 09fae2f0ea0..736bbb9bd1d 100644
--- a/drivers/net/wireless/orinoco/cfg.c
+++ b/drivers/net/wireless/orinoco/cfg.c
@@ -153,6 +153,9 @@ static int orinoco_scan(struct wiphy *wiphy, struct net_device *dev,
         priv->scan_request = request;
 
         err = orinoco_hw_trigger_scan(priv, request->ssids);
+        /* On error the we aren't processing the request */
+        if (err)
+                priv->scan_request = NULL;
 
         return err;
 }
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index f3d396e7544..62c6b2b37db 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -1376,13 +1376,13 @@ static void orinoco_process_scan_results(struct work_struct *work)
 
         spin_lock_irqsave(&priv->scan_lock, flags);
         list_for_each_entry_safe(sd, temp, &priv->scan_list, list) {
-                spin_unlock_irqrestore(&priv->scan_lock, flags);
 
                 buf = sd->buf;
                 len = sd->len;
                 type = sd->type;
 
                 list_del(&sd->list);
+                spin_unlock_irqrestore(&priv->scan_lock, flags);
                 kfree(sd);
 
                 if (len > 0) {
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 1eacba4daa5..0494d7b102d 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -199,6 +199,7 @@ static void p54p_check_rx_ring(struct ieee80211_hw *dev, u32 *index,
         while (i != idx) {
                 u16 len;
                 struct sk_buff *skb;
+                dma_addr_t dma_addr;
                 desc = &ring[i];
                 len = le16_to_cpu(desc->len);
                 skb = rx_buf[i];
@@ -216,17 +217,20 @@ static void p54p_check_rx_ring(struct ieee80211_hw *dev, u32 *index,
 
                         len = priv->common.rx_mtu;
                 }
+                dma_addr = le32_to_cpu(desc->host_addr);
+                pci_dma_sync_single_for_cpu(priv->pdev, dma_addr,
+                        priv->common.rx_mtu + 32, PCI_DMA_FROMDEVICE);
                 skb_put(skb, len);
 
                 if (p54_rx(dev, skb)) {
-                        pci_unmap_single(priv->pdev,
-                                         le32_to_cpu(desc->host_addr),
-                                         priv->common.rx_mtu + 32,
-                                         PCI_DMA_FROMDEVICE);
+                        pci_unmap_single(priv->pdev, dma_addr,
+                                priv->common.rx_mtu + 32, PCI_DMA_FROMDEVICE);
                         rx_buf[i] = NULL;
-                        desc->host_addr = 0;
+                        desc->host_addr = cpu_to_le32(0);
                 } else {
                         skb_trim(skb, 0);
+                        pci_dma_sync_single_for_device(priv->pdev, dma_addr,
+                                priv->common.rx_mtu + 32, PCI_DMA_FROMDEVICE);
                         desc->len = cpu_to_le16(priv->common.rx_mtu + 32);
                 }
 
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index 18d24b7b1e3..7ecc0bda57b 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@ -649,8 +649,7 @@ static int __devinit p54spi_probe(struct spi_device *spi)
                 goto err_free_common;
         }
 
-        set_irq_type(gpio_to_irq(p54spi_gpio_irq),
-                     IRQ_TYPE_EDGE_RISING);
+        irq_set_irq_type(gpio_to_irq(p54spi_gpio_irq), IRQ_TYPE_EDGE_RISING);
 
         disable_irq(gpio_to_irq(p54spi_gpio_irq));
 
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index 21713a7638c..9b344a921e7 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -98,6 +98,7 @@ static struct usb_device_id p54u_table[] __devinitdata = {
         {USB_DEVICE(0x1413, 0x5400)},   /* Telsey 802.11g USB2.0 Adapter */
         {USB_DEVICE(0x1435, 0x0427)},   /* Inventel UR054G */
         {USB_DEVICE(0x1668, 0x1050)},   /* Actiontec 802UIG-1 */
+        {USB_DEVICE(0x1740, 0x1000)},   /* Senao NUB-350 */
         {USB_DEVICE(0x2001, 0x3704)},   /* DLink DWL-G122 rev A2 */
         {USB_DEVICE(0x2001, 0x3705)},   /* D-Link DWL-G120 rev C1 */
         {USB_DEVICE(0x413c, 0x5513)},   /* Dell WLA3310 USB Wireless Adapter */
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 848cc2cce24..518542b4bf9 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -2597,6 +2597,9 @@ static int rndis_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
         __le32 mode;
         int ret;
 
+        if (priv->device_type != RNDIS_BCM4320B)
+                return -ENOTSUPP;
+
         netdev_dbg(usbdev->net, "%s(): %s, %d\n", __func__,
                                 enabled ? "enabled" : "disabled",
                                 timeout);
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index f1a92144996..4e368657a83 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -719,6 +719,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x0b05, 0x1732), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0b05, 0x1742), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0b05, 0x1784), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x1761, 0x0b05), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* AzureWave */
         { USB_DEVICE(0x13d3, 0x3247), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x13d3, 0x3273), USB_DEVICE_DATA(&rt2800usb_ops) },
@@ -913,7 +914,6 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x0b05, 0x1760), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0b05, 0x1761), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0b05, 0x1790), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x1761, 0x0b05), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* AzureWave */
         { USB_DEVICE(0x13d3, 0x3262), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x13d3, 0x3284), USB_DEVICE_DATA(&rt2800usb_ops) },
@@ -937,6 +937,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x07d1, 0x3c13), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x07d1, 0x3c15), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x07d1, 0x3c17), USB_DEVICE_DATA(&rt2800usb_ops) },
+        /* Edimax */
+        { USB_DEVICE(0x7392, 0x4085), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Encore */
         { USB_DEVICE(0x203d, 0x14a1), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Gemtek */
@@ -961,6 +963,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x1d4d, 0x0010), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x1d4d, 0x0011), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Planex */
+        { USB_DEVICE(0x2019, 0x5201), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x2019, 0xab24), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Qcom */
         { USB_DEVICE(0x18e8, 0x6259), USB_DEVICE_DATA(&rt2800usb_ops) },
@@ -972,6 +975,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
         /* Sweex */
         { USB_DEVICE(0x177f, 0x0153), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x177f, 0x0313), USB_DEVICE_DATA(&rt2800usb_ops) },
+        /* Toshiba */
+        { USB_DEVICE(0x0930, 0x0a07), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Zyxel */
         { USB_DEVICE(0x0586, 0x341a), USB_DEVICE_DATA(&rt2800usb_ops) },
 #endif
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
index 4f92cba6810..f74a8701c67 100644
--- a/drivers/net/wireless/rtlwifi/efuse.c
+++ b/drivers/net/wireless/rtlwifi/efuse.c
@@ -410,8 +410,8 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
 
         if (!efuse_shadow_update_chk(hw)) {
                 efuse_read_all_map(hw, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0]);
-                memcpy((void *)&rtlefuse->efuse_map[EFUSE_MODIFY_MAP][0],
-                       (void *)&rtlefuse->efuse_map[EFUSE_INIT_MAP][0],
+                memcpy(&rtlefuse->efuse_map[EFUSE_MODIFY_MAP][0],
+                       &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],
                        rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
 
                 RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
@@ -446,9 +446,9 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
 
                 if (word_en != 0x0F) {
                         u8 tmpdata[8];
-                        memcpy((void *)tmpdata,
-                               (void *)(&rtlefuse->
-                                        efuse_map[EFUSE_MODIFY_MAP][base]), 8);
+                        memcpy(tmpdata,
+                               &rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base],
+                               8);
                         RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD,
                                       ("U-efuse\n"), tmpdata, 8);
 
@@ -465,8 +465,8 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
         efuse_power_switch(hw, true, false);
         efuse_read_all_map(hw, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0]);
 
-        memcpy((void *)&rtlefuse->efuse_map[EFUSE_MODIFY_MAP][0],
-               (void *)&rtlefuse->efuse_map[EFUSE_INIT_MAP][0],
+        memcpy(&rtlefuse->efuse_map[EFUSE_MODIFY_MAP][0],
+               &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],
                rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
 
         RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD, ("<---\n"));
@@ -479,13 +479,12 @@ void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw)
         struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));
 
         if (rtlefuse->autoload_failflag == true) {
-                memset((void *)(&rtlefuse->efuse_map[EFUSE_INIT_MAP][0]), 128,
-                       0xFF);
+                memset(&rtlefuse->efuse_map[EFUSE_INIT_MAP][0], 0xFF, 128);
         } else
                 efuse_read_all_map(hw, &rtlefuse->efuse_map[EFUSE_INIT_MAP][0]);
 
-        memcpy((void *)&rtlefuse->efuse_map[EFUSE_MODIFY_MAP][0],
-               (void *)&rtlefuse->efuse_map[EFUSE_INIT_MAP][0],
+        memcpy(&rtlefuse->efuse_map[EFUSE_MODIFY_MAP][0],
+               &rtlefuse->efuse_map[EFUSE_INIT_MAP][0],
                rtlpriv->cfg->maps[EFUSE_HWSET_MAX_SIZE]);
 
 }
@@ -694,8 +693,8 @@ static int efuse_pg_packet_read(struct ieee80211_hw *hw, u8 offset, u8 *data)
         if (offset > 15)
                 return false;
 
-        memset((void *)data, PGPKT_DATA_SIZE * sizeof(u8), 0xff);
-        memset((void *)tmpdata, PGPKT_DATA_SIZE * sizeof(u8), 0xff);
+        memset(data, 0xff, PGPKT_DATA_SIZE * sizeof(u8));
+        memset(tmpdata, 0xff, PGPKT_DATA_SIZE * sizeof(u8));
 
         while (bcontinual && (efuse_addr < EFUSE_MAX_SIZE)) {
                 if (readstate & PG_STATE_HEADER) {
@@ -862,7 +861,7 @@ static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,
 
                 tmp_word_cnts = efuse_calculate_word_cnts(tmp_pkt.word_en);
 
-                memset((void *)originaldata, 8 * sizeof(u8), 0xff);
+                memset(originaldata, 0xff, 8 * sizeof(u8));
 
                 if (efuse_pg_packet_read(hw, tmp_pkt.offset, originaldata)) {
                         badworden = efuse_word_enable_data_write(hw,
@@ -917,7 +916,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
         target_pkt.offset = offset;
         target_pkt.word_en = word_en;
 
-        memset((void *)target_pkt.data, 8 * sizeof(u8), 0xFF);
+        memset(target_pkt.data, 0xFF, 8 * sizeof(u8));
 
         efuse_word_enable_data_read(word_en, data, target_pkt.data);
         target_word_cnts = efuse_calculate_word_cnts(target_pkt.word_en);
@@ -1022,7 +1021,7 @@ static u8 efuse_word_enable_data_write(struct ieee80211_hw *hw,
         u8 badworden = 0x0F;
         u8 tmpdata[8];
 
-        memset((void *)tmpdata, PGPKT_DATA_SIZE, 0xff);
+        memset(tmpdata, 0xff, PGPKT_DATA_SIZE);
         RT_TRACE(rtlpriv, COMP_EFUSE, DBG_LOUD,
                  ("word_en = %x efuse_addr=%x\n", word_en, efuse_addr));
 
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 1f18bf7df74..9cd7703c2a3 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1477,13 +1477,11 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
         struct pci_dev *bridge_pdev = pdev->bus->self;
         u16 venderid;
         u16 deviceid;
-        u8 revisionid;
         u16 irqline;
         u8 tmp;
 
         venderid = pdev->vendor;
         deviceid = pdev->device;
-        pci_read_config_byte(pdev, 0x8, &revisionid);
         pci_read_config_word(pdev, 0x3C, &irqline);
 
         if (deviceid == RTL_PCI_8192_DID ||
@@ -1494,7 +1492,7 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
             deviceid == RTL_PCI_8173_DID ||
             deviceid == RTL_PCI_8172_DID ||
             deviceid == RTL_PCI_8171_DID) {
-                switch (revisionid) {
+                switch (pdev->revision) {
                 case RTL_PCI_REVISION_ID_8192PCIE:
                         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
                                  ("8192 PCI-E is found - "
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
index 803adcc80c9..b0b0b13dd0a 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.h
@@ -532,9 +532,9 @@
 #define CLEAR_PCI_TX_DESC_CONTENT(__pdesc, _size)       \
 do {                                                    \
         if (_size > TX_DESC_NEXT_DESC_OFFSET)           \
-                memset((void *)__pdesc, 0, TX_DESC_NEXT_DESC_OFFSET);   \
+                memset(__pdesc, 0, TX_DESC_NEXT_DESC_OFFSET);   \
         else                                            \
-                memset((void *)__pdesc, 0, _size);      \
+                memset(__pdesc, 0, _size);      \
 } while (0);
 
 #define RX_HAL_IS_CCK_RATE(_pdesc)\
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index d0b0d43b9a6..3f0cb81c424 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -656,7 +656,7 @@ void rtl92cu_tx_fill_cmddesc(struct ieee80211_hw *hw,
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
         __le16 fc = hdr->frame_control;
 
-        memset((void *)pdesc, 0, RTL_TX_HEADER_SIZE);
+        memset(pdesc, 0, RTL_TX_HEADER_SIZE);
         if (firstseg)
                 SET_TX_DESC_OFFSET(pdesc, RTL_TX_HEADER_SIZE);
         SET_TX_DESC_TX_RATE(pdesc, DESC92C_RATE1M);
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 9d0c01a86d0..01226f8e70f 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -34,6 +34,7 @@
 #include <linux/firmware.h>
 #include <linux/version.h>
 #include <linux/etherdevice.h>
+#include <linux/vmalloc.h>
 #include <linux/usb.h>
 #include <net/mac80211.h>
 #include "debug.h"
diff --git a/drivers/net/wireless/wl1251/sdio.c b/drivers/net/wireless/wl1251/sdio.c
index d550b5e68d3..f51a0241a44 100644
--- a/drivers/net/wireless/wl1251/sdio.c
+++ b/drivers/net/wireless/wl1251/sdio.c
@@ -265,7 +265,7 @@ static int wl1251_sdio_probe(struct sdio_func *func,
                         goto disable;
                 }
 
-                set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
+                irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
                 disable_irq(wl->irq);
 
                 wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
diff --git a/drivers/net/wireless/wl1251/spi.c b/drivers/net/wireless/wl1251/spi.c
index ac872b38960..af6448c4d3e 100644
--- a/drivers/net/wireless/wl1251/spi.c
+++ b/drivers/net/wireless/wl1251/spi.c
@@ -286,7 +286,7 @@ static int __devinit wl1251_spi_probe(struct spi_device *spi)
                 goto out_free;
         }
 
-        set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
+        irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
 
         disable_irq(wl->irq);
 
diff --git a/drivers/net/wireless/zd1211rw/Makefile b/drivers/net/wireless/zd1211rw/Makefile
index 1907eafb9b1..5728a918e50 100644
--- a/drivers/net/wireless/zd1211rw/Makefile
+++ b/drivers/net/wireless/zd1211rw/Makefile
@@ -5,7 +5,5 @@ zd1211rw-objs := zd_chip.o zd_mac.o \
                 zd_rf_al7230b.o zd_rf_uw2453.o \
                 zd_rf.o zd_usb.o
 
-ifeq ($(CONFIG_ZD1211RW_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_ZD1211RW_DEBUG) := -DDEBUG
 
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index 81e80489a05..58236e6d092 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -60,6 +60,7 @@ static struct usb_device_id usb_ids[] = {
         { USB_DEVICE(0x157e, 0x300a), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x157e, 0x300b), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x157e, 0x3204), .driver_info = DEVICE_ZD1211 },
+        { USB_DEVICE(0x157e, 0x3207), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x1740, 0x2000), .driver_info = DEVICE_ZD1211 },
         { USB_DEVICE(0x6891, 0xa727), .driver_info = DEVICE_ZD1211 },
         /* ZD1211B */
diff --git a/drivers/net/xen-netback/Makefile b/drivers/net/xen-netback/Makefile
new file mode 100644
index 00000000000..e346e8125ef
--- /dev/null
+++ b/drivers/net/xen-netback/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_XEN_NETDEV_BACKEND) := xen-netback.o
+
+xen-netback-y := netback.o xenbus.o interface.o
diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
new file mode 100644
index 00000000000..5d7bbf2b2ee
--- /dev/null
+++ b/drivers/net/xen-netback/common.h
@@ -0,0 +1,161 @@
+/*
+ * 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; or, when distributed
+ * separately from the Linux kernel or incorporated into other
+ * software packages, subject to the following license:
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this source file (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy, modify,
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef __XEN_NETBACK__COMMON_H__
+#define __XEN_NETBACK__COMMON_H__
+
+#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
+
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/slab.h>
+#include <linux/ip.h>
+#include <linux/in.h>
+#include <linux/io.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/wait.h>
+#include <linux/sched.h>
+
+#include <xen/interface/io/netif.h>
+#include <xen/interface/grant_table.h>
+#include <xen/grant_table.h>
+#include <xen/xenbus.h>
+
+struct xen_netbk;
+
+struct xenvif {
+        /* Unique identifier for this interface. */
+        domid_t          domid;
+        unsigned int     handle;
+
+        /* Reference to netback processing backend. */
+        struct xen_netbk *netbk;
+
+        u8               fe_dev_addr[6];
+
+        /* Physical parameters of the comms window. */
+        grant_handle_t   tx_shmem_handle;
+        grant_ref_t      tx_shmem_ref;
+        grant_handle_t   rx_shmem_handle;
+        grant_ref_t      rx_shmem_ref;
+        unsigned int     irq;
+
+        /* List of frontends to notify after a batch of frames sent. */
+        struct list_head notify_list;
+
+        /* The shared rings and indexes. */
+        struct xen_netif_tx_back_ring tx;
+        struct xen_netif_rx_back_ring rx;
+        struct vm_struct *tx_comms_area;
+        struct vm_struct *rx_comms_area;
+
+        /* Flags that must not be set in dev->features */
+        u32 features_disabled;
+
+        /* Frontend feature information. */
+        u8 can_sg:1;
+        u8 gso:1;
+        u8 gso_prefix:1;
+        u8 csum:1;
+
+        /* Internal feature information. */
+        u8 can_queue:1;     /* can queue packets for receiver? */
+
+        /*
+         * Allow xenvif_start_xmit() to peek ahead in the rx request
+         * ring.  This is a prediction of what rx_req_cons will be
+         * once all queued skbs are put on the ring.
+         */
+        RING_IDX rx_req_cons_peek;
+
+        /* Transmit shaping: allow 'credit_bytes' every 'credit_usec'. */
+        unsigned long   credit_bytes;
+        unsigned long   credit_usec;
+        unsigned long   remaining_credit;
+        struct timer_list credit_timeout;
+
+        /* Statistics */
+        unsigned long rx_gso_checksum_fixup;
+
+        /* Miscellaneous private stuff. */
+        struct list_head schedule_list;
+        atomic_t         refcnt;
+        struct net_device *dev;
+
+        wait_queue_head_t waiting_to_free;
+};
+
+#define XEN_NETIF_TX_RING_SIZE __RING_SIZE((struct xen_netif_tx_sring *)0, PAGE_SIZE)
+#define XEN_NETIF_RX_RING_SIZE __RING_SIZE((struct xen_netif_rx_sring *)0, PAGE_SIZE)
+
+struct xenvif *xenvif_alloc(struct device *parent,
+                            domid_t domid,
+                            unsigned int handle);
+
+int xenvif_connect(struct xenvif *vif, unsigned long tx_ring_ref,
+                   unsigned long rx_ring_ref, unsigned int evtchn);
+void xenvif_disconnect(struct xenvif *vif);
+
+void xenvif_get(struct xenvif *vif);
+void xenvif_put(struct xenvif *vif);
+
+int xenvif_xenbus_init(void);
+
+int xenvif_schedulable(struct xenvif *vif);
+
+int xen_netbk_rx_ring_full(struct xenvif *vif);
+
+int xen_netbk_must_stop_queue(struct xenvif *vif);
+
+/* (Un)Map communication rings. */
+void xen_netbk_unmap_frontend_rings(struct xenvif *vif);
+int xen_netbk_map_frontend_rings(struct xenvif *vif,
+                                 grant_ref_t tx_ring_ref,
+                                 grant_ref_t rx_ring_ref);
+
+/* (De)Register a xenvif with the netback backend. */
+void xen_netbk_add_xenvif(struct xenvif *vif);
+void xen_netbk_remove_xenvif(struct xenvif *vif);
+
+/* (De)Schedule backend processing for a xenvif */
+void xen_netbk_schedule_xenvif(struct xenvif *vif);
+void xen_netbk_deschedule_xenvif(struct xenvif *vif);
+
+/* Check for SKBs from frontend and schedule backend processing */
+void xen_netbk_check_rx_xenvif(struct xenvif *vif);
+/* Receive an SKB from the frontend */
+void xenvif_receive_skb(struct xenvif *vif, struct sk_buff *skb);
+
+/* Queue an SKB for transmission to the frontend */
+void xen_netbk_queue_tx_skb(struct xenvif *vif, struct sk_buff *skb);
+/* Notify xenvif that ring now has space to send an skb to the frontend */
+void xenvif_notify_tx_completion(struct xenvif *vif);
+
+/* Returns number of ring slots required to send an skb to the frontend */
+unsigned int xen_netbk_count_skb_slots(struct xenvif *vif, struct sk_buff *skb);
+
+#endif /* __XEN_NETBACK__COMMON_H__ */
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
new file mode 100644
index 00000000000..de569cc19da
--- /dev/null
+++ b/drivers/net/xen-netback/interface.c
@@ -0,0 +1,424 @@
+/*
+ * Network-device interface management.
+ *
+ * Copyright (c) 2004-2005, Keir Fraser
+ *
+ * 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; or, when distributed
+ * separately from the Linux kernel or incorporated into other
+ * software packages, subject to the following license:
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this source file (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy, modify,
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "common.h"
+
+#include <linux/ethtool.h>
+#include <linux/rtnetlink.h>
+#include <linux/if_vlan.h>
+
+#include <xen/events.h>
+#include <asm/xen/hypercall.h>
+
+#define XENVIF_QUEUE_LENGTH 32
+
+void xenvif_get(struct xenvif *vif)
+{
+        atomic_inc(&vif->refcnt);
+}
+
+void xenvif_put(struct xenvif *vif)
+{
+        if (atomic_dec_and_test(&vif->refcnt))
+                wake_up(&vif->waiting_to_free);
+}
+
+int xenvif_schedulable(struct xenvif *vif)
+{
+        return netif_running(vif->dev) && netif_carrier_ok(vif->dev);
+}
+
+static int xenvif_rx_schedulable(struct xenvif *vif)
+{
+        return xenvif_schedulable(vif) && !xen_netbk_rx_ring_full(vif);
+}
+
+static irqreturn_t xenvif_interrupt(int irq, void *dev_id)
+{
+        struct xenvif *vif = dev_id;
+
+        if (vif->netbk == NULL)
+                return IRQ_NONE;
+
+        xen_netbk_schedule_xenvif(vif);
+
+        if (xenvif_rx_schedulable(vif))
+                netif_wake_queue(vif->dev);
+
+        return IRQ_HANDLED;
+}
+
+static int xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct xenvif *vif = netdev_priv(dev);
+
+        BUG_ON(skb->dev != dev);
+
+        if (vif->netbk == NULL)
+                goto drop;
+
+        /* Drop the packet if the target domain has no receive buffers. */
+        if (!xenvif_rx_schedulable(vif))
+                goto drop;
+
+        /* Reserve ring slots for the worst-case number of fragments. */
+        vif->rx_req_cons_peek += xen_netbk_count_skb_slots(vif, skb);
+        xenvif_get(vif);
+
+        if (vif->can_queue && xen_netbk_must_stop_queue(vif))
+                netif_stop_queue(dev);
+
+        xen_netbk_queue_tx_skb(vif, skb);
+
+        return NETDEV_TX_OK;
+
+ drop:
+        vif->dev->stats.tx_dropped++;
+        dev_kfree_skb(skb);
+        return NETDEV_TX_OK;
+}
+
+void xenvif_receive_skb(struct xenvif *vif, struct sk_buff *skb)
+{
+        netif_rx_ni(skb);
+}
+
+void xenvif_notify_tx_completion(struct xenvif *vif)
+{
+        if (netif_queue_stopped(vif->dev) && xenvif_rx_schedulable(vif))
+                netif_wake_queue(vif->dev);
+}
+
+static struct net_device_stats *xenvif_get_stats(struct net_device *dev)
+{
+        struct xenvif *vif = netdev_priv(dev);
+        return &vif->dev->stats;
+}
+
+static void xenvif_up(struct xenvif *vif)
+{
+        xen_netbk_add_xenvif(vif);
+        enable_irq(vif->irq);
+        xen_netbk_check_rx_xenvif(vif);
+}
+
+static void xenvif_down(struct xenvif *vif)
+{
+        disable_irq(vif->irq);
+        xen_netbk_deschedule_xenvif(vif);
+        xen_netbk_remove_xenvif(vif);
+}
+
+static int xenvif_open(struct net_device *dev)
+{
+        struct xenvif *vif = netdev_priv(dev);
+        if (netif_carrier_ok(dev))
+                xenvif_up(vif);
+        netif_start_queue(dev);
+        return 0;
+}
+
+static int xenvif_close(struct net_device *dev)
+{
+        struct xenvif *vif = netdev_priv(dev);
+        if (netif_carrier_ok(dev))
+                xenvif_down(vif);
+        netif_stop_queue(dev);
+        return 0;
+}
+
+static int xenvif_change_mtu(struct net_device *dev, int mtu)
+{
+        struct xenvif *vif = netdev_priv(dev);
+        int max = vif->can_sg ? 65535 - VLAN_ETH_HLEN : ETH_DATA_LEN;
+
+        if (mtu > max)
+                return -EINVAL;
+        dev->mtu = mtu;
+        return 0;
+}
+
+static void xenvif_set_features(struct xenvif *vif)
+{
+        struct net_device *dev = vif->dev;
+        u32 features = dev->features;
+
+        if (vif->can_sg)
+                features |= NETIF_F_SG;
+        if (vif->gso || vif->gso_prefix)
+                features |= NETIF_F_TSO;
+        if (vif->csum)
+                features |= NETIF_F_IP_CSUM;
+
+        features &= ~(vif->features_disabled);
+
+        if (!(features & NETIF_F_SG) && dev->mtu > ETH_DATA_LEN)
+                dev->mtu = ETH_DATA_LEN;
+
+        dev->features = features;
+}
+
+static int xenvif_set_tx_csum(struct net_device *dev, u32 data)
+{
+        struct xenvif *vif = netdev_priv(dev);
+        if (data) {
+                if (!vif->csum)
+                        return -EOPNOTSUPP;
+                vif->features_disabled &= ~NETIF_F_IP_CSUM;
+        } else {
+                vif->features_disabled |= NETIF_F_IP_CSUM;
+        }
+
+        xenvif_set_features(vif);
+        return 0;
+}
+
+static int xenvif_set_sg(struct net_device *dev, u32 data)
+{
+        struct xenvif *vif = netdev_priv(dev);
+        if (data) {
+                if (!vif->can_sg)
+                        return -EOPNOTSUPP;
+                vif->features_disabled &= ~NETIF_F_SG;
+        } else {
+                vif->features_disabled |= NETIF_F_SG;
+        }
+
+        xenvif_set_features(vif);
+        return 0;
+}
+
+static int xenvif_set_tso(struct net_device *dev, u32 data)
+{
+        struct xenvif *vif = netdev_priv(dev);
+        if (data) {
+                if (!vif->gso && !vif->gso_prefix)
+                        return -EOPNOTSUPP;
+                vif->features_disabled &= ~NETIF_F_TSO;
+        } else {
+                vif->features_disabled |= NETIF_F_TSO;
+        }
+
+        xenvif_set_features(vif);
+        return 0;
+}
+
+static const struct xenvif_stat {
+        char name[ETH_GSTRING_LEN];
+        u16 offset;
+} xenvif_stats[] = {
+        {
+                "rx_gso_checksum_fixup",
+                offsetof(struct xenvif, rx_gso_checksum_fixup)
+        },
+};
+
+static int xenvif_get_sset_count(struct net_device *dev, int string_set)
+{
+        switch (string_set) {
+        case ETH_SS_STATS:
+                return ARRAY_SIZE(xenvif_stats);
+        default:
+                return -EINVAL;
+        }
+}
+
+static void xenvif_get_ethtool_stats(struct net_device *dev,
+                                     struct ethtool_stats *stats, u64 * data)
+{
+        void *vif = netdev_priv(dev);
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(xenvif_stats); i++)
+                data[i] = *(unsigned long *)(vif + xenvif_stats[i].offset);
+}
+
+static void xenvif_get_strings(struct net_device *dev, u32 stringset, u8 * data)
+{
+        int i;
+
+        switch (stringset) {
+        case ETH_SS_STATS:
+                for (i = 0; i < ARRAY_SIZE(xenvif_stats); i++)
+                        memcpy(data + i * ETH_GSTRING_LEN,
+                               xenvif_stats[i].name, ETH_GSTRING_LEN);
+                break;
+        }
+}
+
+static struct ethtool_ops xenvif_ethtool_ops = {
+        .get_tx_csum    = ethtool_op_get_tx_csum,
+        .set_tx_csum    = xenvif_set_tx_csum,
+        .get_sg         = ethtool_op_get_sg,
+        .set_sg         = xenvif_set_sg,
+        .get_tso        = ethtool_op_get_tso,
+        .set_tso        = xenvif_set_tso,
+        .get_link       = ethtool_op_get_link,
+
+        .get_sset_count = xenvif_get_sset_count,
+        .get_ethtool_stats = xenvif_get_ethtool_stats,
+        .get_strings = xenvif_get_strings,
+};
+
+static struct net_device_ops xenvif_netdev_ops = {
+        .ndo_start_xmit = xenvif_start_xmit,
+        .ndo_get_stats  = xenvif_get_stats,
+        .ndo_open       = xenvif_open,
+        .ndo_stop       = xenvif_close,
+        .ndo_change_mtu = xenvif_change_mtu,
+};
+
+struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,
+                            unsigned int handle)
+{
+        int err;
+        struct net_device *dev;
+        struct xenvif *vif;
+        char name[IFNAMSIZ] = {};
+
+        snprintf(name, IFNAMSIZ - 1, "vif%u.%u", domid, handle);
+        dev = alloc_netdev(sizeof(struct xenvif), name, ether_setup);
+        if (dev == NULL) {
+                pr_warn("Could not allocate netdev\n");
+                return ERR_PTR(-ENOMEM);
+        }
+
+        SET_NETDEV_DEV(dev, parent);
+
+        vif = netdev_priv(dev);
+        vif->domid  = domid;
+        vif->handle = handle;
+        vif->netbk  = NULL;
+        vif->can_sg = 1;
+        vif->csum = 1;
+        atomic_set(&vif->refcnt, 1);
+        init_waitqueue_head(&vif->waiting_to_free);
+        vif->dev = dev;
+        INIT_LIST_HEAD(&vif->schedule_list);
+        INIT_LIST_HEAD(&vif->notify_list);
+
+        vif->credit_bytes = vif->remaining_credit = ~0UL;
+        vif->credit_usec  = 0UL;
+        init_timer(&vif->credit_timeout);
+        /* Initialize 'expires' now: it's used to track the credit window. */
+        vif->credit_timeout.expires = jiffies;
+
+        dev->netdev_ops = &xenvif_netdev_ops;
+        xenvif_set_features(vif);
+        SET_ETHTOOL_OPS(dev, &xenvif_ethtool_ops);
+
+        dev->tx_queue_len = XENVIF_QUEUE_LENGTH;
+
+        /*
+         * Initialise a dummy MAC address. We choose the numerically
+         * largest non-broadcast address to prevent the address getting
+         * stolen by an Ethernet bridge for STP purposes.
+         * (FE:FF:FF:FF:FF:FF)
+         */
+        memset(dev->dev_addr, 0xFF, ETH_ALEN);
+        dev->dev_addr[0] &= ~0x01;
+
+        netif_carrier_off(dev);
+
+        err = register_netdev(dev);
+        if (err) {
+                netdev_warn(dev, "Could not register device: err=%d\n", err);
+                free_netdev(dev);
+                return ERR_PTR(err);
+        }
+
+        netdev_dbg(dev, "Successfully created xenvif\n");
+        return vif;
+}
+
+int xenvif_connect(struct xenvif *vif, unsigned long tx_ring_ref,
+                   unsigned long rx_ring_ref, unsigned int evtchn)
+{
+        int err = -ENOMEM;
+
+        /* Already connected through? */
+        if (vif->irq)
+                return 0;
+
+        xenvif_set_features(vif);
+
+        err = xen_netbk_map_frontend_rings(vif, tx_ring_ref, rx_ring_ref);
+        if (err < 0)
+                goto err;
+
+        err = bind_interdomain_evtchn_to_irqhandler(
+                vif->domid, evtchn, xenvif_interrupt, 0,
+                vif->dev->name, vif);
+        if (err < 0)
+                goto err_unmap;
+        vif->irq = err;
+        disable_irq(vif->irq);
+
+        xenvif_get(vif);
+
+        rtnl_lock();
+        netif_carrier_on(vif->dev);
+        if (netif_running(vif->dev))
+                xenvif_up(vif);
+        rtnl_unlock();
+
+        return 0;
+err_unmap:
+        xen_netbk_unmap_frontend_rings(vif);
+err:
+        return err;
+}
+
+void xenvif_disconnect(struct xenvif *vif)
+{
+        struct net_device *dev = vif->dev;
+        if (netif_carrier_ok(dev)) {
+                rtnl_lock();
+                netif_carrier_off(dev); /* discard queued packets */
+                if (netif_running(dev))
+                        xenvif_down(vif);
+                rtnl_unlock();
+                xenvif_put(vif);
+        }
+
+        atomic_dec(&vif->refcnt);
+        wait_event(vif->waiting_to_free, atomic_read(&vif->refcnt) == 0);
+
+        del_timer_sync(&vif->credit_timeout);
+
+        if (vif->irq)
+                unbind_from_irqhandler(vif->irq, vif);
+
+        unregister_netdev(vif->dev);
+
+        xen_netbk_unmap_frontend_rings(vif);
+
+        free_netdev(vif->dev);
+}
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
new file mode 100644
index 00000000000..0e4851b8a77
--- /dev/null
+++ b/drivers/net/xen-netback/netback.c
@@ -0,0 +1,1745 @@
+/*
+ * Back-end of the driver for virtual network devices. This portion of the
+ * driver exports a 'unified' network-device interface that can be accessed
+ * by any operating system that implements a compatible front end. A
+ * reference front-end implementation can be found in:
+ *  drivers/net/xen-netfront.c
+ *
+ * Copyright (c) 2002-2005, K A Fraser
+ *
+ * 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; or, when distributed
+ * separately from the Linux kernel or incorporated into other
+ * software packages, subject to the following license:
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this source file (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy, modify,
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "common.h"
+
+#include <linux/kthread.h>
+#include <linux/if_vlan.h>
+#include <linux/udp.h>
+
+#include <net/tcp.h>
+
+#include <xen/events.h>
+#include <xen/interface/memory.h>
+
+#include <asm/xen/hypercall.h>
+#include <asm/xen/page.h>
+
+struct pending_tx_info {
+        struct xen_netif_tx_request req;
+        struct xenvif *vif;
+};
+typedef unsigned int pending_ring_idx_t;
+
+struct netbk_rx_meta {
+        int id;
+        int size;
+        int gso_size;
+};
+
+#define MAX_PENDING_REQS 256
+
+#define MAX_BUFFER_OFFSET PAGE_SIZE
+
+/* extra field used in struct page */
+union page_ext {
+        struct {
+#if BITS_PER_LONG < 64
+#define IDX_WIDTH   8
+#define GROUP_WIDTH (BITS_PER_LONG - IDX_WIDTH)
+                unsigned int group:GROUP_WIDTH;
+                unsigned int idx:IDX_WIDTH;
+#else
+                unsigned int group, idx;
+#endif
+        } e;
+        void *mapping;
+};
+
+struct xen_netbk {
+        wait_queue_head_t wq;
+        struct task_struct *task;
+
+        struct sk_buff_head rx_queue;
+        struct sk_buff_head tx_queue;
+
+        struct timer_list net_timer;
+
+        struct page *mmap_pages[MAX_PENDING_REQS];
+
+        pending_ring_idx_t pending_prod;
+        pending_ring_idx_t pending_cons;
+        struct list_head net_schedule_list;
+
+        /* Protect the net_schedule_list in netif. */
+        spinlock_t net_schedule_list_lock;
+
+        atomic_t netfront_count;
+
+        struct pending_tx_info pending_tx_info[MAX_PENDING_REQS];
+        struct gnttab_copy tx_copy_ops[MAX_PENDING_REQS];
+
+        u16 pending_ring[MAX_PENDING_REQS];
+
+        /*
+         * Given MAX_BUFFER_OFFSET of 4096 the worst case is that each
+         * head/fragment page uses 2 copy operations because it
+         * straddles two buffers in the frontend.
+         */
+        struct gnttab_copy grant_copy_op[2*XEN_NETIF_RX_RING_SIZE];
+        struct netbk_rx_meta meta[2*XEN_NETIF_RX_RING_SIZE];
+};
+
+static struct xen_netbk *xen_netbk;
+static int xen_netbk_group_nr;
+
+void xen_netbk_add_xenvif(struct xenvif *vif)
+{
+        int i;
+        int min_netfront_count;
+        int min_group = 0;
+        struct xen_netbk *netbk;
+
+        min_netfront_count = atomic_read(&xen_netbk[0].netfront_count);
+        for (i = 0; i < xen_netbk_group_nr; i++) {
+                int netfront_count = atomic_read(&xen_netbk[i].netfront_count);
+                if (netfront_count < min_netfront_count) {
+                        min_group = i;
+                        min_netfront_count = netfront_count;
+                }
+        }
+
+        netbk = &xen_netbk[min_group];
+
+        vif->netbk = netbk;
+        atomic_inc(&netbk->netfront_count);
+}
+
+void xen_netbk_remove_xenvif(struct xenvif *vif)
+{
+        struct xen_netbk *netbk = vif->netbk;
+        vif->netbk = NULL;
+        atomic_dec(&netbk->netfront_count);
+}
+
+static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx);
+static void make_tx_response(struct xenvif *vif,
+                             struct xen_netif_tx_request *txp,
+                             s8       st);
+static struct xen_netif_rx_response *make_rx_response(struct xenvif *vif,
+                                             u16      id,
+                                             s8       st,
+                                             u16      offset,
+                                             u16      size,
+                                             u16      flags);
+
+static inline unsigned long idx_to_pfn(struct xen_netbk *netbk,
+                                       unsigned int idx)
+{
+        return page_to_pfn(netbk->mmap_pages[idx]);
+}
+
+static inline unsigned long idx_to_kaddr(struct xen_netbk *netbk,
+                                         unsigned int idx)
+{
+        return (unsigned long)pfn_to_kaddr(idx_to_pfn(netbk, idx));
+}
+
+/* extra field used in struct page */
+static inline void set_page_ext(struct page *pg, struct xen_netbk *netbk,
+                                unsigned int idx)
+{
+        unsigned int group = netbk - xen_netbk;
+        union page_ext ext = { .e = { .group = group + 1, .idx = idx } };
+
+        BUILD_BUG_ON(sizeof(ext) > sizeof(ext.mapping));
+        pg->mapping = ext.mapping;
+}
+
+static int get_page_ext(struct page *pg,
+                        unsigned int *pgroup, unsigned int *pidx)
+{
+        union page_ext ext = { .mapping = pg->mapping };
+        struct xen_netbk *netbk;
+        unsigned int group, idx;
+
+        group = ext.e.group - 1;
+
+        if (group < 0 || group >= xen_netbk_group_nr)
+                return 0;
+
+        netbk = &xen_netbk[group];
+
+        idx = ext.e.idx;
+
+        if ((idx < 0) || (idx >= MAX_PENDING_REQS))
+                return 0;
+
+        if (netbk->mmap_pages[idx] != pg)
+                return 0;
+
+        *pgroup = group;
+        *pidx = idx;
+
+        return 1;
+}
+
+/*
+ * This is the amount of packet we copy rather than map, so that the
+ * guest can't fiddle with the contents of the headers while we do
+ * packet processing on them (netfilter, routing, etc).
+ */
+#define PKT_PROT_LEN    (ETH_HLEN + \
+                         VLAN_HLEN + \
+                         sizeof(struct iphdr) + MAX_IPOPTLEN + \
+                         sizeof(struct tcphdr) + MAX_TCP_OPTION_SPACE)
+
+static inline pending_ring_idx_t pending_index(unsigned i)
+{
+        return i & (MAX_PENDING_REQS-1);
+}
+
+static inline pending_ring_idx_t nr_pending_reqs(struct xen_netbk *netbk)
+{
+        return MAX_PENDING_REQS -
+                netbk->pending_prod + netbk->pending_cons;
+}
+
+static void xen_netbk_kick_thread(struct xen_netbk *netbk)
+{
+        wake_up(&netbk->wq);
+}
+
+static int max_required_rx_slots(struct xenvif *vif)
+{
+        int max = DIV_ROUND_UP(vif->dev->mtu, PAGE_SIZE);
+
+        if (vif->can_sg || vif->gso || vif->gso_prefix)
+                max += MAX_SKB_FRAGS + 1; /* extra_info + frags */
+
+        return max;
+}
+
+int xen_netbk_rx_ring_full(struct xenvif *vif)
+{
+        RING_IDX peek   = vif->rx_req_cons_peek;
+        RING_IDX needed = max_required_rx_slots(vif);
+
+        return ((vif->rx.sring->req_prod - peek) < needed) ||
+               ((vif->rx.rsp_prod_pvt + XEN_NETIF_RX_RING_SIZE - peek) < needed);
+}
+
+int xen_netbk_must_stop_queue(struct xenvif *vif)
+{
+        if (!xen_netbk_rx_ring_full(vif))
+                return 0;
+
+        vif->rx.sring->req_event = vif->rx_req_cons_peek +
+                max_required_rx_slots(vif);
+        mb(); /* request notification /then/ check the queue */
+
+        return xen_netbk_rx_ring_full(vif);
+}
+
+/*
+ * Returns true if we should start a new receive buffer instead of
+ * adding 'size' bytes to a buffer which currently contains 'offset'
+ * bytes.
+ */
+static bool start_new_rx_buffer(int offset, unsigned long size, int head)
+{
+        /* simple case: we have completely filled the current buffer. */
+        if (offset == MAX_BUFFER_OFFSET)
+                return true;
+
+        /*
+         * complex case: start a fresh buffer if the current frag
+         * would overflow the current buffer but only if:
+         *     (i)   this frag would fit completely in the next buffer
+         * and (ii)  there is already some data in the current buffer
+         * and (iii) this is not the head buffer.
+         *
+         * Where:
+         * - (i) stops us splitting a frag into two copies
+         *   unless the frag is too large for a single buffer.
+         * - (ii) stops us from leaving a buffer pointlessly empty.
+         * - (iii) stops us leaving the first buffer
+         *   empty. Strictly speaking this is already covered
+         *   by (ii) but is explicitly checked because
+         *   netfront relies on the first buffer being
+         *   non-empty and can crash otherwise.
+         *
+         * This means we will effectively linearise small
+         * frags but do not needlessly split large buffers
+         * into multiple copies tend to give large frags their
+         * own buffers as before.
+         */
+        if ((offset + size > MAX_BUFFER_OFFSET) &&
+            (size <= MAX_BUFFER_OFFSET) && offset && !head)
+                return true;
+
+        return false;
+}
+
+/*
+ * Figure out how many ring slots we're going to need to send @skb to
+ * the guest. This function is essentially a dry run of
+ * netbk_gop_frag_copy.
+ */
+unsigned int xen_netbk_count_skb_slots(struct xenvif *vif, struct sk_buff *skb)
+{
+        unsigned int count;
+        int i, copy_off;
+
+        count = DIV_ROUND_UP(
+                        offset_in_page(skb->data)+skb_headlen(skb), PAGE_SIZE);
+
+        copy_off = skb_headlen(skb) % PAGE_SIZE;
+
+        if (skb_shinfo(skb)->gso_size)
+                count++;
+
+        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+                unsigned long size = skb_shinfo(skb)->frags[i].size;
+                unsigned long bytes;
+                while (size > 0) {
+                        BUG_ON(copy_off > MAX_BUFFER_OFFSET);
+
+                        if (start_new_rx_buffer(copy_off, size, 0)) {
+                                count++;
+                                copy_off = 0;
+                        }
+
+                        bytes = size;
+                        if (copy_off + bytes > MAX_BUFFER_OFFSET)
+                                bytes = MAX_BUFFER_OFFSET - copy_off;
+
+                        copy_off += bytes;
+                        size -= bytes;
+                }
+        }
+        return count;
+}
+
+struct netrx_pending_operations {
+        unsigned copy_prod, copy_cons;
+        unsigned meta_prod, meta_cons;
+        struct gnttab_copy *copy;
+        struct netbk_rx_meta *meta;
+        int copy_off;
+        grant_ref_t copy_gref;
+};
+
+static struct netbk_rx_meta *get_next_rx_buffer(struct xenvif *vif,
+                                                struct netrx_pending_operations *npo)
+{
+        struct netbk_rx_meta *meta;
+        struct xen_netif_rx_request *req;
+
+        req = RING_GET_REQUEST(&vif->rx, vif->rx.req_cons++);
+
+        meta = npo->meta + npo->meta_prod++;
+        meta->gso_size = 0;
+        meta->size = 0;
+        meta->id = req->id;
+
+        npo->copy_off = 0;
+        npo->copy_gref = req->gref;
+
+        return meta;
+}
+
+/*
+ * Set up the grant operations for this fragment. If it's a flipping
+ * interface, we also set up the unmap request from here.
+ */
+static void netbk_gop_frag_copy(struct xenvif *vif, struct sk_buff *skb,
+                                struct netrx_pending_operations *npo,
+                                struct page *page, unsigned long size,
+                                unsigned long offset, int *head)
+{
+        struct gnttab_copy *copy_gop;
+        struct netbk_rx_meta *meta;
+        /*
+         * These variables a used iff get_page_ext returns true,
+         * in which case they are guaranteed to be initialized.
+         */
+        unsigned int uninitialized_var(group), uninitialized_var(idx);
+        int foreign = get_page_ext(page, &group, &idx);
+        unsigned long bytes;
+
+        /* Data must not cross a page boundary. */
+        BUG_ON(size + offset > PAGE_SIZE);
+
+        meta = npo->meta + npo->meta_prod - 1;
+
+        while (size > 0) {
+                BUG_ON(npo->copy_off > MAX_BUFFER_OFFSET);
+
+                if (start_new_rx_buffer(npo->copy_off, size, *head)) {
+                        /*
+                         * Netfront requires there to be some data in the head
+                         * buffer.
+                         */
+                        BUG_ON(*head);
+
+                        meta = get_next_rx_buffer(vif, npo);
+                }
+
+                bytes = size;
+                if (npo->copy_off + bytes > MAX_BUFFER_OFFSET)
+                        bytes = MAX_BUFFER_OFFSET - npo->copy_off;
+
+                copy_gop = npo->copy + npo->copy_prod++;
+                copy_gop->flags = GNTCOPY_dest_gref;
+                if (foreign) {
+                        struct xen_netbk *netbk = &xen_netbk[group];
+                        struct pending_tx_info *src_pend;
+
+                        src_pend = &netbk->pending_tx_info[idx];
+
+                        copy_gop->source.domid = src_pend->vif->domid;
+                        copy_gop->source.u.ref = src_pend->req.gref;
+                        copy_gop->flags |= GNTCOPY_source_gref;
+                } else {
+                        void *vaddr = page_address(page);
+                        copy_gop->source.domid = DOMID_SELF;
+                        copy_gop->source.u.gmfn = virt_to_mfn(vaddr);
+                }
+                copy_gop->source.offset = offset;
+                copy_gop->dest.domid = vif->domid;
+
+                copy_gop->dest.offset = npo->copy_off;
+                copy_gop->dest.u.ref = npo->copy_gref;
+                copy_gop->len = bytes;
+
+                npo->copy_off += bytes;
+                meta->size += bytes;
+
+                offset += bytes;
+                size -= bytes;
+
+                /* Leave a gap for the GSO descriptor. */
+                if (*head && skb_shinfo(skb)->gso_size && !vif->gso_prefix)
+                        vif->rx.req_cons++;
+
+                *head = 0; /* There must be something in this buffer now. */
+
+        }
+}
+
+/*
+ * Prepare an SKB to be transmitted to the frontend.
+ *
+ * This function is responsible for allocating grant operations, meta
+ * structures, etc.
+ *
+ * It returns the number of meta structures consumed. The number of
+ * ring slots used is always equal to the number of meta slots used
+ * plus the number of GSO descriptors used. Currently, we use either
+ * zero GSO descriptors (for non-GSO packets) or one descriptor (for
+ * frontend-side LRO).
+ */
+static int netbk_gop_skb(struct sk_buff *skb,
+                         struct netrx_pending_operations *npo)
+{
+        struct xenvif *vif = netdev_priv(skb->dev);
+        int nr_frags = skb_shinfo(skb)->nr_frags;
+        int i;
+        struct xen_netif_rx_request *req;
+        struct netbk_rx_meta *meta;
+        unsigned char *data;
+        int head = 1;
+        int old_meta_prod;
+
+        old_meta_prod = npo->meta_prod;
+
+        /* Set up a GSO prefix descriptor, if necessary */
+        if (skb_shinfo(skb)->gso_size && vif->gso_prefix) {
+                req = RING_GET_REQUEST(&vif->rx, vif->rx.req_cons++);
+                meta = npo->meta + npo->meta_prod++;
+                meta->gso_size = skb_shinfo(skb)->gso_size;
+                meta->size = 0;
+                meta->id = req->id;
+        }
+
+        req = RING_GET_REQUEST(&vif->rx, vif->rx.req_cons++);
+        meta = npo->meta + npo->meta_prod++;
+
+        if (!vif->gso_prefix)
+                meta->gso_size = skb_shinfo(skb)->gso_size;
+        else
+                meta->gso_size = 0;
+
+        meta->size = 0;
+        meta->id = req->id;
+        npo->copy_off = 0;
+        npo->copy_gref = req->gref;
+
+        data = skb->data;
+        while (data < skb_tail_pointer(skb)) {
+                unsigned int offset = offset_in_page(data);
+                unsigned int len = PAGE_SIZE - offset;
+
+                if (data + len > skb_tail_pointer(skb))
+                        len = skb_tail_pointer(skb) - data;
+
+                netbk_gop_frag_copy(vif, skb, npo,
+                                    virt_to_page(data), len, offset, &head);
+                data += len;
+        }
+
+        for (i = 0; i < nr_frags; i++) {
+                netbk_gop_frag_copy(vif, skb, npo,
+                                    skb_shinfo(skb)->frags[i].page,
+                                    skb_shinfo(skb)->frags[i].size,
+                                    skb_shinfo(skb)->frags[i].page_offset,
+                                    &head);
+        }
+
+        return npo->meta_prod - old_meta_prod;
+}
+
+/*
+ * This is a twin to netbk_gop_skb.  Assume that netbk_gop_skb was
+ * used to set up the operations on the top of
+ * netrx_pending_operations, which have since been done.  Check that
+ * they didn't give any errors and advance over them.
+ */
+static int netbk_check_gop(struct xenvif *vif, int nr_meta_slots,
+                           struct netrx_pending_operations *npo)
+{
+        struct gnttab_copy     *copy_op;
+        int status = XEN_NETIF_RSP_OKAY;
+        int i;
+
+        for (i = 0; i < nr_meta_slots; i++) {
+                copy_op = npo->copy + npo->copy_cons++;
+                if (copy_op->status != GNTST_okay) {
+                        netdev_dbg(vif->dev,
+                                   "Bad status %d from copy to DOM%d.\n",
+                                   copy_op->status, vif->domid);
+                        status = XEN_NETIF_RSP_ERROR;
+                }
+        }
+
+        return status;
+}
+
+static void netbk_add_frag_responses(struct xenvif *vif, int status,
+                                     struct netbk_rx_meta *meta,
+                                     int nr_meta_slots)
+{
+        int i;
+        unsigned long offset;
+
+        /* No fragments used */
+        if (nr_meta_slots <= 1)
+                return;
+
+        nr_meta_slots--;
+
+        for (i = 0; i < nr_meta_slots; i++) {
+                int flags;
+                if (i == nr_meta_slots - 1)
+                        flags = 0;
+                else
+                        flags = XEN_NETRXF_more_data;
+
+                offset = 0;
+                make_rx_response(vif, meta[i].id, status, offset,
+                                 meta[i].size, flags);
+        }
+}
+
+struct skb_cb_overlay {
+        int meta_slots_used;
+};
+
+static void xen_netbk_rx_action(struct xen_netbk *netbk)
+{
+        struct xenvif *vif = NULL, *tmp;
+        s8 status;
+        u16 irq, flags;
+        struct xen_netif_rx_response *resp;
+        struct sk_buff_head rxq;
+        struct sk_buff *skb;
+        LIST_HEAD(notify);
+        int ret;
+        int nr_frags;
+        int count;
+        unsigned long offset;
+        struct skb_cb_overlay *sco;
+
+        struct netrx_pending_operations npo = {
+                .copy  = netbk->grant_copy_op,
+                .meta  = netbk->meta,
+        };
+
+        skb_queue_head_init(&rxq);
+
+        count = 0;
+
+        while ((skb = skb_dequeue(&netbk->rx_queue)) != NULL) {
+                vif = netdev_priv(skb->dev);
+                nr_frags = skb_shinfo(skb)->nr_frags;
+
+                sco = (struct skb_cb_overlay *)skb->cb;
+                sco->meta_slots_used = netbk_gop_skb(skb, &npo);
+
+                count += nr_frags + 1;
+
+                __skb_queue_tail(&rxq, skb);
+
+                /* Filled the batch queue? */
+                if (count + MAX_SKB_FRAGS >= XEN_NETIF_RX_RING_SIZE)
+                        break;
+        }
+
+        BUG_ON(npo.meta_prod > ARRAY_SIZE(netbk->meta));
+
+        if (!npo.copy_prod)
+                return;
+
+        BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
+        ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op,
+                                        npo.copy_prod);
+        BUG_ON(ret != 0);
+
+        while ((skb = __skb_dequeue(&rxq)) != NULL) {
+                sco = (struct skb_cb_overlay *)skb->cb;
+
+                vif = netdev_priv(skb->dev);
+
+                if (netbk->meta[npo.meta_cons].gso_size && vif->gso_prefix) {
+                        resp = RING_GET_RESPONSE(&vif->rx,
+                                                vif->rx.rsp_prod_pvt++);
+
+                        resp->flags = XEN_NETRXF_gso_prefix | XEN_NETRXF_more_data;
+
+                        resp->offset = netbk->meta[npo.meta_cons].gso_size;
+                        resp->id = netbk->meta[npo.meta_cons].id;
+                        resp->status = sco->meta_slots_used;
+
+                        npo.meta_cons++;
+                        sco->meta_slots_used--;
+                }
+
+
+                vif->dev->stats.tx_bytes += skb->len;
+                vif->dev->stats.tx_packets++;
+
+                status = netbk_check_gop(vif, sco->meta_slots_used, &npo);
+
+                if (sco->meta_slots_used == 1)
+                        flags = 0;
+                else
+                        flags = XEN_NETRXF_more_data;
+
+                if (skb->ip_summed == CHECKSUM_PARTIAL) /* local packet? */
+                        flags |= XEN_NETRXF_csum_blank | XEN_NETRXF_data_validated;
+                else if (skb->ip_summed == CHECKSUM_UNNECESSARY)
+                        /* remote but checksummed. */
+                        flags |= XEN_NETRXF_data_validated;
+
+                offset = 0;
+                resp = make_rx_response(vif, netbk->meta[npo.meta_cons].id,
+                                        status, offset,
+                                        netbk->meta[npo.meta_cons].size,
+                                        flags);
+
+                if (netbk->meta[npo.meta_cons].gso_size && !vif->gso_prefix) {
+                        struct xen_netif_extra_info *gso =
+                                (struct xen_netif_extra_info *)
+                                RING_GET_RESPONSE(&vif->rx,
+                                                  vif->rx.rsp_prod_pvt++);
+
+                        resp->flags |= XEN_NETRXF_extra_info;
+
+                        gso->u.gso.size = netbk->meta[npo.meta_cons].gso_size;
+                        gso->u.gso.type = XEN_NETIF_GSO_TYPE_TCPV4;
+                        gso->u.gso.pad = 0;
+                        gso->u.gso.features = 0;
+
+                        gso->type = XEN_NETIF_EXTRA_TYPE_GSO;
+                        gso->flags = 0;
+                }
+
+                netbk_add_frag_responses(vif, status,
+                                         netbk->meta + npo.meta_cons + 1,
+                                         sco->meta_slots_used);
+
+                RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&vif->rx, ret);
+                irq = vif->irq;
+                if (ret && list_empty(&vif->notify_list))
+                        list_add_tail(&vif->notify_list, &notify);
+
+                xenvif_notify_tx_completion(vif);
+
+                xenvif_put(vif);
+                npo.meta_cons += sco->meta_slots_used;
+                dev_kfree_skb(skb);
+        }
+
+        list_for_each_entry_safe(vif, tmp, &notify, notify_list) {
+                notify_remote_via_irq(vif->irq);
+                list_del_init(&vif->notify_list);
+        }
+
+        /* More work to do? */
+        if (!skb_queue_empty(&netbk->rx_queue) &&
+                        !timer_pending(&netbk->net_timer))
+                xen_netbk_kick_thread(netbk);
+}
+
+void xen_netbk_queue_tx_skb(struct xenvif *vif, struct sk_buff *skb)
+{
+        struct xen_netbk *netbk = vif->netbk;
+
+        skb_queue_tail(&netbk->rx_queue, skb);
+
+        xen_netbk_kick_thread(netbk);
+}
+
+static void xen_netbk_alarm(unsigned long data)
+{
+        struct xen_netbk *netbk = (struct xen_netbk *)data;
+        xen_netbk_kick_thread(netbk);
+}
+
+static int __on_net_schedule_list(struct xenvif *vif)
+{
+        return !list_empty(&vif->schedule_list);
+}
+
+/* Must be called with net_schedule_list_lock held */
+static void remove_from_net_schedule_list(struct xenvif *vif)
+{
+        if (likely(__on_net_schedule_list(vif))) {
+                list_del_init(&vif->schedule_list);
+                xenvif_put(vif);
+        }
+}
+
+static struct xenvif *poll_net_schedule_list(struct xen_netbk *netbk)
+{
+        struct xenvif *vif = NULL;
+
+        spin_lock_irq(&netbk->net_schedule_list_lock);
+        if (list_empty(&netbk->net_schedule_list))
+                goto out;
+
+        vif = list_first_entry(&netbk->net_schedule_list,
+                               struct xenvif, schedule_list);
+        if (!vif)
+                goto out;
+
+        xenvif_get(vif);
+
+        remove_from_net_schedule_list(vif);
+out:
+        spin_unlock_irq(&netbk->net_schedule_list_lock);
+        return vif;
+}
+
+void xen_netbk_schedule_xenvif(struct xenvif *vif)
+{
+        unsigned long flags;
+        struct xen_netbk *netbk = vif->netbk;
+
+        if (__on_net_schedule_list(vif))
+                goto kick;
+
+        spin_lock_irqsave(&netbk->net_schedule_list_lock, flags);
+        if (!__on_net_schedule_list(vif) &&
+            likely(xenvif_schedulable(vif))) {
+                list_add_tail(&vif->schedule_list, &netbk->net_schedule_list);
+                xenvif_get(vif);
+        }
+        spin_unlock_irqrestore(&netbk->net_schedule_list_lock, flags);
+
+kick:
+        smp_mb();
+        if ((nr_pending_reqs(netbk) < (MAX_PENDING_REQS/2)) &&
+            !list_empty(&netbk->net_schedule_list))
+                xen_netbk_kick_thread(netbk);
+}
+
+void xen_netbk_deschedule_xenvif(struct xenvif *vif)
+{
+        struct xen_netbk *netbk = vif->netbk;
+        spin_lock_irq(&netbk->net_schedule_list_lock);
+        remove_from_net_schedule_list(vif);
+        spin_unlock_irq(&netbk->net_schedule_list_lock);
+}
+
+void xen_netbk_check_rx_xenvif(struct xenvif *vif)
+{
+        int more_to_do;
+
+        RING_FINAL_CHECK_FOR_REQUESTS(&vif->tx, more_to_do);
+
+        if (more_to_do)
+                xen_netbk_schedule_xenvif(vif);
+}
+
+static void tx_add_credit(struct xenvif *vif)
+{
+        unsigned long max_burst, max_credit;
+
+        /*
+         * Allow a burst big enough to transmit a jumbo packet of up to 128kB.
+         * Otherwise the interface can seize up due to insufficient credit.
+         */
+        max_burst = RING_GET_REQUEST(&vif->tx, vif->tx.req_cons)->size;
+        max_burst = min(max_burst, 131072UL);
+        max_burst = max(max_burst, vif->credit_bytes);
+
+        /* Take care that adding a new chunk of credit doesn't wrap to zero. */
+        max_credit = vif->remaining_credit + vif->credit_bytes;
+        if (max_credit < vif->remaining_credit)
+                max_credit = ULONG_MAX; /* wrapped: clamp to ULONG_MAX */
+
+        vif->remaining_credit = min(max_credit, max_burst);
+}
+
+static void tx_credit_callback(unsigned long data)
+{
+        struct xenvif *vif = (struct xenvif *)data;
+        tx_add_credit(vif);
+        xen_netbk_check_rx_xenvif(vif);
+}
+
+static void netbk_tx_err(struct xenvif *vif,
+                         struct xen_netif_tx_request *txp, RING_IDX end)
+{
+        RING_IDX cons = vif->tx.req_cons;
+
+        do {
+                make_tx_response(vif, txp, XEN_NETIF_RSP_ERROR);
+                if (cons >= end)
+                        break;
+                txp = RING_GET_REQUEST(&vif->tx, cons++);
+        } while (1);
+        vif->tx.req_cons = cons;
+        xen_netbk_check_rx_xenvif(vif);
+        xenvif_put(vif);
+}
+
+static int netbk_count_requests(struct xenvif *vif,
+                                struct xen_netif_tx_request *first,
+                                struct xen_netif_tx_request *txp,
+                                int work_to_do)
+{
+        RING_IDX cons = vif->tx.req_cons;
+        int frags = 0;
+
+        if (!(first->flags & XEN_NETTXF_more_data))
+                return 0;
+
+        do {
+                if (frags >= work_to_do) {
+                        netdev_dbg(vif->dev, "Need more frags\n");
+                        return -frags;
+                }
+
+                if (unlikely(frags >= MAX_SKB_FRAGS)) {
+                        netdev_dbg(vif->dev, "Too many frags\n");
+                        return -frags;
+                }
+
+                memcpy(txp, RING_GET_REQUEST(&vif->tx, cons + frags),
+                       sizeof(*txp));
+                if (txp->size > first->size) {
+                        netdev_dbg(vif->dev, "Frags galore\n");
+                        return -frags;
+                }
+
+                first->size -= txp->size;
+                frags++;
+
+                if (unlikely((txp->offset + txp->size) > PAGE_SIZE)) {
+                        netdev_dbg(vif->dev, "txp->offset: %x, size: %u\n",
+                                 txp->offset, txp->size);
+                        return -frags;
+                }
+        } while ((txp++)->flags & XEN_NETTXF_more_data);
+        return frags;
+}
+
+static struct page *xen_netbk_alloc_page(struct xen_netbk *netbk,
+                                         struct sk_buff *skb,
+                                         unsigned long pending_idx)
+{
+        struct page *page;
+        page = alloc_page(GFP_KERNEL|__GFP_COLD);
+        if (!page)
+                return NULL;
+        set_page_ext(page, netbk, pending_idx);
+        netbk->mmap_pages[pending_idx] = page;
+        return page;
+}
+
+static struct gnttab_copy *xen_netbk_get_requests(struct xen_netbk *netbk,
+                                                  struct xenvif *vif,
+                                                  struct sk_buff *skb,
+                                                  struct xen_netif_tx_request *txp,
+                                                  struct gnttab_copy *gop)
+{
+        struct skb_shared_info *shinfo = skb_shinfo(skb);
+        skb_frag_t *frags = shinfo->frags;
+        unsigned long pending_idx = *((u16 *)skb->data);
+        int i, start;
+
+        /* Skip first skb fragment if it is on same page as header fragment. */
+        start = ((unsigned long)shinfo->frags[0].page == pending_idx);
+
+        for (i = start; i < shinfo->nr_frags; i++, txp++) {
+                struct page *page;
+                pending_ring_idx_t index;
+                struct pending_tx_info *pending_tx_info =
+                        netbk->pending_tx_info;
+
+                index = pending_index(netbk->pending_cons++);
+                pending_idx = netbk->pending_ring[index];
+                page = xen_netbk_alloc_page(netbk, skb, pending_idx);
+                if (!page)
+                        return NULL;
+
+                netbk->mmap_pages[pending_idx] = page;
+
+                gop->source.u.ref = txp->gref;
+                gop->source.domid = vif->domid;
+                gop->source.offset = txp->offset;
+
+                gop->dest.u.gmfn = virt_to_mfn(page_address(page));
+                gop->dest.domid = DOMID_SELF;
+                gop->dest.offset = txp->offset;
+
+                gop->len = txp->size;
+                gop->flags = GNTCOPY_source_gref;
+
+                gop++;
+
+                memcpy(&pending_tx_info[pending_idx].req, txp, sizeof(*txp));
+                xenvif_get(vif);
+                pending_tx_info[pending_idx].vif = vif;
+                frags[i].page = (void *)pending_idx;
+        }
+
+        return gop;
+}
+
+static int xen_netbk_tx_check_gop(struct xen_netbk *netbk,
+                                  struct sk_buff *skb,
+                                  struct gnttab_copy **gopp)
+{
+        struct gnttab_copy *gop = *gopp;
+        int pending_idx = *((u16 *)skb->data);
+        struct pending_tx_info *pending_tx_info = netbk->pending_tx_info;
+        struct xenvif *vif = pending_tx_info[pending_idx].vif;
+        struct xen_netif_tx_request *txp;
+        struct skb_shared_info *shinfo = skb_shinfo(skb);
+        int nr_frags = shinfo->nr_frags;
+        int i, err, start;
+
+        /* Check status of header. */
+        err = gop->status;
+        if (unlikely(err)) {
+                pending_ring_idx_t index;
+                index = pending_index(netbk->pending_prod++);
+                txp = &pending_tx_info[pending_idx].req;
+                make_tx_response(vif, txp, XEN_NETIF_RSP_ERROR);
+                netbk->pending_ring[index] = pending_idx;
+                xenvif_put(vif);
+        }
+
+        /* Skip first skb fragment if it is on same page as header fragment. */
+        start = ((unsigned long)shinfo->frags[0].page == pending_idx);
+
+        for (i = start; i < nr_frags; i++) {
+                int j, newerr;
+                pending_ring_idx_t index;
+
+                pending_idx = (unsigned long)shinfo->frags[i].page;
+
+                /* Check error status: if okay then remember grant handle. */
+                newerr = (++gop)->status;
+                if (likely(!newerr)) {
+                        /* Had a previous error? Invalidate this fragment. */
+                        if (unlikely(err))
+                                xen_netbk_idx_release(netbk, pending_idx);
+                        continue;
+                }
+
+                /* Error on this fragment: respond to client with an error. */
+                txp = &netbk->pending_tx_info[pending_idx].req;
+                make_tx_response(vif, txp, XEN_NETIF_RSP_ERROR);
+                index = pending_index(netbk->pending_prod++);
+                netbk->pending_ring[index] = pending_idx;
+                xenvif_put(vif);
+
+                /* Not the first error? Preceding frags already invalidated. */
+                if (err)
+                        continue;
+
+                /* First error: invalidate header and preceding fragments. */
+                pending_idx = *((u16 *)skb->data);
+                xen_netbk_idx_release(netbk, pending_idx);
+                for (j = start; j < i; j++) {
+                        pending_idx = (unsigned long)shinfo->frags[i].page;
+                        xen_netbk_idx_release(netbk, pending_idx);
+                }
+
+                /* Remember the error: invalidate all subsequent fragments. */
+                err = newerr;
+        }
+
+        *gopp = gop + 1;
+        return err;
+}
+
+static void xen_netbk_fill_frags(struct xen_netbk *netbk, struct sk_buff *skb)
+{
+        struct skb_shared_info *shinfo = skb_shinfo(skb);
+        int nr_frags = shinfo->nr_frags;
+        int i;
+
+        for (i = 0; i < nr_frags; i++) {
+                skb_frag_t *frag = shinfo->frags + i;
+                struct xen_netif_tx_request *txp;
+                unsigned long pending_idx;
+
+                pending_idx = (unsigned long)frag->page;
+
+                txp = &netbk->pending_tx_info[pending_idx].req;
+                frag->page = virt_to_page(idx_to_kaddr(netbk, pending_idx));
+                frag->size = txp->size;
+                frag->page_offset = txp->offset;
+
+                skb->len += txp->size;
+                skb->data_len += txp->size;
+                skb->truesize += txp->size;
+
+                /* Take an extra reference to offset xen_netbk_idx_release */
+                get_page(netbk->mmap_pages[pending_idx]);
+                xen_netbk_idx_release(netbk, pending_idx);
+        }
+}
+
+static int xen_netbk_get_extras(struct xenvif *vif,
+                                struct xen_netif_extra_info *extras,
+                                int work_to_do)
+{
+        struct xen_netif_extra_info extra;
+        RING_IDX cons = vif->tx.req_cons;
+
+        do {
+                if (unlikely(work_to_do-- <= 0)) {
+                        netdev_dbg(vif->dev, "Missing extra info\n");
+                        return -EBADR;
+                }
+
+                memcpy(&extra, RING_GET_REQUEST(&vif->tx, cons),
+                       sizeof(extra));
+                if (unlikely(!extra.type ||
+                             extra.type >= XEN_NETIF_EXTRA_TYPE_MAX)) {
+                        vif->tx.req_cons = ++cons;
+                        netdev_dbg(vif->dev,
+                                   "Invalid extra type: %d\n", extra.type);
+                        return -EINVAL;
+                }
+
+                memcpy(&extras[extra.type - 1], &extra, sizeof(extra));
+                vif->tx.req_cons = ++cons;
+        } while (extra.flags & XEN_NETIF_EXTRA_FLAG_MORE);
+
+        return work_to_do;
+}
+
+static int netbk_set_skb_gso(struct xenvif *vif,
+                             struct sk_buff *skb,
+                             struct xen_netif_extra_info *gso)
+{
+        if (!gso->u.gso.size) {
+                netdev_dbg(vif->dev, "GSO size must not be zero.\n");
+                return -EINVAL;
+        }
+
+        /* Currently only TCPv4 S.O. is supported. */
+        if (gso->u.gso.type != XEN_NETIF_GSO_TYPE_TCPV4) {
+                netdev_dbg(vif->dev, "Bad GSO type %d.\n", gso->u.gso.type);
+                return -EINVAL;
+        }
+
+        skb_shinfo(skb)->gso_size = gso->u.gso.size;
+        skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;
+
+        /* Header must be checked, and gso_segs computed. */
+        skb_shinfo(skb)->gso_type |= SKB_GSO_DODGY;
+        skb_shinfo(skb)->gso_segs = 0;
+
+        return 0;
+}
+
+static int checksum_setup(struct xenvif *vif, struct sk_buff *skb)
+{
+        struct iphdr *iph;
+        unsigned char *th;
+        int err = -EPROTO;
+        int recalculate_partial_csum = 0;
+
+        /*
+         * A GSO SKB must be CHECKSUM_PARTIAL. However some buggy
+         * peers can fail to set NETRXF_csum_blank when sending a GSO
+         * frame. In this case force the SKB to CHECKSUM_PARTIAL and
+         * recalculate the partial checksum.
+         */
+        if (skb->ip_summed != CHECKSUM_PARTIAL && skb_is_gso(skb)) {
+                vif->rx_gso_checksum_fixup++;
+                skb->ip_summed = CHECKSUM_PARTIAL;
+                recalculate_partial_csum = 1;
+        }
+
+        /* A non-CHECKSUM_PARTIAL SKB does not require setup. */
+        if (skb->ip_summed != CHECKSUM_PARTIAL)
+                return 0;
+
+        if (skb->protocol != htons(ETH_P_IP))
+                goto out;
+
+        iph = (void *)skb->data;
+        th = skb->data + 4 * iph->ihl;
+        if (th >= skb_tail_pointer(skb))
+                goto out;
+
+        skb->csum_start = th - skb->head;
+        switch (iph->protocol) {
+        case IPPROTO_TCP:
+                skb->csum_offset = offsetof(struct tcphdr, check);
+
+                if (recalculate_partial_csum) {
+                        struct tcphdr *tcph = (struct tcphdr *)th;
+                        tcph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
+                                                         skb->len - iph->ihl*4,
+                                                         IPPROTO_TCP, 0);
+                }
+                break;
+        case IPPROTO_UDP:
+                skb->csum_offset = offsetof(struct udphdr, check);
+
+                if (recalculate_partial_csum) {
+                        struct udphdr *udph = (struct udphdr *)th;
+                        udph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
+                                                         skb->len - iph->ihl*4,
+                                                         IPPROTO_UDP, 0);
+                }
+                break;
+        default:
+                if (net_ratelimit())
+                        netdev_err(vif->dev,
+                                   "Attempting to checksum a non-TCP/UDP packet, dropping a protocol %d packet\n",
+                                   iph->protocol);
+                goto out;
+        }
+
+        if ((th + skb->csum_offset + 2) > skb_tail_pointer(skb))
+                goto out;
+
+        err = 0;
+
+out:
+        return err;
+}
+
+static bool tx_credit_exceeded(struct xenvif *vif, unsigned size)
+{
+        unsigned long now = jiffies;
+        unsigned long next_credit =
+                vif->credit_timeout.expires +
+                msecs_to_jiffies(vif->credit_usec / 1000);
+
+        /* Timer could already be pending in rare cases. */
+        if (timer_pending(&vif->credit_timeout))
+                return true;
+
+        /* Passed the point where we can replenish credit? */
+        if (time_after_eq(now, next_credit)) {
+                vif->credit_timeout.expires = now;
+                tx_add_credit(vif);
+        }
+
+        /* Still too big to send right now? Set a callback. */
+        if (size > vif->remaining_credit) {
+                vif->credit_timeout.data     =
+                        (unsigned long)vif;
+                vif->credit_timeout.function =
+                        tx_credit_callback;
+                mod_timer(&vif->credit_timeout,
+                          next_credit);
+
+                return true;
+        }
+
+        return false;
+}
+
+static unsigned xen_netbk_tx_build_gops(struct xen_netbk *netbk)
+{
+        struct gnttab_copy *gop = netbk->tx_copy_ops, *request_gop;
+        struct sk_buff *skb;
+        int ret;
+
+        while (((nr_pending_reqs(netbk) + MAX_SKB_FRAGS) < MAX_PENDING_REQS) &&
+                !list_empty(&netbk->net_schedule_list)) {
+                struct xenvif *vif;
+                struct xen_netif_tx_request txreq;
+                struct xen_netif_tx_request txfrags[MAX_SKB_FRAGS];
+                struct page *page;
+                struct xen_netif_extra_info extras[XEN_NETIF_EXTRA_TYPE_MAX-1];
+                u16 pending_idx;
+                RING_IDX idx;
+                int work_to_do;
+                unsigned int data_len;
+                pending_ring_idx_t index;
+
+                /* Get a netif from the list with work to do. */
+                vif = poll_net_schedule_list(netbk);
+                if (!vif)
+                        continue;
+
+                RING_FINAL_CHECK_FOR_REQUESTS(&vif->tx, work_to_do);
+                if (!work_to_do) {
+                        xenvif_put(vif);
+                        continue;
+                }
+
+                idx = vif->tx.req_cons;
+                rmb(); /* Ensure that we see the request before we copy it. */
+                memcpy(&txreq, RING_GET_REQUEST(&vif->tx, idx), sizeof(txreq));
+
+                /* Credit-based scheduling. */
+                if (txreq.size > vif->remaining_credit &&
+                    tx_credit_exceeded(vif, txreq.size)) {
+                        xenvif_put(vif);
+                        continue;
+                }
+
+                vif->remaining_credit -= txreq.size;
+
+                work_to_do--;
+                vif->tx.req_cons = ++idx;
+
+                memset(extras, 0, sizeof(extras));
+                if (txreq.flags & XEN_NETTXF_extra_info) {
+                        work_to_do = xen_netbk_get_extras(vif, extras,
+                                                          work_to_do);
+                        idx = vif->tx.req_cons;
+                        if (unlikely(work_to_do < 0)) {
+                                netbk_tx_err(vif, &txreq, idx);
+                                continue;
+                        }
+                }
+
+                ret = netbk_count_requests(vif, &txreq, txfrags, work_to_do);
+                if (unlikely(ret < 0)) {
+                        netbk_tx_err(vif, &txreq, idx - ret);
+                        continue;
+                }
+                idx += ret;
+
+                if (unlikely(txreq.size < ETH_HLEN)) {
+                        netdev_dbg(vif->dev,
+                                   "Bad packet size: %d\n", txreq.size);
+                        netbk_tx_err(vif, &txreq, idx);
+                        continue;
+                }
+
+                /* No crossing a page as the payload mustn't fragment. */
+                if (unlikely((txreq.offset + txreq.size) > PAGE_SIZE)) {
+                        netdev_dbg(vif->dev,
+                                   "txreq.offset: %x, size: %u, end: %lu\n",
+                                   txreq.offset, txreq.size,
+                                   (txreq.offset&~PAGE_MASK) + txreq.size);
+                        netbk_tx_err(vif, &txreq, idx);
+                        continue;
+                }
+
+                index = pending_index(netbk->pending_cons);
+                pending_idx = netbk->pending_ring[index];
+
+                data_len = (txreq.size > PKT_PROT_LEN &&
+                            ret < MAX_SKB_FRAGS) ?
+                        PKT_PROT_LEN : txreq.size;
+
+                skb = alloc_skb(data_len + NET_SKB_PAD + NET_IP_ALIGN,
+                                GFP_ATOMIC | __GFP_NOWARN);
+                if (unlikely(skb == NULL)) {
+                        netdev_dbg(vif->dev,
+                                   "Can't allocate a skb in start_xmit.\n");
+                        netbk_tx_err(vif, &txreq, idx);
+                        break;
+                }
+
+                /* Packets passed to netif_rx() must have some headroom. */
+                skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN);
+
+                if (extras[XEN_NETIF_EXTRA_TYPE_GSO - 1].type) {
+                        struct xen_netif_extra_info *gso;
+                        gso = &extras[XEN_NETIF_EXTRA_TYPE_GSO - 1];
+
+                        if (netbk_set_skb_gso(vif, skb, gso)) {
+                                kfree_skb(skb);
+                                netbk_tx_err(vif, &txreq, idx);
+                                continue;
+                        }
+                }
+
+                /* XXX could copy straight to head */
+                page = xen_netbk_alloc_page(netbk, skb, pending_idx);
+                if (!page) {
+                        kfree_skb(skb);
+                        netbk_tx_err(vif, &txreq, idx);
+                        continue;
+                }
+
+                netbk->mmap_pages[pending_idx] = page;
+
+                gop->source.u.ref = txreq.gref;
+                gop->source.domid = vif->domid;
+                gop->source.offset = txreq.offset;
+
+                gop->dest.u.gmfn = virt_to_mfn(page_address(page));
+                gop->dest.domid = DOMID_SELF;
+                gop->dest.offset = txreq.offset;
+
+                gop->len = txreq.size;
+                gop->flags = GNTCOPY_source_gref;
+
+                gop++;
+
+                memcpy(&netbk->pending_tx_info[pending_idx].req,
+                       &txreq, sizeof(txreq));
+                netbk->pending_tx_info[pending_idx].vif = vif;
+                *((u16 *)skb->data) = pending_idx;
+
+                __skb_put(skb, data_len);
+
+                skb_shinfo(skb)->nr_frags = ret;
+                if (data_len < txreq.size) {
+                        skb_shinfo(skb)->nr_frags++;
+                        skb_shinfo(skb)->frags[0].page =
+                                (void *)(unsigned long)pending_idx;
+                } else {
+                        /* Discriminate from any valid pending_idx value. */
+                        skb_shinfo(skb)->frags[0].page = (void *)~0UL;
+                }
+
+                __skb_queue_tail(&netbk->tx_queue, skb);
+
+                netbk->pending_cons++;
+
+                request_gop = xen_netbk_get_requests(netbk, vif,
+                                                     skb, txfrags, gop);
+                if (request_gop == NULL) {
+                        kfree_skb(skb);
+                        netbk_tx_err(vif, &txreq, idx);
+                        continue;
+                }
+                gop = request_gop;
+
+                vif->tx.req_cons = idx;
+                xen_netbk_check_rx_xenvif(vif);
+
+                if ((gop-netbk->tx_copy_ops) >= ARRAY_SIZE(netbk->tx_copy_ops))
+                        break;
+        }
+
+        return gop - netbk->tx_copy_ops;
+}
+
+static void xen_netbk_tx_submit(struct xen_netbk *netbk)
+{
+        struct gnttab_copy *gop = netbk->tx_copy_ops;
+        struct sk_buff *skb;
+
+        while ((skb = __skb_dequeue(&netbk->tx_queue)) != NULL) {
+                struct xen_netif_tx_request *txp;
+                struct xenvif *vif;
+                u16 pending_idx;
+                unsigned data_len;
+
+                pending_idx = *((u16 *)skb->data);
+                vif = netbk->pending_tx_info[pending_idx].vif;
+                txp = &netbk->pending_tx_info[pending_idx].req;
+
+                /* Check the remap error code. */
+                if (unlikely(xen_netbk_tx_check_gop(netbk, skb, &gop))) {
+                        netdev_dbg(vif->dev, "netback grant failed.\n");
+                        skb_shinfo(skb)->nr_frags = 0;
+                        kfree_skb(skb);
+                        continue;
+                }
+
+                data_len = skb->len;
+                memcpy(skb->data,
+                       (void *)(idx_to_kaddr(netbk, pending_idx)|txp->offset),
+                       data_len);
+                if (data_len < txp->size) {
+                        /* Append the packet payload as a fragment. */
+                        txp->offset += data_len;
+                        txp->size -= data_len;
+                } else {
+                        /* Schedule a response immediately. */
+                        xen_netbk_idx_release(netbk, pending_idx);
+                }
+
+                if (txp->flags & XEN_NETTXF_csum_blank)
+                        skb->ip_summed = CHECKSUM_PARTIAL;
+                else if (txp->flags & XEN_NETTXF_data_validated)
+                        skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+                xen_netbk_fill_frags(netbk, skb);
+
+                /*
+                 * If the initial fragment was < PKT_PROT_LEN then
+                 * pull through some bytes from the other fragments to
+                 * increase the linear region to PKT_PROT_LEN bytes.
+                 */
+                if (skb_headlen(skb) < PKT_PROT_LEN && skb_is_nonlinear(skb)) {
+                        int target = min_t(int, skb->len, PKT_PROT_LEN);
+                        __pskb_pull_tail(skb, target - skb_headlen(skb));
+                }
+
+                skb->dev      = vif->dev;
+                skb->protocol = eth_type_trans(skb, skb->dev);
+
+                if (checksum_setup(vif, skb)) {
+                        netdev_dbg(vif->dev,
+                                   "Can't setup checksum in net_tx_action\n");
+                        kfree_skb(skb);
+                        continue;
+                }
+
+                vif->dev->stats.rx_bytes += skb->len;
+                vif->dev->stats.rx_packets++;
+
+                xenvif_receive_skb(vif, skb);
+        }
+}
+
+/* Called after netfront has transmitted */
+static void xen_netbk_tx_action(struct xen_netbk *netbk)
+{
+        unsigned nr_gops;
+        int ret;
+
+        nr_gops = xen_netbk_tx_build_gops(netbk);
+
+        if (nr_gops == 0)
+                return;
+        ret = HYPERVISOR_grant_table_op(GNTTABOP_copy,
+                                        netbk->tx_copy_ops, nr_gops);
+        BUG_ON(ret);
+
+        xen_netbk_tx_submit(netbk);
+
+}
+
+static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx)
+{
+        struct xenvif *vif;
+        struct pending_tx_info *pending_tx_info;
+        pending_ring_idx_t index;
+
+        /* Already complete? */
+        if (netbk->mmap_pages[pending_idx] == NULL)
+                return;
+
+        pending_tx_info = &netbk->pending_tx_info[pending_idx];
+
+        vif = pending_tx_info->vif;
+
+        make_tx_response(vif, &pending_tx_info->req, XEN_NETIF_RSP_OKAY);
+
+        index = pending_index(netbk->pending_prod++);
+        netbk->pending_ring[index] = pending_idx;
+
+        xenvif_put(vif);
+
+        netbk->mmap_pages[pending_idx]->mapping = 0;
+        put_page(netbk->mmap_pages[pending_idx]);
+        netbk->mmap_pages[pending_idx] = NULL;
+}
+
+static void make_tx_response(struct xenvif *vif,
+                             struct xen_netif_tx_request *txp,
+                             s8       st)
+{
+        RING_IDX i = vif->tx.rsp_prod_pvt;
+        struct xen_netif_tx_response *resp;
+        int notify;
+
+        resp = RING_GET_RESPONSE(&vif->tx, i);
+        resp->id     = txp->id;
+        resp->status = st;
+
+        if (txp->flags & XEN_NETTXF_extra_info)
+                RING_GET_RESPONSE(&vif->tx, ++i)->status = XEN_NETIF_RSP_NULL;
+
+        vif->tx.rsp_prod_pvt = ++i;
+        RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&vif->tx, notify);
+        if (notify)
+                notify_remote_via_irq(vif->irq);
+}
+
+static struct xen_netif_rx_response *make_rx_response(struct xenvif *vif,
+                                             u16      id,
+                                             s8       st,
+                                             u16      offset,
+                                             u16      size,
+                                             u16      flags)
+{
+        RING_IDX i = vif->rx.rsp_prod_pvt;
+        struct xen_netif_rx_response *resp;
+
+        resp = RING_GET_RESPONSE(&vif->rx, i);
+        resp->offset     = offset;
+        resp->flags      = flags;
+        resp->id         = id;
+        resp->status     = (s16)size;
+        if (st < 0)
+                resp->status = (s16)st;
+
+        vif->rx.rsp_prod_pvt = ++i;
+
+        return resp;
+}
+
+static inline int rx_work_todo(struct xen_netbk *netbk)
+{
+        return !skb_queue_empty(&netbk->rx_queue);
+}
+
+static inline int tx_work_todo(struct xen_netbk *netbk)
+{
+
+        if (((nr_pending_reqs(netbk) + MAX_SKB_FRAGS) < MAX_PENDING_REQS) &&
+                        !list_empty(&netbk->net_schedule_list))
+                return 1;
+
+        return 0;
+}
+
+static int xen_netbk_kthread(void *data)
+{
+        struct xen_netbk *netbk = data;
+        while (!kthread_should_stop()) {
+                wait_event_interruptible(netbk->wq,
+                                rx_work_todo(netbk) ||
+                                tx_work_todo(netbk) ||
+                                kthread_should_stop());
+                cond_resched();
+
+                if (kthread_should_stop())
+                        break;
+
+                if (rx_work_todo(netbk))
+                        xen_netbk_rx_action(netbk);
+
+                if (tx_work_todo(netbk))
+                        xen_netbk_tx_action(netbk);
+        }
+
+        return 0;
+}
+
+void xen_netbk_unmap_frontend_rings(struct xenvif *vif)
+{
+        struct gnttab_unmap_grant_ref op;
+
+        if (vif->tx.sring) {
+                gnttab_set_unmap_op(&op, (unsigned long)vif->tx_comms_area->addr,
+                                    GNTMAP_host_map, vif->tx_shmem_handle);
+
+                if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1))
+                        BUG();
+        }
+
+        if (vif->rx.sring) {
+                gnttab_set_unmap_op(&op, (unsigned long)vif->rx_comms_area->addr,
+                                    GNTMAP_host_map, vif->rx_shmem_handle);
+
+                if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1))
+                        BUG();
+        }
+        if (vif->rx_comms_area)
+                free_vm_area(vif->rx_comms_area);
+        if (vif->tx_comms_area)
+                free_vm_area(vif->tx_comms_area);
+}
+
+int xen_netbk_map_frontend_rings(struct xenvif *vif,
+                                 grant_ref_t tx_ring_ref,
+                                 grant_ref_t rx_ring_ref)
+{
+        struct gnttab_map_grant_ref op;
+        struct xen_netif_tx_sring *txs;
+        struct xen_netif_rx_sring *rxs;
+
+        int err = -ENOMEM;
+
+        vif->tx_comms_area = alloc_vm_area(PAGE_SIZE);
+        if (vif->tx_comms_area == NULL)
+                goto err;
+
+        vif->rx_comms_area = alloc_vm_area(PAGE_SIZE);
+        if (vif->rx_comms_area == NULL)
+                goto err;
+
+        gnttab_set_map_op(&op, (unsigned long)vif->tx_comms_area->addr,
+                          GNTMAP_host_map, tx_ring_ref, vif->domid);
+
+        if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
+                BUG();
+
+        if (op.status) {
+                netdev_warn(vif->dev,
+                            "failed to map tx ring. err=%d status=%d\n",
+                            err, op.status);
+                err = op.status;
+                goto err;
+        }
+
+        vif->tx_shmem_ref    = tx_ring_ref;
+        vif->tx_shmem_handle = op.handle;
+
+        txs = (struct xen_netif_tx_sring *)vif->tx_comms_area->addr;
+        BACK_RING_INIT(&vif->tx, txs, PAGE_SIZE);
+
+        gnttab_set_map_op(&op, (unsigned long)vif->rx_comms_area->addr,
+                          GNTMAP_host_map, rx_ring_ref, vif->domid);
+
+        if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
+                BUG();
+
+        if (op.status) {
+                netdev_warn(vif->dev,
+                            "failed to map rx ring. err=%d status=%d\n",
+                            err, op.status);
+                err = op.status;
+                goto err;
+        }
+
+        vif->rx_shmem_ref     = rx_ring_ref;
+        vif->rx_shmem_handle  = op.handle;
+        vif->rx_req_cons_peek = 0;
+
+        rxs = (struct xen_netif_rx_sring *)vif->rx_comms_area->addr;
+        BACK_RING_INIT(&vif->rx, rxs, PAGE_SIZE);
+
+        return 0;
+
+err:
+        xen_netbk_unmap_frontend_rings(vif);
+        return err;
+}
+
+static int __init netback_init(void)
+{
+        int i;
+        int rc = 0;
+        int group;
+
+        if (!xen_pv_domain())
+                return -ENODEV;
+
+        xen_netbk_group_nr = num_online_cpus();
+        xen_netbk = vzalloc(sizeof(struct xen_netbk) * xen_netbk_group_nr);
+        if (!xen_netbk) {
+                printk(KERN_ALERT "%s: out of memory\n", __func__);
+                return -ENOMEM;
+        }
+
+        for (group = 0; group < xen_netbk_group_nr; group++) {
+                struct xen_netbk *netbk = &xen_netbk[group];
+                skb_queue_head_init(&netbk->rx_queue);
+                skb_queue_head_init(&netbk->tx_queue);
+
+                init_timer(&netbk->net_timer);
+                netbk->net_timer.data = (unsigned long)netbk;
+                netbk->net_timer.function = xen_netbk_alarm;
+
+                netbk->pending_cons = 0;
+                netbk->pending_prod = MAX_PENDING_REQS;
+                for (i = 0; i < MAX_PENDING_REQS; i++)
+                        netbk->pending_ring[i] = i;
+
+                init_waitqueue_head(&netbk->wq);
+                netbk->task = kthread_create(xen_netbk_kthread,
+                                             (void *)netbk,
+                                             "netback/%u", group);
+
+                if (IS_ERR(netbk->task)) {
+                        printk(KERN_ALERT "kthread_run() fails at netback\n");
+                        del_timer(&netbk->net_timer);
+                        rc = PTR_ERR(netbk->task);
+                        goto failed_init;
+                }
+
+                kthread_bind(netbk->task, group);
+
+                INIT_LIST_HEAD(&netbk->net_schedule_list);
+
+                spin_lock_init(&netbk->net_schedule_list_lock);
+
+                atomic_set(&netbk->netfront_count, 0);
+
+                wake_up_process(netbk->task);
+        }
+
+        rc = xenvif_xenbus_init();
+        if (rc)
+                goto failed_init;
+
+        return 0;
+
+failed_init:
+        while (--group >= 0) {
+                struct xen_netbk *netbk = &xen_netbk[group];
+                for (i = 0; i < MAX_PENDING_REQS; i++) {
+                        if (netbk->mmap_pages[i])
+                                __free_page(netbk->mmap_pages[i]);
+                }
+                del_timer(&netbk->net_timer);
+                kthread_stop(netbk->task);
+        }
+        vfree(xen_netbk);
+        return rc;
+
+}
+
+module_init(netback_init);
+
+MODULE_LICENSE("Dual BSD/GPL");
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
new file mode 100644
index 00000000000..22b8c350599
--- /dev/null
+++ b/drivers/net/xen-netback/xenbus.c
@@ -0,0 +1,490 @@
+/*
+ * Xenbus code for netif backend
+ *
+ * Copyright (C) 2005 Rusty Russell <rusty@rustcorp.com.au>
+ * Copyright (C) 2005 XenSource Ltd
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "common.h"
+
+struct backend_info {
+        struct xenbus_device *dev;
+        struct xenvif *vif;
+        enum xenbus_state frontend_state;
+        struct xenbus_watch hotplug_status_watch;
+        int have_hotplug_status_watch:1;
+};
+
+static int connect_rings(struct backend_info *);
+static void connect(struct backend_info *);
+static void backend_create_xenvif(struct backend_info *be);
+static void unregister_hotplug_status_watch(struct backend_info *be);
+
+static int netback_remove(struct xenbus_device *dev)
+{
+        struct backend_info *be = dev_get_drvdata(&dev->dev);
+
+        unregister_hotplug_status_watch(be);
+        if (be->vif) {
+                kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE);
+                xenbus_rm(XBT_NIL, dev->nodename, "hotplug-status");
+                xenvif_disconnect(be->vif);
+                be->vif = NULL;
+        }
+        kfree(be);
+        dev_set_drvdata(&dev->dev, NULL);
+        return 0;
+}
+
+
+/**
+ * Entry point to this code when a new device is created.  Allocate the basic
+ * structures and switch to InitWait.
+ */
+static int netback_probe(struct xenbus_device *dev,
+                         const struct xenbus_device_id *id)
+{
+        const char *message;
+        struct xenbus_transaction xbt;
+        int err;
+        int sg;
+        struct backend_info *be = kzalloc(sizeof(struct backend_info),
+                                          GFP_KERNEL);
+        if (!be) {
+                xenbus_dev_fatal(dev, -ENOMEM,
+                                 "allocating backend structure");
+                return -ENOMEM;
+        }
+
+        be->dev = dev;
+        dev_set_drvdata(&dev->dev, be);
+
+        sg = 1;
+
+        do {
+                err = xenbus_transaction_start(&xbt);
+                if (err) {
+                        xenbus_dev_fatal(dev, err, "starting transaction");
+                        goto fail;
+                }
+
+                err = xenbus_printf(xbt, dev->nodename, "feature-sg", "%d", sg);
+                if (err) {
+                        message = "writing feature-sg";
+                        goto abort_transaction;
+                }
+
+                err = xenbus_printf(xbt, dev->nodename, "feature-gso-tcpv4",
+                                    "%d", sg);
+                if (err) {
+                        message = "writing feature-gso-tcpv4";
+                        goto abort_transaction;
+                }
+
+                /* We support rx-copy path. */
+                err = xenbus_printf(xbt, dev->nodename,
+                                    "feature-rx-copy", "%d", 1);
+                if (err) {
+                        message = "writing feature-rx-copy";
+                        goto abort_transaction;
+                }
+
+                /*
+                 * We don't support rx-flip path (except old guests who don't
+                 * grok this feature flag).
+                 */
+                err = xenbus_printf(xbt, dev->nodename,
+                                    "feature-rx-flip", "%d", 0);
+                if (err) {
+                        message = "writing feature-rx-flip";
+                        goto abort_transaction;
+                }
+
+                err = xenbus_transaction_end(xbt, 0);
+        } while (err == -EAGAIN);
+
+        if (err) {
+                xenbus_dev_fatal(dev, err, "completing transaction");
+                goto fail;
+        }
+
+        err = xenbus_switch_state(dev, XenbusStateInitWait);
+        if (err)
+                goto fail;
+
+        /* This kicks hotplug scripts, so do it immediately. */
+        backend_create_xenvif(be);
+
+        return 0;
+
+abort_transaction:
+        xenbus_transaction_end(xbt, 1);
+        xenbus_dev_fatal(dev, err, "%s", message);
+fail:
+        pr_debug("failed");
+        netback_remove(dev);
+        return err;
+}
+
+
+/*
+ * Handle the creation of the hotplug script environment.  We add the script
+ * and vif variables to the environment, for the benefit of the vif-* hotplug
+ * scripts.
+ */
+static int netback_uevent(struct xenbus_device *xdev,
+                          struct kobj_uevent_env *env)
+{
+        struct backend_info *be = dev_get_drvdata(&xdev->dev);
+        char *val;
+
+        val = xenbus_read(XBT_NIL, xdev->nodename, "script", NULL);
+        if (IS_ERR(val)) {
+                int err = PTR_ERR(val);
+                xenbus_dev_fatal(xdev, err, "reading script");
+                return err;
+        } else {
+                if (add_uevent_var(env, "script=%s", val)) {
+                        kfree(val);
+                        return -ENOMEM;
+                }
+                kfree(val);
+        }
+
+        if (!be || !be->vif)
+                return 0;
+
+        return add_uevent_var(env, "vif=%s", be->vif->dev->name);
+}
+
+
+static void backend_create_xenvif(struct backend_info *be)
+{
+        int err;
+        long handle;
+        struct xenbus_device *dev = be->dev;
+
+        if (be->vif != NULL)
+                return;
+
+        err = xenbus_scanf(XBT_NIL, dev->nodename, "handle", "%li", &handle);
+        if (err != 1) {
+                xenbus_dev_fatal(dev, err, "reading handle");
+                return;
+        }
+
+        be->vif = xenvif_alloc(&dev->dev, dev->otherend_id, handle);
+        if (IS_ERR(be->vif)) {
+                err = PTR_ERR(be->vif);
+                be->vif = NULL;
+                xenbus_dev_fatal(dev, err, "creating interface");
+                return;
+        }
+
+        kobject_uevent(&dev->dev.kobj, KOBJ_ONLINE);
+}
+
+
+static void disconnect_backend(struct xenbus_device *dev)
+{
+        struct backend_info *be = dev_get_drvdata(&dev->dev);
+
+        if (be->vif) {
+                xenbus_rm(XBT_NIL, dev->nodename, "hotplug-status");
+                xenvif_disconnect(be->vif);
+                be->vif = NULL;
+        }
+}
+
+/**
+ * Callback received when the frontend's state changes.
+ */
+static void frontend_changed(struct xenbus_device *dev,
+                             enum xenbus_state frontend_state)
+{
+        struct backend_info *be = dev_get_drvdata(&dev->dev);
+
+        pr_debug("frontend state %s", xenbus_strstate(frontend_state));
+
+        be->frontend_state = frontend_state;
+
+        switch (frontend_state) {
+        case XenbusStateInitialising:
+                if (dev->state == XenbusStateClosed) {
+                        printk(KERN_INFO "%s: %s: prepare for reconnect\n",
+                               __func__, dev->nodename);
+                        xenbus_switch_state(dev, XenbusStateInitWait);
+                }
+                break;
+
+        case XenbusStateInitialised:
+                break;
+
+        case XenbusStateConnected:
+                if (dev->state == XenbusStateConnected)
+                        break;
+                backend_create_xenvif(be);
+                if (be->vif)
+                        connect(be);
+                break;
+
+        case XenbusStateClosing:
+                if (be->vif)
+                        kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE);
+                disconnect_backend(dev);
+                xenbus_switch_state(dev, XenbusStateClosing);
+                break;
+
+        case XenbusStateClosed:
+                xenbus_switch_state(dev, XenbusStateClosed);
+                if (xenbus_dev_is_online(dev))
+                        break;
+                /* fall through if not online */
+        case XenbusStateUnknown:
+                device_unregister(&dev->dev);
+                break;
+
+        default:
+                xenbus_dev_fatal(dev, -EINVAL, "saw state %d at frontend",
+                                 frontend_state);
+                break;
+        }
+}
+
+
+static void xen_net_read_rate(struct xenbus_device *dev,
+                              unsigned long *bytes, unsigned long *usec)
+{
+        char *s, *e;
+        unsigned long b, u;
+        char *ratestr;
+
+        /* Default to unlimited bandwidth. */
+        *bytes = ~0UL;
+        *usec = 0;
+
+        ratestr = xenbus_read(XBT_NIL, dev->nodename, "rate", NULL);
+        if (IS_ERR(ratestr))
+                return;
+
+        s = ratestr;
+        b = simple_strtoul(s, &e, 10);
+        if ((s == e) || (*e != ','))
+                goto fail;
+
+        s = e + 1;
+        u = simple_strtoul(s, &e, 10);
+        if ((s == e) || (*e != '\0'))
+                goto fail;
+
+        *bytes = b;
+        *usec = u;
+
+        kfree(ratestr);
+        return;
+
+ fail:
+        pr_warn("Failed to parse network rate limit. Traffic unlimited.\n");
+        kfree(ratestr);
+}
+
+static int xen_net_read_mac(struct xenbus_device *dev, u8 mac[])
+{
+        char *s, *e, *macstr;
+        int i;
+
+        macstr = s = xenbus_read(XBT_NIL, dev->nodename, "mac", NULL);
+        if (IS_ERR(macstr))
+                return PTR_ERR(macstr);
+
+        for (i = 0; i < ETH_ALEN; i++) {
+                mac[i] = simple_strtoul(s, &e, 16);
+                if ((s == e) || (*e != ((i == ETH_ALEN-1) ? '\0' : ':'))) {
+                        kfree(macstr);
+                        return -ENOENT;
+                }
+                s = e+1;
+        }
+
+        kfree(macstr);
+        return 0;
+}
+
+static void unregister_hotplug_status_watch(struct backend_info *be)
+{
+        if (be->have_hotplug_status_watch) {
+                unregister_xenbus_watch(&be->hotplug_status_watch);
+                kfree(be->hotplug_status_watch.node);
+        }
+        be->have_hotplug_status_watch = 0;
+}
+
+static void hotplug_status_changed(struct xenbus_watch *watch,
+                                   const char **vec,
+                                   unsigned int vec_size)
+{
+        struct backend_info *be = container_of(watch,
+                                               struct backend_info,
+                                               hotplug_status_watch);
+        char *str;
+        unsigned int len;
+
+        str = xenbus_read(XBT_NIL, be->dev->nodename, "hotplug-status", &len);
+        if (IS_ERR(str))
+                return;
+        if (len == sizeof("connected")-1 && !memcmp(str, "connected", len)) {
+                xenbus_switch_state(be->dev, XenbusStateConnected);
+                /* Not interested in this watch anymore. */
+                unregister_hotplug_status_watch(be);
+        }
+        kfree(str);
+}
+
+static void connect(struct backend_info *be)
+{
+        int err;
+        struct xenbus_device *dev = be->dev;
+
+        err = connect_rings(be);
+        if (err)
+                return;
+
+        err = xen_net_read_mac(dev, be->vif->fe_dev_addr);
+        if (err) {
+                xenbus_dev_fatal(dev, err, "parsing %s/mac", dev->nodename);
+                return;
+        }
+
+        xen_net_read_rate(dev, &be->vif->credit_bytes,
+                          &be->vif->credit_usec);
+        be->vif->remaining_credit = be->vif->credit_bytes;
+
+        unregister_hotplug_status_watch(be);
+        err = xenbus_watch_pathfmt(dev, &be->hotplug_status_watch,
+                                   hotplug_status_changed,
+                                   "%s/%s", dev->nodename, "hotplug-status");
+        if (err) {
+                /* Switch now, since we can't do a watch. */
+                xenbus_switch_state(dev, XenbusStateConnected);
+        } else {
+                be->have_hotplug_status_watch = 1;
+        }
+
+        netif_wake_queue(be->vif->dev);
+}
+
+
+static int connect_rings(struct backend_info *be)
+{
+        struct xenvif *vif = be->vif;
+        struct xenbus_device *dev = be->dev;
+        unsigned long tx_ring_ref, rx_ring_ref;
+        unsigned int evtchn, rx_copy;
+        int err;
+        int val;
+
+        err = xenbus_gather(XBT_NIL, dev->otherend,
+                            "tx-ring-ref", "%lu", &tx_ring_ref,
+                            "rx-ring-ref", "%lu", &rx_ring_ref,
+                            "event-channel", "%u", &evtchn, NULL);
+        if (err) {
+                xenbus_dev_fatal(dev, err,
+                                 "reading %s/ring-ref and event-channel",
+                                 dev->otherend);
+                return err;
+        }
+
+        err = xenbus_scanf(XBT_NIL, dev->otherend, "request-rx-copy", "%u",
+                           &rx_copy);
+        if (err == -ENOENT) {
+                err = 0;
+                rx_copy = 0;
+        }
+        if (err < 0) {
+                xenbus_dev_fatal(dev, err, "reading %s/request-rx-copy",
+                                 dev->otherend);
+                return err;
+        }
+        if (!rx_copy)
+                return -EOPNOTSUPP;
+
+        if (vif->dev->tx_queue_len != 0) {
+                if (xenbus_scanf(XBT_NIL, dev->otherend,
+                                 "feature-rx-notify", "%d", &val) < 0)
+                        val = 0;
+                if (val)
+                        vif->can_queue = 1;
+                else
+                        /* Must be non-zero for pfifo_fast to work. */
+                        vif->dev->tx_queue_len = 1;
+        }
+
+        if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-sg",
+                         "%d", &val) < 0)
+                val = 0;
+        vif->can_sg = !!val;
+
+        if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-gso-tcpv4",
+                         "%d", &val) < 0)
+                val = 0;
+        vif->gso = !!val;
+
+        if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-gso-tcpv4-prefix",
+                         "%d", &val) < 0)
+                val = 0;
+        vif->gso_prefix = !!val;
+
+        if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-no-csum-offload",
+                         "%d", &val) < 0)
+                val = 0;
+        vif->csum = !val;
+
+        /* Map the shared frame, irq etc. */
+        err = xenvif_connect(vif, tx_ring_ref, rx_ring_ref, evtchn);
+        if (err) {
+                xenbus_dev_fatal(dev, err,
+                                 "mapping shared-frames %lu/%lu port %u",
+                                 tx_ring_ref, rx_ring_ref, evtchn);
+                return err;
+        }
+        return 0;
+}
+
+
+/* ** Driver Registration ** */
+
+
+static const struct xenbus_device_id netback_ids[] = {
+        { "vif" },
+        { "" }
+};
+
+
+static struct xenbus_driver netback = {
+        .name = "vif",
+        .owner = THIS_MODULE,
+        .ids = netback_ids,
+        .probe = netback_probe,
+        .remove = netback_remove,
+        .uevent = netback_uevent,
+        .otherend_changed = frontend_changed,
+};
+
+int xenvif_xenbus_init(void)
+{
+        return xenbus_register_backend(&netback);
+}
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 546de574982..5c8d9c385be 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -120,6 +120,9 @@ struct netfront_info {
         unsigned long rx_pfn_array[NET_RX_RING_SIZE];
         struct multicall_entry rx_mcl[NET_RX_RING_SIZE+1];
         struct mmu_update rx_mmu[NET_RX_RING_SIZE];
+
+        /* Statistics */
+        unsigned long rx_gso_checksum_fixup;
 };
 
 struct netfront_rx_info {
@@ -356,7 +359,7 @@ static void xennet_tx_buf_gc(struct net_device *dev)
                         struct xen_netif_tx_response *txrsp;
 
                         txrsp = RING_GET_RESPONSE(&np->tx, cons);
-                        if (txrsp->status == NETIF_RSP_NULL)
+                        if (txrsp->status == XEN_NETIF_RSP_NULL)
                                 continue;
 
                         id  = txrsp->id;
@@ -413,7 +416,7 @@ static void xennet_make_frags(struct sk_buff *skb, struct net_device *dev,
            larger than a page), split it it into page-sized chunks. */
         while (len > PAGE_SIZE - offset) {
                 tx->size = PAGE_SIZE - offset;
-                tx->flags |= NETTXF_more_data;
+                tx->flags |= XEN_NETTXF_more_data;
                 len -= tx->size;
                 data += tx->size;
                 offset = 0;
@@ -439,7 +442,7 @@ static void xennet_make_frags(struct sk_buff *skb, struct net_device *dev,
         for (i = 0; i < frags; i++) {
                 skb_frag_t *frag = skb_shinfo(skb)->frags + i;
 
-                tx->flags |= NETTXF_more_data;
+                tx->flags |= XEN_NETTXF_more_data;
 
                 id = get_id_from_freelist(&np->tx_skb_freelist, np->tx_skbs);
                 np->tx_skbs[id].skb = skb_get(skb);
@@ -514,10 +517,10 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
         tx->flags = 0;
         if (skb->ip_summed == CHECKSUM_PARTIAL)
                 /* local packet? */
-                tx->flags |= NETTXF_csum_blank | NETTXF_data_validated;
+                tx->flags |= XEN_NETTXF_csum_blank | XEN_NETTXF_data_validated;
         else if (skb->ip_summed == CHECKSUM_UNNECESSARY)
                 /* remote but checksummed. */
-                tx->flags |= NETTXF_data_validated;
+                tx->flags |= XEN_NETTXF_data_validated;
 
         if (skb_shinfo(skb)->gso_size) {
                 struct xen_netif_extra_info *gso;
@@ -528,7 +531,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 if (extra)
                         extra->flags |= XEN_NETIF_EXTRA_FLAG_MORE;
                 else
-                        tx->flags |= NETTXF_extra_info;
+                        tx->flags |= XEN_NETTXF_extra_info;
 
                 gso->u.gso.size = skb_shinfo(skb)->gso_size;
                 gso->u.gso.type = XEN_NETIF_GSO_TYPE_TCPV4;
@@ -648,7 +651,7 @@ static int xennet_get_responses(struct netfront_info *np,
         int err = 0;
         unsigned long ret;
 
-        if (rx->flags & NETRXF_extra_info) {
+        if (rx->flags & XEN_NETRXF_extra_info) {
                 err = xennet_get_extras(np, extras, rp);
                 cons = np->rx.rsp_cons;
         }
@@ -685,7 +688,7 @@ static int xennet_get_responses(struct netfront_info *np,
                 __skb_queue_tail(list, skb);
 
 next:
-                if (!(rx->flags & NETRXF_more_data))
+                if (!(rx->flags & XEN_NETRXF_more_data))
                         break;
 
                 if (cons + frags == rp) {
@@ -770,11 +773,29 @@ static RING_IDX xennet_fill_frags(struct netfront_info *np,
         return cons;
 }
 
-static int skb_checksum_setup(struct sk_buff *skb)
+static int checksum_setup(struct net_device *dev, struct sk_buff *skb)
 {
         struct iphdr *iph;
         unsigned char *th;
         int err = -EPROTO;
+        int recalculate_partial_csum = 0;
+
+        /*
+         * A GSO SKB must be CHECKSUM_PARTIAL. However some buggy
+         * peers can fail to set NETRXF_csum_blank when sending a GSO
+         * frame. In this case force the SKB to CHECKSUM_PARTIAL and
+         * recalculate the partial checksum.
+         */
+        if (skb->ip_summed != CHECKSUM_PARTIAL && skb_is_gso(skb)) {
+                struct netfront_info *np = netdev_priv(dev);
+                np->rx_gso_checksum_fixup++;
+                skb->ip_summed = CHECKSUM_PARTIAL;
+                recalculate_partial_csum = 1;
+        }
+
+        /* A non-CHECKSUM_PARTIAL SKB does not require setup. */
+        if (skb->ip_summed != CHECKSUM_PARTIAL)
+                return 0;
 
         if (skb->protocol != htons(ETH_P_IP))
                 goto out;
@@ -788,9 +809,23 @@ static int skb_checksum_setup(struct sk_buff *skb)
         switch (iph->protocol) {
         case IPPROTO_TCP:
                 skb->csum_offset = offsetof(struct tcphdr, check);
+
+                if (recalculate_partial_csum) {
+                        struct tcphdr *tcph = (struct tcphdr *)th;
+                        tcph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
+                                                         skb->len - iph->ihl*4,
+                                                         IPPROTO_TCP, 0);
+                }
                 break;
         case IPPROTO_UDP:
                 skb->csum_offset = offsetof(struct udphdr, check);
+
+                if (recalculate_partial_csum) {
+                        struct udphdr *udph = (struct udphdr *)th;
+                        udph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
+                                                         skb->len - iph->ihl*4,
+                                                         IPPROTO_UDP, 0);
+                }
                 break;
         default:
                 if (net_ratelimit())
@@ -829,13 +864,11 @@ static int handle_incoming_queue(struct net_device *dev,
                 /* Ethernet work: Delayed to here as it peeks the header. */
                 skb->protocol = eth_type_trans(skb, dev);
 
-                if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                        if (skb_checksum_setup(skb)) {
-                                kfree_skb(skb);
-                                packets_dropped++;
-                                dev->stats.rx_errors++;
-                                continue;
-                        }
+                if (checksum_setup(dev, skb)) {
+                        kfree_skb(skb);
+                        packets_dropped++;
+                        dev->stats.rx_errors++;
+                        continue;
                 }
 
                 dev->stats.rx_packets++;
@@ -950,9 +983,9 @@ err:
                 skb->truesize += skb->data_len - (RX_COPY_THRESHOLD - len);
                 skb->len += skb->data_len;
 
-                if (rx->flags & NETRXF_csum_blank)
+                if (rx->flags & XEN_NETRXF_csum_blank)
                         skb->ip_summed = CHECKSUM_PARTIAL;
-                else if (rx->flags & NETRXF_data_validated)
+                else if (rx->flags & XEN_NETRXF_data_validated)
                         skb->ip_summed = CHECKSUM_UNNECESSARY;
 
                 __skb_queue_tail(&rxq, skb);
@@ -1632,12 +1665,59 @@ static void netback_changed(struct xenbus_device *dev,
         }
 }
 
+static const struct xennet_stat {
+        char name[ETH_GSTRING_LEN];
+        u16 offset;
+} xennet_stats[] = {
+        {
+                "rx_gso_checksum_fixup",
+                offsetof(struct netfront_info, rx_gso_checksum_fixup)
+        },
+};
+
+static int xennet_get_sset_count(struct net_device *dev, int string_set)
+{
+        switch (string_set) {
+        case ETH_SS_STATS:
+                return ARRAY_SIZE(xennet_stats);
+        default:
+                return -EINVAL;
+        }
+}
+
+static void xennet_get_ethtool_stats(struct net_device *dev,
+                                     struct ethtool_stats *stats, u64 * data)
+{
+        void *np = netdev_priv(dev);
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(xennet_stats); i++)
+                data[i] = *(unsigned long *)(np + xennet_stats[i].offset);
+}
+
+static void xennet_get_strings(struct net_device *dev, u32 stringset, u8 * data)
+{
+        int i;
+
+        switch (stringset) {
+        case ETH_SS_STATS:
+                for (i = 0; i < ARRAY_SIZE(xennet_stats); i++)
+                        memcpy(data + i * ETH_GSTRING_LEN,
+                               xennet_stats[i].name, ETH_GSTRING_LEN);
+                break;
+        }
+}
+
 static const struct ethtool_ops xennet_ethtool_ops =
 {
         .set_tx_csum = ethtool_op_set_tx_csum,
         .set_sg = xennet_set_sg,
         .set_tso = xennet_set_tso,
         .get_link = ethtool_op_get_link,
+
+        .get_sset_count = xennet_get_sset_count,
+        .get_ethtool_stats = xennet_get_ethtool_stats,
+        .get_strings = xennet_get_strings,
 };
 
 #ifdef CONFIG_SYSFS
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index cad66ce1640..2642af4ee49 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -1101,8 +1101,7 @@ static struct net_device_ops xemaclite_netdev_ops;
  * Return:      0, if the driver is bound to the Emaclite device, or
  *              a negative error if there is failure.
  */
-static int __devinit xemaclite_of_probe(struct platform_device *ofdev,
-                                        const struct of_device_id *match)
+static int __devinit xemaclite_of_probe(struct platform_device *ofdev)
 {
         struct resource r_irq; /* Interrupt resources */
         struct resource r_mem; /* IO mem resources */
@@ -1288,7 +1287,7 @@ static struct of_device_id xemaclite_of_match[] __devinitdata = {
 };
 MODULE_DEVICE_TABLE(of, xemaclite_of_match);
 
-static struct of_platform_driver xemaclite_of_driver = {
+static struct platform_driver xemaclite_of_driver = {
         .driver = {
                 .name = DRIVER_NAME,
                 .owner = THIS_MODULE,
@@ -1306,7 +1305,7 @@ static struct of_platform_driver xemaclite_of_driver = {
 static int __init xemaclite_init(void)
 {
         /* No kernel boot options used, we just need to register the driver */
-        return of_register_platform_driver(&xemaclite_of_driver);
+        return platform_driver_register(&xemaclite_of_driver);
 }
 
 /**
@@ -1314,7 +1313,7 @@ static int __init xemaclite_init(void)
  */
 static void __exit xemaclite_cleanup(void)
 {
-        of_unregister_platform_driver(&xemaclite_of_driver);
+        platform_driver_unregister(&xemaclite_of_driver);
 }
 
 module_init(xemaclite_init);