Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

210 files changed, 7702 insertions, 4987 deletions

diff --git a/Documentation/nfc/nfc-hci.txt b/Documentation/nfc/nfc-hci.txt
index 89a339c9b079..0686c9e211c2 100644
--- a/Documentation/nfc/nfc-hci.txt
+++ b/Documentation/nfc/nfc-hci.txt
@@ -17,10 +17,12 @@ HCI
 HCI registers as an nfc device with NFC Core. Requests coming from userspace are
 routed through netlink sockets to NFC Core and then to HCI. From this point,
 they are translated in a sequence of HCI commands sent to the HCI layer in the
-host controller (the chip). The sending context blocks while waiting for the
-response to arrive.
+host controller (the chip). Commands can be executed synchronously (the sending
+context blocks waiting for response) or asynchronously (the response is returned
+from HCI Rx context).
 HCI events can also be received from the host controller. They will be handled
-and a translation will be forwarded to NFC Core as needed.
+and a translation will be forwarded to NFC Core as needed. There are hooks to
+let the HCI driver handle proprietary events or override standard behavior.
 HCI uses 2 execution contexts:
 - one for executing commands : nfc_hci_msg_tx_work(). Only one command
 can be executing at any given moment.
@@ -33,6 +35,8 @@ The Session initialization is an HCI standard which must unfortunately
 support proprietary gates. This is the reason why the driver will pass a list
 of proprietary gates that must be part of the session. HCI will ensure all
 those gates have pipes connected when the hci device is set up.
+In case the chip supports pre-opened gates and pseudo-static pipes, the driver
+can pass that information to HCI core.
 
 HCI Gates and Pipes
 -------------------
@@ -46,6 +50,13 @@ without knowing the pipe connected to it.
 Driver interface
 ----------------
 
+A driver is generally written in two parts : the physical link management and
+the HCI management. This makes it easier to maintain a driver for a chip that
+can be connected using various phy (i2c, spi, ...)
+
+HCI Management
+--------------
+
 A driver would normally register itself with HCI and provide the following
 entry points:
 
@@ -53,58 +64,113 @@ struct nfc_hci_ops {
         int (*open)(struct nfc_hci_dev *hdev);
         void (*close)(struct nfc_hci_dev *hdev);
         int (*hci_ready) (struct nfc_hci_dev *hdev);
-        int (*xmit)(struct nfc_hci_dev *hdev, struct sk_buff *skb);
-        int (*start_poll)(struct nfc_hci_dev *hdev, u32 protocols);
-        int (*target_from_gate)(struct nfc_hci_dev *hdev, u8 gate,
-                                struct nfc_target *target);
+        int (*xmit) (struct nfc_hci_dev *hdev, struct sk_buff *skb);
+        int (*start_poll) (struct nfc_hci_dev *hdev,
+                           u32 im_protocols, u32 tm_protocols);
+        int (*dep_link_up)(struct nfc_hci_dev *hdev, struct nfc_target *target,
+                           u8 comm_mode, u8 *gb, size_t gb_len);
+        int (*dep_link_down)(struct nfc_hci_dev *hdev);
+        int (*target_from_gate) (struct nfc_hci_dev *hdev, u8 gate,
+                                 struct nfc_target *target);
         int (*complete_target_discovered) (struct nfc_hci_dev *hdev, u8 gate,
                                            struct nfc_target *target);
-        int (*data_exchange) (struct nfc_hci_dev *hdev,
-                              struct nfc_target *target,
-                              struct sk_buff *skb, struct sk_buff **res_skb);
+        int (*im_transceive) (struct nfc_hci_dev *hdev,
+                              struct nfc_target *target, struct sk_buff *skb,
+                              data_exchange_cb_t cb, void *cb_context);
+        int (*tm_send)(struct nfc_hci_dev *hdev, struct sk_buff *skb);
         int (*check_presence)(struct nfc_hci_dev *hdev,
                               struct nfc_target *target);
+        int (*event_received)(struct nfc_hci_dev *hdev, u8 gate, u8 event,
+                              struct sk_buff *skb);
 };
 
 - open() and close() shall turn the hardware on and off.
 - hci_ready() is an optional entry point that is called right after the hci
 session has been set up. The driver can use it to do additional initialization
 that must be performed using HCI commands.
-- xmit() shall simply write a frame to the chip.
+- xmit() shall simply write a frame to the physical link.
 - start_poll() is an optional entrypoint that shall set the hardware in polling
 mode. This must be implemented only if the hardware uses proprietary gates or a
 mechanism slightly different from the HCI standard.
+- dep_link_up() is called after a p2p target has been detected, to finish
+the p2p connection setup with hardware parameters that need to be passed back
+to nfc core.
+- dep_link_down() is called to bring the p2p link down.
 - target_from_gate() is an optional entrypoint to return the nfc protocols
 corresponding to a proprietary gate.
 - complete_target_discovered() is an optional entry point to let the driver
 perform additional proprietary processing necessary to auto activate the
 discovered target.
-- data_exchange() must be implemented by the driver if proprietary HCI commands
+- im_transceive() must be implemented by the driver if proprietary HCI commands
 are required to send data to the tag. Some tag types will require custom
 commands, others can be written to using the standard HCI commands. The driver
 can check the tag type and either do proprietary processing, or return 1 to ask
-for standard processing.
+for standard processing. The data exchange command itself must be sent
+asynchronously.
+- tm_send() is called to send data in the case of a p2p connection
 - check_presence() is an optional entry point that will be called regularly
 by the core to check that an activated tag is still in the field. If this is
 not implemented, the core will not be able to push tag_lost events to the user
 space
+- event_received() is called to handle an event coming from the chip. Driver
+can handle the event or return 1 to let HCI attempt standard processing.
 
 On the rx path, the driver is responsible to push incoming HCP frames to HCI
 using nfc_hci_recv_frame(). HCI will take care of re-aggregation and handling
 This must be done from a context that can sleep.
 
-SHDLC
------
+PHY Management
+--------------
+
+The physical link (i2c, ...) management is defined by the following struture:
+
+struct nfc_phy_ops {
+        int (*write)(void *dev_id, struct sk_buff *skb);
+        int (*enable)(void *dev_id);
+        void (*disable)(void *dev_id);
+};
+
+enable(): turn the phy on (power on), make it ready to transfer data
+disable(): turn the phy off
+write(): Send a data frame to the chip. Note that to enable higher
+layers such as an llc to store the frame for re-emission, this function must
+not alter the skb. It must also not return a positive result (return 0 for
+success, negative for failure).
+
+Data coming from the chip shall be sent directly to nfc_hci_recv_frame().
+
+LLC
+---
+
+Communication between the CPU and the chip often requires some link layer
+protocol. Those are isolated as modules managed by the HCI layer. There are
+currently two modules : nop (raw transfert) and shdlc.
+A new llc must implement the following functions:
+
+struct nfc_llc_ops {
+        void *(*init) (struct nfc_hci_dev *hdev, xmit_to_drv_t xmit_to_drv,
+                       rcv_to_hci_t rcv_to_hci, int tx_headroom,
+                       int tx_tailroom, int *rx_headroom, int *rx_tailroom,
+                       llc_failure_t llc_failure);
+        void (*deinit) (struct nfc_llc *llc);
+        int (*start) (struct nfc_llc *llc);
+        int (*stop) (struct nfc_llc *llc);
+        void (*rcv_from_drv) (struct nfc_llc *llc, struct sk_buff *skb);
+        int (*xmit_from_hci) (struct nfc_llc *llc, struct sk_buff *skb);
+};
+
+- init() : allocate and init your private storage
+- deinit() : cleanup
+- start() : establish the logical connection
+- stop () : terminate the logical connection
+- rcv_from_drv() : handle data coming from the chip, going to HCI
+- xmit_from_hci() : handle data sent by HCI, going to the chip
 
-Most chips use shdlc to ensure integrity and delivery ordering of the HCP
-frames between the host controller (the chip) and hosts (entities connected
-to the chip, like the cpu). In order to simplify writing the driver, an shdlc
-layer is available for use by the driver.
-When used, the driver actually registers with shdlc, and shdlc will register
-with HCI. HCI sees shdlc as the driver and thus send its HCP frames
-through shdlc->xmit.
-SHDLC adds a new execution context (nfc_shdlc_sm_work()) to run its state
-machine and handle both its rx and tx path.
+The llc must be registered with nfc before it can be used. Do that by
+calling nfc_llc_register(const char *name, struct nfc_llc_ops *ops);
+
+Again, note that the llc does not handle the physical link. It is thus very
+easy to mix any physical link with any llc for a given chip driver.
 
 Included Drivers
 ----------------
@@ -117,10 +183,12 @@ Execution Contexts
 
 The execution contexts are the following:
 - IRQ handler (IRQH):
-fast, cannot sleep. stores incoming frames into an shdlc rx queue
+fast, cannot sleep. sends incoming frames to HCI where they are passed to
+the current llc. In case of shdlc, the frame is queued in shdlc rx queue.
 
 - SHDLC State Machine worker (SMW)
-handles shdlc rx & tx queues. Dispatches HCI cmd responses.
+Only when llc_shdlc is used: handles shdlc rx & tx queues.
+Dispatches HCI cmd responses.
 
 - HCI Tx Cmd worker (MSGTXWQ)
 Serializes execution of HCI commands. Completes execution in case of response
@@ -166,6 +234,15 @@ waiting command execution. Response processing involves invoking the completion
 callback that was provided by nfc_hci_msg_tx_work() when it sent the command.
 The completion callback will then wake the syscall context.
 
+It is also possible to execute the command asynchronously using this API:
+
+static int nfc_hci_execute_cmd_async(struct nfc_hci_dev *hdev, u8 pipe, u8 cmd,
+                               const u8 *param, size_t param_len,
+                               data_exchange_cb_t cb, void *cb_context)
+
+The workflow is the same, except that the API call returns immediately, and
+the callback will be called with the result from the SMW context.
+
 Workflow receiving an HCI event or command
 ------------------------------------------
 
diff --git a/Documentation/nfc/nfc-pn544.txt b/Documentation/nfc/nfc-pn544.txt
index 2fcac9f5996e..b36ca14ca2d6 100644
--- a/Documentation/nfc/nfc-pn544.txt
+++ b/Documentation/nfc/nfc-pn544.txt
@@ -1,32 +1,15 @@
 Kernel driver for the NXP Semiconductors PN544 Near Field
 Communication chip
 
-Author: Jari Vanhala
-Contact: Matti Aaltonen (matti.j.aaltonen at nokia.com)
-
 General
 -------
 
 The PN544 is an integrated transmission module for contactless
 communication. The driver goes under drives/nfc/ and is compiled as a
-module named "pn544". It registers a misc device and creates a device
-file named "/dev/pn544".
+module named "pn544".
 
 Host Interfaces: I2C, SPI and HSU, this driver supports currently only I2C.
 
-The Interface
--------------
-
-The driver offers a sysfs interface for a hardware test and an IOCTL
-interface for selecting between two operating modes. There are read,
-write and poll functions for transferring messages. The two operating
-modes are the normal (HCI) mode and the firmware update mode.
-
-PN544 is controlled by sending messages from the userspace to the
-chip. The main function of the driver is just to pass those messages
-without caring about the message content.
-
-
 Protocols
 ---------
 
@@ -47,68 +30,3 @@ and third (LSB) bytes of the message. The maximum FW message length is
 
 For the ETSI HCI specification see
 http://www.etsi.org/WebSite/Technologies/ProtocolSpecification.aspx
-
-The Hardware Test
------------------
-
-The idea of the test is that it can performed by reading from the
-corresponding sysfs file. The test is implemented in the board file
-and it should test that PN544 can be put into the firmware update
-mode. If the test is not implemented the sysfs file does not get
-created.
-
-Example:
-> cat /sys/module/pn544/drivers/i2c\:pn544/3-002b/nfc_test
-1
-
-Normal Operation
-----------------
-
-PN544 is powered up when the device file is opened, otherwise it's
-turned off. Only one instance can use the device at a time.
-
-Userspace applications control PN544 with HCI messages. The hardware
-sends an interrupt when data is available for reading. Data is
-physically read when the read function is called by a userspace
-application. Poll() checks the read interrupt state. Configuration and
-self testing are also done from the userspace using read and write.
-
-Example platform data:
-
-static int rx71_pn544_nfc_request_resources(struct i2c_client *client)
-{
-        /* Get and setup the HW resources for the device */
-}
-
-static void rx71_pn544_nfc_free_resources(void)
-{
-        /* Release the HW resources */
-}
-
-static void rx71_pn544_nfc_enable(int fw)
-{
-        /* Turn the device on */
-}
-
-static int rx71_pn544_nfc_test(void)
-{
-        /*
-         * Put the device into the FW update mode
-         * and then back to the normal mode.
-         * Check the behavior and return one on success,
-         * zero on failure.
-         */
-}
-
-static void rx71_pn544_nfc_disable(void)
-{
-        /* turn the power off */
-}
-
-static struct pn544_nfc_platform_data rx71_nfc_data = {
-        .request_resources = rx71_pn544_nfc_request_resources,
-        .free_resources = rx71_pn544_nfc_free_resources,
-        .enable = rx71_pn544_nfc_enable,
-        .test = rx71_pn544_nfc_test,
-        .disable = rx71_pn544_nfc_disable,
-};
diff --git a/arch/mips/bcm47xx/serial.c b/arch/mips/bcm47xx/serial.c
index 57981e4fe2bc..b8ef965705cf 100644
--- a/arch/mips/bcm47xx/serial.c
+++ b/arch/mips/bcm47xx/serial.c
@@ -62,7 +62,7 @@ static int __init uart8250_init_bcma(void)
 
                 p->mapbase = (unsigned int) bcma_port->regs;
                 p->membase = (void *) bcma_port->regs;
-                p->irq = bcma_port->irq + 2;
+                p->irq = bcma_port->irq;
                 p->uartclk = bcma_port->baud_base;
                 p->regshift = bcma_port->reg_shift;
                 p->iotype = UPIO_MEM;
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
index 19e3fbfd5757..04f7c86ea3d8 100644
--- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h
@@ -31,6 +31,8 @@ int __init bcma_bus_early_register(struct bcma_bus *bus,
 int bcma_bus_suspend(struct bcma_bus *bus);
 int bcma_bus_resume(struct bcma_bus *bus);
 #endif
+struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
+                                        u8 unit);
 
 /* scan.c */
 int bcma_bus_scan(struct bcma_bus *bus);
diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c
index e461ad25fda4..28fa50ad87be 100644
--- a/drivers/bcma/driver_chipcommon.c
+++ b/drivers/bcma/driver_chipcommon.c
@@ -329,7 +329,7 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
                 return;
         }
 
-        irq = bcma_core_mips_irq(cc->core);
+        irq = bcma_core_irq(cc->core);
 
         /* Determine the registers of the UARTs */
         cc->nr_serial_ports = (cc->capabilities & BCMA_CC_CAP_NRUART);
diff --git a/drivers/bcma/driver_mips.c b/drivers/bcma/driver_mips.c
index 792daad28cbc..9fe86ee16c66 100644
--- a/drivers/bcma/driver_mips.c
+++ b/drivers/bcma/driver_mips.c
@@ -74,28 +74,41 @@ static u32 bcma_core_mips_irqflag(struct bcma_device *dev)
                 return dev->core_index;
         flag = bcma_aread32(dev, BCMA_MIPS_OOBSELOUTA30);
 
-        return flag & 0x1F;
+        if (flag)
+                return flag & 0x1F;
+        else
+                return 0x3f;
 }
 
 /* Get the MIPS IRQ assignment for a specified device.
  * If unassigned, 0 is returned.
+ * If disabled, 5 is returned.
+ * If not supported, 6 is returned.
  */
-unsigned int bcma_core_mips_irq(struct bcma_device *dev)
+static unsigned int bcma_core_mips_irq(struct bcma_device *dev)
 {
         struct bcma_device *mdev = dev->bus->drv_mips.core;
         u32 irqflag;
         unsigned int irq;
 
         irqflag = bcma_core_mips_irqflag(dev);
+        if (irqflag == 0x3f)
+                return 6;
 
-        for (irq = 1; irq <= 4; irq++)
+        for (irq = 0; irq <= 4; irq++)
                 if (bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq)) &
                     (1 << irqflag))
                         return irq;
 
-        return 0;
+        return 5;
+}
+
+unsigned int bcma_core_irq(struct bcma_device *dev)
+{
+        unsigned int mips_irq = bcma_core_mips_irq(dev);
+        return mips_irq <= 4 ? mips_irq + 2 : 0;
 }
-EXPORT_SYMBOL(bcma_core_mips_irq);
+EXPORT_SYMBOL(bcma_core_irq);
 
 static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
 {
@@ -114,7 +127,7 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
                 bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0),
                             bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) &
                             ~(1 << irqflag));
-        else
+        else if (oldirq != 5)
                 bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(oldirq), 0);
 
         /* assign the new one */
@@ -123,9 +136,9 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
                             bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) |
                             (1 << irqflag));
         } else {
-                u32 oldirqflag = bcma_read32(mdev,
-                                             BCMA_MIPS_MIPS74K_INTMASK(irq));
-                if (oldirqflag) {
+                u32 irqinitmask = bcma_read32(mdev,
+                                              BCMA_MIPS_MIPS74K_INTMASK(irq));
+                if (irqinitmask) {
                         struct bcma_device *core;
 
                         /* backplane irq line is in use, find out who uses
@@ -133,7 +146,7 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
                          */
                         list_for_each_entry(core, &bus->cores, list) {
                                 if ((1 << bcma_core_mips_irqflag(core)) ==
-                                    oldirqflag) {
+                                    irqinitmask) {
                                         bcma_core_mips_set_irq(core, 0);
                                         break;
                                 }
@@ -143,15 +156,31 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
                              1 << irqflag);
         }
 
-        bcma_info(bus, "set_irq: core 0x%04x, irq %d => %d\n",
-                  dev->id.id, oldirq + 2, irq + 2);
+        bcma_debug(bus, "set_irq: core 0x%04x, irq %d => %d\n",
+                   dev->id.id, oldirq <= 4 ? oldirq + 2 : 0, irq + 2);
+}
+
+static void bcma_core_mips_set_irq_name(struct bcma_bus *bus, unsigned int irq,
+                                        u16 coreid, u8 unit)
+{
+        struct bcma_device *core;
+
+        core = bcma_find_core_unit(bus, coreid, unit);
+        if (!core) {
+                bcma_warn(bus,
+                          "Can not find core (id: 0x%x, unit %i) for IRQ configuration.\n",
+                          coreid, unit);
+                return;
+        }
+
+        bcma_core_mips_set_irq(core, irq);
 }
 
 static void bcma_core_mips_print_irq(struct bcma_device *dev, unsigned int irq)
 {
         int i;
         static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};
-        printk(KERN_INFO KBUILD_MODNAME ": core 0x%04x, irq :", dev->id.id);
+        printk(KERN_DEBUG KBUILD_MODNAME ": core 0x%04x, irq :", dev->id.id);
         for (i = 0; i <= 6; i++)
                 printk(" %s%s", irq_name[i], i == irq ? "*" : " ");
         printk("\n");
@@ -227,6 +256,32 @@ void bcma_core_mips_early_init(struct bcma_drv_mips *mcore)
         mcore->early_setup_done = true;
 }
 
+static void bcma_fix_i2s_irqflag(struct bcma_bus *bus)
+{
+        struct bcma_device *cpu, *pcie, *i2s;
+
+        /* Fixup the interrupts in 4716/4748 for i2s core (2010 Broadcom SDK)
+         * (IRQ flags > 7 are ignored when setting the interrupt masks)
+         */
+        if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4716 &&
+            bus->chipinfo.id != BCMA_CHIP_ID_BCM4748)
+                return;
+
+        cpu = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
+        pcie = bcma_find_core(bus, BCMA_CORE_PCIE);
+        i2s = bcma_find_core(bus, BCMA_CORE_I2S);
+        if (cpu && pcie && i2s &&
+            bcma_aread32(cpu, BCMA_MIPS_OOBSELINA74) == 0x08060504 &&
+            bcma_aread32(pcie, BCMA_MIPS_OOBSELINA74) == 0x08060504 &&
+            bcma_aread32(i2s, BCMA_MIPS_OOBSELOUTA30) == 0x88) {
+                bcma_awrite32(cpu, BCMA_MIPS_OOBSELINA74, 0x07060504);
+                bcma_awrite32(pcie, BCMA_MIPS_OOBSELINA74, 0x07060504);
+                bcma_awrite32(i2s, BCMA_MIPS_OOBSELOUTA30, 0x87);
+                bcma_debug(bus,
+                           "Moved i2s interrupt to oob line 7 instead of 8\n");
+        }
+}
+
 void bcma_core_mips_init(struct bcma_drv_mips *mcore)
 {
         struct bcma_bus *bus;
@@ -236,43 +291,55 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore)
         if (mcore->setup_done)
                 return;
 
-        bcma_info(bus, "Initializing MIPS core...\n");
+        bcma_debug(bus, "Initializing MIPS core...\n");
 
         bcma_core_mips_early_init(mcore);
 
-        mcore->assigned_irqs = 1;
-
-        /* Assign IRQs to all cores on the bus */
-        list_for_each_entry(core, &bus->cores, list) {
-                int mips_irq;
-                if (core->irq)
-                        continue;
-
-                mips_irq = bcma_core_mips_irq(core);
-                if (mips_irq > 4)
-                        core->irq = 0;
-                else
-                        core->irq = mips_irq + 2;
-                if (core->irq > 5)
-                        continue;
-                switch (core->id.id) {
-                case BCMA_CORE_PCI:
-                case BCMA_CORE_PCIE:
-                case BCMA_CORE_ETHERNET:
-                case BCMA_CORE_ETHERNET_GBIT:
-                case BCMA_CORE_MAC_GBIT:
-                case BCMA_CORE_80211:
-                case BCMA_CORE_USB20_HOST:
-                        /* These devices get their own IRQ line if available,
-                         * the rest goes on IRQ0
-                         */
-                        if (mcore->assigned_irqs <= 4)
-                                bcma_core_mips_set_irq(core,
-                                                       mcore->assigned_irqs++);
-                        break;
+        bcma_fix_i2s_irqflag(bus);
+
+        switch (bus->chipinfo.id) {
+        case BCMA_CHIP_ID_BCM4716:
+        case BCMA_CHIP_ID_BCM4748:
+                bcma_core_mips_set_irq_name(bus, 1, BCMA_CORE_80211, 0);
+                bcma_core_mips_set_irq_name(bus, 2, BCMA_CORE_MAC_GBIT, 0);
+                bcma_core_mips_set_irq_name(bus, 3, BCMA_CORE_USB20_HOST, 0);
+                bcma_core_mips_set_irq_name(bus, 4, BCMA_CORE_PCIE, 0);
+                bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_CHIPCOMMON, 0);
+                bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_I2S, 0);
+                break;
+        case BCMA_CHIP_ID_BCM5356:
+        case BCMA_CHIP_ID_BCM47162:
+        case BCMA_CHIP_ID_BCM53572:
+                bcma_core_mips_set_irq_name(bus, 1, BCMA_CORE_80211, 0);
+                bcma_core_mips_set_irq_name(bus, 2, BCMA_CORE_MAC_GBIT, 0);
+                bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_CHIPCOMMON, 0);
+                break;
+        case BCMA_CHIP_ID_BCM5357:
+        case BCMA_CHIP_ID_BCM4749:
+                bcma_core_mips_set_irq_name(bus, 1, BCMA_CORE_80211, 0);
+                bcma_core_mips_set_irq_name(bus, 2, BCMA_CORE_MAC_GBIT, 0);
+                bcma_core_mips_set_irq_name(bus, 3, BCMA_CORE_USB20_HOST, 0);
+                bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_CHIPCOMMON, 0);
+                bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_I2S, 0);
+                break;
+        case BCMA_CHIP_ID_BCM4706:
+                bcma_core_mips_set_irq_name(bus, 1, BCMA_CORE_PCIE, 0);
+                bcma_core_mips_set_irq_name(bus, 2, BCMA_CORE_4706_MAC_GBIT,
+                                            0);
+                bcma_core_mips_set_irq_name(bus, 3, BCMA_CORE_PCIE, 1);
+                bcma_core_mips_set_irq_name(bus, 4, BCMA_CORE_USB20_HOST, 0);
+                bcma_core_mips_set_irq_name(bus, 0, BCMA_CORE_4706_CHIPCOMMON,
+                                            0);
+                break;
+        default:
+                list_for_each_entry(core, &bus->cores, list) {
+                        core->irq = bcma_core_irq(core);
                 }
+                bcma_err(bus,
+                         "Unknown device (0x%x) found, can not configure IRQs\n",
+                         bus->chipinfo.id);
         }
-        bcma_info(bus, "IRQ reconfiguration done\n");
+        bcma_debug(bus, "IRQ reconfiguration done\n");
         bcma_core_mips_dump_irq(bus);
 
         mcore->setup_done = true;
diff --git a/drivers/bcma/driver_pci_host.c b/drivers/bcma/driver_pci_host.c
index af0c9fabee54..d3bde6cec927 100644
--- a/drivers/bcma/driver_pci_host.c
+++ b/drivers/bcma/driver_pci_host.c
@@ -94,19 +94,19 @@ static int bcma_extpci_read_config(struct bcma_drv_pci *pc, unsigned int dev,
         if (dev == 0) {
                 /* we support only two functions on device 0 */
                 if (func > 1)
-                        return -EINVAL;
+                        goto out;
 
                 /* accesses to config registers with offsets >= 256
                  * requires indirect access.
                  */
                 if (off >= PCI_CONFIG_SPACE_SIZE) {
                         addr = (func << 12);
-                        addr |= (off & 0x0FFF);
+                        addr |= (off & 0x0FFC);
                         val = bcma_pcie_read_config(pc, addr);
                 } else {
                         addr = BCMA_CORE_PCI_PCICFG0;
                         addr |= (func << 8);
-                        addr |= (off & 0xfc);
+                        addr |= (off & 0xFC);
                         val = pcicore_read32(pc, addr);
                 }
         } else {
@@ -119,11 +119,9 @@ static int bcma_extpci_read_config(struct bcma_drv_pci *pc, unsigned int dev,
                         goto out;
 
                 if (mips_busprobe32(val, mmio)) {
-                        val = 0xffffffff;
+                        val = 0xFFFFFFFF;
                         goto unmap;
                 }
-
-                val = readl(mmio);
         }
         val >>= (8 * (off & 3));
 
@@ -151,7 +149,7 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev,
                                    const void *buf, int len)
 {
         int err = -EINVAL;
-        u32 addr = 0, val = 0;
+        u32 addr, val;
         void __iomem *mmio = 0;
         u16 chipid = pc->core->bus->chipinfo.id;
 
@@ -159,16 +157,22 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev,
         if (unlikely(len != 1 && len != 2 && len != 4))
                 goto out;
         if (dev == 0) {
+                /* we support only two functions on device 0 */
+                if (func > 1)
+                        goto out;
+
                 /* accesses to config registers with offsets >= 256
                  * requires indirect access.
                  */
-                if (off < PCI_CONFIG_SPACE_SIZE) {
-                        addr = pc->core->addr + BCMA_CORE_PCI_PCICFG0;
+                if (off >= PCI_CONFIG_SPACE_SIZE) {
+                        addr = (func << 12);
+                        addr |= (off & 0x0FFC);
+                        val = bcma_pcie_read_config(pc, addr);
+                } else {
+                        addr = BCMA_CORE_PCI_PCICFG0;
                         addr |= (func << 8);
-                        addr |= (off & 0xfc);
-                        mmio = ioremap_nocache(addr, sizeof(val));
-                        if (!mmio)
-                                goto out;
+                        addr |= (off & 0xFC);
+                        val = pcicore_read32(pc, addr);
                 }
         } else {
                 addr = bcma_get_cfgspace_addr(pc, dev, func, off);
@@ -180,19 +184,17 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev,
                         goto out;
 
                 if (mips_busprobe32(val, mmio)) {
-                        val = 0xffffffff;
+                        val = 0xFFFFFFFF;
                         goto unmap;
                 }
         }
 
         switch (len) {
         case 1:
-                val = readl(mmio);
                 val &= ~(0xFF << (8 * (off & 3)));
                 val |= *((const u8 *)buf) << (8 * (off & 3));
                 break;
         case 2:
-                val = readl(mmio);
                 val &= ~(0xFFFF << (8 * (off & 3)));
                 val |= *((const u16 *)buf) << (8 * (off & 3));
                 break;
@@ -200,13 +202,14 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev,
                 val = *((const u32 *)buf);
                 break;
         }
-        if (dev == 0 && !addr) {
+        if (dev == 0) {
                 /* accesses to config registers with offsets >= 256
                  * requires indirect access.
                  */
-                addr = (func << 12);
-                addr |= (off & 0x0FFF);
-                bcma_pcie_write_config(pc, addr, val);
+                if (off >= PCI_CONFIG_SPACE_SIZE)
+                        bcma_pcie_write_config(pc, addr, val);
+                else
+                        pcicore_write32(pc, addr, val);
         } else {
                 writel(val, mmio);
 
@@ -276,7 +279,7 @@ static u8 bcma_find_pci_capability(struct bcma_drv_pci *pc, unsigned int dev,
         /* check for Header type 0 */
         bcma_extpci_read_config(pc, dev, func, PCI_HEADER_TYPE, &byte_val,
                                 sizeof(u8));
-        if ((byte_val & 0x7f) != PCI_HEADER_TYPE_NORMAL)
+        if ((byte_val & 0x7F) != PCI_HEADER_TYPE_NORMAL)
                 return cap_ptr;
 
         /* check if the capability pointer field exists */
@@ -426,7 +429,7 @@ void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
         /* Reset RC */
         usleep_range(3000, 5000);
         pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST_OE);
-        usleep_range(1000, 2000);
+        msleep(50);
         pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST |
                         BCMA_CORE_PCI_CTL_RST_OE);
 
@@ -488,6 +491,17 @@ void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
 
         bcma_core_pci_enable_crs(pc);
 
+        if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706 ||
+            bus->chipinfo.id == BCMA_CHIP_ID_BCM4716) {
+                u16 val16;
+                bcma_extpci_read_config(pc, 0, 0, BCMA_CORE_PCI_CFG_DEVCTRL,
+                                        &val16, sizeof(val16));
+                val16 |= (2 << 5);      /* Max payload size of 512 */
+                val16 |= (2 << 12);     /* MRRS 512 */
+                bcma_extpci_write_config(pc, 0, 0, BCMA_CORE_PCI_CFG_DEVCTRL,
+                                         &val16, sizeof(val16));
+        }
+
         /* Enable PCI bridge BAR0 memory & master access */
         tmp = PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
         bcma_extpci_write_config(pc, 0, 0, PCI_COMMAND, &tmp, sizeof(tmp));
@@ -576,7 +590,7 @@ int bcma_core_pci_plat_dev_init(struct pci_dev *dev)
         pr_info("PCI: Fixing up device %s\n", pci_name(dev));
 
         /* Fix up interrupt lines */
-        dev->irq = bcma_core_mips_irq(pc_host->pdev->core) + 2;
+        dev->irq = bcma_core_irq(pc_host->pdev->core);
         pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
 
         return 0;
@@ -595,6 +609,6 @@ int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev)
 
         pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
                                pci_ops);
-        return bcma_core_mips_irq(pc_host->pdev->core) + 2;
+        return bcma_core_irq(pc_host->pdev->core);
 }
 EXPORT_SYMBOL(bcma_core_pci_pcibios_map_irq);
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 4a92f647b58b..ff8528925322 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -81,8 +81,8 @@ struct bcma_device *bcma_find_core(struct bcma_bus *bus, u16 coreid)
 }
 EXPORT_SYMBOL_GPL(bcma_find_core);
 
-static struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
-                                               u8 unit)
+struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid,
+                                        u8 unit)
 {
         struct bcma_device *core;
 
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index b00000e8aef6..33c9a44a9678 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -77,10 +77,15 @@ static struct usb_device_id ath3k_table[] = {
         { USB_DEVICE(0x0CF3, 0x311D) },
         { USB_DEVICE(0x13d3, 0x3375) },
         { USB_DEVICE(0x04CA, 0x3005) },
+        { USB_DEVICE(0x04CA, 0x3006) },
+        { USB_DEVICE(0x04CA, 0x3008) },
         { USB_DEVICE(0x13d3, 0x3362) },
         { USB_DEVICE(0x0CF3, 0xE004) },
         { USB_DEVICE(0x0930, 0x0219) },
         { USB_DEVICE(0x0489, 0xe057) },
+        { USB_DEVICE(0x13d3, 0x3393) },
+        { USB_DEVICE(0x0489, 0xe04e) },
+        { USB_DEVICE(0x0489, 0xe056) },
 
         /* Atheros AR5BBU12 with sflash firmware */
         { USB_DEVICE(0x0489, 0xE02C) },
@@ -104,10 +109,15 @@ static struct usb_device_id ath3k_blist_tbl[] = {
         { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
 
         /* Atheros AR5BBU22 with sflash firmware */
         { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index a1d4ede5b892..7e351e345476 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -135,10 +135,15 @@ static struct usb_device_id blacklist_table[] = {
         { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
 
         /* Atheros AR5BBU12 with sflash firmware */
         { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 30ca0a60a64c..1d264c0f5a9b 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -240,13 +240,14 @@ static const struct ath_ops ath5k_common_ops = {
 * Driver Initialization *
 \***********************/
 
-static int ath5k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)
+static void ath5k_reg_notifier(struct wiphy *wiphy,
+                               struct regulatory_request *request)
 {
         struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
         struct ath5k_hw *ah = hw->priv;
         struct ath_regulatory *regulatory = ath5k_hw_regulatory(ah);
 
-        return ath_reg_notifier_apply(wiphy, request, regulatory);
+        ath_reg_notifier_apply(wiphy, request, regulatory);
 }
 
 /********************\
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 5516a8ccc3c6..4225cca0f198 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -3492,8 +3492,8 @@ void ath6kl_cfg80211_stop_all(struct ath6kl *ar)
                 ath6kl_cfg80211_stop(vif);
 }
 
-static int ath6kl_cfg80211_reg_notify(struct wiphy *wiphy,
-                                      struct regulatory_request *request)
+static void ath6kl_cfg80211_reg_notify(struct wiphy *wiphy,
+                                       struct regulatory_request *request)
 {
         struct ath6kl *ar = wiphy_priv(wiphy);
         u32 rates[IEEE80211_NUM_BANDS];
@@ -3506,17 +3506,13 @@ static int ath6kl_cfg80211_reg_notify(struct wiphy *wiphy,
                    request->processed ? " processed" : "",
                    request->initiator, request->user_reg_hint_type);
 
-        /*
-         * As firmware is not able intersect regdoms, we can only listen to
-         * cellular hints.
-         */
         if (request->user_reg_hint_type != NL80211_USER_REG_HINT_CELL_BASE)
-                return -EOPNOTSUPP;
+                return;
 
         ret = ath6kl_wmi_set_regdomain_cmd(ar->wmi, request->alpha2);
         if (ret) {
                 ath6kl_err("failed to set regdomain: %d\n", ret);
-                return ret;
+                return;
         }
 
         /*
@@ -3536,10 +3532,8 @@ static int ath6kl_cfg80211_reg_notify(struct wiphy *wiphy,
         if (ret) {
                 ath6kl_err("failed to start scan for a regdomain change: %d\n",
                            ret);
-                return ret;
+                return;
         }
-
-        return 0;
 }
 
 static int ath6kl_cfg80211_vif_init(struct ath6kl_vif *vif)
diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 3a69804f4c16..d1ff3c246a12 100644
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -86,29 +86,25 @@ static int ath_ahb_probe(struct platform_device *pdev)
 
         if (!pdev->dev.platform_data) {
                 dev_err(&pdev->dev, "no platform data specified\n");
-                ret = -EINVAL;
-                goto err_out;
+                return -EINVAL;
         }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res == NULL) {
                 dev_err(&pdev->dev, "no memory resource found\n");
-                ret = -ENXIO;
-                goto err_out;
+                return -ENXIO;
         }
 
-        mem = ioremap_nocache(res->start, resource_size(res));
+        mem = devm_ioremap_nocache(&pdev->dev, res->start, resource_size(res));
         if (mem == NULL) {
                 dev_err(&pdev->dev, "ioremap failed\n");
-                ret = -ENOMEM;
-                goto err_out;
+                return -ENOMEM;
         }
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (res == NULL) {
                 dev_err(&pdev->dev, "no IRQ resource found\n");
-                ret = -ENXIO;
-                goto err_iounmap;
+                return -ENXIO;
         }
 
         irq = res->start;
@@ -116,8 +112,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
         hw = ieee80211_alloc_hw(sizeof(struct ath_softc), &ath9k_ops);
         if (hw == NULL) {
                 dev_err(&pdev->dev, "no memory for ieee80211_hw\n");
-                ret = -ENOMEM;
-                goto err_iounmap;
+                return -ENOMEM;
         }
 
         SET_IEEE80211_DEV(hw, &pdev->dev);
@@ -156,9 +151,6 @@ static int ath_ahb_probe(struct platform_device *pdev)
  err_free_hw:
         ieee80211_free_hw(hw);
         platform_set_drvdata(pdev, NULL);
- err_iounmap:
-        iounmap(mem);
- err_out:
         return ret;
 }
 
@@ -168,12 +160,10 @@ static int ath_ahb_remove(struct platform_device *pdev)
 
         if (hw) {
                 struct ath_softc *sc = hw->priv;
-                void __iomem *mem = sc->mem;
 
                 ath9k_deinit_device(sc);
                 free_irq(sc->irq, sc);
                 ieee80211_free_hw(sc->hw);
-                iounmap(mem);
                 platform_set_drvdata(pdev, NULL);
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index e09ec40ce71a..7ecd40f07a74 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -152,7 +152,8 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel,
         ath_dbg(common, ANI, "**** ofdmlevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",
                 aniState->ofdmNoiseImmunityLevel,
                 immunityLevel, BEACON_RSSI(ah),
-                aniState->rssiThrLow, aniState->rssiThrHigh);
+                ATH9K_ANI_RSSI_THR_LOW,
+                ATH9K_ANI_RSSI_THR_HIGH);
 
         if (!scan)
                 aniState->ofdmNoiseImmunityLevel = immunityLevel;
@@ -173,7 +174,7 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel,
 
         weak_sig = entry_ofdm->ofdm_weak_signal_on;
         if (ah->opmode == NL80211_IFTYPE_STATION &&
-            BEACON_RSSI(ah) <= aniState->rssiThrHigh)
+            BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_HIGH)
                 weak_sig = true;
 
         if (aniState->ofdmWeakSigDetect != weak_sig)
@@ -216,11 +217,11 @@ static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel,
 
         ath_dbg(common, ANI, "**** ccklevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",
                 aniState->cckNoiseImmunityLevel, immunityLevel,
-                BEACON_RSSI(ah), aniState->rssiThrLow,
-                aniState->rssiThrHigh);
+                BEACON_RSSI(ah), ATH9K_ANI_RSSI_THR_LOW,
+                ATH9K_ANI_RSSI_THR_HIGH);
 
         if (ah->opmode == NL80211_IFTYPE_STATION &&
-            BEACON_RSSI(ah) <= aniState->rssiThrLow &&
+            BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_LOW &&
             immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)
                 immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;
 
@@ -418,9 +419,6 @@ void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan)
                 return;
 
         aniState = &ah->curchan->ani;
-        if (WARN_ON(!aniState))
-                return;
-
         if (!ath9k_hw_ani_read_counters(ah))
                 return;
 
@@ -489,23 +487,6 @@ void ath9k_hw_disable_mib_counters(struct ath_hw *ah)
 }
 EXPORT_SYMBOL(ath9k_hw_disable_mib_counters);
 
-void ath9k_hw_ani_setup(struct ath_hw *ah)
-{
-        int i;
-
-        static const int totalSizeDesired[] = { -55, -55, -55, -55, -62 };
-        static const int coarseHigh[] = { -14, -14, -14, -14, -12 };
-        static const int coarseLow[] = { -64, -64, -64, -64, -70 };
-        static const int firpwr[] = { -78, -78, -78, -78, -80 };
-
-        for (i = 0; i < 5; i++) {
-                ah->totalSizeDesired[i] = totalSizeDesired[i];
-                ah->coarse_high[i] = coarseHigh[i];
-                ah->coarse_low[i] = coarseLow[i];
-                ah->firpwr[i] = firpwr[i];
-        }
-}
-
 void ath9k_hw_ani_init(struct ath_hw *ah)
 {
         struct ath_common *common = ath9k_hw_common(ah);
@@ -531,8 +512,6 @@ void ath9k_hw_ani_init(struct ath_hw *ah)
 
                 ani->ofdmsTurn = true;
 
-                ani->rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH;
-                ani->rssiThrLow = ATH9K_ANI_RSSI_THR_LOW;
                 ani->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;
                 ani->cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;
                 ani->ofdmNoiseImmunityLevel = ATH9K_ANI_OFDM_DEF_LEVEL;
diff --git a/drivers/net/wireless/ath/ath9k/ani.h b/drivers/net/wireless/ath/ath9k/ani.h
index 1485bf5e3518..dddb1361039a 100644
--- a/drivers/net/wireless/ath/ath9k/ani.h
+++ b/drivers/net/wireless/ath/ath9k/ani.h
@@ -104,7 +104,6 @@ struct ath9k_ani_default {
 };
 
 struct ar5416AniState {
-        struct ath9k_channel *c;
         u8 noiseImmunityLevel;
         u8 ofdmNoiseImmunityLevel;
         u8 cckNoiseImmunityLevel;
@@ -113,15 +112,9 @@ struct ar5416AniState {
         u8 spurImmunityLevel;
         u8 firstepLevel;
         u8 ofdmWeakSigDetect;
-        u8 cckWeakSigThreshold;
         u32 listenTime;
-        int32_t rssiThrLow;
-        int32_t rssiThrHigh;
         u32 ofdmPhyErrCount;
         u32 cckPhyErrCount;
-        int16_t pktRssi[2];
-        int16_t ofdmErrRssi[2];
-        int16_t cckErrRssi[2];
         struct ath9k_ani_default iniDef;
 };
 
@@ -147,7 +140,6 @@ struct ar5416Stats {
 
 void ath9k_enable_mib_counters(struct ath_hw *ah);
 void ath9k_hw_disable_mib_counters(struct ath_hw *ah);
-void ath9k_hw_ani_setup(struct ath_hw *ah);
 void ath9k_hw_ani_init(struct ath_hw *ah);
 
 #endif /* ANI_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_initvals.h b/drivers/net/wireless/ath/ath9k/ar5008_initvals.h
index f81e7fc60a36..467ccfae2cee 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar5008_initvals.h
@@ -466,7 +466,7 @@ static const u32 ar5416Bank0[][2] = {
 };
 
 static const u32 ar5416BB_RfGain[][3] = {
-        /* Addr      5G_HT20     5G_HT40   */
+        /* Addr      5G          2G        */
         {0x00009a00, 0x00000000, 0x00000000},
         {0x00009a04, 0x00000040, 0x00000040},
         {0x00009a08, 0x00000080, 0x00000080},
@@ -546,12 +546,12 @@ static const u32 ar5416Bank2[][2] = {
 };
 
 static const u32 ar5416Bank3[][3] = {
-        /* Addr      5G_HT20     5G_HT40   */
+        /* Addr      5G          2G        */
         {0x000098f0, 0x01400018, 0x01c00018},
 };
 
 static const u32 ar5416Bank6[][3] = {
-        /* Addr      5G_HT20     5G_HT40   */
+        /* Addr      5G          2G        */
         {0x0000989c, 0x00000000, 0x00000000},
         {0x0000989c, 0x00000000, 0x00000000},
         {0x0000989c, 0x00000000, 0x00000000},
@@ -588,7 +588,7 @@ static const u32 ar5416Bank6[][3] = {
 };
 
 static const u32 ar5416Bank6TPC[][3] = {
-        /* Addr      5G_HT20     5G_HT40   */
+        /* Addr      5G          2G        */
         {0x0000989c, 0x00000000, 0x00000000},
         {0x0000989c, 0x00000000, 0x00000000},
         {0x0000989c, 0x00000000, 0x00000000},
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index 874186bfda41..fd69376ecc83 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -470,16 +470,15 @@ static void ar5008_hw_spur_mitigate(struct ath_hw *ah,
 static int ar5008_hw_rf_alloc_ext_banks(struct ath_hw *ah)
 {
 #define ATH_ALLOC_BANK(bank, size) do { \
-                bank = kzalloc((sizeof(u32) * size), GFP_KERNEL); \
-                if (!bank) { \
-                        ath_err(common, "Cannot allocate RF banks\n"); \
-                        return -ENOMEM; \
-                } \
+                bank = devm_kzalloc(ah->dev, sizeof(u32) * size, GFP_KERNEL); \
+                if (!bank) \
+                        goto error; \
         } while (0);
 
         struct ath_common *common = ath9k_hw_common(ah);
 
-        BUG_ON(AR_SREV_9280_20_OR_LATER(ah));
+        if (AR_SREV_9280_20_OR_LATER(ah))
+            return 0;
 
         ATH_ALLOC_BANK(ah->analogBank0Data, ah->iniBank0.ia_rows);
         ATH_ALLOC_BANK(ah->analogBank1Data, ah->iniBank1.ia_rows);
@@ -492,35 +491,12 @@ static int ar5008_hw_rf_alloc_ext_banks(struct ath_hw *ah)
 
         return 0;
 #undef ATH_ALLOC_BANK
+error:
+        ath_err(common, "Cannot allocate RF banks\n");
+        return -ENOMEM;
 }
 
 
-/**
- * ar5008_hw_rf_free_ext_banks - Free memory for analog bank scratch buffers
- * @ah: atheros hardware struture
- * For the external AR2133/AR5133 radios banks.
- */
-static void ar5008_hw_rf_free_ext_banks(struct ath_hw *ah)
-{
-#define ATH_FREE_BANK(bank) do { \
-                kfree(bank); \
-                bank = NULL; \
-        } while (0);
-
-        BUG_ON(AR_SREV_9280_20_OR_LATER(ah));
-
-        ATH_FREE_BANK(ah->analogBank0Data);
-        ATH_FREE_BANK(ah->analogBank1Data);
-        ATH_FREE_BANK(ah->analogBank2Data);
-        ATH_FREE_BANK(ah->analogBank3Data);
-        ATH_FREE_BANK(ah->analogBank6Data);
-        ATH_FREE_BANK(ah->analogBank6TPCData);
-        ATH_FREE_BANK(ah->analogBank7Data);
-        ATH_FREE_BANK(ah->bank6Temp);
-
-#undef ATH_FREE_BANK
-}
-
 /* *
  * ar5008_hw_set_rf_regs - programs rf registers based on EEPROM
  * @ah: atheros hardware structure
@@ -1380,7 +1356,7 @@ static void ar5008_hw_set_radar_conf(struct ath_hw *ah)
         conf->radar_inband = 8;
 }
 
-void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
+int ar5008_hw_attach_phy_ops(struct ath_hw *ah)
 {
         struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
         static const u32 ar5416_cca_regs[6] = {
@@ -1391,12 +1367,15 @@ void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
                 AR_PHY_CH1_EXT_CCA,
                 AR_PHY_CH2_EXT_CCA
         };
+        int ret;
+
+        ret = ar5008_hw_rf_alloc_ext_banks(ah);
+        if (ret)
+            return ret;
 
         priv_ops->rf_set_freq = ar5008_hw_set_channel;
         priv_ops->spur_mitigate_freq = ar5008_hw_spur_mitigate;
 
-        priv_ops->rf_alloc_ext_banks = ar5008_hw_rf_alloc_ext_banks;
-        priv_ops->rf_free_ext_banks = ar5008_hw_rf_free_ext_banks;
         priv_ops->set_rf_regs = ar5008_hw_set_rf_regs;
         priv_ops->set_channel_regs = ar5008_hw_set_channel_regs;
         priv_ops->init_bb = ar5008_hw_init_bb;
@@ -1421,4 +1400,5 @@ void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
         ar5008_hw_set_nf_limits(ah);
         ar5008_hw_set_radar_conf(ah);
         memcpy(ah->nf_regs, ar5416_cca_regs, sizeof(ah->nf_regs));
+        return 0;
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9001_initvals.h b/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
index ea4a230997ac..59524e1d4678 100644
--- a/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
@@ -460,7 +460,7 @@ static const u32 ar5416Common_9100[][2] = {
 };
 
 static const u32 ar5416Bank6_9100[][3] = {
-        /* Addr      5G_HT20     5G_HT40   */
+        /* Addr      5G          2G        */
         {0x0000989c, 0x00000000, 0x00000000},
         {0x0000989c, 0x00000000, 0x00000000},
         {0x0000989c, 0x00000000, 0x00000000},
@@ -497,7 +497,7 @@ static const u32 ar5416Bank6_9100[][3] = {
 };
 
 static const u32 ar5416Bank6TPC_9100[][3] = {
-        /* Addr      5G_HT20     5G_HT40   */
+        /* Addr      5G          2G        */
         {0x0000989c, 0x00000000, 0x00000000},
         {0x0000989c, 0x00000000, 0x00000000},
         {0x0000989c, 0x00000000, 0x00000000},
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
index 648da3e885e9..f053d978540e 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
@@ -23,13 +23,13 @@
 
 /* General hardware code for the A5008/AR9001/AR9002 hadware families */
 
-static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
+static int ar9002_hw_init_mode_regs(struct ath_hw *ah)
 {
         if (AR_SREV_9271(ah)) {
                 INIT_INI_ARRAY(&ah->iniModes, ar9271Modes_9271);
                 INIT_INI_ARRAY(&ah->iniCommon, ar9271Common_9271);
                 INIT_INI_ARRAY(&ah->iniModes_9271_ANI_reg, ar9271Modes_9271_ANI_reg);
-                return;
+                return 0;
         }
 
         if (ah->config.pcie_clock_req)
@@ -102,9 +102,9 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
                 u32 size = sizeof(u32) * addac->ia_rows * addac->ia_columns;
                 u32 *data;
 
-                data = kmalloc(size, GFP_KERNEL);
+                data = devm_kzalloc(ah->dev, size, GFP_KERNEL);
                 if (!data)
-                        return;
+                        return -ENOMEM;
 
                 memcpy(data, addac->ia_array, size);
                 addac->ia_array = data;
@@ -120,6 +120,7 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
                 INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
                        ar9287Common_japan_2484_cck_fir_coeff_9287_1_1);
         }
+        return 0;
 }
 
 static void ar9280_20_hw_init_rxgain_ini(struct ath_hw *ah)
@@ -409,22 +410,30 @@ void ar9002_hw_enable_async_fifo(struct ath_hw *ah)
 }
 
 /* Sets up the AR5008/AR9001/AR9002 hardware familiy callbacks */
-void ar9002_hw_attach_ops(struct ath_hw *ah)
+int ar9002_hw_attach_ops(struct ath_hw *ah)
 {
         struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
         struct ath_hw_ops *ops = ath9k_hw_ops(ah);
+        int ret;
+
+        ret = ar9002_hw_init_mode_regs(ah);
+        if (ret)
+                return ret;
 
-        priv_ops->init_mode_regs = ar9002_hw_init_mode_regs;
         priv_ops->init_mode_gain_regs = ar9002_hw_init_mode_gain_regs;
 
         ops->config_pci_powersave = ar9002_hw_configpcipowersave;
 
-        ar5008_hw_attach_phy_ops(ah);
+        ret = ar5008_hw_attach_phy_ops(ah);
+        if (ret)
+                return ret;
+
         if (AR_SREV_9280_20_OR_LATER(ah))
                 ar9002_hw_attach_phy_ops(ah);
 
         ar9002_hw_attach_calib_ops(ah);
         ar9002_hw_attach_mac_ops(ah);
+        return 0;
 }
 
 void ar9002_hw_load_ani_reg(struct ath_hw *ah, struct ath9k_channel *chan)
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_phy.c b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
index 846dd7974eb8..f4003512d8d5 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
@@ -555,14 +555,73 @@ static void ar9002_hw_antdiv_comb_conf_set(struct ath_hw *ah,
         REG_WRITE(ah, AR_PHY_MULTICHAIN_GAIN_CTL, regval);
 }
 
+static void ar9002_hw_spectral_scan_config(struct ath_hw *ah,
+                                    struct ath_spec_scan *param)
+{
+        u8 count;
+
+        if (!param->enabled) {
+                REG_CLR_BIT(ah, AR_PHY_SPECTRAL_SCAN,
+                            AR_PHY_SPECTRAL_SCAN_ENABLE);
+                return;
+        }
+        REG_SET_BIT(ah, AR_PHY_RADAR_0, AR_PHY_RADAR_0_FFT_ENA);
+        REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN, AR_PHY_SPECTRAL_SCAN_ENABLE);
+
+        if (param->short_repeat)
+                REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN,
+                            AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT);
+        else
+                REG_CLR_BIT(ah, AR_PHY_SPECTRAL_SCAN,
+                            AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT);
+
+        /* on AR92xx, the highest bit of count will make the the chip send
+         * spectral samples endlessly. Check if this really was intended,
+         * and fix otherwise.
+         */
+        count = param->count;
+        if (param->endless)
+                count = 0x80;
+        else if (count & 0x80)
+                count = 0x7f;
+
+        REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
+                      AR_PHY_SPECTRAL_SCAN_COUNT, count);
+        REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
+                      AR_PHY_SPECTRAL_SCAN_PERIOD, param->period);
+        REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
+                      AR_PHY_SPECTRAL_SCAN_FFT_PERIOD, param->fft_period);
+
+        return;
+}
+
+static void ar9002_hw_spectral_scan_trigger(struct ath_hw *ah)
+{
+        REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN, AR_PHY_SPECTRAL_SCAN_ENABLE);
+        /* Activate spectral scan */
+        REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN,
+                    AR_PHY_SPECTRAL_SCAN_ACTIVE);
+}
+
+static void ar9002_hw_spectral_scan_wait(struct ath_hw *ah)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+
+        /* Poll for spectral scan complete */
+        if (!ath9k_hw_wait(ah, AR_PHY_SPECTRAL_SCAN,
+                           AR_PHY_SPECTRAL_SCAN_ACTIVE,
+                           0, AH_WAIT_TIMEOUT)) {
+                ath_err(common, "spectral scan wait failed\n");
+                return;
+        }
+}
+
 void ar9002_hw_attach_phy_ops(struct ath_hw *ah)
 {
         struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
         struct ath_hw_ops *ops = ath9k_hw_ops(ah);
 
         priv_ops->set_rf_regs = NULL;
-        priv_ops->rf_alloc_ext_banks = NULL;
-        priv_ops->rf_free_ext_banks = NULL;
         priv_ops->rf_set_freq = ar9002_hw_set_channel;
         priv_ops->spur_mitigate_freq = ar9002_hw_spur_mitigate;
         priv_ops->olc_init = ar9002_olc_init;
@@ -571,6 +630,9 @@ void ar9002_hw_attach_phy_ops(struct ath_hw *ah)
 
         ops->antdiv_comb_conf_get = ar9002_hw_antdiv_comb_conf_get;
         ops->antdiv_comb_conf_set = ar9002_hw_antdiv_comb_conf_set;
+        ops->spectral_scan_config = ar9002_hw_spectral_scan_config;
+        ops->spectral_scan_trigger = ar9002_hw_spectral_scan_trigger;
+        ops->spectral_scan_wait = ar9002_hw_spectral_scan_wait;
 
         ar9002_hw_set_nf_limits(ah);
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
index 262e1e036fd7..db5ffada2217 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
@@ -744,6 +744,186 @@ static const u32 ar9300Modes_high_ob_db_tx_gain_table_2p2[][5] = {
         {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
 };
 
+static const u32 ar9300Modes_mixed_ob_db_tx_gain_table_2p2[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
+        {0x0000a2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
+        {0x0000a2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
+        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+        {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
+        {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
+        {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
+        {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
+        {0x0000a514, 0x1c000223, 0x1c000223, 0x11000400, 0x11000400},
+        {0x0000a518, 0x21002220, 0x21002220, 0x15000402, 0x15000402},
+        {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
+        {0x0000a520, 0x2b022220, 0x2b022220, 0x1b000603, 0x1b000603},
+        {0x0000a524, 0x2f022222, 0x2f022222, 0x1f000a02, 0x1f000a02},
+        {0x0000a528, 0x34022225, 0x34022225, 0x23000a04, 0x23000a04},
+        {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x26000a20, 0x26000a20},
+        {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2a000e20, 0x2a000e20},
+        {0x0000a534, 0x4202242a, 0x4202242a, 0x2e000e22, 0x2e000e22},
+        {0x0000a538, 0x4702244a, 0x4702244a, 0x31000e24, 0x31000e24},
+        {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x34001640, 0x34001640},
+        {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38001660, 0x38001660},
+        {0x0000a544, 0x52022470, 0x52022470, 0x3b001861, 0x3b001861},
+        {0x0000a548, 0x55022490, 0x55022490, 0x3e001a81, 0x3e001a81},
+        {0x0000a54c, 0x59022492, 0x59022492, 0x42001a83, 0x42001a83},
+        {0x0000a550, 0x5d022692, 0x5d022692, 0x44001c84, 0x44001c84},
+        {0x0000a554, 0x61022892, 0x61022892, 0x48001ce3, 0x48001ce3},
+        {0x0000a558, 0x65024890, 0x65024890, 0x4c001ce5, 0x4c001ce5},
+        {0x0000a55c, 0x69024892, 0x69024892, 0x50001ce9, 0x50001ce9},
+        {0x0000a560, 0x6e024c92, 0x6e024c92, 0x54001ceb, 0x54001ceb},
+        {0x0000a564, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
+        {0x0000a568, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
+        {0x0000a56c, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
+        {0x0000a570, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
+        {0x0000a574, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
+        {0x0000a578, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
+        {0x0000a57c, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
+        {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
+        {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
+        {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
+        {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
+        {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
+        {0x0000a594, 0x1c800223, 0x1c800223, 0x11800400, 0x11800400},
+        {0x0000a598, 0x21802220, 0x21802220, 0x15800402, 0x15800402},
+        {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
+        {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1b800603, 0x1b800603},
+        {0x0000a5a4, 0x2f822222, 0x2f822222, 0x1f800a02, 0x1f800a02},
+        {0x0000a5a8, 0x34822225, 0x34822225, 0x23800a04, 0x23800a04},
+        {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x26800a20, 0x26800a20},
+        {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2a800e20, 0x2a800e20},
+        {0x0000a5b4, 0x4282242a, 0x4282242a, 0x2e800e22, 0x2e800e22},
+        {0x0000a5b8, 0x4782244a, 0x4782244a, 0x31800e24, 0x31800e24},
+        {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x34801640, 0x34801640},
+        {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x38801660, 0x38801660},
+        {0x0000a5c4, 0x52822470, 0x52822470, 0x3b801861, 0x3b801861},
+        {0x0000a5c8, 0x55822490, 0x55822490, 0x3e801a81, 0x3e801a81},
+        {0x0000a5cc, 0x59822492, 0x59822492, 0x42801a83, 0x42801a83},
+        {0x0000a5d0, 0x5d822692, 0x5d822692, 0x44801c84, 0x44801c84},
+        {0x0000a5d4, 0x61822892, 0x61822892, 0x48801ce3, 0x48801ce3},
+        {0x0000a5d8, 0x65824890, 0x65824890, 0x4c801ce5, 0x4c801ce5},
+        {0x0000a5dc, 0x69824892, 0x69824892, 0x50801ce9, 0x50801ce9},
+        {0x0000a5e0, 0x6e824c92, 0x6e824c92, 0x54801ceb, 0x54801ceb},
+        {0x0000a5e4, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
+        {0x0000a5e8, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
+        {0x0000a5ec, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
+        {0x0000a5f0, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
+        {0x0000a5f4, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
+        {0x0000a5f8, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
+        {0x0000a5fc, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
+        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a614, 0x02004000, 0x02004000, 0x01404000, 0x01404000},
+        {0x0000a618, 0x02004801, 0x02004801, 0x01404501, 0x01404501},
+        {0x0000a61c, 0x02808a02, 0x02808a02, 0x02008501, 0x02008501},
+        {0x0000a620, 0x0380ce03, 0x0380ce03, 0x0280ca03, 0x0280ca03},
+        {0x0000a624, 0x04411104, 0x04411104, 0x03010c04, 0x03010c04},
+        {0x0000a628, 0x04411104, 0x04411104, 0x04014c04, 0x04014c04},
+        {0x0000a62c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+        {0x0000a630, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+        {0x0000a634, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+        {0x0000a638, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+        {0x0000a63c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
+        {0x0000b2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
+        {0x0000b2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
+        {0x0000b2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
+        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+        {0x0000c2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
+        {0x0000c2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
+        {0x0000c2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
+        {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+        {0x00016044, 0x012492d4, 0x012492d4, 0x056db2e4, 0x056db2e4},
+        {0x00016048, 0x66480001, 0x66480001, 0x8e480001, 0x8e480001},
+        {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+        {0x00016444, 0x012492d4, 0x012492d4, 0x056db2e4, 0x056db2e4},
+        {0x00016448, 0x66480001, 0x66480001, 0x8e480001, 0x8e480001},
+        {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+        {0x00016844, 0x012492d4, 0x012492d4, 0x056db2e4, 0x056db2e4},
+        {0x00016848, 0x66480001, 0x66480001, 0x8e480001, 0x8e480001},
+        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+};
+
+static const u32 ar9300Modes_type5_tx_gain_table_2p2[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
+        {0x0000a2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
+        {0x0000a2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
+        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+        {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
+        {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
+        {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
+        {0x0000a510, 0x15000028, 0x15000028, 0x0f000202, 0x0f000202},
+        {0x0000a514, 0x1b00002b, 0x1b00002b, 0x12000400, 0x12000400},
+        {0x0000a518, 0x1f020028, 0x1f020028, 0x16000402, 0x16000402},
+        {0x0000a51c, 0x2502002b, 0x2502002b, 0x19000404, 0x19000404},
+        {0x0000a520, 0x2a04002a, 0x2a04002a, 0x1c000603, 0x1c000603},
+        {0x0000a524, 0x2e06002a, 0x2e06002a, 0x21000a02, 0x21000a02},
+        {0x0000a528, 0x3302202d, 0x3302202d, 0x25000a04, 0x25000a04},
+        {0x0000a52c, 0x3804202c, 0x3804202c, 0x28000a20, 0x28000a20},
+        {0x0000a530, 0x3c06202c, 0x3c06202c, 0x2c000e20, 0x2c000e20},
+        {0x0000a534, 0x4108202d, 0x4108202d, 0x30000e22, 0x30000e22},
+        {0x0000a538, 0x4506402d, 0x4506402d, 0x34000e24, 0x34000e24},
+        {0x0000a53c, 0x4906222d, 0x4906222d, 0x38001640, 0x38001640},
+        {0x0000a540, 0x4d062231, 0x4d062231, 0x3c001660, 0x3c001660},
+        {0x0000a544, 0x50082231, 0x50082231, 0x3f001861, 0x3f001861},
+        {0x0000a548, 0x5608422e, 0x5608422e, 0x43001a81, 0x43001a81},
+        {0x0000a54c, 0x5e08442e, 0x5e08442e, 0x47001a83, 0x47001a83},
+        {0x0000a550, 0x620a4431, 0x620a4431, 0x4a001c84, 0x4a001c84},
+        {0x0000a554, 0x640a4432, 0x640a4432, 0x4e001ce3, 0x4e001ce3},
+        {0x0000a558, 0x680a4434, 0x680a4434, 0x52001ce5, 0x52001ce5},
+        {0x0000a55c, 0x6c0a6434, 0x6c0a6434, 0x56001ce9, 0x56001ce9},
+        {0x0000a560, 0x6f0a6633, 0x6f0a6633, 0x5a001ceb, 0x5a001ceb},
+        {0x0000a564, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a568, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a56c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a570, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a574, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a578, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a57c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a608, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
+        {0x0000a610, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
+        {0x0000a614, 0x01804601, 0x01804601, 0x01404000, 0x01404000},
+        {0x0000a618, 0x01804601, 0x01804601, 0x01404501, 0x01404501},
+        {0x0000a61c, 0x01804601, 0x01804601, 0x02008501, 0x02008501},
+        {0x0000a620, 0x03408d02, 0x03408d02, 0x0280ca03, 0x0280ca03},
+        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
+        {0x0000a628, 0x03410d04, 0x03410d04, 0x04014c04, 0x04014c04},
+        {0x0000a62c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000a630, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000a634, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000a638, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000a63c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000b2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
+        {0x0000b2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
+        {0x0000b2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
+        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+        {0x0000c2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
+        {0x0000c2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
+        {0x0000c2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
+        {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+        {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+        {0x00016048, 0x65240001, 0x65240001, 0x66480001, 0x66480001},
+        {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+        {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+        {0x00016448, 0x65240001, 0x65240001, 0x66480001, 0x66480001},
+        {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+        {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+        {0x00016848, 0x65240001, 0x65240001, 0x66480001, 0x66480001},
+        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+};
+
 static const u32 ar9300Common_rx_gain_table_2p2[][2] = {
         /* Addr      allmodes  */
         {0x0000a000, 0x00010000},
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 8b0d8dcd7625..4cc13940c895 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -32,7 +32,6 @@ struct coeff {
 
 enum ar9003_cal_types {
         IQ_MISMATCH_CAL = BIT(0),
-        TEMP_COMP_CAL = BIT(1),
 };
 
 static void ar9003_hw_setup_calibration(struct ath_hw *ah,
@@ -49,7 +48,7 @@ static void ar9003_hw_setup_calibration(struct ath_hw *ah,
                  */
                 REG_RMW_FIELD(ah, AR_PHY_TIMING4,
                               AR_PHY_TIMING4_IQCAL_LOG_COUNT_MAX,
-                currCal->calData->calCountMax);
+                              currCal->calData->calCountMax);
                 REG_WRITE(ah, AR_PHY_CALMODE, AR_PHY_CALMODE_IQ);
 
                 ath_dbg(common, CALIBRATE,
@@ -58,14 +57,8 @@ static void ar9003_hw_setup_calibration(struct ath_hw *ah,
                 /* Kick-off cal */
                 REG_SET_BIT(ah, AR_PHY_TIMING4, AR_PHY_TIMING4_DO_CAL);
                 break;
-        case TEMP_COMP_CAL:
-                REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_THERM,
-                              AR_PHY_65NM_CH0_THERM_LOCAL, 1);
-                REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_THERM,
-                              AR_PHY_65NM_CH0_THERM_START, 1);
-
-                ath_dbg(common, CALIBRATE,
-                        "starting Temperature Compensation Calibration\n");
+        default:
+                ath_err(common, "Invalid calibration type\n");
                 break;
         }
 }
@@ -323,6 +316,14 @@ static const struct ath9k_percal_data iq_cal_single_sample = {
 static void ar9003_hw_init_cal_settings(struct ath_hw *ah)
 {
         ah->iq_caldata.calData = &iq_cal_single_sample;
+
+        if (AR_SREV_9300_20_OR_LATER(ah)) {
+                ah->enabled_cals |= TX_IQ_CAL;
+                if (AR_SREV_9485_OR_LATER(ah) && !AR_SREV_9340(ah))
+                        ah->enabled_cals |= TX_IQ_ON_AGC_CAL;
+        }
+
+        ah->supp_cals = IQ_MISMATCH_CAL;
 }
 
 /*
@@ -959,22 +960,70 @@ static void ar9003_hw_manual_peak_cal(struct ath_hw *ah, u8 chain, bool is_2g)
                       AR_PHY_65NM_RXRF_AGC_AGC_CAL_OVR, 0);
 }
 
+static void ar9003_hw_do_manual_peak_cal(struct ath_hw *ah,
+                                         struct ath9k_channel *chan)
+{
+        int i;
+
+        if (!AR_SREV_9462(ah) && !AR_SREV_9565(ah))
+                return;
+
+        for (i = 0; i < AR9300_MAX_CHAINS; i++) {
+                if (!(ah->rxchainmask & (1 << i)))
+                        continue;
+                ar9003_hw_manual_peak_cal(ah, i, IS_CHAN_2GHZ(chan));
+        }
+}
+
+static void ar9003_hw_cl_cal_post_proc(struct ath_hw *ah, bool is_reusable)
+{
+        u32 cl_idx[AR9300_MAX_CHAINS] = { AR_PHY_CL_TAB_0,
+                                          AR_PHY_CL_TAB_1,
+                                          AR_PHY_CL_TAB_2 };
+        struct ath9k_hw_cal_data *caldata = ah->caldata;
+        bool txclcal_done = false;
+        int i, j;
+
+        if (!caldata || !(ah->enabled_cals & TX_CL_CAL))
+                return;
+
+        txclcal_done = !!(REG_READ(ah, AR_PHY_AGC_CONTROL) &
+                          AR_PHY_AGC_CONTROL_CLC_SUCCESS);
+
+        if (caldata->done_txclcal_once) {
+                for (i = 0; i < AR9300_MAX_CHAINS; i++) {
+                        if (!(ah->txchainmask & (1 << i)))
+                                continue;
+                        for (j = 0; j < MAX_CL_TAB_ENTRY; j++)
+                                REG_WRITE(ah, CL_TAB_ENTRY(cl_idx[i]),
+                                          caldata->tx_clcal[i][j]);
+                }
+        } else if (is_reusable && txclcal_done) {
+                for (i = 0; i < AR9300_MAX_CHAINS; i++) {
+                        if (!(ah->txchainmask & (1 << i)))
+                                continue;
+                        for (j = 0; j < MAX_CL_TAB_ENTRY; j++)
+                                caldata->tx_clcal[i][j] =
+                                        REG_READ(ah, CL_TAB_ENTRY(cl_idx[i]));
+                }
+                caldata->done_txclcal_once = true;
+        }
+}
+
 static bool ar9003_hw_init_cal(struct ath_hw *ah,
                                struct ath9k_channel *chan)
 {
         struct ath_common *common = ath9k_hw_common(ah);
         struct ath9k_hw_cal_data *caldata = ah->caldata;
-        bool txiqcal_done = false, txclcal_done = false;
+        bool txiqcal_done = false;
         bool is_reusable = true, status = true;
-        bool run_rtt_cal = false, run_agc_cal;
+        bool run_rtt_cal = false, run_agc_cal, sep_iq_cal = false;
         bool rtt = !!(ah->caps.hw_caps & ATH9K_HW_CAP_RTT);
         u32 agc_ctrl = 0, agc_supp_cals = AR_PHY_AGC_CONTROL_OFFSET_CAL |
                                           AR_PHY_AGC_CONTROL_FLTR_CAL   |
                                           AR_PHY_AGC_CONTROL_PKDET_CAL;
-        int i, j;
-        u32 cl_idx[AR9300_MAX_CHAINS] = { AR_PHY_CL_TAB_0,
-                                          AR_PHY_CL_TAB_1,
-                                          AR_PHY_CL_TAB_2 };
+
+        ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);
 
         if (rtt) {
                 if (!ar9003_hw_rtt_restore(ah, chan))
@@ -1012,7 +1061,8 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
                 }
         }
 
-        if (!(ah->enabled_cals & TX_IQ_CAL))
+        if ((IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan)) ||
+            !(ah->enabled_cals & TX_IQ_CAL))
                 goto skip_tx_iqcal;
 
         /* Do Tx IQ Calibration */
@@ -1032,21 +1082,22 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
                         REG_CLR_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0,
                                     AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL);
                 txiqcal_done = run_agc_cal = true;
-                goto skip_tx_iqcal;
-        } else if (caldata && !caldata->done_txiqcal_once)
+        } else if (caldata && !caldata->done_txiqcal_once) {
                 run_agc_cal = true;
+                sep_iq_cal = true;
+        }
 
+skip_tx_iqcal:
         if (ath9k_hw_mci_is_enabled(ah) && IS_CHAN_2GHZ(chan) && run_agc_cal)
                 ar9003_mci_init_cal_req(ah, &is_reusable);
 
-        if (!(IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan))) {
+        if (sep_iq_cal) {
                 txiqcal_done = ar9003_hw_tx_iq_cal_run(ah);
                 REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
                 udelay(5);
                 REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
         }
 
-skip_tx_iqcal:
         if (run_agc_cal || !(ah->ah_flags & AH_FASTCC)) {
                 /* Calibrate the AGC */
                 REG_WRITE(ah, AR_PHY_AGC_CONTROL,
@@ -1057,14 +1108,8 @@ skip_tx_iqcal:
                 status = ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,
                                        AR_PHY_AGC_CONTROL_CAL,
                                        0, AH_WAIT_TIMEOUT);
-                if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
-                        for (i = 0; i < AR9300_MAX_CHAINS; i++) {
-                                if (!(ah->rxchainmask & (1 << i)))
-                                        continue;
-                                ar9003_hw_manual_peak_cal(ah, i,
-                                                          IS_CHAN_2GHZ(chan));
-                        }
-                }
+
+                ar9003_hw_do_manual_peak_cal(ah, chan);
         }
 
         if (ath9k_hw_mci_is_enabled(ah) && IS_CHAN_2GHZ(chan) && run_agc_cal)
@@ -1089,31 +1134,7 @@ skip_tx_iqcal:
         else if (caldata && caldata->done_txiqcal_once)
                 ar9003_hw_tx_iq_cal_reload(ah);
 
-#define CL_TAB_ENTRY(reg_base)  (reg_base + (4 * j))
-        if (caldata && (ah->enabled_cals & TX_CL_CAL)) {
-                txclcal_done = !!(REG_READ(ah, AR_PHY_AGC_CONTROL) &
-                                           AR_PHY_AGC_CONTROL_CLC_SUCCESS);
-                if (caldata->done_txclcal_once) {
-                        for (i = 0; i < AR9300_MAX_CHAINS; i++) {
-                                if (!(ah->txchainmask & (1 << i)))
-                                        continue;
-                                for (j = 0; j < MAX_CL_TAB_ENTRY; j++)
-                                        REG_WRITE(ah, CL_TAB_ENTRY(cl_idx[i]),
-                                                  caldata->tx_clcal[i][j]);
-                        }
-                } else if (is_reusable && txclcal_done) {
-                        for (i = 0; i < AR9300_MAX_CHAINS; i++) {
-                                if (!(ah->txchainmask & (1 << i)))
-                                        continue;
-                                for (j = 0; j < MAX_CL_TAB_ENTRY; j++)
-                                        caldata->tx_clcal[i][j] =
-                                                REG_READ(ah,
-                                                  CL_TAB_ENTRY(cl_idx[i]));
-                        }
-                        caldata->done_txclcal_once = true;
-                }
-        }
-#undef CL_TAB_ENTRY
+        ar9003_hw_cl_cal_post_proc(ah, is_reusable);
 
         if (run_rtt_cal && caldata) {
                 if (is_reusable) {
@@ -1131,20 +1152,10 @@ skip_tx_iqcal:
 
         /* Initialize list pointers */
         ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;
-        ah->supp_cals = IQ_MISMATCH_CAL;
-
-        if (ah->supp_cals & IQ_MISMATCH_CAL) {
-                INIT_CAL(&ah->iq_caldata);
-                INSERT_CAL(ah, &ah->iq_caldata);
-                ath_dbg(common, CALIBRATE, "enabling IQ Calibration\n");
-        }
 
-        if (ah->supp_cals & TEMP_COMP_CAL) {
-                INIT_CAL(&ah->tempCompCalData);
-                INSERT_CAL(ah, &ah->tempCompCalData);
-                ath_dbg(common, CALIBRATE,
-                        "enabling Temperature Compensation Calibration\n");
-        }
+        INIT_CAL(&ah->iq_caldata);
+        INSERT_CAL(ah, &ah->iq_caldata);
+        ath_dbg(common, CALIBRATE, "enabling IQ Calibration\n");
 
         /* Initialize current pointer to first element in list */
         ah->cal_list_curr = ah->cal_list;
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 562186ca9b52..881e989ea470 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -4586,14 +4586,14 @@ static int ar9003_hw_cal_pier_get(struct ath_hw *ah,
         return 0;
 }
 
-static int ar9003_hw_power_control_override(struct ath_hw *ah,
-                                            int frequency,
-                                            int *correction,
-                                            int *voltage, int *temperature)
+static void ar9003_hw_power_control_override(struct ath_hw *ah,
+                                             int frequency,
+                                             int *correction,
+                                             int *voltage, int *temperature)
 {
-        int tempSlope = 0;
+        int temp_slope = 0, temp_slope1 = 0, temp_slope2 = 0;
         struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-        int f[8], t[8], i;
+        int f[8], t[8], t1[3], t2[3], i;
 
         REG_RMW(ah, AR_PHY_TPC_11_B0,
                 (correction[0] << AR_PHY_TPC_OLPC_GAIN_DELTA_S),
@@ -4624,38 +4624,108 @@ static int ar9003_hw_power_control_override(struct ath_hw *ah,
          * enable temperature compensation
          * Need to use register names
          */
-        if (frequency < 4000)
-                tempSlope = eep->modalHeader2G.tempSlope;
-        else if ((eep->baseEepHeader.miscConfiguration & 0x20) != 0) {
-                for (i = 0; i < 8; i++) {
-                        t[i] = eep->base_ext1.tempslopextension[i];
-                        f[i] = FBIN2FREQ(eep->calFreqPier5G[i], 0);
+        if (frequency < 4000) {
+                temp_slope = eep->modalHeader2G.tempSlope;
+        } else {
+                if (AR_SREV_9550(ah)) {
+                        t[0] = eep->base_ext1.tempslopextension[2];
+                        t1[0] = eep->base_ext1.tempslopextension[3];
+                        t2[0] = eep->base_ext1.tempslopextension[4];
+                        f[0] = 5180;
+
+                        t[1] = eep->modalHeader5G.tempSlope;
+                        t1[1] = eep->base_ext1.tempslopextension[0];
+                        t2[1] = eep->base_ext1.tempslopextension[1];
+                        f[1] = 5500;
+
+                        t[2] = eep->base_ext1.tempslopextension[5];
+                        t1[2] = eep->base_ext1.tempslopextension[6];
+                        t2[2] = eep->base_ext1.tempslopextension[7];
+                        f[2] = 5785;
+
+                        temp_slope = ar9003_hw_power_interpolate(frequency,
+                                                                 f, t, 3);
+                        temp_slope1 = ar9003_hw_power_interpolate(frequency,
+                                                                   f, t1, 3);
+                        temp_slope2 = ar9003_hw_power_interpolate(frequency,
+                                                                   f, t2, 3);
+
+                        goto tempslope;
                 }
-                tempSlope = ar9003_hw_power_interpolate((s32) frequency,
-                                                        f, t, 8);
-        } else if (eep->base_ext2.tempSlopeLow != 0) {
-                t[0] = eep->base_ext2.tempSlopeLow;
-                f[0] = 5180;
-                t[1] = eep->modalHeader5G.tempSlope;
-                f[1] = 5500;
-                t[2] = eep->base_ext2.tempSlopeHigh;
-                f[2] = 5785;
-                tempSlope = ar9003_hw_power_interpolate((s32) frequency,
-                                                        f, t, 3);
-        } else
-                tempSlope = eep->modalHeader5G.tempSlope;
 
-        REG_RMW_FIELD(ah, AR_PHY_TPC_19, AR_PHY_TPC_19_ALPHA_THERM, tempSlope);
+                if ((eep->baseEepHeader.miscConfiguration & 0x20) != 0) {
+                        for (i = 0; i < 8; i++) {
+                                t[i] = eep->base_ext1.tempslopextension[i];
+                                f[i] = FBIN2FREQ(eep->calFreqPier5G[i], 0);
+                        }
+                        temp_slope = ar9003_hw_power_interpolate((s32) frequency,
+                                                                 f, t, 8);
+                } else if (eep->base_ext2.tempSlopeLow != 0) {
+                        t[0] = eep->base_ext2.tempSlopeLow;
+                        f[0] = 5180;
+                        t[1] = eep->modalHeader5G.tempSlope;
+                        f[1] = 5500;
+                        t[2] = eep->base_ext2.tempSlopeHigh;
+                        f[2] = 5785;
+                        temp_slope = ar9003_hw_power_interpolate((s32) frequency,
+                                                                 f, t, 3);
+                } else {
+                        temp_slope = eep->modalHeader5G.tempSlope;
+                }
+        }
+
+tempslope:
+        if (AR_SREV_9550(ah)) {
+                /*
+                 * AR955x has tempSlope register for each chain.
+                 * Check whether temp_compensation feature is enabled or not.
+                 */
+                if (eep->baseEepHeader.featureEnable & 0x1) {
+                        if (frequency < 4000) {
+                                REG_RMW_FIELD(ah, AR_PHY_TPC_19,
+                                              AR_PHY_TPC_19_ALPHA_THERM,
+                                              eep->base_ext2.tempSlopeLow);
+                                REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
+                                              AR_PHY_TPC_19_ALPHA_THERM,
+                                              temp_slope);
+                                REG_RMW_FIELD(ah, AR_PHY_TPC_19_B2,
+                                              AR_PHY_TPC_19_ALPHA_THERM,
+                                              eep->base_ext2.tempSlopeHigh);
+                        } else {
+                                REG_RMW_FIELD(ah, AR_PHY_TPC_19,
+                                              AR_PHY_TPC_19_ALPHA_THERM,
+                                              temp_slope);
+                                REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
+                                              AR_PHY_TPC_19_ALPHA_THERM,
+                                              temp_slope1);
+                                REG_RMW_FIELD(ah, AR_PHY_TPC_19_B2,
+                                              AR_PHY_TPC_19_ALPHA_THERM,
+                                              temp_slope2);
+                        }
+                } else {
+                        /*
+                         * If temp compensation is not enabled,
+                         * set all registers to 0.
+                         */
+                        REG_RMW_FIELD(ah, AR_PHY_TPC_19,
+                                      AR_PHY_TPC_19_ALPHA_THERM, 0);
+                        REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
+                                      AR_PHY_TPC_19_ALPHA_THERM, 0);
+                        REG_RMW_FIELD(ah, AR_PHY_TPC_19_B2,
+                                      AR_PHY_TPC_19_ALPHA_THERM, 0);
+                }
+        } else {
+                REG_RMW_FIELD(ah, AR_PHY_TPC_19,
+                              AR_PHY_TPC_19_ALPHA_THERM, temp_slope);
+        }
 
         if (AR_SREV_9462_20(ah))
                 REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
-                              AR_PHY_TPC_19_B1_ALPHA_THERM, tempSlope);
+                              AR_PHY_TPC_19_B1_ALPHA_THERM, temp_slope);
 
 
         REG_RMW_FIELD(ah, AR_PHY_TPC_18, AR_PHY_TPC_18_THERM_CAL_VALUE,
                       temperature[0]);
-
-        return 0;
 }
 
 /* Apply the recorded correction values. */
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_hw.c b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
index 59bf5f31e212..a3523c969a3a 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
@@ -507,28 +507,59 @@ static void ar9003_tx_gain_table_mode4(struct ath_hw *ah)
         else if (AR_SREV_9580(ah))
                 INIT_INI_ARRAY(&ah->iniModesTxGain,
                         ar9580_1p0_mixed_ob_db_tx_gain_table);
+        else
+                INIT_INI_ARRAY(&ah->iniModesTxGain,
+                        ar9300Modes_mixed_ob_db_tx_gain_table_2p2);
+}
+
+static void ar9003_tx_gain_table_mode5(struct ath_hw *ah)
+{
+        if (AR_SREV_9485_11(ah))
+                INIT_INI_ARRAY(&ah->iniModesTxGain,
+                        ar9485Modes_green_ob_db_tx_gain_1_1);
+        else if (AR_SREV_9340(ah))
+                INIT_INI_ARRAY(&ah->iniModesTxGain,
+                        ar9340Modes_ub124_tx_gain_table_1p0);
+        else if (AR_SREV_9580(ah))
+                INIT_INI_ARRAY(&ah->iniModesTxGain,
+                        ar9580_1p0_type5_tx_gain_table);
+        else if (AR_SREV_9300_22(ah))
+                INIT_INI_ARRAY(&ah->iniModesTxGain,
+                        ar9300Modes_type5_tx_gain_table_2p2);
 }
 
+static void ar9003_tx_gain_table_mode6(struct ath_hw *ah)
+{
+        if (AR_SREV_9340(ah))
+                INIT_INI_ARRAY(&ah->iniModesTxGain,
+                        ar9340Modes_low_ob_db_and_spur_tx_gain_table_1p0);
+        else if (AR_SREV_9485_11(ah))
+                INIT_INI_ARRAY(&ah->iniModesTxGain,
+                        ar9485Modes_green_spur_ob_db_tx_gain_1_1);
+        else if (AR_SREV_9580(ah))
+                INIT_INI_ARRAY(&ah->iniModesTxGain,
+                        ar9580_1p0_type6_tx_gain_table);
+}
+
+typedef void (*ath_txgain_tab)(struct ath_hw *ah);
+
 static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
 {
-        switch (ar9003_hw_get_tx_gain_idx(ah)) {
-        case 0:
-        default:
-                ar9003_tx_gain_table_mode0(ah);
-                break;
-        case 1:
-                ar9003_tx_gain_table_mode1(ah);
-                break;
-        case 2:
-                ar9003_tx_gain_table_mode2(ah);
-                break;
-        case 3:
-                ar9003_tx_gain_table_mode3(ah);
-                break;
-        case 4:
-                ar9003_tx_gain_table_mode4(ah);
-                break;
-        }
+        static const ath_txgain_tab modes[] = {
+                ar9003_tx_gain_table_mode0,
+                ar9003_tx_gain_table_mode1,
+                ar9003_tx_gain_table_mode2,
+                ar9003_tx_gain_table_mode3,
+                ar9003_tx_gain_table_mode4,
+                ar9003_tx_gain_table_mode5,
+                ar9003_tx_gain_table_mode6,
+        };
+        int idx = ar9003_hw_get_tx_gain_idx(ah);
+
+        if (idx >= ARRAY_SIZE(modes))
+                idx = 0;
+
+        modes[idx](ah);
 }
 
 static void ar9003_rx_gain_table_mode0(struct ath_hw *ah)
@@ -673,7 +704,7 @@ void ar9003_hw_attach_ops(struct ath_hw *ah)
         struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
         struct ath_hw_ops *ops = ath9k_hw_ops(ah);
 
-        priv_ops->init_mode_regs = ar9003_hw_init_mode_regs;
+        ar9003_hw_init_mode_regs(ah);
         priv_ops->init_mode_gain_regs = ar9003_hw_init_mode_gain_regs;
 
         ops->config_pci_powersave = ar9003_hw_configpcipowersave;
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index ce19c09fa8e8..2bf6548dd143 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -68,7 +68,7 @@ static const int m2ThreshExt_off = 127;
 static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
 {
         u16 bMode, fracMode = 0, aModeRefSel = 0;
-        u32 freq, channelSel = 0, reg32 = 0;
+        u32 freq, chan_frac, div, channelSel = 0, reg32 = 0;
         struct chan_centers centers;
         int loadSynthChannel;
 
@@ -77,9 +77,6 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
 
         if (freq < 4800) {     /* 2 GHz, fractional mode */
                 if (AR_SREV_9330(ah)) {
-                        u32 chan_frac;
-                        u32 div;
-
                         if (ah->is_clk_25mhz)
                                 div = 75;
                         else
@@ -89,34 +86,40 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
                         chan_frac = (((freq * 4) % div) * 0x20000) / div;
                         channelSel = (channelSel << 17) | chan_frac;
                 } else if (AR_SREV_9485(ah) || AR_SREV_9565(ah)) {
-                        u32 chan_frac;
-
                         /*
-                         * freq_ref = 40 / (refdiva >> amoderefsel); where refdiva=1 and amoderefsel=0
+                         * freq_ref = 40 / (refdiva >> amoderefsel);
+                         * where refdiva=1 and amoderefsel=0
                          * ndiv = ((chan_mhz * 4) / 3) / freq_ref;
                          * chansel = int(ndiv), chanfrac = (ndiv - chansel) * 0x20000
                          */
                         channelSel = (freq * 4) / 120;
                         chan_frac = (((freq * 4) % 120) * 0x20000) / 120;
                         channelSel = (channelSel << 17) | chan_frac;
-                } else if (AR_SREV_9340(ah) || AR_SREV_9550(ah)) {
+                } else if (AR_SREV_9340(ah)) {
                         if (ah->is_clk_25mhz) {
-                                u32 chan_frac;
-
                                 channelSel = (freq * 2) / 75;
                                 chan_frac = (((freq * 2) % 75) * 0x20000) / 75;
                                 channelSel = (channelSel << 17) | chan_frac;
-                        } else
+                        } else {
                                 channelSel = CHANSEL_2G(freq) >> 1;
-                } else
+                        }
+                } else if (AR_SREV_9550(ah)) {
+                        if (ah->is_clk_25mhz)
+                                div = 75;
+                        else
+                                div = 120;
+
+                        channelSel = (freq * 4) / div;
+                        chan_frac = (((freq * 4) % div) * 0x20000) / div;
+                        channelSel = (channelSel << 17) | chan_frac;
+                } else {
                         channelSel = CHANSEL_2G(freq);
+                }
                 /* Set to 2G mode */
                 bMode = 1;
         } else {
                 if ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) &&
                     ah->is_clk_25mhz) {
-                        u32 chan_frac;
-
                         channelSel = freq / 75;
                         chan_frac = ((freq % 75) * 0x20000) / 75;
                         channelSel = (channelSel << 17) | chan_frac;
@@ -586,32 +589,19 @@ static void ar9003_hw_init_bb(struct ath_hw *ah,
         ath9k_hw_synth_delay(ah, chan, synthDelay);
 }
 
-static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
+void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)
 {
-        switch (rx) {
-        case 0x5:
+        if (ah->caps.tx_chainmask == 5 || ah->caps.rx_chainmask == 5)
                 REG_SET_BIT(ah, AR_PHY_ANALOG_SWAP,
                             AR_PHY_SWAP_ALT_CHAIN);
-        case 0x3:
-        case 0x1:
-        case 0x2:
-        case 0x7:
-                REG_WRITE(ah, AR_PHY_RX_CHAINMASK, rx);
-                REG_WRITE(ah, AR_PHY_CAL_CHAINMASK, rx);
-                break;
-        default:
-                break;
-        }
+
+        REG_WRITE(ah, AR_PHY_RX_CHAINMASK, rx);
+        REG_WRITE(ah, AR_PHY_CAL_CHAINMASK, rx);
 
         if ((ah->caps.hw_caps & ATH9K_HW_CAP_APM) && (tx == 0x7))
-                REG_WRITE(ah, AR_SELFGEN_MASK, 0x3);
-        else
-                REG_WRITE(ah, AR_SELFGEN_MASK, tx);
+                tx = 3;
 
-        if (tx == 0x5) {
-                REG_SET_BIT(ah, AR_PHY_ANALOG_SWAP,
-                            AR_PHY_SWAP_ALT_CHAIN);
-        }
+        REG_WRITE(ah, AR_SELFGEN_MASK, tx);
 }
 
 /*
@@ -1450,6 +1440,67 @@ set_rfmode:
         return 0;
 }
 
+static void ar9003_hw_spectral_scan_config(struct ath_hw *ah,
+                                           struct ath_spec_scan *param)
+{
+        u8 count;
+
+        if (!param->enabled) {
+                REG_CLR_BIT(ah, AR_PHY_SPECTRAL_SCAN,
+                            AR_PHY_SPECTRAL_SCAN_ENABLE);
+                return;
+        }
+
+        REG_SET_BIT(ah, AR_PHY_RADAR_0, AR_PHY_RADAR_0_FFT_ENA);
+        REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN, AR_PHY_SPECTRAL_SCAN_ENABLE);
+
+        /* on AR93xx and newer, count = 0 will make the the chip send
+         * spectral samples endlessly. Check if this really was intended,
+         * and fix otherwise.
+         */
+        count = param->count;
+        if (param->endless)
+                count = 0;
+        else if (param->count == 0)
+                count = 1;
+
+        if (param->short_repeat)
+                REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN,
+                            AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT);
+        else
+                REG_CLR_BIT(ah, AR_PHY_SPECTRAL_SCAN,
+                            AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT);
+
+        REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
+                      AR_PHY_SPECTRAL_SCAN_COUNT, count);
+        REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
+                      AR_PHY_SPECTRAL_SCAN_PERIOD, param->period);
+        REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
+                      AR_PHY_SPECTRAL_SCAN_FFT_PERIOD, param->fft_period);
+
+        return;
+}
+
+static void ar9003_hw_spectral_scan_trigger(struct ath_hw *ah)
+{
+        /* Activate spectral scan */
+        REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN,
+                    AR_PHY_SPECTRAL_SCAN_ACTIVE);
+}
+
+static void ar9003_hw_spectral_scan_wait(struct ath_hw *ah)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+
+        /* Poll for spectral scan complete */
+        if (!ath9k_hw_wait(ah, AR_PHY_SPECTRAL_SCAN,
+                           AR_PHY_SPECTRAL_SCAN_ACTIVE,
+                           0, AH_WAIT_TIMEOUT)) {
+                ath_err(common, "spectral scan wait failed\n");
+                return;
+        }
+}
+
 void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
 {
         struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
@@ -1483,6 +1534,9 @@ void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
         ops->antdiv_comb_conf_get = ar9003_hw_antdiv_comb_conf_get;
         ops->antdiv_comb_conf_set = ar9003_hw_antdiv_comb_conf_set;
         ops->antctrl_shared_chain_lnadiv = ar9003_hw_antctrl_shared_chain_lnadiv;
+        ops->spectral_scan_config = ar9003_hw_spectral_scan_config;
+        ops->spectral_scan_trigger = ar9003_hw_spectral_scan_trigger;
+        ops->spectral_scan_wait = ar9003_hw_spectral_scan_wait;
 
         ar9003_hw_set_nf_limits(ah);
         ar9003_hw_set_radar_conf(ah);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
index 107956298488..e71774196c01 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
@@ -1028,7 +1028,7 @@
 #define AR_PHY_TPC_5_B2          (AR_SM2_BASE + 0x208)
 #define AR_PHY_TPC_6_B2          (AR_SM2_BASE + 0x20c)
 #define AR_PHY_TPC_11_B2         (AR_SM2_BASE + 0x220)
-#define AR_PHY_PDADC_TAB_2       (AR_SM2_BASE + 0x240)
+#define AR_PHY_TPC_19_B2         (AR_SM2_BASE + 0x240)
 #define AR_PHY_TX_IQCAL_STATUS_B2   (AR_SM2_BASE + 0x48c)
 #define AR_PHY_TX_IQCAL_CORR_COEFF_B2(_i)    (AR_SM2_BASE + 0x450 + ((_i) << 2))
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
index f69d292bdc02..25db9215985a 100644
--- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
@@ -1172,6 +1172,106 @@ static const u32 ar9340Modes_mixed_ob_db_tx_gain_table_1p0[][5] = {
         {0x00016448, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
 };
 
+static const u32 ar9340Modes_low_ob_db_and_spur_tx_gain_table_1p0[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03eaac5a, 0x03eaac5a},
+        {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03f330ac, 0x03f330ac},
+        {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03fc3f00, 0x03fc3f00},
+        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ffc000, 0x03ffc000},
+        {0x0000a394, 0x00000444, 0x00000444, 0x00000404, 0x00000404},
+        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+        {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a504, 0x06000003, 0x06000003, 0x02000001, 0x02000001},
+        {0x0000a508, 0x0a000020, 0x0a000020, 0x05000003, 0x05000003},
+        {0x0000a50c, 0x10000023, 0x10000023, 0x0a000005, 0x0a000005},
+        {0x0000a510, 0x16000220, 0x16000220, 0x0e000201, 0x0e000201},
+        {0x0000a514, 0x1c000223, 0x1c000223, 0x11000203, 0x11000203},
+        {0x0000a518, 0x21002220, 0x21002220, 0x14000401, 0x14000401},
+        {0x0000a51c, 0x27002223, 0x27002223, 0x18000403, 0x18000403},
+        {0x0000a520, 0x2b022220, 0x2b022220, 0x1b000602, 0x1b000602},
+        {0x0000a524, 0x2f022222, 0x2f022222, 0x1f000802, 0x1f000802},
+        {0x0000a528, 0x34022225, 0x34022225, 0x21000620, 0x21000620},
+        {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x25000820, 0x25000820},
+        {0x0000a530, 0x3e02222c, 0x3e02222c, 0x29000822, 0x29000822},
+        {0x0000a534, 0x4202242a, 0x4202242a, 0x2d000824, 0x2d000824},
+        {0x0000a538, 0x4702244a, 0x4702244a, 0x30000828, 0x30000828},
+        {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x3400082a, 0x3400082a},
+        {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38000849, 0x38000849},
+        {0x0000a544, 0x5302266c, 0x5302266c, 0x3b000a2c, 0x3b000a2c},
+        {0x0000a548, 0x5702286c, 0x5702286c, 0x3e000e2b, 0x3e000e2b},
+        {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x42000e2d, 0x42000e2d},
+        {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4500124a, 0x4500124a},
+        {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4900124c, 0x4900124c},
+        {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x4c00126c, 0x4c00126c},
+        {0x0000a55c, 0x7002708c, 0x7002708c, 0x4f00128c, 0x4f00128c},
+        {0x0000a560, 0x7302b08a, 0x7302b08a, 0x52001290, 0x52001290},
+        {0x0000a564, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
+        {0x0000a568, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
+        {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
+        {0x0000a570, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
+        {0x0000a574, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
+        {0x0000a578, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
+        {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
+        {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
+        {0x0000a584, 0x06800003, 0x06800003, 0x02800001, 0x02800001},
+        {0x0000a588, 0x0a800020, 0x0a800020, 0x05800003, 0x05800003},
+        {0x0000a58c, 0x10800023, 0x10800023, 0x0a800005, 0x0a800005},
+        {0x0000a590, 0x16800220, 0x16800220, 0x0e800201, 0x0e800201},
+        {0x0000a594, 0x1c800223, 0x1c800223, 0x11800203, 0x11800203},
+        {0x0000a598, 0x21820220, 0x21820220, 0x14800401, 0x14800401},
+        {0x0000a59c, 0x27820223, 0x27820223, 0x18800403, 0x18800403},
+        {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1b800602, 0x1b800602},
+        {0x0000a5a4, 0x2f822222, 0x2f822222, 0x1f800802, 0x1f800802},
+        {0x0000a5a8, 0x34822225, 0x34822225, 0x21800620, 0x21800620},
+        {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x25800820, 0x25800820},
+        {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x29800822, 0x29800822},
+        {0x0000a5b4, 0x4282242a, 0x4282242a, 0x2d800824, 0x2d800824},
+        {0x0000a5b8, 0x4782244a, 0x4782244a, 0x30800828, 0x30800828},
+        {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x3480082a, 0x3480082a},
+        {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x38800849, 0x38800849},
+        {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3b800a2c, 0x3b800a2c},
+        {0x0000a5c8, 0x5782286c, 0x5782286c, 0x3e800e2b, 0x3e800e2b},
+        {0x0000a5cc, 0x5c84286b, 0x5c84286b, 0x42800e2d, 0x42800e2d},
+        {0x0000a5d0, 0x61842a6c, 0x61842a6c, 0x4580124a, 0x4580124a},
+        {0x0000a5d4, 0x66862a6c, 0x66862a6c, 0x4980124c, 0x4980124c},
+        {0x0000a5d8, 0x6b862e6c, 0x6b862e6c, 0x4c80126c, 0x4c80126c},
+        {0x0000a5dc, 0x7086308c, 0x7086308c, 0x4f80128c, 0x4f80128c},
+        {0x0000a5e0, 0x738a308a, 0x738a308a, 0x52801290, 0x52801290},
+        {0x0000a5e4, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
+        {0x0000a5e8, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
+        {0x0000a5ec, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
+        {0x0000a5f0, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
+        {0x0000a5f4, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
+        {0x0000a5f8, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
+        {0x0000a5fc, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
+        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a614, 0x01404000, 0x01404000, 0x01404501, 0x01404501},
+        {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
+        {0x0000a61c, 0x02008802, 0x02008802, 0x01404501, 0x01404501},
+        {0x0000a620, 0x0300cc03, 0x0300cc03, 0x03c0cf02, 0x03c0cf02},
+        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03c0cf03, 0x03c0cf03},
+        {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04011004, 0x04011004},
+        {0x0000a62c, 0x03810c03, 0x03810c03, 0x05419405, 0x05419405},
+        {0x0000a630, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
+        {0x0000a634, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
+        {0x0000a638, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
+        {0x0000a63c, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
+        {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03eaac5a, 0x03eaac5a},
+        {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03f330ac, 0x03f330ac},
+        {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03fc3f00, 0x03fc3f00},
+        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ffc000, 0x03ffc000},
+        {0x00016044, 0x022492db, 0x022492db, 0x022492db, 0x022492db},
+        {0x00016048, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
+        {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
+        {0x00016288, 0xf0318000, 0xf0318000, 0xf0318000, 0xf0318000},
+        {0x00016444, 0x022492db, 0x022492db, 0x022492db, 0x022492db},
+        {0x00016448, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
+};
+
 static const u32 ar9340_1p0_mac_core[][2] = {
         /* Addr      allmodes  */
         {0x00000008, 0x00000000},
diff --git a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
index a3710f3bb90c..712f415b8c08 100644
--- a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
@@ -260,6 +260,79 @@ static const u32 ar9485Modes_high_power_tx_gain_1_1[][5] = {
         {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
 };
 
+static const u32 ar9485Modes_green_ob_db_tx_gain_1_1[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x000098bc, 0x00000003, 0x00000003, 0x00000003, 0x00000003},
+        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
+        {0x0000a458, 0x80000000, 0x80000000, 0x80000000, 0x80000000},
+        {0x0000a500, 0x00022200, 0x00022200, 0x00000006, 0x00000006},
+        {0x0000a504, 0x05062002, 0x05062002, 0x03000201, 0x03000201},
+        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x06000203, 0x06000203},
+        {0x0000a50c, 0x11062202, 0x11062202, 0x0a000401, 0x0a000401},
+        {0x0000a510, 0x17022e00, 0x17022e00, 0x0e000403, 0x0e000403},
+        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x12000405, 0x12000405},
+        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x15000604, 0x15000604},
+        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x18000605, 0x18000605},
+        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x1c000a04, 0x1c000a04},
+        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x21000a06, 0x21000a06},
+        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x29000a24, 0x29000a24},
+        {0x0000a52c, 0x41023e85, 0x41023e85, 0x2f000e21, 0x2f000e21},
+        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x31000e20, 0x31000e20},
+        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x33000e20, 0x33000e20},
+        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
+        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
+        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
+        {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
+        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
+        {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
+        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
+        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
+        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
+        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
+        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
+        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
+        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
+        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
+        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
+        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
+        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
+        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
+        {0x0000b500, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b504, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b508, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b50c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b510, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b514, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b518, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b51c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b520, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b524, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b528, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b52c, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a},
+        {0x0000b530, 0x0000003a, 0x0000003a, 0x0000003a, 0x0000003a},
+        {0x0000b534, 0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a},
+        {0x0000b538, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b53c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b540, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b544, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b548, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b54c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b550, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b554, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b558, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b55c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b560, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b564, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b568, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b56c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b570, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b574, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b578, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b57c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
+        {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
+};
+
 static const u32 ar9485Modes_high_ob_db_tx_gain_1_1[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
@@ -450,6 +523,79 @@ static const u32 ar9485Modes_low_ob_db_tx_gain_1_1[][5] = {
 
 #define ar9485_modes_lowest_ob_db_tx_gain_1_1 ar9485Modes_low_ob_db_tx_gain_1_1
 
+static const u32 ar9485Modes_green_spur_ob_db_tx_gain_1_1[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x000098bc, 0x00000003, 0x00000003, 0x00000003, 0x00000003},
+        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
+        {0x0000a458, 0x80000000, 0x80000000, 0x80000000, 0x80000000},
+        {0x0000a500, 0x00022200, 0x00022200, 0x00000006, 0x00000006},
+        {0x0000a504, 0x05062002, 0x05062002, 0x03000201, 0x03000201},
+        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x07000203, 0x07000203},
+        {0x0000a50c, 0x11062202, 0x11062202, 0x0a000401, 0x0a000401},
+        {0x0000a510, 0x17022e00, 0x17022e00, 0x0e000403, 0x0e000403},
+        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x12000405, 0x12000405},
+        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x14000406, 0x14000406},
+        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1800040a, 0x1800040a},
+        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x1c000460, 0x1c000460},
+        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x22000463, 0x22000463},
+        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x26000465, 0x26000465},
+        {0x0000a52c, 0x41023e85, 0x41023e85, 0x2e0006e0, 0x2e0006e0},
+        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x310006e0, 0x310006e0},
+        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x330006e0, 0x330006e0},
+        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x3e0008e3, 0x3e0008e3},
+        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x410008e5, 0x410008e5},
+        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x430008e6, 0x430008e6},
+        {0x0000a544, 0x6502feca, 0x6502feca, 0x4a0008ec, 0x4a0008ec},
+        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4e0008f1, 0x4e0008f1},
+        {0x0000a54c, 0x7203feca, 0x7203feca, 0x520008f3, 0x520008f3},
+        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x54000eed, 0x54000eed},
+        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x58000ef1, 0x58000ef1},
+        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5c000ef3, 0x5c000ef3},
+        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x60000ef5, 0x60000ef5},
+        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x62000ef6, 0x62000ef6},
+        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x62000ef6, 0x62000ef6},
+        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
+        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
+        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
+        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
+        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
+        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
+        {0x0000b500, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b504, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b508, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b50c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b510, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b514, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b518, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b51c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b520, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b524, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b528, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
+        {0x0000b52c, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a},
+        {0x0000b530, 0x0000003a, 0x0000003a, 0x0000003a, 0x0000003a},
+        {0x0000b534, 0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a},
+        {0x0000b538, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b53c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b540, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b544, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b548, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b54c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b550, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b554, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b558, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b55c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b560, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b564, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b568, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b56c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b570, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b574, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b578, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x0000b57c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
+        {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
+        {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
+};
+
 static const u32 ar9485_1_1[][2] = {
         /* Addr      allmodes  */
         {0x0000a580, 0x00000000},
diff --git a/drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h
index df97f21c52dc..ccc5b6c99add 100644
--- a/drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h
@@ -23,16 +23,16 @@
 static const u32 ar955x_1p0_radio_postamble[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x00016098, 0xd2dd5554, 0xd2dd5554, 0xd28b3330, 0xd28b3330},
-        {0x0001609c, 0x0a566f3a, 0x0a566f3a, 0x06345f2a, 0x06345f2a},
-        {0x000160ac, 0xa4647c00, 0xa4647c00, 0xa4646800, 0xa4646800},
-        {0x000160b0, 0x01885f52, 0x01885f52, 0x04accf3a, 0x04accf3a},
-        {0x00016104, 0xb7a00001, 0xb7a00001, 0xb7a00001, 0xb7a00001},
+        {0x0001609c, 0x0a566f3a, 0x0a566f3a, 0x0a566f3a, 0x0a566f3a},
+        {0x000160ac, 0xa4647c00, 0xa4647c00, 0x24647c00, 0x24647c00},
+        {0x000160b0, 0x01885f52, 0x01885f52, 0x01885f52, 0x01885f52},
+        {0x00016104, 0xb7a00000, 0xb7a00000, 0xb7a00001, 0xb7a00001},
         {0x0001610c, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000},
         {0x00016140, 0x10804008, 0x10804008, 0x10804008, 0x10804008},
-        {0x00016504, 0xb7a00001, 0xb7a00001, 0xb7a00001, 0xb7a00001},
+        {0x00016504, 0xb7a00000, 0xb7a00000, 0xb7a00001, 0xb7a00001},
         {0x0001650c, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000},
         {0x00016540, 0x10804008, 0x10804008, 0x10804008, 0x10804008},
-        {0x00016904, 0xb7a00001, 0xb7a00001, 0xb7a00001, 0xb7a00001},
+        {0x00016904, 0xb7a00000, 0xb7a00000, 0xb7a00001, 0xb7a00001},
         {0x0001690c, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000},
         {0x00016940, 0x10804008, 0x10804008, 0x10804008, 0x10804008},
 };
@@ -69,15 +69,15 @@ static const u32 ar955x_1p0_baseband_postamble[][5] = {
         {0x0000a204, 0x005c0ec0, 0x005c0ec4, 0x005c0ec4, 0x005c0ec0},
         {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
         {0x0000a22c, 0x07e26a2f, 0x07e26a2f, 0x01026a2f, 0x01026a2f},
-        {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b},
+        {0x0000a230, 0x0000400a, 0x00004014, 0x00004016, 0x0000400b},
         {0x0000a234, 0x00000fff, 0x10000fff, 0x10000fff, 0x00000fff},
         {0x0000a238, 0xffb01018, 0xffb01018, 0xffb01018, 0xffb01018},
         {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
         {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
         {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
-        {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
+        {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01010e0e, 0x01010e0e},
         {0x0000a260, 0x0a021501, 0x0a021501, 0x3a021501, 0x3a021501},
-        {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+        {0x0000a264, 0x00000e0e, 0x00000e0e, 0x01000e0e, 0x01000e0e},
         {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
         {0x0000a284, 0x00000000, 0x00000000, 0x00000010, 0x00000010},
         {0x0000a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
@@ -125,7 +125,7 @@ static const u32 ar955x_1p0_radio_core[][2] = {
         {0x00016094, 0x00000000},
         {0x000160a0, 0x0a108ffe},
         {0x000160a4, 0x812fc370},
-        {0x000160a8, 0x423c8000},
+        {0x000160a8, 0x423c8100},
         {0x000160b4, 0x92480080},
         {0x000160c0, 0x006db6d0},
         {0x000160c4, 0x6db6db60},
@@ -134,7 +134,7 @@ static const u32 ar955x_1p0_radio_core[][2] = {
         {0x00016100, 0x11999601},
         {0x00016108, 0x00080010},
         {0x00016144, 0x02084080},
-        {0x00016148, 0x000080c0},
+        {0x00016148, 0x00008040},
         {0x00016280, 0x01800804},
         {0x00016284, 0x00038dc5},
         {0x00016288, 0x00000000},
@@ -178,7 +178,7 @@ static const u32 ar955x_1p0_radio_core[][2] = {
         {0x00016500, 0x11999601},
         {0x00016508, 0x00080010},
         {0x00016544, 0x02084080},
-        {0x00016548, 0x000080c0},
+        {0x00016548, 0x00008040},
         {0x00016780, 0x00000000},
         {0x00016784, 0x00000000},
         {0x00016788, 0x00400705},
@@ -218,7 +218,7 @@ static const u32 ar955x_1p0_radio_core[][2] = {
         {0x00016900, 0x11999601},
         {0x00016908, 0x00080010},
         {0x00016944, 0x02084080},
-        {0x00016948, 0x000080c0},
+        {0x00016948, 0x00008040},
         {0x00016b80, 0x00000000},
         {0x00016b84, 0x00000000},
         {0x00016b88, 0x00400705},
@@ -245,9 +245,9 @@ static const u32 ar955x_1p0_radio_core[][2] = {
 
 static const u32 ar955x_1p0_modes_xpa_tx_gain_table[][9] = {
         /* Addr      5G_HT20_L   5G_HT40_L   5G_HT20_M   5G_HT40_M   5G_HT20_H   5G_HT40_H   2G_HT40     2G_HT20  */
-        {0x0000a2dc, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xfffd5aaa, 0xfffd5aaa},
-        {0x0000a2e0, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xfffe9ccc, 0xfffe9ccc},
-        {0x0000a2e4, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xffffe0f0, 0xffffe0f0},
+        {0x0000a2dc, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xfffd5aaa, 0xfffd5aaa},
+        {0x0000a2e0, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffe9ccc, 0xfffe9ccc},
+        {0x0000a2e4, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffffe0f0, 0xffffe0f0},
         {0x0000a2e8, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xfffcff00, 0xfffcff00},
         {0x0000a410, 0x000050de, 0x000050de, 0x000050de, 0x000050de, 0x000050de, 0x000050de, 0x000050da, 0x000050da},
         {0x0000a500, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000000, 0x00000000},
@@ -256,63 +256,63 @@ static const u32 ar955x_1p0_modes_xpa_tx_gain_table[][9] = {
         {0x0000a50c, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c000006, 0x0c000006},
         {0x0000a510, 0x1000000d, 0x1000000d, 0x1000000d, 0x1000000d, 0x1000000d, 0x1000000d, 0x0f00000a, 0x0f00000a},
         {0x0000a514, 0x14000011, 0x14000011, 0x14000011, 0x14000011, 0x14000011, 0x14000011, 0x1300000c, 0x1300000c},
-        {0x0000a518, 0x19004008, 0x19004008, 0x19004008, 0x19004008, 0x18004008, 0x18004008, 0x1700000e, 0x1700000e},
-        {0x0000a51c, 0x1d00400a, 0x1d00400a, 0x1d00400a, 0x1d00400a, 0x1c00400a, 0x1c00400a, 0x1b000064, 0x1b000064},
-        {0x0000a520, 0x230020a2, 0x230020a2, 0x210020a2, 0x210020a2, 0x200020a2, 0x200020a2, 0x1f000242, 0x1f000242},
-        {0x0000a524, 0x2500006e, 0x2500006e, 0x2500006e, 0x2500006e, 0x2400006e, 0x2400006e, 0x23000229, 0x23000229},
-        {0x0000a528, 0x29022221, 0x29022221, 0x28022221, 0x28022221, 0x27022221, 0x27022221, 0x270002a2, 0x270002a2},
-        {0x0000a52c, 0x2d00062a, 0x2d00062a, 0x2c00062a, 0x2c00062a, 0x2a00062a, 0x2a00062a, 0x2c001203, 0x2c001203},
-        {0x0000a530, 0x340220a5, 0x340220a5, 0x320220a5, 0x320220a5, 0x2f0220a5, 0x2f0220a5, 0x30001803, 0x30001803},
-        {0x0000a534, 0x380022c5, 0x380022c5, 0x350022c5, 0x350022c5, 0x320022c5, 0x320022c5, 0x33000881, 0x33000881},
-        {0x0000a538, 0x3b002486, 0x3b002486, 0x39002486, 0x39002486, 0x36002486, 0x36002486, 0x38001809, 0x38001809},
-        {0x0000a53c, 0x3f00248a, 0x3f00248a, 0x3d00248a, 0x3d00248a, 0x3a00248a, 0x3a00248a, 0x3a000814, 0x3a000814},
-        {0x0000a540, 0x4202242c, 0x4202242c, 0x4102242c, 0x4102242c, 0x3f02242c, 0x3f02242c, 0x3f001a0c, 0x3f001a0c},
-        {0x0000a544, 0x490044c6, 0x490044c6, 0x460044c6, 0x460044c6, 0x420044c6, 0x420044c6, 0x43001a0e, 0x43001a0e},
-        {0x0000a548, 0x4d024485, 0x4d024485, 0x4a024485, 0x4a024485, 0x46024485, 0x46024485, 0x46001812, 0x46001812},
-        {0x0000a54c, 0x51044483, 0x51044483, 0x4e044483, 0x4e044483, 0x4a044483, 0x4a044483, 0x49001884, 0x49001884},
-        {0x0000a550, 0x5404a40c, 0x5404a40c, 0x5204a40c, 0x5204a40c, 0x4d04a40c, 0x4d04a40c, 0x4d001e84, 0x4d001e84},
-        {0x0000a554, 0x57024632, 0x57024632, 0x55024632, 0x55024632, 0x52024632, 0x52024632, 0x50001e69, 0x50001e69},
-        {0x0000a558, 0x5c00a634, 0x5c00a634, 0x5900a634, 0x5900a634, 0x5600a634, 0x5600a634, 0x550006f4, 0x550006f4},
-        {0x0000a55c, 0x5f026832, 0x5f026832, 0x5d026832, 0x5d026832, 0x5a026832, 0x5a026832, 0x59000ad3, 0x59000ad3},
-        {0x0000a560, 0x6602b012, 0x6602b012, 0x6202b012, 0x6202b012, 0x5d02b012, 0x5d02b012, 0x5e000ad5, 0x5e000ad5},
-        {0x0000a564, 0x6e02d0e1, 0x6e02d0e1, 0x6802d0e1, 0x6802d0e1, 0x6002d0e1, 0x6002d0e1, 0x61001ced, 0x61001ced},
-        {0x0000a568, 0x7202b4c4, 0x7202b4c4, 0x6c02b4c4, 0x6c02b4c4, 0x6502b4c4, 0x6502b4c4, 0x660018d4, 0x660018d4},
-        {0x0000a56c, 0x75007894, 0x75007894, 0x70007894, 0x70007894, 0x6b007894, 0x6b007894, 0x660018d4, 0x660018d4},
-        {0x0000a570, 0x7b025c74, 0x7b025c74, 0x75025c74, 0x75025c74, 0x70025c74, 0x70025c74, 0x660018d4, 0x660018d4},
-        {0x0000a574, 0x8300bcb5, 0x8300bcb5, 0x7a00bcb5, 0x7a00bcb5, 0x7600bcb5, 0x7600bcb5, 0x660018d4, 0x660018d4},
-        {0x0000a578, 0x8a04dc74, 0x8a04dc74, 0x7f04dc74, 0x7f04dc74, 0x7c04dc74, 0x7c04dc74, 0x660018d4, 0x660018d4},
-        {0x0000a57c, 0x8a04dc74, 0x8a04dc74, 0x7f04dc74, 0x7f04dc74, 0x7c04dc74, 0x7c04dc74, 0x660018d4, 0x660018d4},
+        {0x0000a518, 0x1700002b, 0x1700002b, 0x1700002b, 0x1700002b, 0x1600002b, 0x1600002b, 0x1700000e, 0x1700000e},
+        {0x0000a51c, 0x1b00002d, 0x1b00002d, 0x1b00002d, 0x1b00002d, 0x1a00002d, 0x1a00002d, 0x1b000064, 0x1b000064},
+        {0x0000a520, 0x20000031, 0x20000031, 0x1f000031, 0x1f000031, 0x1e000031, 0x1e000031, 0x1f000242, 0x1f000242},
+        {0x0000a524, 0x24000051, 0x24000051, 0x23000051, 0x23000051, 0x23000051, 0x23000051, 0x23000229, 0x23000229},
+        {0x0000a528, 0x27000071, 0x27000071, 0x27000071, 0x27000071, 0x26000071, 0x26000071, 0x270002a2, 0x270002a2},
+        {0x0000a52c, 0x2b000092, 0x2b000092, 0x2b000092, 0x2b000092, 0x2b000092, 0x2b000092, 0x2c001203, 0x2c001203},
+        {0x0000a530, 0x3000028c, 0x3000028c, 0x2f00028c, 0x2f00028c, 0x2e00028c, 0x2e00028c, 0x30001803, 0x30001803},
+        {0x0000a534, 0x34000290, 0x34000290, 0x33000290, 0x33000290, 0x32000290, 0x32000290, 0x33000881, 0x33000881},
+        {0x0000a538, 0x37000292, 0x37000292, 0x36000292, 0x36000292, 0x35000292, 0x35000292, 0x38001809, 0x38001809},
+        {0x0000a53c, 0x3b02028d, 0x3b02028d, 0x3a02028d, 0x3a02028d, 0x3902028d, 0x3902028d, 0x3a000814, 0x3a000814},
+        {0x0000a540, 0x3f020291, 0x3f020291, 0x3e020291, 0x3e020291, 0x3d020291, 0x3d020291, 0x3f001a0c, 0x3f001a0c},
+        {0x0000a544, 0x44020490, 0x44020490, 0x43020490, 0x43020490, 0x42020490, 0x42020490, 0x43001a0e, 0x43001a0e},
+        {0x0000a548, 0x48020492, 0x48020492, 0x47020492, 0x47020492, 0x46020492, 0x46020492, 0x46001812, 0x46001812},
+        {0x0000a54c, 0x4c020692, 0x4c020692, 0x4b020692, 0x4b020692, 0x4a020692, 0x4a020692, 0x49001884, 0x49001884},
+        {0x0000a550, 0x50020892, 0x50020892, 0x4f020892, 0x4f020892, 0x4e020892, 0x4e020892, 0x4d001e84, 0x4d001e84},
+        {0x0000a554, 0x53040891, 0x53040891, 0x53040891, 0x53040891, 0x52040891, 0x52040891, 0x50001e69, 0x50001e69},
+        {0x0000a558, 0x58040893, 0x58040893, 0x57040893, 0x57040893, 0x56040893, 0x56040893, 0x550006f4, 0x550006f4},
+        {0x0000a55c, 0x5c0408b4, 0x5c0408b4, 0x5a0408b4, 0x5a0408b4, 0x5a0408b4, 0x5a0408b4, 0x59000ad3, 0x59000ad3},
+        {0x0000a560, 0x610408b6, 0x610408b6, 0x5e0408b6, 0x5e0408b6, 0x5e0408b6, 0x5e0408b6, 0x5e000ad5, 0x5e000ad5},
+        {0x0000a564, 0x670408f6, 0x670408f6, 0x620408f6, 0x620408f6, 0x620408f6, 0x620408f6, 0x61001ced, 0x61001ced},
+        {0x0000a568, 0x6a040cf6, 0x6a040cf6, 0x66040cf6, 0x66040cf6, 0x66040cf6, 0x66040cf6, 0x660018d4, 0x660018d4},
+        {0x0000a56c, 0x6d040d76, 0x6d040d76, 0x6a040d76, 0x6a040d76, 0x6a040d76, 0x6a040d76, 0x660018d4, 0x660018d4},
+        {0x0000a570, 0x70060db6, 0x70060db6, 0x6e060db6, 0x6e060db6, 0x6e060db6, 0x6e060db6, 0x660018d4, 0x660018d4},
+        {0x0000a574, 0x730a0df6, 0x730a0df6, 0x720a0df6, 0x720a0df6, 0x720a0df6, 0x720a0df6, 0x660018d4, 0x660018d4},
+        {0x0000a578, 0x770a13f6, 0x770a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x660018d4, 0x660018d4},
+        {0x0000a57c, 0x770a13f6, 0x770a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x660018d4, 0x660018d4},
         {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03804000, 0x03804000},
-        {0x0000a610, 0x04c08c01, 0x04c08c01, 0x04808b01, 0x04808b01, 0x04808a01, 0x04808a01, 0x0300ca02, 0x0300ca02},
-        {0x0000a614, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00000e04, 0x00000e04},
-        {0x0000a618, 0x04010c01, 0x04010c01, 0x03c10b01, 0x03c10b01, 0x03810a01, 0x03810a01, 0x03014000, 0x03014000},
-        {0x0000a61c, 0x03814e05, 0x03814e05, 0x03414d05, 0x03414d05, 0x03414d05, 0x03414d05, 0x00000000, 0x00000000},
-        {0x0000a620, 0x04010303, 0x04010303, 0x03c10303, 0x03c10303, 0x03810303, 0x03810303, 0x00000000, 0x00000000},
-        {0x0000a624, 0x03814e05, 0x03814e05, 0x03414d05, 0x03414d05, 0x03414d05, 0x03414d05, 0x03014000, 0x03014000},
-        {0x0000a628, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x03804c05, 0x03804c05},
-        {0x0000a62c, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x0701de06, 0x0701de06},
-        {0x0000a630, 0x03418000, 0x03418000, 0x03018000, 0x03018000, 0x02c18000, 0x02c18000, 0x07819c07, 0x07819c07},
-        {0x0000a634, 0x03815004, 0x03815004, 0x03414f04, 0x03414f04, 0x03414e04, 0x03414e04, 0x0701dc07, 0x0701dc07},
-        {0x0000a638, 0x03005302, 0x03005302, 0x02c05202, 0x02c05202, 0x02805202, 0x02805202, 0x0701dc07, 0x0701dc07},
-        {0x0000a63c, 0x04c09302, 0x04c09302, 0x04809202, 0x04809202, 0x04809202, 0x04809202, 0x0701dc07, 0x0701dc07},
-        {0x0000b2dc, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xfffd5aaa, 0xfffd5aaa},
-        {0x0000b2e0, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xfffe9ccc, 0xfffe9ccc},
-        {0x0000b2e4, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xffffe0f0, 0xffffe0f0},
+        {0x0000a60c, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x03804000, 0x03804000},
+        {0x0000a610, 0x04008b01, 0x04008b01, 0x04008b01, 0x04008b01, 0x03c08b01, 0x03c08b01, 0x0300ca02, 0x0300ca02},
+        {0x0000a614, 0x05811403, 0x05811403, 0x05411303, 0x05411303, 0x05411303, 0x05411303, 0x00000e04, 0x00000e04},
+        {0x0000a618, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x03014000, 0x03014000},
+        {0x0000a61c, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x00000000, 0x00000000},
+        {0x0000a620, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x00000000, 0x00000000},
+        {0x0000a624, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x03014000, 0x03014000},
+        {0x0000a628, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x03804c05, 0x03804c05},
+        {0x0000a62c, 0x06815604, 0x06815604, 0x06415504, 0x06415504, 0x06015504, 0x06015504, 0x0701de06, 0x0701de06},
+        {0x0000a630, 0x07819a05, 0x07819a05, 0x07419905, 0x07419905, 0x07019805, 0x07019805, 0x07819c07, 0x07819c07},
+        {0x0000a634, 0x07819e06, 0x07819e06, 0x07419d06, 0x07419d06, 0x07019c06, 0x07019c06, 0x0701dc07, 0x0701dc07},
+        {0x0000a638, 0x07819e06, 0x07819e06, 0x07419d06, 0x07419d06, 0x07019c06, 0x07019c06, 0x0701dc07, 0x0701dc07},
+        {0x0000a63c, 0x07819e06, 0x07819e06, 0x07419d06, 0x07419d06, 0x07019c06, 0x07019c06, 0x0701dc07, 0x0701dc07},
+        {0x0000b2dc, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xfffd5aaa, 0xfffd5aaa},
+        {0x0000b2e0, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffe9ccc, 0xfffe9ccc},
+        {0x0000b2e4, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffffe0f0, 0xffffe0f0},
         {0x0000b2e8, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xfffcff00, 0xfffcff00},
-        {0x0000c2dc, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xfffd5aaa, 0xfffd5aaa},
-        {0x0000c2e0, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xfffe9ccc, 0xfffe9ccc},
-        {0x0000c2e4, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xffffe0f0, 0xffffe0f0},
+        {0x0000c2dc, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xfffd5aaa, 0xfffd5aaa},
+        {0x0000c2e0, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffe9ccc, 0xfffe9ccc},
+        {0x0000c2e4, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffffe0f0, 0xffffe0f0},
         {0x0000c2e8, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xfffcff00, 0xfffcff00},
         {0x00016044, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x010002d4, 0x010002d4},
-        {0x00016048, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x66482401, 0x66482401},
+        {0x00016048, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401},
         {0x00016280, 0x01801e84, 0x01801e84, 0x01801e84, 0x01801e84, 0x01801e84, 0x01801e84, 0x01808e84, 0x01808e84},
         {0x00016444, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x010002d4, 0x010002d4},
-        {0x00016448, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x66482401, 0x66482401},
+        {0x00016448, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401},
         {0x00016844, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x010002d4, 0x010002d4},
-        {0x00016848, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x66482401, 0x66482401},
+        {0x00016848, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401},
 };
 
 static const u32 ar955x_1p0_mac_core[][2] = {
@@ -846,7 +846,7 @@ static const u32 ar955x_1p0_baseband_core[][2] = {
         {0x0000a44c, 0x00000001},
         {0x0000a450, 0x00010000},
         {0x0000a458, 0x00000000},
-        {0x0000a644, 0x3fad9d74},
+        {0x0000a644, 0xbfad9d74},
         {0x0000a648, 0x0048060a},
         {0x0000a64c, 0x00003c37},
         {0x0000a670, 0x03020100},
@@ -1277,7 +1277,7 @@ static const u32 ar955x_1p0_modes_fast_clock[][3] = {
         {0x0000801c, 0x148ec02b, 0x148ec057},
         {0x00008318, 0x000044c0, 0x00008980},
         {0x00009e00, 0x0372131c, 0x0372131c},
-        {0x0000a230, 0x0000000b, 0x00000016},
+        {0x0000a230, 0x0000400b, 0x00004016},
         {0x0000a254, 0x00000898, 0x00001130},
 };
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
index 6e1915aee712..28fd99203f64 100644
--- a/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
@@ -685,6 +685,82 @@ static const u32 ar9580_1p0_mixed_ob_db_tx_gain_table[][5] = {
 
 #define ar9580_1p0_high_ob_db_tx_gain_table ar9300Modes_high_ob_db_tx_gain_table_2p2
 
+#define ar9580_1p0_type5_tx_gain_table ar9300Modes_type5_tx_gain_table_2p2
+
+static const u32 ar9580_1p0_type6_tx_gain_table[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
+        {0x0000a2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
+        {0x0000a2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
+        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
+        {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
+        {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
+        {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
+        {0x0000a510, 0x15000028, 0x15000028, 0x0f000202, 0x0f000202},
+        {0x0000a514, 0x1b00002b, 0x1b00002b, 0x12000400, 0x12000400},
+        {0x0000a518, 0x1f020028, 0x1f020028, 0x16000402, 0x16000402},
+        {0x0000a51c, 0x2502002b, 0x2502002b, 0x19000404, 0x19000404},
+        {0x0000a520, 0x2a04002a, 0x2a04002a, 0x1c000603, 0x1c000603},
+        {0x0000a524, 0x2e06002a, 0x2e06002a, 0x21000a02, 0x21000a02},
+        {0x0000a528, 0x3302202d, 0x3302202d, 0x25000a04, 0x25000a04},
+        {0x0000a52c, 0x3804202c, 0x3804202c, 0x28000a20, 0x28000a20},
+        {0x0000a530, 0x3c06202c, 0x3c06202c, 0x2c000e20, 0x2c000e20},
+        {0x0000a534, 0x4108202d, 0x4108202d, 0x30000e22, 0x30000e22},
+        {0x0000a538, 0x4506402d, 0x4506402d, 0x34000e24, 0x34000e24},
+        {0x0000a53c, 0x4906222d, 0x4906222d, 0x38001640, 0x38001640},
+        {0x0000a540, 0x4d062231, 0x4d062231, 0x3c001660, 0x3c001660},
+        {0x0000a544, 0x50082231, 0x50082231, 0x3f001861, 0x3f001861},
+        {0x0000a548, 0x5608422e, 0x5608422e, 0x43001a81, 0x43001a81},
+        {0x0000a54c, 0x5e08442e, 0x5e08442e, 0x47001a83, 0x47001a83},
+        {0x0000a550, 0x620a4431, 0x620a4431, 0x4a001c84, 0x4a001c84},
+        {0x0000a554, 0x640a4432, 0x640a4432, 0x4e001ce3, 0x4e001ce3},
+        {0x0000a558, 0x680a4434, 0x680a4434, 0x52001ce5, 0x52001ce5},
+        {0x0000a55c, 0x6c0a6434, 0x6c0a6434, 0x56001ce9, 0x56001ce9},
+        {0x0000a560, 0x6f0a6633, 0x6f0a6633, 0x5a001ceb, 0x5a001ceb},
+        {0x0000a564, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a568, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a56c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a570, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a574, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a578, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a57c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
+        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a608, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
+        {0x0000a610, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
+        {0x0000a614, 0x01804601, 0x01804601, 0x01404000, 0x01404000},
+        {0x0000a618, 0x01804601, 0x01804601, 0x01404501, 0x01404501},
+        {0x0000a61c, 0x01804601, 0x01804601, 0x02008501, 0x02008501},
+        {0x0000a620, 0x03408d02, 0x03408d02, 0x0280ca03, 0x0280ca03},
+        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
+        {0x0000a628, 0x03410d04, 0x03410d04, 0x04014c04, 0x04014c04},
+        {0x0000a62c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000a630, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000a634, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000a638, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000a63c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
+        {0x0000b2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
+        {0x0000b2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
+        {0x0000b2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
+        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+        {0x0000c2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
+        {0x0000c2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
+        {0x0000c2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
+        {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+        {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+        {0x00016048, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
+        {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+        {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+        {0x00016448, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
+        {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+        {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
+        {0x00016848, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
+        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
+};
+
 static const u32 ar9580_1p0_soc_preamble[][2] = {
         /* Addr      allmodes  */
         {0x000040a4, 0x00a0c1c9},
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 86e26a19efda..b2d6c18d1678 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -109,14 +109,11 @@ struct ath_descdma {
         void *dd_desc;
         dma_addr_t dd_desc_paddr;
         u32 dd_desc_len;
-        struct ath_buf *dd_bufptr;
 };
 
 int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
                       struct list_head *head, const char *name,
                       int nbuf, int ndesc, bool is_tx);
-void ath_descdma_cleanup(struct ath_softc *sc, struct ath_descdma *dd,
-                         struct list_head *head);
 
 /***********/
 /* RX / TX */
@@ -317,10 +314,8 @@ struct ath_rx {
         u32 *rxlink;
         u32 num_pkts;
         unsigned int rxfilter;
-        spinlock_t rxbuflock;
         struct list_head rxbuf;
         struct ath_descdma rxdma;
-        struct ath_buf *rx_bufptr;
         struct ath_rx_edma rx_edma[ATH9K_RX_QUEUE_MAX];
 
         struct sk_buff *frag;
@@ -328,7 +323,6 @@ struct ath_rx {
 
 int ath_startrecv(struct ath_softc *sc);
 bool ath_stoprecv(struct ath_softc *sc);
-void ath_flushrecv(struct ath_softc *sc);
 u32 ath_calcrxfilter(struct ath_softc *sc);
 int ath_rx_init(struct ath_softc *sc, int nbufs);
 void ath_rx_cleanup(struct ath_softc *sc);
@@ -338,14 +332,12 @@ void ath_txq_lock(struct ath_softc *sc, struct ath_txq *txq);
 void ath_txq_unlock(struct ath_softc *sc, struct ath_txq *txq);
 void ath_txq_unlock_complete(struct ath_softc *sc, struct ath_txq *txq);
 void ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq);
-bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx);
-void ath_draintxq(struct ath_softc *sc,
-                     struct ath_txq *txq, bool retry_tx);
+bool ath_drain_all_txq(struct ath_softc *sc);
+void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq);
 void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an);
 void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an);
 void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq);
 int ath_tx_init(struct ath_softc *sc, int nbufs);
-void ath_tx_cleanup(struct ath_softc *sc);
 int ath_txq_update(struct ath_softc *sc, int qnum,
                    struct ath9k_tx_queue_info *q);
 void ath_update_max_aggr_framelen(struct ath_softc *sc, int queue, int txop);
@@ -646,7 +638,6 @@ void ath_ant_comb_update(struct ath_softc *sc);
 enum sc_op_flags {
         SC_OP_INVALID,
         SC_OP_BEACONS,
-        SC_OP_RXFLUSH,
         SC_OP_ANI_RUN,
         SC_OP_PRIM_STA_VIF,
         SC_OP_HW_RESET,
@@ -675,6 +666,23 @@ struct ath9k_vif_iter_data {
         int nadhocs;   /* number of adhoc vifs */
 };
 
+/* enum spectral_mode:
+ *
+ * @SPECTRAL_DISABLED: spectral mode is disabled
+ * @SPECTRAL_BACKGROUND: hardware sends samples when it is not busy with
+ *      something else.
+ * @SPECTRAL_MANUAL: spectral scan is enabled, triggering for samples
+ *      is performed manually.
+ * @SPECTRAL_CHANSCAN: Like manual, but also triggered when changing channels
+ *      during a channel scan.
+ */
+enum spectral_mode {
+        SPECTRAL_DISABLED = 0,
+        SPECTRAL_BACKGROUND,
+        SPECTRAL_MANUAL,
+        SPECTRAL_CHANSCAN,
+};
+
 struct ath_softc {
         struct ieee80211_hw *hw;
         struct device *dev;
@@ -743,6 +751,10 @@ struct ath_softc {
         u8 ant_tx, ant_rx;
         struct dfs_pattern_detector *dfs_detector;
         u32 wow_enabled;
+        /* relay(fs) channel for spectral scan */
+        struct rchan *rfs_chan_spec_scan;
+        enum spectral_mode spectral_mode;
+        int scanning;
 
 #ifdef CONFIG_PM_SLEEP
         atomic_t wow_got_bmiss_intr;
@@ -751,6 +763,133 @@ struct ath_softc {
 #endif
 };
 
+#define SPECTRAL_SCAN_BITMASK           0x10
+/* Radar info packet format, used for DFS and spectral formats. */
+struct ath_radar_info {
+        u8 pulse_length_pri;
+        u8 pulse_length_ext;
+        u8 pulse_bw_info;
+} __packed;
+
+/* The HT20 spectral data has 4 bytes of additional information at it's end.
+ *
+ * [7:0]: all bins {max_magnitude[1:0], bitmap_weight[5:0]}
+ * [7:0]: all bins  max_magnitude[9:2]
+ * [7:0]: all bins {max_index[5:0], max_magnitude[11:10]}
+ * [3:0]: max_exp (shift amount to size max bin to 8-bit unsigned)
+ */
+struct ath_ht20_mag_info {
+        u8 all_bins[3];
+        u8 max_exp;
+} __packed;
+
+#define SPECTRAL_HT20_NUM_BINS          56
+
+/* WARNING: don't actually use this struct! MAC may vary the amount of
+ * data by -1/+2. This struct is for reference only.
+ */
+struct ath_ht20_fft_packet {
+        u8 data[SPECTRAL_HT20_NUM_BINS];
+        struct ath_ht20_mag_info mag_info;
+        struct ath_radar_info radar_info;
+} __packed;
+
+#define SPECTRAL_HT20_TOTAL_DATA_LEN    (sizeof(struct ath_ht20_fft_packet))
+
+/* Dynamic 20/40 mode:
+ *
+ * [7:0]: lower bins {max_magnitude[1:0], bitmap_weight[5:0]}
+ * [7:0]: lower bins  max_magnitude[9:2]
+ * [7:0]: lower bins {max_index[5:0], max_magnitude[11:10]}
+ * [7:0]: upper bins {max_magnitude[1:0], bitmap_weight[5:0]}
+ * [7:0]: upper bins  max_magnitude[9:2]
+ * [7:0]: upper bins {max_index[5:0], max_magnitude[11:10]}
+ * [3:0]: max_exp (shift amount to size max bin to 8-bit unsigned)
+ */
+struct ath_ht20_40_mag_info {
+        u8 lower_bins[3];
+        u8 upper_bins[3];
+        u8 max_exp;
+} __packed;
+
+#define SPECTRAL_HT20_40_NUM_BINS               128
+
+/* WARNING: don't actually use this struct! MAC may vary the amount of
+ * data. This struct is for reference only.
+ */
+struct ath_ht20_40_fft_packet {
+        u8 data[SPECTRAL_HT20_40_NUM_BINS];
+        struct ath_ht20_40_mag_info mag_info;
+        struct ath_radar_info radar_info;
+} __packed;
+
+
+#define SPECTRAL_HT20_40_TOTAL_DATA_LEN (sizeof(struct ath_ht20_40_fft_packet))
+
+/* grabs the max magnitude from the all/upper/lower bins */
+static inline u16 spectral_max_magnitude(u8 *bins)
+{
+        return (bins[0] & 0xc0) >> 6 |
+               (bins[1] & 0xff) << 2 |
+               (bins[2] & 0x03) << 10;
+}
+
+/* return the max magnitude from the all/upper/lower bins */
+static inline u8 spectral_max_index(u8 *bins)
+{
+        s8 m = (bins[2] & 0xfc) >> 2;
+
+        /* TODO: this still doesn't always report the right values ... */
+        if (m > 32)
+                m |= 0xe0;
+        else
+                m &= ~0xe0;
+
+        return m + 29;
+}
+
+/* return the bitmap weight from the all/upper/lower bins */
+static inline u8 spectral_bitmap_weight(u8 *bins)
+{
+        return bins[0] & 0x3f;
+}
+
+/* FFT sample format given to userspace via debugfs.
+ *
+ * Please keep the type/length at the front position and change
+ * other fields after adding another sample type
+ *
+ * TODO: this might need rework when switching to nl80211-based
+ * interface.
+ */
+enum ath_fft_sample_type {
+        ATH_FFT_SAMPLE_HT20 = 0,
+};
+
+struct fft_sample_tlv {
+        u8 type;        /* see ath_fft_sample */
+        u16 length;
+        /* type dependent data follows */
+} __packed;
+
+struct fft_sample_ht20 {
+        struct fft_sample_tlv tlv;
+
+        u8 __alignment;
+
+        u16 freq;
+        s8 rssi;
+        s8 noise;
+
+        u16 max_magnitude;
+        u8 max_index;
+        u8 bitmap_weight;
+
+        u64 tsf;
+
+        u16 data[SPECTRAL_HT20_NUM_BINS];
+} __packed;
+
 void ath9k_tasklet(unsigned long data);
 int ath_cabq_update(struct ath_softc *);
 
@@ -773,6 +912,10 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);
 void ath9k_reload_chainmask_settings(struct ath_softc *sc);
 
 bool ath9k_uses_beacons(int type);
+void ath9k_spectral_scan_trigger(struct ieee80211_hw *hw);
+int ath9k_spectral_scan_config(struct ieee80211_hw *hw,
+                               enum spectral_mode spectral_mode);
+
 
 #ifdef CONFIG_ATH9K_PCI
 int ath_pci_init(void);
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 531fffd801a3..dd3771954bd7 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -147,6 +147,7 @@ static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw,
                                  skb->len, DMA_TO_DEVICE);
                 dev_kfree_skb_any(skb);
                 bf->bf_buf_addr = 0;
+                bf->bf_mpdu = NULL;
         }
 
         skb = ieee80211_beacon_get(hw, vif);
@@ -198,7 +199,7 @@ static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw,
                 if (sc->nvifs > 1) {
                         ath_dbg(common, BEACON,
                                 "Flushing previous cabq traffic\n");
-                        ath_draintxq(sc, cabq, false);
+                        ath_draintxq(sc, cabq);
                 }
         }
 
@@ -359,7 +360,6 @@ void ath9k_beacon_tasklet(unsigned long data)
                 return;
 
         bf = ath9k_beacon_generate(sc->hw, vif);
-        WARN_ON(!bf);
 
         if (sc->beacon.bmisscnt != 0) {
                 ath_dbg(common, BSTUCK, "resume beacon xmit after %u misses\n",
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 13ff9edc2401..6c5d313ebcb7 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/export.h>
+#include <linux/relay.h>
 #include <asm/unaligned.h>
 
 #include "ath9k.h"
@@ -861,7 +862,6 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,
         RXS_ERR("RX-LENGTH-ERR", rx_len_err);
         RXS_ERR("RX-OOM-ERR", rx_oom_err);
         RXS_ERR("RX-RATE-ERR", rx_rate_err);
-        RXS_ERR("RX-DROP-RXFLUSH", rx_drop_rxflush);
         RXS_ERR("RX-TOO-MANY-FRAGS", rx_too_many_frags_err);
 
         PHY_ERR("UNDERRUN ERR", ATH9K_PHYERR_UNDERRUN);
@@ -966,6 +966,112 @@ static const struct file_operations fops_recv = {
         .llseek = default_llseek,
 };
 
+static ssize_t read_file_spec_scan_ctl(struct file *file, char __user *user_buf,
+                                       size_t count, loff_t *ppos)
+{
+        struct ath_softc *sc = file->private_data;
+        char *mode = "";
+        unsigned int len;
+
+        switch (sc->spectral_mode) {
+        case SPECTRAL_DISABLED:
+                mode = "disable";
+                break;
+        case SPECTRAL_BACKGROUND:
+                mode = "background";
+                break;
+        case SPECTRAL_CHANSCAN:
+                mode = "chanscan";
+                break;
+        case SPECTRAL_MANUAL:
+                mode = "manual";
+                break;
+        }
+        len = strlen(mode);
+        return simple_read_from_buffer(user_buf, count, ppos, mode, len);
+}
+
+static ssize_t write_file_spec_scan_ctl(struct file *file,
+                                        const char __user *user_buf,
+                                        size_t count, loff_t *ppos)
+{
+        struct ath_softc *sc = file->private_data;
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        char buf[32];
+        ssize_t len;
+
+        len = min(count, sizeof(buf) - 1);
+        if (copy_from_user(buf, user_buf, len))
+                return -EFAULT;
+
+        buf[len] = '\0';
+
+        if (strncmp("trigger", buf, 7) == 0) {
+                ath9k_spectral_scan_trigger(sc->hw);
+        } else if (strncmp("background", buf, 9) == 0) {
+                ath9k_spectral_scan_config(sc->hw, SPECTRAL_BACKGROUND);
+                ath_dbg(common, CONFIG, "spectral scan: background mode enabled\n");
+        } else if (strncmp("chanscan", buf, 8) == 0) {
+                ath9k_spectral_scan_config(sc->hw, SPECTRAL_CHANSCAN);
+                ath_dbg(common, CONFIG, "spectral scan: channel scan mode enabled\n");
+        } else if (strncmp("manual", buf, 6) == 0) {
+                ath9k_spectral_scan_config(sc->hw, SPECTRAL_MANUAL);
+                ath_dbg(common, CONFIG, "spectral scan: manual mode enabled\n");
+        } else if (strncmp("disable", buf, 7) == 0) {
+                ath9k_spectral_scan_config(sc->hw, SPECTRAL_DISABLED);
+                ath_dbg(common, CONFIG, "spectral scan: disabled\n");
+        } else {
+                return -EINVAL;
+        }
+
+        return count;
+}
+
+static const struct file_operations fops_spec_scan_ctl = {
+        .read = read_file_spec_scan_ctl,
+        .write = write_file_spec_scan_ctl,
+        .open = simple_open,
+        .owner = THIS_MODULE,
+        .llseek = default_llseek,
+};
+
+static struct dentry *create_buf_file_handler(const char *filename,
+                                              struct dentry *parent,
+                                              umode_t mode,
+                                              struct rchan_buf *buf,
+                                              int *is_global)
+{
+        struct dentry *buf_file;
+
+        buf_file = debugfs_create_file(filename, mode, parent, buf,
+                                       &relay_file_operations);
+        *is_global = 1;
+        return buf_file;
+}
+
+static int remove_buf_file_handler(struct dentry *dentry)
+{
+        debugfs_remove(dentry);
+
+        return 0;
+}
+
+void ath_debug_send_fft_sample(struct ath_softc *sc,
+                               struct fft_sample_tlv *fft_sample_tlv)
+{
+        if (!sc->rfs_chan_spec_scan)
+                return;
+
+        relay_write(sc->rfs_chan_spec_scan, fft_sample_tlv,
+                    fft_sample_tlv->length + sizeof(*fft_sample_tlv));
+}
+
+static struct rchan_callbacks rfs_spec_scan_cb = {
+        .create_buf_file = create_buf_file_handler,
+        .remove_buf_file = remove_buf_file_handler,
+};
+
+
 static ssize_t read_file_regidx(struct file *file, char __user *user_buf,
                                 size_t count, loff_t *ppos)
 {
@@ -1780,6 +1886,14 @@ int ath9k_init_debug(struct ath_hw *ah)
                             &fops_base_eeprom);
         debugfs_create_file("modal_eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
                             &fops_modal_eeprom);
+        sc->rfs_chan_spec_scan = relay_open("spectral_scan",
+                                            sc->debug.debugfs_phy,
+                                            262144, 4, &rfs_spec_scan_cb,
+                                            NULL);
+        debugfs_create_file("spectral_scan_ctl", S_IRUSR | S_IWUSR,
+                            sc->debug.debugfs_phy, sc,
+                            &fops_spec_scan_ctl);
+
 #ifdef CONFIG_ATH9K_MAC_DEBUG
         debugfs_create_file("samples", S_IRUSR, sc->debug.debugfs_phy, sc,
                             &fops_samps);
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h
index 375c3b46411e..a22c0d780700 100644
--- a/drivers/net/wireless/ath/ath9k/debug.h
+++ b/drivers/net/wireless/ath/ath9k/debug.h
@@ -23,6 +23,7 @@
 
 struct ath_txq;
 struct ath_buf;
+struct fft_sample_tlv;
 
 #ifdef CONFIG_ATH9K_DEBUGFS
 #define TX_STAT_INC(q, c) sc->debug.stats.txstats[q].c++
@@ -216,7 +217,6 @@ struct ath_tx_stats {
  * @rx_oom_err:  No. of frames dropped due to OOM issues.
  * @rx_rate_err:  No. of frames dropped due to rate errors.
  * @rx_too_many_frags_err:  Frames dropped due to too-many-frags received.
- * @rx_drop_rxflush: No. of frames dropped due to RX-FLUSH.
  * @rx_beacons:  No. of beacons received.
  * @rx_frags:  No. of rx-fragements received.
  */
@@ -235,7 +235,6 @@ struct ath_rx_stats {
         u32 rx_oom_err;
         u32 rx_rate_err;
         u32 rx_too_many_frags_err;
-        u32 rx_drop_rxflush;
         u32 rx_beacons;
         u32 rx_frags;
 };
@@ -323,6 +322,10 @@ void ath9k_sta_remove_debugfs(struct ieee80211_hw *hw,
                               struct ieee80211_vif *vif,
                               struct ieee80211_sta *sta,
                               struct dentry *dir);
+
+void ath_debug_send_fft_sample(struct ath_softc *sc,
+                               struct fft_sample_tlv *fft_sample);
+
 #else
 
 #define RX_STAT_INC(c) /* NOP */
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index b2f85cb5ed30..716058b67557 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -280,14 +280,14 @@ err:
         return ret;
 }
 
-static int ath9k_reg_notifier(struct wiphy *wiphy,
-                              struct regulatory_request *request)
+static void ath9k_reg_notifier(struct wiphy *wiphy,
+                               struct regulatory_request *request)
 {
         struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
         struct ath9k_htc_priv *priv = hw->priv;
 
-        return ath_reg_notifier_apply(wiphy, request,
-                                      ath9k_hw_regulatory(priv->ah));
+        ath_reg_notifier_apply(wiphy, request,
+                               ath9k_hw_regulatory(priv->ah));
 }
 
 static unsigned int ath9k_regread(void *hw_priv, u32 reg_offset)
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 9c07a8fa5134..a8016d70088a 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1628,7 +1628,9 @@ static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw,
                 if (!ret)
                         ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
                 break;
-        case IEEE80211_AMPDU_TX_STOP:
+        case IEEE80211_AMPDU_TX_STOP_CONT:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
                 ath9k_htc_tx_aggr_oper(priv, vif, sta, action, tid);
                 ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
                 break;
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
index 4a9570dfba72..aac4a406a513 100644
--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -344,6 +344,8 @@ void ath9k_htc_txcompletion_cb(struct htc_target *htc_handle,
                         endpoint->ep_callbacks.tx(endpoint->ep_callbacks.priv,
                                                   skb, htc_hdr->endpoint_id,
                                                   txok);
+                } else {
+                        kfree_skb(skb);
                 }
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/hw-ops.h b/drivers/net/wireless/ath/ath9k/hw-ops.h
index 0f2b97f6b739..14b701140b49 100644
--- a/drivers/net/wireless/ath/ath9k/hw-ops.h
+++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
@@ -101,22 +101,6 @@ static inline void ath9k_hw_spur_mitigate_freq(struct ath_hw *ah,
         ath9k_hw_private_ops(ah)->spur_mitigate_freq(ah, chan);
 }
 
-static inline int ath9k_hw_rf_alloc_ext_banks(struct ath_hw *ah)
-{
-        if (!ath9k_hw_private_ops(ah)->rf_alloc_ext_banks)
-                return 0;
-
-        return ath9k_hw_private_ops(ah)->rf_alloc_ext_banks(ah);
-}
-
-static inline void ath9k_hw_rf_free_ext_banks(struct ath_hw *ah)
-{
-        if (!ath9k_hw_private_ops(ah)->rf_free_ext_banks)
-                return;
-
-        ath9k_hw_private_ops(ah)->rf_free_ext_banks(ah);
-}
-
 static inline bool ath9k_hw_set_rf_regs(struct ath_hw *ah,
                                         struct ath9k_channel *chan,
                                         u16 modesIndex)
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 7cb787065913..42cf3c7f1e25 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -54,11 +54,6 @@ static void ath9k_hw_init_cal_settings(struct ath_hw *ah)
         ath9k_hw_private_ops(ah)->init_cal_settings(ah);
 }
 
-static void ath9k_hw_init_mode_regs(struct ath_hw *ah)
-{
-        ath9k_hw_private_ops(ah)->init_mode_regs(ah);
-}
-
 static u32 ath9k_hw_compute_pll_control(struct ath_hw *ah,
                                         struct ath9k_channel *chan)
 {
@@ -208,7 +203,7 @@ void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan,
         udelay(hw_delay + BASE_ACTIVATE_DELAY);
 }
 
-void ath9k_hw_write_array(struct ath_hw *ah, struct ar5416IniArray *array,
+void ath9k_hw_write_array(struct ath_hw *ah, const struct ar5416IniArray *array,
                           int column, unsigned int *writecnt)
 {
         int r;
@@ -554,28 +549,19 @@ static int ath9k_hw_post_init(struct ath_hw *ah)
                 ah->eep_ops->get_eeprom_ver(ah),
                 ah->eep_ops->get_eeprom_rev(ah));
 
-        ecode = ath9k_hw_rf_alloc_ext_banks(ah);
-        if (ecode) {
-                ath_err(ath9k_hw_common(ah),
-                        "Failed allocating banks for external radio\n");
-                ath9k_hw_rf_free_ext_banks(ah);
-                return ecode;
-        }
-
-        if (ah->config.enable_ani) {
-                ath9k_hw_ani_setup(ah);
+        if (ah->config.enable_ani)
                 ath9k_hw_ani_init(ah);
-        }
 
         return 0;
 }
 
-static void ath9k_hw_attach_ops(struct ath_hw *ah)
+static int ath9k_hw_attach_ops(struct ath_hw *ah)
 {
-        if (AR_SREV_9300_20_OR_LATER(ah))
-                ar9003_hw_attach_ops(ah);
-        else
-                ar9002_hw_attach_ops(ah);
+        if (!AR_SREV_9300_20_OR_LATER(ah))
+                return ar9002_hw_attach_ops(ah);
+
+        ar9003_hw_attach_ops(ah);
+        return 0;
 }
 
 /* Called for all hardware families */
@@ -611,7 +597,9 @@ static int __ath9k_hw_init(struct ath_hw *ah)
         ath9k_hw_init_defaults(ah);
         ath9k_hw_init_config(ah);
 
-        ath9k_hw_attach_ops(ah);
+        r = ath9k_hw_attach_ops(ah);
+        if (r)
+                return r;
 
         if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE)) {
                 ath_err(common, "Couldn't wakeup chip\n");
@@ -675,8 +663,6 @@ static int __ath9k_hw_init(struct ath_hw *ah)
         if (!AR_SREV_9300_20_OR_LATER(ah))
                 ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
 
-        ath9k_hw_init_mode_regs(ah);
-
         if (!ah->is_pciexpress)
                 ath9k_hw_disablepcie(ah);
 
@@ -1153,12 +1139,9 @@ void ath9k_hw_deinit(struct ath_hw *ah)
         struct ath_common *common = ath9k_hw_common(ah);
 
         if (common->state < ATH_HW_INITIALIZED)
-                goto free_hw;
+                return;
 
         ath9k_hw_setpower(ah, ATH9K_PM_FULL_SLEEP);
-
-free_hw:
-        ath9k_hw_rf_free_ext_banks(ah);
 }
 EXPORT_SYMBOL(ath9k_hw_deinit);
 
@@ -2576,12 +2559,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
                 rx_chainmask >>= 1;
         }
 
-        if (AR_SREV_9300_20_OR_LATER(ah)) {
-                ah->enabled_cals |= TX_IQ_CAL;
-                if (AR_SREV_9485_OR_LATER(ah))
-                        ah->enabled_cals |= TX_IQ_ON_AGC_CAL;
-        }
-
         if (AR_SREV_9462(ah) || AR_SREV_9565(ah)) {
                 if (!(ah->ent_mode & AR_ENT_OTP_49GHZ_DISABLE))
                         pCap->hw_caps |= ATH9K_HW_CAP_MCI;
@@ -2590,7 +2567,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
                         pCap->hw_caps |= ATH9K_HW_CAP_RTT;
         }
 
-
         if (AR_SREV_9280_20_OR_LATER(ah)) {
                 pCap->hw_caps |= ATH9K_HW_WOW_DEVICE_CAPABLE |
                                  ATH9K_HW_WOW_PATTERN_MATCH_EXACT;
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 7f1a8e91c908..784e81ccb903 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -397,6 +397,7 @@ enum ath9k_int {
 #define MAX_RTT_TABLE_ENTRY     6
 #define MAX_IQCAL_MEASUREMENT   8
 #define MAX_CL_TAB_ENTRY        16
+#define CL_TAB_ENTRY(reg_base)  (reg_base + (4 * j))
 
 struct ath9k_hw_cal_data {
         u16 channel;
@@ -599,13 +600,10 @@ struct ath_hw_radar_conf {
  * @init_cal_settings: setup types of calibrations supported
  * @init_cal: starts actual calibration
  *
- * @init_mode_regs: Initializes mode registers
  * @init_mode_gain_regs: Initialize TX/RX gain registers
  *
  * @rf_set_freq: change frequency
  * @spur_mitigate_freq: spur mitigation
- * @rf_alloc_ext_banks:
- * @rf_free_ext_banks:
  * @set_rf_regs:
  * @compute_pll_control: compute the PLL control value to use for
  *      AR_RTC_PLL_CONTROL for a given channel
@@ -620,7 +618,6 @@ struct ath_hw_private_ops {
         void (*init_cal_settings)(struct ath_hw *ah);
         bool (*init_cal)(struct ath_hw *ah, struct ath9k_channel *chan);
 
-        void (*init_mode_regs)(struct ath_hw *ah);
         void (*init_mode_gain_regs)(struct ath_hw *ah);
         void (*setup_calibration)(struct ath_hw *ah,
                                   struct ath9k_cal_list *currCal);
@@ -630,8 +627,6 @@ struct ath_hw_private_ops {
                            struct ath9k_channel *chan);
         void (*spur_mitigate_freq)(struct ath_hw *ah,
                                    struct ath9k_channel *chan);
-        int (*rf_alloc_ext_banks)(struct ath_hw *ah);
-        void (*rf_free_ext_banks)(struct ath_hw *ah);
         bool (*set_rf_regs)(struct ath_hw *ah,
                             struct ath9k_channel *chan,
                             u16 modesIndex);
@@ -661,6 +656,37 @@ struct ath_hw_private_ops {
 };
 
 /**
+ * struct ath_spec_scan - parameters for Atheros spectral scan
+ *
+ * @enabled: enable/disable spectral scan
+ * @short_repeat: controls whether the chip is in spectral scan mode
+ *                for 4 usec (enabled) or 204 usec (disabled)
+ * @count: number of scan results requested. There are special meanings
+ *         in some chip revisions:
+ *         AR92xx: highest bit set (>=128) for endless mode
+ *                 (spectral scan won't stopped until explicitly disabled)
+ *         AR9300 and newer: 0 for endless mode
+ * @endless: true if endless mode is intended. Otherwise, count value is
+ *           corrected to the next possible value.
+ * @period: time duration between successive spectral scan entry points
+ *          (period*256*Tclk). Tclk = ath_common->clockrate
+ * @fft_period: PHY passes FFT frames to MAC every (fft_period+1)*4uS
+ *
+ * Note: Tclk = 40MHz or 44MHz depending upon operating mode.
+ *       Typically it's 44MHz in 2/5GHz on later chips, but there's
+ *       a "fast clock" check for this in 5GHz.
+ *
+ */
+struct ath_spec_scan {
+        bool enabled;
+        bool short_repeat;
+        bool endless;
+        u8 count;
+        u8 period;
+        u8 fft_period;
+};
+
+/**
  * struct ath_hw_ops - callbacks used by hardware code and driver code
  *
  * This structure contains callbacks designed to to be used internally by
@@ -668,6 +694,10 @@ struct ath_hw_private_ops {
  *
  * @config_pci_powersave:
  * @calibrate: periodic calibration for NF, ANI, IQ, ADC gain, ADC-DC
+ *
+ * @spectral_scan_config: set parameters for spectral scan and enable/disable it
+ * @spectral_scan_trigger: trigger a spectral scan run
+ * @spectral_scan_wait: wait for a spectral scan run to finish
  */
 struct ath_hw_ops {
         void (*config_pci_powersave)(struct ath_hw *ah,
@@ -688,6 +718,10 @@ struct ath_hw_ops {
         void (*antdiv_comb_conf_set)(struct ath_hw *ah,
                         struct ath_hw_antcomb_conf *antconf);
         void (*antctrl_shared_chain_lnadiv)(struct ath_hw *hw, bool enable);
+        void (*spectral_scan_config)(struct ath_hw *ah,
+                                     struct ath_spec_scan *param);
+        void (*spectral_scan_trigger)(struct ath_hw *ah);
+        void (*spectral_scan_wait)(struct ath_hw *ah);
 };
 
 struct ath_nf_limits {
@@ -710,6 +744,7 @@ enum ath_cal_list {
 struct ath_hw {
         struct ath_ops reg_ops;
 
+        struct device *dev;
         struct ieee80211_hw *hw;
         struct ath_common common;
         struct ath9k_hw_version hw_version;
@@ -771,7 +806,6 @@ struct ath_hw {
         struct ath9k_cal_list iq_caldata;
         struct ath9k_cal_list adcgain_caldata;
         struct ath9k_cal_list adcdc_caldata;
-        struct ath9k_cal_list tempCompCalData;
         struct ath9k_cal_list *cal_list;
         struct ath9k_cal_list *cal_list_last;
         struct ath9k_cal_list *cal_list_curr;
@@ -830,10 +864,6 @@ struct ath_hw {
         /* ANI */
         u32 proc_phyerr;
         u32 aniperiod;
-        int totalSizeDesired[5];
-        int coarse_high[5];
-        int coarse_low[5];
-        int firpwr[5];
         enum ath9k_ani_cmd ani_function;
         u32 ani_skip_count;
 
@@ -979,7 +1009,7 @@ void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna);
 void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan,
                           int hw_delay);
 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,
+void ath9k_hw_write_array(struct ath_hw *ah, const struct ar5416IniArray *array,
                           int column, unsigned int *writecnt);
 u32 ath9k_hw_reverse_bits(u32 val, u32 n);
 u16 ath9k_hw_computetxtime(struct ath_hw *ah,
@@ -1066,16 +1096,17 @@ void ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain);
 int ar9003_paprd_init_table(struct ath_hw *ah);
 bool ar9003_paprd_is_done(struct ath_hw *ah);
 bool ar9003_is_paprd_enabled(struct ath_hw *ah);
+void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
 
 /* Hardware family op attach helpers */
-void ar5008_hw_attach_phy_ops(struct ath_hw *ah);
+int ar5008_hw_attach_phy_ops(struct ath_hw *ah);
 void ar9002_hw_attach_phy_ops(struct ath_hw *ah);
 void ar9003_hw_attach_phy_ops(struct ath_hw *ah);
 
 void ar9002_hw_attach_calib_ops(struct ath_hw *ah);
 void ar9003_hw_attach_calib_ops(struct ath_hw *ah);
 
-void ar9002_hw_attach_ops(struct ath_hw *ah);
+int ar9002_hw_attach_ops(struct ath_hw *ah);
 void ar9003_hw_attach_ops(struct ath_hw *ah);
 
 void ar9002_hw_load_ani_reg(struct ath_hw *ah, struct ath9k_channel *chan);
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index f69ef5d48c7b..4b1abc7da98c 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -20,6 +20,7 @@
 #include <linux/slab.h>
 #include <linux/ath9k_platform.h>
 #include <linux/module.h>
+#include <linux/relay.h>
 
 #include "ath9k.h"
 
@@ -302,16 +303,15 @@ static void setup_ht_cap(struct ath_softc *sc,
         ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_DEFINED;
 }
 
-static int ath9k_reg_notifier(struct wiphy *wiphy,
-                              struct regulatory_request *request)
+static void ath9k_reg_notifier(struct wiphy *wiphy,
+                               struct regulatory_request *request)
 {
         struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
         struct ath_softc *sc = hw->priv;
         struct ath_hw *ah = sc->sc_ah;
         struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
-        int ret;
 
-        ret = ath_reg_notifier_apply(wiphy, request, reg);
+        ath_reg_notifier_apply(wiphy, request, reg);
 
         /* Set tx power */
         if (ah->curchan) {
@@ -321,8 +321,6 @@ static int ath9k_reg_notifier(struct wiphy *wiphy,
                 sc->curtxpow = ath9k_hw_regulatory(ah)->power_limit;
                 ath9k_ps_restore(sc);
         }
-
-        return ret;
 }
 
 /*
@@ -337,7 +335,7 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         u8 *ds;
         struct ath_buf *bf;
-        int i, bsize, error, desc_len;
+        int i, bsize, desc_len;
 
         ath_dbg(common, CONFIG, "%s DMA: %u buffers %u desc/buf\n",
                 name, nbuf, ndesc);
@@ -353,8 +351,7 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
         if ((desc_len % 4) != 0) {
                 ath_err(common, "ath_desc not DWORD aligned\n");
                 BUG_ON((desc_len % 4) != 0);
-                error = -ENOMEM;
-                goto fail;
+                return -ENOMEM;
         }
 
         dd->dd_desc_len = desc_len * nbuf * ndesc;
@@ -378,12 +375,11 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
         }
 
         /* allocate descriptors */
-        dd->dd_desc = dma_alloc_coherent(sc->dev, dd->dd_desc_len,
-                                         &dd->dd_desc_paddr, GFP_KERNEL);
-        if (dd->dd_desc == NULL) {
-                error = -ENOMEM;
-                goto fail;
-        }
+        dd->dd_desc = dmam_alloc_coherent(sc->dev, dd->dd_desc_len,
+                                          &dd->dd_desc_paddr, GFP_KERNEL);
+        if (!dd->dd_desc)
+                return -ENOMEM;
+
         ds = (u8 *) dd->dd_desc;
         ath_dbg(common, CONFIG, "%s DMA map: %p (%u) -> %llx (%u)\n",
                 name, ds, (u32) dd->dd_desc_len,
@@ -391,12 +387,9 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
 
         /* allocate buffers */
         bsize = sizeof(struct ath_buf) * nbuf;
-        bf = kzalloc(bsize, GFP_KERNEL);
-        if (bf == NULL) {
-                error = -ENOMEM;
-                goto fail2;
-        }
-        dd->dd_bufptr = bf;
+        bf = devm_kzalloc(sc->dev, bsize, GFP_KERNEL);
+        if (!bf)
+                return -ENOMEM;
 
         for (i = 0; i < nbuf; i++, bf++, ds += (desc_len * ndesc)) {
                 bf->bf_desc = ds;
@@ -422,12 +415,6 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
                 list_add_tail(&bf->list, head);
         }
         return 0;
-fail2:
-        dma_free_coherent(sc->dev, dd->dd_desc_len, dd->dd_desc,
-                          dd->dd_desc_paddr);
-fail:
-        memset(dd, 0, sizeof(*dd));
-        return error;
 }
 
 static int ath9k_init_queues(struct ath_softc *sc)
@@ -457,11 +444,13 @@ static int ath9k_init_channels_rates(struct ath_softc *sc)
                      ATH9K_NUM_CHANNELS);
 
         if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ) {
-                channels = kmemdup(ath9k_2ghz_chantable,
+                channels = devm_kzalloc(sc->dev,
                         sizeof(ath9k_2ghz_chantable), GFP_KERNEL);
                 if (!channels)
                     return -ENOMEM;
 
+                memcpy(channels, ath9k_2ghz_chantable,
+                       sizeof(ath9k_2ghz_chantable));
                 sc->sbands[IEEE80211_BAND_2GHZ].channels = channels;
                 sc->sbands[IEEE80211_BAND_2GHZ].band = IEEE80211_BAND_2GHZ;
                 sc->sbands[IEEE80211_BAND_2GHZ].n_channels =
@@ -472,14 +461,13 @@ static int ath9k_init_channels_rates(struct ath_softc *sc)
         }
 
         if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ) {
-                channels = kmemdup(ath9k_5ghz_chantable,
+                channels = devm_kzalloc(sc->dev,
                         sizeof(ath9k_5ghz_chantable), GFP_KERNEL);
-                if (!channels) {
-                        if (sc->sbands[IEEE80211_BAND_2GHZ].channels)
-                                kfree(sc->sbands[IEEE80211_BAND_2GHZ].channels);
+                if (!channels)
                         return -ENOMEM;
-                }
 
+                memcpy(channels, ath9k_5ghz_chantable,
+                       sizeof(ath9k_5ghz_chantable));
                 sc->sbands[IEEE80211_BAND_5GHZ].channels = channels;
                 sc->sbands[IEEE80211_BAND_5GHZ].band = IEEE80211_BAND_5GHZ;
                 sc->sbands[IEEE80211_BAND_5GHZ].n_channels =
@@ -565,10 +553,11 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
         int ret = 0, i;
         int csz = 0;
 
-        ah = kzalloc(sizeof(struct ath_hw), GFP_KERNEL);
+        ah = devm_kzalloc(sc->dev, sizeof(struct ath_hw), GFP_KERNEL);
         if (!ah)
                 return -ENOMEM;
 
+        ah->dev = sc->dev;
         ah->hw = sc->hw;
         ah->hw_version.devid = devid;
         ah->reg_ops.read = ath9k_ioread32;
@@ -636,7 +625,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
         if (pdata && pdata->eeprom_name) {
                 ret = ath9k_eeprom_request(sc, pdata->eeprom_name);
                 if (ret)
-                        goto err_eeprom;
+                        return ret;
         }
 
         /* Initializes the hardware for all supported chipsets */
@@ -676,10 +665,6 @@ err_queues:
         ath9k_hw_deinit(ah);
 err_hw:
         ath9k_eeprom_release(sc);
-err_eeprom:
-        kfree(ah);
-        sc->sc_ah = NULL;
-
         return ret;
 }
 
@@ -844,8 +829,8 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,
 
         /* Bring up device */
         error = ath9k_init_softc(devid, sc, bus_ops);
-        if (error != 0)
-                goto error_init;
+        if (error)
+                return error;
 
         ah = sc->sc_ah;
         common = ath9k_hw_common(ah);
@@ -855,19 +840,19 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,
         error = ath_regd_init(&common->regulatory, sc->hw->wiphy,
                               ath9k_reg_notifier);
         if (error)
-                goto error_regd;
+                goto deinit;
 
         reg = &common->regulatory;
 
         /* Setup TX DMA */
         error = ath_tx_init(sc, ATH_TXBUF);
         if (error != 0)
-                goto error_tx;
+                goto deinit;
 
         /* Setup RX DMA */
         error = ath_rx_init(sc, ATH_RXBUF);
         if (error != 0)
-                goto error_rx;
+                goto deinit;
 
         ath9k_init_txpower_limits(sc);
 
@@ -881,19 +866,19 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,
         /* Register with mac80211 */
         error = ieee80211_register_hw(hw);
         if (error)
-                goto error_register;
+                goto rx_cleanup;
 
         error = ath9k_init_debug(ah);
         if (error) {
                 ath_err(common, "Unable to create debugfs files\n");
-                goto error_world;
+                goto unregister;
         }
 
         /* Handle world regulatory */
         if (!ath_is_world_regd(reg)) {
                 error = regulatory_hint(hw->wiphy, reg->alpha2);
                 if (error)
-                        goto error_world;
+                        goto unregister;
         }
 
         ath_init_leds(sc);
@@ -901,17 +886,12 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc,
 
         return 0;
 
-error_world:
+unregister:
         ieee80211_unregister_hw(hw);
-error_register:
+rx_cleanup:
         ath_rx_cleanup(sc);
-error_rx:
-        ath_tx_cleanup(sc);
-error_tx:
-        /* Nothing */
-error_regd:
+deinit:
         ath9k_deinit_softc(sc);
-error_init:
         return error;
 }
 
@@ -923,12 +903,6 @@ static void ath9k_deinit_softc(struct ath_softc *sc)
 {
         int i = 0;
 
-        if (sc->sbands[IEEE80211_BAND_2GHZ].channels)
-                kfree(sc->sbands[IEEE80211_BAND_2GHZ].channels);
-
-        if (sc->sbands[IEEE80211_BAND_5GHZ].channels)
-                kfree(sc->sbands[IEEE80211_BAND_5GHZ].channels);
-
         ath9k_deinit_btcoex(sc);
 
         for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)
@@ -940,8 +914,11 @@ static void ath9k_deinit_softc(struct ath_softc *sc)
                 sc->dfs_detector->exit(sc->dfs_detector);
 
         ath9k_eeprom_release(sc);
-        kfree(sc->sc_ah);
-        sc->sc_ah = NULL;
+
+        if (sc->rfs_chan_spec_scan) {
+                relay_close(sc->rfs_chan_spec_scan);
+                sc->rfs_chan_spec_scan = NULL;
+        }
 }
 
 void ath9k_deinit_device(struct ath_softc *sc)
@@ -957,22 +934,9 @@ void ath9k_deinit_device(struct ath_softc *sc)
 
         ieee80211_unregister_hw(hw);
         ath_rx_cleanup(sc);
-        ath_tx_cleanup(sc);
         ath9k_deinit_softc(sc);
 }
 
-void ath_descdma_cleanup(struct ath_softc *sc,
-                         struct ath_descdma *dd,
-                         struct list_head *head)
-{
-        dma_free_coherent(sc->dev, dd->dd_desc_len, dd->dd_desc,
-                          dd->dd_desc_paddr);
-
-        INIT_LIST_HEAD(head);
-        kfree(dd->dd_bufptr);
-        memset(dd, 0, sizeof(*dd));
-}
-
 /************************/
 /*     Module Hooks     */
 /************************/
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h
index 4a745e68dd94..1ff817061ebc 100644
--- a/drivers/net/wireless/ath/ath9k/mac.h
+++ b/drivers/net/wireless/ath/ath9k/mac.h
@@ -226,7 +226,8 @@ enum ath9k_phyerr {
         ATH9K_PHYERR_HT_LENGTH_ILLEGAL    = 35,
         ATH9K_PHYERR_HT_RATE_ILLEGAL      = 36,
 
-        ATH9K_PHYERR_MAX                  = 37,
+        ATH9K_PHYERR_SPECTRAL             = 38,
+        ATH9K_PHYERR_MAX                  = 39,
 };
 
 struct ath_desc {
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index be30a9af1528..4b72b660f180 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -182,7 +182,7 @@ static void ath_restart_work(struct ath_softc *sc)
         ath_start_ani(sc);
 }
 
-static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
+static bool ath_prepare_reset(struct ath_softc *sc)
 {
         struct ath_hw *ah = sc->sc_ah;
         bool ret = true;
@@ -196,20 +196,12 @@ static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
         ath9k_debug_samp_bb_mac(sc);
         ath9k_hw_disable_interrupts(ah);
 
-        if (!ath_stoprecv(sc))
+        if (!ath_drain_all_txq(sc))
                 ret = false;
 
-        if (!ath_drain_all_txq(sc, retry_tx))
+        if (!ath_stoprecv(sc))
                 ret = false;
 
-        if (!flush) {
-                if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
-                        ath_rx_tasklet(sc, 1, true);
-                ath_rx_tasklet(sc, 1, false);
-        } else {
-                ath_flushrecv(sc);
-        }
-
         return ret;
 }
 
@@ -255,18 +247,17 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start)
         return true;
 }
 
-static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
-                              bool retry_tx)
+static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan)
 {
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(ah);
         struct ath9k_hw_cal_data *caldata = NULL;
         bool fastcc = true;
-        bool flush = false;
         int r;
 
         __ath_cancel_work(sc);
 
+        tasklet_disable(&sc->intr_tq);
         spin_lock_bh(&sc->sc_pcu_lock);
 
         if (!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
@@ -276,11 +267,10 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
 
         if (!hchan) {
                 fastcc = false;
-                flush = true;
                 hchan = ah->curchan;
         }
 
-        if (!ath_prepare_reset(sc, retry_tx, flush))
+        if (!ath_prepare_reset(sc))
                 fastcc = false;
 
         ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n",
@@ -302,6 +292,8 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
 
 out:
         spin_unlock_bh(&sc->sc_pcu_lock);
+        tasklet_enable(&sc->intr_tq);
+
         return r;
 }
 
@@ -319,7 +311,7 @@ static int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw,
         if (test_bit(SC_OP_INVALID, &sc->sc_flags))
                 return -EIO;
 
-        r = ath_reset_internal(sc, hchan, false);
+        r = ath_reset_internal(sc, hchan);
 
         return r;
 }
@@ -549,23 +541,21 @@ chip_reset:
 #undef SCHED_INTR
 }
 
-static int ath_reset(struct ath_softc *sc, bool retry_tx)
+static int ath_reset(struct ath_softc *sc)
 {
-        int r;
+        int i, r;
 
         ath9k_ps_wakeup(sc);
 
-        r = ath_reset_internal(sc, NULL, retry_tx);
+        r = ath_reset_internal(sc, NULL);
 
-        if (retry_tx) {
-                int i;
-                for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
-                        if (ATH_TXQ_SETUP(sc, i)) {
-                                spin_lock_bh(&sc->tx.txq[i].axq_lock);
-                                ath_txq_schedule(sc, &sc->tx.txq[i]);
-                                spin_unlock_bh(&sc->tx.txq[i].axq_lock);
-                        }
-                }
+        for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
+                if (!ATH_TXQ_SETUP(sc, i))
+                        continue;
+
+                spin_lock_bh(&sc->tx.txq[i].axq_lock);
+                ath_txq_schedule(sc, &sc->tx.txq[i]);
+                spin_unlock_bh(&sc->tx.txq[i].axq_lock);
         }
 
         ath9k_ps_restore(sc);
@@ -586,7 +576,7 @@ void ath_reset_work(struct work_struct *work)
 {
         struct ath_softc *sc = container_of(work, struct ath_softc, hw_reset_work);
 
-        ath_reset(sc, true);
+        ath_reset(sc);
 }
 
 /**********************/
@@ -804,7 +794,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
                 ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
         }
 
-        ath_prepare_reset(sc, false, true);
+        ath_prepare_reset(sc);
 
         if (sc->rx.frag) {
                 dev_kfree_skb_any(sc->rx.frag);
@@ -1075,6 +1065,86 @@ static void ath9k_disable_ps(struct ath_softc *sc)
         ath_dbg(common, PS, "PowerSave disabled\n");
 }
 
+void ath9k_spectral_scan_trigger(struct ieee80211_hw *hw)
+{
+        struct ath_softc *sc = hw->priv;
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
+        u32 rxfilter;
+
+        if (!ath9k_hw_ops(ah)->spectral_scan_trigger) {
+                ath_err(common, "spectrum analyzer not implemented on this hardware\n");
+                return;
+        }
+
+        ath9k_ps_wakeup(sc);
+        rxfilter = ath9k_hw_getrxfilter(ah);
+        ath9k_hw_setrxfilter(ah, rxfilter |
+                                 ATH9K_RX_FILTER_PHYRADAR |
+                                 ATH9K_RX_FILTER_PHYERR);
+
+        /* TODO: usually this should not be neccesary, but for some reason
+         * (or in some mode?) the trigger must be called after the
+         * configuration, otherwise the register will have its values reset
+         * (on my ar9220 to value 0x01002310)
+         */
+        ath9k_spectral_scan_config(hw, sc->spectral_mode);
+        ath9k_hw_ops(ah)->spectral_scan_trigger(ah);
+        ath9k_ps_restore(sc);
+}
+
+int ath9k_spectral_scan_config(struct ieee80211_hw *hw,
+                               enum spectral_mode spectral_mode)
+{
+        struct ath_softc *sc = hw->priv;
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(ah);
+        struct ath_spec_scan param;
+
+        if (!ath9k_hw_ops(ah)->spectral_scan_trigger) {
+                ath_err(common, "spectrum analyzer not implemented on this hardware\n");
+                return -1;
+        }
+
+        /* NOTE: this will generate a few samples ...
+         *
+         * TODO: review default parameters, and/or define an interface to set
+         * them.
+         */
+        param.enabled = 1;
+        param.short_repeat = true;
+        param.count = 8;
+        param.endless = false;
+        param.period = 0xFF;
+        param.fft_period = 0xF;
+
+        switch (spectral_mode) {
+        case SPECTRAL_DISABLED:
+                param.enabled = 0;
+                break;
+        case SPECTRAL_BACKGROUND:
+                /* send endless samples.
+                 * TODO: is this really useful for "background"?
+                 */
+                param.endless = 1;
+                break;
+        case SPECTRAL_CHANSCAN:
+                break;
+        case SPECTRAL_MANUAL:
+                break;
+        default:
+                return -1;
+        }
+
+        ath9k_ps_wakeup(sc);
+        ath9k_hw_ops(ah)->spectral_scan_config(ah, &param);
+        ath9k_ps_restore(sc);
+
+        sc->spectral_mode = spectral_mode;
+
+        return 0;
+}
+
 static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
 {
         struct ath_softc *sc = hw->priv;
@@ -1188,6 +1258,11 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
                  */
                 if (old_pos >= 0)
                         ath_update_survey_nf(sc, old_pos);
+
+                /* perform spectral scan if requested. */
+                if (sc->scanning && sc->spectral_mode == SPECTRAL_CHANSCAN)
+                        ath9k_spectral_scan_trigger(hw);
+
         }
 
         if (changed & IEEE80211_CONF_CHANGE_POWER) {
@@ -1610,7 +1685,9 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
                         ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
                 ath9k_ps_restore(sc);
                 break;
-        case IEEE80211_AMPDU_TX_STOP:
+        case IEEE80211_AMPDU_TX_STOP_CONT:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
                 ath9k_ps_wakeup(sc);
                 ath_tx_aggr_stop(sc, sta, tid);
                 ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
@@ -1729,11 +1806,11 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop)
         if (drop) {
                 ath9k_ps_wakeup(sc);
                 spin_lock_bh(&sc->sc_pcu_lock);
-                drain_txq = ath_drain_all_txq(sc, false);
+                drain_txq = ath_drain_all_txq(sc);
                 spin_unlock_bh(&sc->sc_pcu_lock);
 
                 if (!drain_txq)
-                        ath_reset(sc, false);
+                        ath_reset(sc);
 
                 ath9k_ps_restore(sc);
                 ieee80211_wake_queues(hw);
@@ -1833,6 +1910,9 @@ static u32 fill_chainmask(u32 cap, u32 new)
 
 static bool validate_antenna_mask(struct ath_hw *ah, u32 val)
 {
+        if (AR_SREV_9300_20_OR_LATER(ah))
+                return true;
+
         switch (val & 0x7) {
         case 0x1:
         case 0x3:
@@ -2238,6 +2318,19 @@ static void ath9k_set_wakeup(struct ieee80211_hw *hw, bool enabled)
 }
 
 #endif
+static void ath9k_sw_scan_start(struct ieee80211_hw *hw)
+{
+        struct ath_softc *sc = hw->priv;
+
+        sc->scanning = 1;
+}
+
+static void ath9k_sw_scan_complete(struct ieee80211_hw *hw)
+{
+        struct ath_softc *sc = hw->priv;
+
+        sc->scanning = 0;
+}
 
 struct ieee80211_ops ath9k_ops = {
         .tx                 = ath9k_tx,
@@ -2284,4 +2377,6 @@ struct ieee80211_ops ath9k_ops = {
         .sta_add_debugfs    = ath9k_sta_add_debugfs,
         .sta_remove_debugfs = ath9k_sta_remove_debugfs,
 #endif
+        .sw_scan_start      = ath9k_sw_scan_start,
+        .sw_scan_complete   = ath9k_sw_scan_complete,
 };
diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c
index 5c02702f21e7..d2074334ec9b 100644
--- a/drivers/net/wireless/ath/ath9k/mci.c
+++ b/drivers/net/wireless/ath/ath9k/mci.c
@@ -438,7 +438,7 @@ int ath_mci_setup(struct ath_softc *sc)
         struct ath_mci_buf *buf = &mci->sched_buf;
         int ret;
 
-        buf->bf_addr = dma_alloc_coherent(sc->dev,
+        buf->bf_addr = dmam_alloc_coherent(sc->dev,
                                   ATH_MCI_SCHED_BUF_SIZE + ATH_MCI_GPM_BUF_SIZE,
                                   &buf->bf_paddr, GFP_KERNEL);
 
@@ -477,11 +477,6 @@ void ath_mci_cleanup(struct ath_softc *sc)
         struct ath_mci_coex *mci = &sc->mci_coex;
         struct ath_mci_buf *buf = &mci->sched_buf;
 
-        if (buf->bf_addr)
-                dma_free_coherent(sc->dev,
-                                  ATH_MCI_SCHED_BUF_SIZE + ATH_MCI_GPM_BUF_SIZE,
-                                  buf->bf_addr, buf->bf_paddr);
-
         ar9003_mci_cleanup(ah);
 
         ath_dbg(common, MCI, "MCI De-Initialized\n");
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index 7ae73fbd9136..0e0d39583837 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -147,7 +147,6 @@ static const struct ath_bus_ops ath_pci_bus_ops = {
 
 static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
-        void __iomem *mem;
         struct ath_softc *sc;
         struct ieee80211_hw *hw;
         u8 csz;
@@ -155,19 +154,19 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         int ret = 0;
         char hw_name[64];
 
-        if (pci_enable_device(pdev))
+        if (pcim_enable_device(pdev))
                 return -EIO;
 
         ret =  pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         if (ret) {
                 pr_err("32-bit DMA not available\n");
-                goto err_dma;
+                return ret;
         }
 
         ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
         if (ret) {
                 pr_err("32-bit DMA consistent DMA enable failed\n");
-                goto err_dma;
+                return ret;
         }
 
         /*
@@ -203,25 +202,16 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         if ((val & 0x0000ff00) != 0)
                 pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
 
-        ret = pci_request_region(pdev, 0, "ath9k");
+        ret = pcim_iomap_regions(pdev, BIT(0), "ath9k");
         if (ret) {
                 dev_err(&pdev->dev, "PCI memory region reserve error\n");
-                ret = -ENODEV;
-                goto err_region;
-        }
-
-        mem = pci_iomap(pdev, 0, 0);
-        if (!mem) {
-                pr_err("PCI memory map error\n") ;
-                ret = -EIO;
-                goto err_iomap;
+                return -ENODEV;
         }
 
         hw = ieee80211_alloc_hw(sizeof(struct ath_softc), &ath9k_ops);
         if (!hw) {
                 dev_err(&pdev->dev, "No memory for ieee80211_hw\n");
-                ret = -ENOMEM;
-                goto err_alloc_hw;
+                return -ENOMEM;
         }
 
         SET_IEEE80211_DEV(hw, &pdev->dev);
@@ -230,7 +220,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         sc = hw->priv;
         sc->hw = hw;
         sc->dev = &pdev->dev;
-        sc->mem = mem;
+        sc->mem = pcim_iomap_table(pdev)[0];
 
         /* Will be cleared in ath9k_start() */
         set_bit(SC_OP_INVALID, &sc->sc_flags);
@@ -251,7 +241,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
         ath9k_hw_name(sc->sc_ah, hw_name, sizeof(hw_name));
         wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n",
-                   hw_name, (unsigned long)mem, pdev->irq);
+                   hw_name, (unsigned long)sc->mem, pdev->irq);
 
         return 0;
 
@@ -259,14 +249,6 @@ err_init:
         free_irq(sc->irq, sc);
 err_irq:
         ieee80211_free_hw(hw);
-err_alloc_hw:
-        pci_iounmap(pdev, mem);
-err_iomap:
-        pci_release_region(pdev, 0);
-err_region:
-        /* Nothing */
-err_dma:
-        pci_disable_device(pdev);
         return ret;
 }
 
@@ -274,17 +256,12 @@ static void ath_pci_remove(struct pci_dev *pdev)
 {
         struct ieee80211_hw *hw = pci_get_drvdata(pdev);
         struct ath_softc *sc = hw->priv;
-        void __iomem *mem = sc->mem;
 
         if (!is_ath9k_unloaded)
                 sc->sc_ah->ah_flags |= AH_UNPLUGGED;
         ath9k_deinit_device(sc);
         free_irq(sc->irq, sc);
         ieee80211_free_hw(sc->hw);
-
-        pci_iounmap(pdev, mem);
-        pci_disable_device(pdev);
-        pci_release_region(pdev, 0);
 }
 
 #ifdef CONFIG_PM_SLEEP
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index d4df98a938bf..d7c129bb571b 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -15,6 +15,7 @@
  */
 
 #include <linux/dma-mapping.h>
+#include <linux/relay.h>
 #include "ath9k.h"
 #include "ar9003_mac.h"
 
@@ -180,11 +181,6 @@ static void ath_rx_edma_cleanup(struct ath_softc *sc)
                         bf->bf_mpdu = NULL;
                 }
         }
-
-        INIT_LIST_HEAD(&sc->rx.rxbuf);
-
-        kfree(sc->rx.rx_bufptr);
-        sc->rx.rx_bufptr = NULL;
 }
 
 static void ath_rx_edma_init_queue(struct ath_rx_edma *rx_edma, int size)
@@ -211,12 +207,11 @@ static int ath_rx_edma_init(struct ath_softc *sc, int nbufs)
                                ah->caps.rx_hp_qdepth);
 
         size = sizeof(struct ath_buf) * nbufs;
-        bf = kzalloc(size, GFP_KERNEL);
+        bf = devm_kzalloc(sc->dev, size, GFP_KERNEL);
         if (!bf)
                 return -ENOMEM;
 
         INIT_LIST_HEAD(&sc->rx.rxbuf);
-        sc->rx.rx_bufptr = bf;
 
         for (i = 0; i < nbufs; i++, bf++) {
                 skb = ath_rxbuf_alloc(common, common->rx_bufsize, GFP_KERNEL);
@@ -254,8 +249,6 @@ rx_init_fail:
 
 static void ath_edma_start_recv(struct ath_softc *sc)
 {
-        spin_lock_bh(&sc->rx.rxbuflock);
-
         ath9k_hw_rxena(sc->sc_ah);
 
         ath_rx_addbuffer_edma(sc, ATH9K_RX_QUEUE_HP,
@@ -267,8 +260,6 @@ static void ath_edma_start_recv(struct ath_softc *sc)
         ath_opmode_init(sc);
 
         ath9k_hw_startpcureceive(sc->sc_ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL));
-
-        spin_unlock_bh(&sc->rx.rxbuflock);
 }
 
 static void ath_edma_stop_recv(struct ath_softc *sc)
@@ -285,8 +276,6 @@ int ath_rx_init(struct ath_softc *sc, int nbufs)
         int error = 0;
 
         spin_lock_init(&sc->sc_pcu_lock);
-        spin_lock_init(&sc->rx.rxbuflock);
-        clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
 
         common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 +
                              sc->sc_ah->caps.rx_status_len;
@@ -363,9 +352,6 @@ void ath_rx_cleanup(struct ath_softc *sc)
                                 bf->bf_mpdu = NULL;
                         }
                 }
-
-                if (sc->rx.rxdma.dd_desc_len != 0)
-                        ath_descdma_cleanup(sc, &sc->rx.rxdma, &sc->rx.rxbuf);
         }
 }
 
@@ -447,7 +433,6 @@ int ath_startrecv(struct ath_softc *sc)
                 return 0;
         }
 
-        spin_lock_bh(&sc->rx.rxbuflock);
         if (list_empty(&sc->rx.rxbuf))
                 goto start_recv;
 
@@ -468,26 +453,31 @@ start_recv:
         ath_opmode_init(sc);
         ath9k_hw_startpcureceive(ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL));
 
-        spin_unlock_bh(&sc->rx.rxbuflock);
-
         return 0;
 }
 
+static void ath_flushrecv(struct ath_softc *sc)
+{
+        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
+                ath_rx_tasklet(sc, 1, true);
+        ath_rx_tasklet(sc, 1, false);
+}
+
 bool ath_stoprecv(struct ath_softc *sc)
 {
         struct ath_hw *ah = sc->sc_ah;
         bool stopped, reset = false;
 
-        spin_lock_bh(&sc->rx.rxbuflock);
         ath9k_hw_abortpcurecv(ah);
         ath9k_hw_setrxfilter(ah, 0);
         stopped = ath9k_hw_stopdmarecv(ah, &reset);
 
+        ath_flushrecv(sc);
+
         if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
                 ath_edma_stop_recv(sc);
         else
                 sc->rx.rxlink = NULL;
-        spin_unlock_bh(&sc->rx.rxbuflock);
 
         if (!(ah->ah_flags & AH_UNPLUGGED) &&
             unlikely(!stopped)) {
@@ -499,15 +489,6 @@ bool ath_stoprecv(struct ath_softc *sc)
         return stopped && !reset;
 }
 
-void ath_flushrecv(struct ath_softc *sc)
-{
-        set_bit(SC_OP_RXFLUSH, &sc->sc_flags);
-        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
-                ath_rx_tasklet(sc, 1, true);
-        ath_rx_tasklet(sc, 1, false);
-        clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
-}
-
 static bool ath_beacon_dtim_pending_cab(struct sk_buff *skb)
 {
         /* Check whether the Beacon frame has DTIM indicating buffered bc/mc */
@@ -744,6 +725,7 @@ static struct ath_buf *ath_get_next_rx_buf(struct ath_softc *sc,
                         return NULL;
         }
 
+        list_del(&bf->list);
         if (!bf->bf_mpdu)
                 return bf;
 
@@ -1034,6 +1016,108 @@ static void ath9k_rx_skb_postprocess(struct ath_common *common,
                 rxs->flag &= ~RX_FLAG_DECRYPTED;
 }
 
+static s8 fix_rssi_inv_only(u8 rssi_val)
+{
+        if (rssi_val == 128)
+                rssi_val = 0;
+        return (s8) rssi_val;
+}
+
+
+static void ath_process_fft(struct ath_softc *sc, struct ieee80211_hdr *hdr,
+                            struct ath_rx_status *rs, u64 tsf)
+{
+#ifdef CONFIG_ATH_DEBUG
+        struct ath_hw *ah = sc->sc_ah;
+        u8 bins[SPECTRAL_HT20_NUM_BINS];
+        u8 *vdata = (u8 *)hdr;
+        struct fft_sample_ht20 fft_sample;
+        struct ath_radar_info *radar_info;
+        struct ath_ht20_mag_info *mag_info;
+        int len = rs->rs_datalen;
+        int i, dc_pos;
+
+        /* AR9280 and before report via ATH9K_PHYERR_RADAR, AR93xx and newer
+         * via ATH9K_PHYERR_SPECTRAL. Haven't seen ATH9K_PHYERR_FALSE_RADAR_EXT
+         * yet, but this is supposed to be possible as well.
+         */
+        if (rs->rs_phyerr != ATH9K_PHYERR_RADAR &&
+            rs->rs_phyerr != ATH9K_PHYERR_FALSE_RADAR_EXT &&
+            rs->rs_phyerr != ATH9K_PHYERR_SPECTRAL)
+                return;
+
+        /* Variation in the data length is possible and will be fixed later.
+         * Note that we only support HT20 for now.
+         *
+         * TODO: add HT20_40 support as well.
+         */
+        if ((len > SPECTRAL_HT20_TOTAL_DATA_LEN + 2) ||
+            (len < SPECTRAL_HT20_TOTAL_DATA_LEN - 1))
+                return;
+
+        /* check if spectral scan bit is set. This does not have to be checked
+         * if received through a SPECTRAL phy error, but shouldn't hurt.
+         */
+        radar_info = ((struct ath_radar_info *)&vdata[len]) - 1;
+        if (!(radar_info->pulse_bw_info & SPECTRAL_SCAN_BITMASK))
+                return;
+
+        fft_sample.tlv.type = ATH_FFT_SAMPLE_HT20;
+        fft_sample.tlv.length = sizeof(fft_sample) - sizeof(fft_sample.tlv);
+
+        fft_sample.freq = ah->curchan->chan->center_freq;
+        fft_sample.rssi = fix_rssi_inv_only(rs->rs_rssi_ctl0);
+        fft_sample.noise = ah->noise;
+
+        switch (len - SPECTRAL_HT20_TOTAL_DATA_LEN) {
+        case 0:
+                /* length correct, nothing to do. */
+                memcpy(bins, vdata, SPECTRAL_HT20_NUM_BINS);
+                break;
+        case -1:
+                /* first byte missing, duplicate it. */
+                memcpy(&bins[1], vdata, SPECTRAL_HT20_NUM_BINS - 1);
+                bins[0] = vdata[0];
+                break;
+        case 2:
+                /* MAC added 2 extra bytes at bin 30 and 32, remove them. */
+                memcpy(bins, vdata, 30);
+                bins[30] = vdata[31];
+                memcpy(&bins[31], &vdata[33], SPECTRAL_HT20_NUM_BINS - 31);
+                break;
+        case 1:
+                /* MAC added 2 extra bytes AND first byte is missing. */
+                bins[0] = vdata[0];
+                memcpy(&bins[0], vdata, 30);
+                bins[31] = vdata[31];
+                memcpy(&bins[32], &vdata[33], SPECTRAL_HT20_NUM_BINS - 32);
+                break;
+        default:
+                return;
+        }
+
+        /* DC value (value in the middle) is the blind spot of the spectral
+         * sample and invalid, interpolate it.
+         */
+        dc_pos = SPECTRAL_HT20_NUM_BINS / 2;
+        bins[dc_pos] = (bins[dc_pos + 1] + bins[dc_pos - 1]) / 2;
+
+        /* mag data is at the end of the frame, in front of radar_info */
+        mag_info = ((struct ath_ht20_mag_info *)radar_info) - 1;
+
+        /* Apply exponent and grab further auxiliary information. */
+        for (i = 0; i < SPECTRAL_HT20_NUM_BINS; i++)
+                fft_sample.data[i] = bins[i] << mag_info->max_exp;
+
+        fft_sample.max_magnitude = spectral_max_magnitude(mag_info->all_bins);
+        fft_sample.max_index = spectral_max_index(mag_info->all_bins);
+        fft_sample.bitmap_weight = spectral_bitmap_weight(mag_info->all_bins);
+        fft_sample.tsf = tsf;
+
+        ath_debug_send_fft_sample(sc, &fft_sample.tlv);
+#endif
+}
+
 int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
 {
         struct ath_buf *bf;
@@ -1059,16 +1143,12 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                 dma_type = DMA_FROM_DEVICE;
 
         qtype = hp ? ATH9K_RX_QUEUE_HP : ATH9K_RX_QUEUE_LP;
-        spin_lock_bh(&sc->rx.rxbuflock);
 
         tsf = ath9k_hw_gettsf64(ah);
         tsf_lower = tsf & 0xffffffff;
 
         do {
                 bool decrypt_error = false;
-                /* If handling rx interrupt and flush is in progress => exit */
-                if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags) && (flush == 0))
-                        break;
 
                 memset(&rs, 0, sizeof(rs));
                 if (edma)
@@ -1111,15 +1191,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
 
                 ath_debug_stat_rx(sc, &rs);
 
-                /*
-                 * If we're asked to flush receive queue, directly
-                 * chain it back at the queue without processing it.
-                 */
-                if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags)) {
-                        RX_STAT_INC(rx_drop_rxflush);
-                        goto requeue_drop_frag;
-                }
-
                 memset(rxs, 0, sizeof(struct ieee80211_rx_status));
 
                 rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
@@ -1131,6 +1202,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                     unlikely(tsf_lower - rs.rs_tstamp > 0x10000000))
                         rxs->mactime += 0x100000000ULL;
 
+                if ((rs.rs_status & ATH9K_RXERR_PHY))
+                        ath_process_fft(sc, hdr, &rs, rxs->mactime);
+
                 retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs,
                                                  rxs, &decrypt_error);
                 if (retval)
@@ -1254,19 +1328,18 @@ requeue_drop_frag:
                         sc->rx.frag = NULL;
                 }
 requeue:
+                list_add_tail(&bf->list, &sc->rx.rxbuf);
+                if (flush)
+                        continue;
+
                 if (edma) {
-                        list_add_tail(&bf->list, &sc->rx.rxbuf);
                         ath_rx_edma_buf_link(sc, qtype);
                 } else {
-                        list_move_tail(&bf->list, &sc->rx.rxbuf);
                         ath_rx_buf_link(sc, bf);
-                        if (!flush)
-                                ath9k_hw_rxena(ah);
+                        ath9k_hw_rxena(ah);
                 }
         } while (1);
 
-        spin_unlock_bh(&sc->rx.rxbuflock);
-
         if (!(ah->imask & ATH9K_INT_RXEOL)) {
                 ah->imask |= (ATH9K_INT_RXEOL | ATH9K_INT_RXORN);
                 ath9k_hw_set_interrupts(ah);
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index ad3c82c09177..5929850649f0 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -789,6 +789,7 @@
 #define AR_SREV_REVISION_9271_11        1
 #define AR_SREV_VERSION_9300            0x1c0
 #define AR_SREV_REVISION_9300_20        2 /* 2.0 and 2.1 */
+#define AR_SREV_REVISION_9300_22        3
 #define AR_SREV_VERSION_9330            0x200
 #define AR_SREV_REVISION_9330_10        0
 #define AR_SREV_REVISION_9330_11        1
@@ -869,6 +870,9 @@
         (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9300))
 #define AR_SREV_9300_20_OR_LATER(_ah) \
         ((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9300)
+#define AR_SREV_9300_22(_ah) \
+        (AR_SREV_9300(ah) && \
+         ((_ah)->hw_version.macRev == AR_SREV_REVISION_9300_22))
 
 #define AR_SREV_9330(_ah) \
         (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9330))
@@ -884,9 +888,6 @@
 
 #define AR_SREV_9485(_ah) \
         (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9485))
-#define AR_SREV_9485_10(_ah) \
-        (AR_SREV_9485(_ah) && \
-         ((_ah)->hw_version.macRev == AR_SREV_REVISION_9485_10))
 #define AR_SREV_9485_11(_ah) \
         (AR_SREV_9485(_ah) && \
          ((_ah)->hw_version.macRev == AR_SREV_REVISION_9485_11))
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 90e48a0fafe5..feacaafee959 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -378,7 +378,7 @@ static void ath_tx_count_frames(struct ath_softc *sc, struct ath_buf *bf,
 
 static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                                  struct ath_buf *bf, struct list_head *bf_q,
-                                 struct ath_tx_status *ts, int txok, bool retry)
+                                 struct ath_tx_status *ts, int txok)
 {
         struct ath_node *an = NULL;
         struct sk_buff *skb;
@@ -490,7 +490,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                 } else if (!isaggr && txok) {
                         /* transmit completion */
                         acked_cnt++;
-                } else if ((tid->state & AGGR_CLEANUP) || !retry) {
+                } else if (tid->state & AGGR_CLEANUP) {
                         /*
                          * cleanup in progress, just fail
                          * the un-acked sub-frames
@@ -604,6 +604,37 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                 ath9k_queue_reset(sc, RESET_TYPE_TX_ERROR);
 }
 
+static bool bf_is_ampdu_not_probing(struct ath_buf *bf)
+{
+    struct ieee80211_tx_info *info = IEEE80211_SKB_CB(bf->bf_mpdu);
+    return bf_isampdu(bf) && !(info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE);
+}
+
+static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,
+                                  struct ath_tx_status *ts, struct ath_buf *bf,
+                                  struct list_head *bf_head)
+{
+        bool txok, flush;
+
+        txok = !(ts->ts_status & ATH9K_TXERR_MASK);
+        flush = !!(ts->ts_status & ATH9K_TX_FLUSH);
+        txq->axq_tx_inprogress = false;
+
+        txq->axq_depth--;
+        if (bf_is_ampdu_not_probing(bf))
+                txq->axq_ampdu_depth--;
+
+        if (!bf_isampdu(bf)) {
+                if (!flush)
+                        ath_tx_rc_status(sc, bf, ts, 1, txok ? 0 : 1, txok);
+                ath_tx_complete_buf(sc, bf, txq, bf_head, ts, txok);
+        } else
+                ath_tx_complete_aggr(sc, txq, bf, bf_head, ts, txok);
+
+        if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) && !flush)
+                ath_txq_schedule(sc, txq);
+}
+
 static bool ath_lookup_legacy(struct ath_buf *bf)
 {
         struct sk_buff *skb;
@@ -1331,23 +1362,6 @@ void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid
 /* Queue Management */
 /********************/
 
-static void ath_txq_drain_pending_buffers(struct ath_softc *sc,
-                                          struct ath_txq *txq)
-{
-        struct ath_atx_ac *ac, *ac_tmp;
-        struct ath_atx_tid *tid, *tid_tmp;
-
-        list_for_each_entry_safe(ac, ac_tmp, &txq->axq_acq, list) {
-                list_del(&ac->list);
-                ac->sched = false;
-                list_for_each_entry_safe(tid, tid_tmp, &ac->tid_q, list) {
-                        list_del(&tid->list);
-                        tid->sched = false;
-                        ath_tid_drain(sc, txq, tid);
-                }
-        }
-}
-
 struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype)
 {
         struct ath_hw *ah = sc->sc_ah;
@@ -1470,14 +1484,8 @@ int ath_cabq_update(struct ath_softc *sc)
         return 0;
 }
 
-static bool bf_is_ampdu_not_probing(struct ath_buf *bf)
-{
-    struct ieee80211_tx_info *info = IEEE80211_SKB_CB(bf->bf_mpdu);
-    return bf_isampdu(bf) && !(info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE);
-}
-
 static void ath_drain_txq_list(struct ath_softc *sc, struct ath_txq *txq,
-                               struct list_head *list, bool retry_tx)
+                               struct list_head *list)
 {
         struct ath_buf *bf, *lastbf;
         struct list_head bf_head;
@@ -1499,16 +1507,7 @@ static void ath_drain_txq_list(struct ath_softc *sc, struct ath_txq *txq,
 
                 lastbf = bf->bf_lastbf;
                 list_cut_position(&bf_head, list, &lastbf->list);
-
-                txq->axq_depth--;
-                if (bf_is_ampdu_not_probing(bf))
-                        txq->axq_ampdu_depth--;
-
-                if (bf_isampdu(bf))
-                        ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, 0,
-                                             retry_tx);
-                else
-                        ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
+                ath_tx_process_buffer(sc, txq, &ts, bf, &bf_head);
         }
 }
 
@@ -1518,7 +1517,7 @@ static void ath_drain_txq_list(struct ath_softc *sc, struct ath_txq *txq,
  * This assumes output has been stopped and
  * we do not need to block ath_tx_tasklet.
  */
-void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx)
+void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq)
 {
         ath_txq_lock(sc, txq);
 
@@ -1526,8 +1525,7 @@ void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx)
                 int idx = txq->txq_tailidx;
 
                 while (!list_empty(&txq->txq_fifo[idx])) {
-                        ath_drain_txq_list(sc, txq, &txq->txq_fifo[idx],
-                                           retry_tx);
+                        ath_drain_txq_list(sc, txq, &txq->txq_fifo[idx]);
 
                         INCR(idx, ATH_TXFIFO_DEPTH);
                 }
@@ -1536,16 +1534,12 @@ void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx)
 
         txq->axq_link = NULL;
         txq->axq_tx_inprogress = false;
-        ath_drain_txq_list(sc, txq, &txq->axq_q, retry_tx);
-
-        /* flush any pending frames if aggregation is enabled */
-        if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) && !retry_tx)
-                ath_txq_drain_pending_buffers(sc, txq);
+        ath_drain_txq_list(sc, txq, &txq->axq_q);
 
         ath_txq_unlock_complete(sc, txq);
 }
 
-bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
+bool ath_drain_all_txq(struct ath_softc *sc)
 {
         struct ath_hw *ah = sc->sc_ah;
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
@@ -1581,7 +1575,7 @@ bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
                  */
                 txq = &sc->tx.txq[i];
                 txq->stopped = false;
-                ath_draintxq(sc, txq, retry_tx);
+                ath_draintxq(sc, txq);
         }
 
         return !npend;
@@ -2175,28 +2169,6 @@ static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,
         tx_info->status.rates[tx_rateindex].count = ts->ts_longretry + 1;
 }
 
-static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,
-                                  struct ath_tx_status *ts, struct ath_buf *bf,
-                                  struct list_head *bf_head)
-{
-        int txok;
-
-        txq->axq_depth--;
-        txok = !(ts->ts_status & ATH9K_TXERR_MASK);
-        txq->axq_tx_inprogress = false;
-        if (bf_is_ampdu_not_probing(bf))
-                txq->axq_ampdu_depth--;
-
-        if (!bf_isampdu(bf)) {
-                ath_tx_rc_status(sc, bf, ts, 1, txok ? 0 : 1, txok);
-                ath_tx_complete_buf(sc, bf, txq, bf_head, ts, txok);
-        } else
-                ath_tx_complete_aggr(sc, txq, bf, bf_head, ts, txok, true);
-
-        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT)
-                ath_txq_schedule(sc, txq);
-}
-
 static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
 {
         struct ath_hw *ah = sc->sc_ah;
@@ -2361,8 +2333,8 @@ static int ath_txstatus_setup(struct ath_softc *sc, int size)
         u8 txs_len = sc->sc_ah->caps.txs_len;
 
         dd->dd_desc_len = size * txs_len;
-        dd->dd_desc = dma_alloc_coherent(sc->dev, dd->dd_desc_len,
-                                         &dd->dd_desc_paddr, GFP_KERNEL);
+        dd->dd_desc = dmam_alloc_coherent(sc->dev, dd->dd_desc_len,
+                                          &dd->dd_desc_paddr, GFP_KERNEL);
         if (!dd->dd_desc)
                 return -ENOMEM;
 
@@ -2382,14 +2354,6 @@ static int ath_tx_edma_init(struct ath_softc *sc)
         return err;
 }
 
-static void ath_tx_edma_cleanup(struct ath_softc *sc)
-{
-        struct ath_descdma *dd = &sc->txsdma;
-
-        dma_free_coherent(sc->dev, dd->dd_desc_len, dd->dd_desc,
-                          dd->dd_desc_paddr);
-}
-
 int ath_tx_init(struct ath_softc *sc, int nbufs)
 {
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
@@ -2402,7 +2366,7 @@ int ath_tx_init(struct ath_softc *sc, int nbufs)
         if (error != 0) {
                 ath_err(common,
                         "Failed to allocate tx descriptors: %d\n", error);
-                goto err;
+                return error;
         }
 
         error = ath_descdma_setup(sc, &sc->beacon.bdma, &sc->beacon.bbuf,
@@ -2410,36 +2374,17 @@ int ath_tx_init(struct ath_softc *sc, int nbufs)
         if (error != 0) {
                 ath_err(common,
                         "Failed to allocate beacon descriptors: %d\n", error);
-                goto err;
+                return error;
         }
 
         INIT_DELAYED_WORK(&sc->tx_complete_work, ath_tx_complete_poll_work);
 
-        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
+        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
                 error = ath_tx_edma_init(sc);
-                if (error)
-                        goto err;
-        }
-
-err:
-        if (error != 0)
-                ath_tx_cleanup(sc);
 
         return error;
 }
 
-void ath_tx_cleanup(struct ath_softc *sc)
-{
-        if (sc->beacon.bdma.dd_desc_len != 0)
-                ath_descdma_cleanup(sc, &sc->beacon.bdma, &sc->beacon.bbuf);
-
-        if (sc->tx.txdma.dd_desc_len != 0)
-                ath_descdma_cleanup(sc, &sc->tx.txdma, &sc->tx.txbuf);
-
-        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
-                ath_tx_edma_cleanup(sc);
-}
-
 void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an)
 {
         struct ath_atx_tid *tid;
diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h
index 2df17f1e49ef..25599741cd8a 100644
--- a/drivers/net/wireless/ath/carl9170/carl9170.h
+++ b/drivers/net/wireless/ath/carl9170/carl9170.h
@@ -85,20 +85,14 @@ enum carl9170_device_state {
         CARL9170_STARTED,
 };
 
-#define CARL9170_NUM_TID                16
 #define WME_BA_BMP_SIZE                 64
 #define CARL9170_TX_USER_RATE_TRIES     3
 
-#define WME_AC_BE   2
-#define WME_AC_BK   3
-#define WME_AC_VI   1
-#define WME_AC_VO   0
-
 #define TID_TO_WME_AC(_tid)                             \
-        ((((_tid) == 0) || ((_tid) == 3)) ? WME_AC_BE : \
-         (((_tid) == 1) || ((_tid) == 2)) ? WME_AC_BK : \
-         (((_tid) == 4) || ((_tid) == 5)) ? WME_AC_VI : \
-         WME_AC_VO)
+        ((((_tid) == 0) || ((_tid) == 3)) ? IEEE80211_AC_BE :   \
+         (((_tid) == 1) || ((_tid) == 2)) ? IEEE80211_AC_BK :   \
+         (((_tid) == 4) || ((_tid) == 5)) ? IEEE80211_AC_VI :   \
+         IEEE80211_AC_VO)
 
 #define SEQ_DIFF(_start, _seq) \
         (((_start) - (_seq)) & 0x0fff)
@@ -290,6 +284,7 @@ struct ar9170 {
                 unsigned int rx_size;
                 unsigned int tx_seq_table;
                 bool ba_filter;
+                bool disable_offload_fw;
         } fw;
 
         /* interface configuration combinations */
@@ -493,8 +488,8 @@ struct carl9170_sta_info {
         bool sleeping;
         atomic_t pending_frames;
         unsigned int ampdu_max_len;
-        struct carl9170_sta_tid __rcu *agg[CARL9170_NUM_TID];
-        struct carl9170_ba_stats stats[CARL9170_NUM_TID];
+        struct carl9170_sta_tid __rcu *agg[IEEE80211_NUM_TIDS];
+        struct carl9170_ba_stats stats[IEEE80211_NUM_TIDS];
 };
 
 struct carl9170_tx_info {
diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
index 63fd9af3fd39..47d5c2e910ad 100644
--- a/drivers/net/wireless/ath/carl9170/fw.c
+++ b/drivers/net/wireless/ath/carl9170/fw.c
@@ -215,6 +215,24 @@ static int carl9170_fw_tx_sequence(struct ar9170 *ar)
         return 0;
 }
 
+static void carl9170_fw_set_if_combinations(struct ar9170 *ar,
+                                            u16 if_comb_types)
+{
+        if (ar->fw.vif_num < 2)
+                return;
+
+        ar->if_comb_limits[0].max = ar->fw.vif_num;
+        ar->if_comb_limits[0].types = if_comb_types;
+
+        ar->if_combs[0].num_different_channels = 1;
+        ar->if_combs[0].max_interfaces = ar->fw.vif_num;
+        ar->if_combs[0].limits = ar->if_comb_limits;
+        ar->if_combs[0].n_limits = ARRAY_SIZE(ar->if_comb_limits);
+
+        ar->hw->wiphy->iface_combinations = ar->if_combs;
+        ar->hw->wiphy->n_iface_combinations = ARRAY_SIZE(ar->if_combs);
+}
+
 static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)
 {
         const struct carl9170fw_otus_desc *otus_desc;
@@ -264,7 +282,7 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)
         if (!SUPP(CARL9170FW_COMMAND_CAM)) {
                 dev_info(&ar->udev->dev, "crypto offloading is disabled "
                          "by firmware.\n");
-                ar->disable_offload = true;
+                ar->fw.disable_offload_fw = true;
         }
 
         if (SUPP(CARL9170FW_PSM) && SUPP(CARL9170FW_FIXED_5GHZ_PSM))
@@ -345,20 +363,15 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)
                 }
         }
 
-        ar->if_comb_limits[0].max = ar->fw.vif_num;
-        ar->if_comb_limits[0].types = if_comb_types;
-
-        ar->if_combs[0].num_different_channels = 1;
-        ar->if_combs[0].max_interfaces = ar->fw.vif_num;
-        ar->if_combs[0].limits = ar->if_comb_limits;
-        ar->if_combs[0].n_limits = ARRAY_SIZE(ar->if_comb_limits);
-
-        ar->hw->wiphy->iface_combinations = ar->if_combs;
-        ar->hw->wiphy->n_iface_combinations = ARRAY_SIZE(ar->if_combs);
+        carl9170_fw_set_if_combinations(ar, if_comb_types);
 
         ar->hw->wiphy->interface_modes |= if_comb_types;
 
-        ar->hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
+        ar->hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+
+        /* As IBSS Encryption is software-based, IBSS RSN is supported. */
+        ar->hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |
+                 WIPHY_FLAG_IBSS_RSN | WIPHY_FLAG_SUPPORTS_TDLS;
 
 #undef SUPPORTED
         return carl9170_fw_tx_sequence(ar);
diff --git a/drivers/net/wireless/ath/carl9170/fwcmd.h b/drivers/net/wireless/ath/carl9170/fwcmd.h
index 9443c802b25b..9111d4ffc1b3 100644
--- a/drivers/net/wireless/ath/carl9170/fwcmd.h
+++ b/drivers/net/wireless/ath/carl9170/fwcmd.h
@@ -156,6 +156,14 @@ struct carl9170_psm {
 } __packed;
 #define CARL9170_PSM_SIZE               4
 
+/*
+ * Note: If a bit in rx_filter is set, then it
+ * means that the particular frames which matches
+ * the condition are FILTERED/REMOVED/DISCARDED!
+ * (This is can be a bit confusing, especially
+ * because someone people think it's the exact
+ * opposite way, so watch out!)
+ */
 struct carl9170_rx_filter_cmd {
         __le32          rx_filter;
 } __packed;
diff --git a/drivers/net/wireless/ath/carl9170/hw.h b/drivers/net/wireless/ath/carl9170/hw.h
index fa834c1460f0..0db874abde50 100644
--- a/drivers/net/wireless/ath/carl9170/hw.h
+++ b/drivers/net/wireless/ath/carl9170/hw.h
@@ -384,7 +384,7 @@
 
 #define AR9170_MAC_REG_BCN_ADDR                 (AR9170_MAC_REG_BASE + 0xd84)
 #define AR9170_MAC_REG_BCN_LENGTH               (AR9170_MAC_REG_BASE + 0xd88)
-#define         AR9170_MAC_BCN_LENGTH_MAX               256
+#define         AR9170_MAC_BCN_LENGTH_MAX               (512 - 32)
 
 #define AR9170_MAC_REG_BCN_STATUS               (AR9170_MAC_REG_BASE + 0xd8c)
 
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index 25a1e2f4f738..ef82751722e0 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -358,8 +358,13 @@ static int carl9170_op_start(struct ieee80211_hw *hw)
         ar->ps.last_action = jiffies;
         ar->ps.last_slept = jiffies;
         ar->erp_mode = CARL9170_ERP_AUTO;
-        ar->rx_software_decryption = false;
-        ar->disable_offload = false;
+
+        /* Set "disable hw crypto offload" whenever the module parameter
+         * nohwcrypt is true or if the firmware does not support it.
+         */
+        ar->disable_offload = modparam_nohwcrypt |
+                ar->fw.disable_offload_fw;
+        ar->rx_software_decryption = ar->disable_offload;
 
         for (i = 0; i < ar->hw->queues; i++) {
                 ar->queue_stop_timeout[i] = jiffies;
@@ -565,12 +570,28 @@ static int carl9170_init_interface(struct ar9170 *ar,
 
         memcpy(common->macaddr, vif->addr, ETH_ALEN);
 
-        if (modparam_nohwcrypt ||
-            ((vif->type != NL80211_IFTYPE_STATION) &&
-             (vif->type != NL80211_IFTYPE_AP))) {
-                ar->rx_software_decryption = true;
-                ar->disable_offload = true;
-        }
+        /* We have to fall back to software crypto, whenever
+         * the user choose to participates in an IBSS. HW
+         * offload for IBSS RSN is not supported by this driver.
+         *
+         * NOTE: If the previous main interface has already
+         * disabled hw crypto offload, we have to keep this
+         * previous disable_offload setting as it was.
+         * Altough ideally, we should notify mac80211 and tell
+         * it to forget about any HW crypto offload for now.
+         */
+        ar->disable_offload |= ((vif->type != NL80211_IFTYPE_STATION) &&
+            (vif->type != NL80211_IFTYPE_AP));
+
+        /* While the driver supports HW offload in a single
+         * P2P client configuration, it doesn't support HW
+         * offload in the favourit, concurrent P2P GO+CLIENT
+         * configuration. Hence, HW offload will always be
+         * disabled for P2P.
+         */
+        ar->disable_offload |= vif->p2p;
+
+        ar->rx_software_decryption = ar->disable_offload;
 
         err = carl9170_set_operating_mode(ar);
         return err;
@@ -580,7 +601,7 @@ static int carl9170_op_add_interface(struct ieee80211_hw *hw,
                                      struct ieee80211_vif *vif)
 {
         struct carl9170_vif_info *vif_priv = (void *) vif->drv_priv;
-        struct ieee80211_vif *main_vif;
+        struct ieee80211_vif *main_vif, *old_main = NULL;
         struct ar9170 *ar = hw->priv;
         int vif_id = -1, err = 0;
 
@@ -602,6 +623,15 @@ static int carl9170_op_add_interface(struct ieee80211_hw *hw,
                 goto init;
         }
 
+        /* Because the AR9170 HW's MAC doesn't provide full support for
+         * multiple, independent interfaces [of different operation modes].
+         * We have to select ONE main interface [main mode of HW], but we
+         * can have multiple slaves [AKA: entry in the ACK-table].
+         *
+         * The first (from HEAD/TOP) interface in the ar->vif_list is
+         * always the main intf. All following intfs in this list
+         * are considered to be slave intfs.
+         */
         main_vif = carl9170_get_main_vif(ar);
 
         if (main_vif) {
@@ -610,6 +640,18 @@ static int carl9170_op_add_interface(struct ieee80211_hw *hw,
                         if (vif->type == NL80211_IFTYPE_STATION)
                                 break;
 
+                        /* P2P GO [master] use-case
+                         * Because the P2P GO station is selected dynamically
+                         * by all participating peers of a WIFI Direct network,
+                         * the driver has be able to change the main interface
+                         * operating mode on the fly.
+                         */
+                        if (main_vif->p2p && vif->p2p &&
+                            vif->type == NL80211_IFTYPE_AP) {
+                                old_main = main_vif;
+                                break;
+                        }
+
                         err = -EBUSY;
                         rcu_read_unlock();
 
@@ -648,14 +690,41 @@ static int carl9170_op_add_interface(struct ieee80211_hw *hw,
         vif_priv->id = vif_id;
         vif_priv->enable_beacon = false;
         ar->vifs++;
-        list_add_tail_rcu(&vif_priv->list, &ar->vif_list);
+        if (old_main) {
+                /* We end up in here, if the main interface is being replaced.
+                 * Put the new main interface at the HEAD of the list and the
+                 * previous inteface will automatically become second in line.
+                 */
+                list_add_rcu(&vif_priv->list, &ar->vif_list);
+        } else {
+                /* Add new inteface. If the list is empty, it will become the
+                 * main inteface, otherwise it will be slave.
+                 */
+                list_add_tail_rcu(&vif_priv->list, &ar->vif_list);
+        }
         rcu_assign_pointer(ar->vif_priv[vif_id].vif, vif);
 
 init:
-        if (carl9170_get_main_vif(ar) == vif) {
+        main_vif = carl9170_get_main_vif(ar);
+
+        if (main_vif == vif) {
                 rcu_assign_pointer(ar->beacon_iter, vif_priv);
                 rcu_read_unlock();
 
+                if (old_main) {
+                        struct carl9170_vif_info *old_main_priv =
+                                (void *) old_main->drv_priv;
+                        /* downgrade old main intf to slave intf.
+                         * NOTE: We are no longer under rcu_read_lock.
+                         * But we are still holding ar->mutex, so the
+                         * vif data [id, addr] is safe.
+                         */
+                        err = carl9170_mod_virtual_mac(ar, old_main_priv->id,
+                                                       old_main->addr);
+                        if (err)
+                                goto unlock;
+                }
+
                 err = carl9170_init_interface(ar, vif);
                 if (err)
                         goto unlock;
@@ -1112,9 +1181,7 @@ static int carl9170_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         if (ar->disable_offload || !vif)
                 return -EOPNOTSUPP;
 
-        /*
-         * We have to fall back to software encryption, whenever
-         * the user choose to participates in an IBSS or is connected
+        /* Fall back to software encryption whenever the driver is connected
          * to more than one network.
          *
          * This is very unfortunate, because some machines cannot handle
@@ -1263,7 +1330,7 @@ static int carl9170_op_sta_add(struct ieee80211_hw *hw,
                         return 0;
                 }
 
-                for (i = 0; i < CARL9170_NUM_TID; i++)
+                for (i = 0; i < ARRAY_SIZE(sta_info->agg); i++)
                         RCU_INIT_POINTER(sta_info->agg[i], NULL);
 
                 sta_info->ampdu_max_len = 1 << (3 + sta->ht_cap.ampdu_factor);
@@ -1287,7 +1354,7 @@ static int carl9170_op_sta_remove(struct ieee80211_hw *hw,
                 sta_info->ht_sta = false;
 
                 rcu_read_lock();
-                for (i = 0; i < CARL9170_NUM_TID; i++) {
+                for (i = 0; i < ARRAY_SIZE(sta_info->agg); i++) {
                         struct carl9170_sta_tid *tid_info;
 
                         tid_info = rcu_dereference(sta_info->agg[i]);
@@ -1394,7 +1461,9 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw,
                 ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
                 break;
 
-        case IEEE80211_AMPDU_TX_STOP:
+        case IEEE80211_AMPDU_TX_STOP_CONT:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
                 rcu_read_lock();
                 tid_info = rcu_dereference(sta_info->agg[tid]);
                 if (tid_info) {
@@ -1805,10 +1874,6 @@ void *carl9170_alloc(size_t priv_size)
         for (i = 0; i < ARRAY_SIZE(ar->noise); i++)
                 ar->noise[i] = -95; /* ATH_DEFAULT_NOISE_FLOOR */
 
-        hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
-
-        /* As IBSS Encryption is software-based, IBSS RSN is supported. */
-        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
         return ar;
 
 err_nomem:
@@ -1916,13 +1981,13 @@ static int carl9170_parse_eeprom(struct ar9170 *ar)
         return 0;
 }
 
-static int carl9170_reg_notifier(struct wiphy *wiphy,
-                                 struct regulatory_request *request)
+static void carl9170_reg_notifier(struct wiphy *wiphy,
+                                  struct regulatory_request *request)
 {
         struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
         struct ar9170 *ar = hw->priv;
 
-        return ath_reg_notifier_apply(wiphy, request, &ar->common.regulatory);
+        ath_reg_notifier_apply(wiphy, request, &ar->common.regulatory);
 }
 
 int carl9170_register(struct ar9170 *ar)
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index ef4ec0da6e49..9c0b150d5b8e 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -1520,35 +1520,92 @@ void carl9170_tx_scheduler(struct ar9170 *ar)
                 carl9170_tx(ar);
 }
 
-int carl9170_update_beacon(struct ar9170 *ar, const bool submit)
+/* caller has to take rcu_read_lock */
+static struct carl9170_vif_info *carl9170_pick_beaconing_vif(struct ar9170 *ar)
 {
-        struct sk_buff *skb = NULL;
         struct carl9170_vif_info *cvif;
+        int i = 1;
+
+        /* The AR9170 hardware has no fancy beacon queue or some
+         * other scheduling mechanism. So, the driver has to make
+         * due by setting the two beacon timers (pretbtt and tbtt)
+         * once and then swapping the beacon address in the HW's
+         * register file each time the pretbtt fires.
+         */
+
+        cvif = rcu_dereference(ar->beacon_iter);
+        if (ar->vifs > 0 && cvif) {
+                do {
+                        list_for_each_entry_continue_rcu(cvif, &ar->vif_list,
+                                                         list) {
+                                if (cvif->active && cvif->enable_beacon)
+                                        goto out;
+                        }
+                } while (ar->beacon_enabled && i--);
+        }
+
+out:
+        rcu_assign_pointer(ar->beacon_iter, cvif);
+        return cvif;
+}
+
+static bool carl9170_tx_beacon_physet(struct ar9170 *ar, struct sk_buff *skb,
+                                      u32 *ht1, u32 *plcp)
+{
         struct ieee80211_tx_info *txinfo;
         struct ieee80211_tx_rate *rate;
-        __le32 *data, *old = NULL;
-        unsigned int plcp, power, chains;
-        u32 word, ht1, off, addr, len;
-        int i = 0, err = 0;
+        unsigned int power, chains;
+        bool ht_rate;
 
-        rcu_read_lock();
-        cvif = rcu_dereference(ar->beacon_iter);
-retry:
-        if (ar->vifs == 0 || !cvif)
-                goto out_unlock;
+        txinfo = IEEE80211_SKB_CB(skb);
+        rate = &txinfo->control.rates[0];
+        ht_rate = !!(txinfo->control.rates[0].flags & IEEE80211_TX_RC_MCS);
+        carl9170_tx_rate_tpc_chains(ar, txinfo, rate, plcp, &power, &chains);
 
-        list_for_each_entry_continue_rcu(cvif, &ar->vif_list, list) {
-                if (cvif->active && cvif->enable_beacon)
-                        goto found;
+        *ht1 = AR9170_MAC_BCN_HT1_TX_ANT0;
+        if (chains == AR9170_TX_PHY_TXCHAIN_2)
+                *ht1 |= AR9170_MAC_BCN_HT1_TX_ANT1;
+        SET_VAL(AR9170_MAC_BCN_HT1_PWR_CTRL, *ht1, 7);
+        SET_VAL(AR9170_MAC_BCN_HT1_TPC, *ht1, power);
+        SET_VAL(AR9170_MAC_BCN_HT1_CHAIN_MASK, *ht1, chains);
+
+        if (ht_rate) {
+                *ht1 |= AR9170_MAC_BCN_HT1_HT_EN;
+                if (rate->flags & IEEE80211_TX_RC_SHORT_GI)
+                        *plcp |= AR9170_MAC_BCN_HT2_SGI;
+
+                if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH) {
+                        *ht1 |= AR9170_MAC_BCN_HT1_BWC_40M_SHARED;
+                        *plcp |= AR9170_MAC_BCN_HT2_BW40;
+                } else if (rate->flags & IEEE80211_TX_RC_DUP_DATA) {
+                        *ht1 |= AR9170_MAC_BCN_HT1_BWC_40M_DUP;
+                        *plcp |= AR9170_MAC_BCN_HT2_BW40;
+                }
+
+                SET_VAL(AR9170_MAC_BCN_HT2_LEN, *plcp, skb->len + FCS_LEN);
+        } else {
+                if (*plcp <= AR9170_TX_PHY_RATE_CCK_11M)
+                        *plcp |= ((skb->len + FCS_LEN) << (3 + 16)) + 0x0400;
+                else
+                        *plcp |= ((skb->len + FCS_LEN) << 16) + 0x0010;
         }
 
-        if (!ar->beacon_enabled || i++)
-                goto out_unlock;
+        return ht_rate;
+}
 
-        goto retry;
+int carl9170_update_beacon(struct ar9170 *ar, const bool submit)
+{
+        struct sk_buff *skb = NULL;
+        struct carl9170_vif_info *cvif;
+        __le32 *data, *old = NULL;
+        u32 word, ht1, plcp, off, addr, len;
+        int i = 0, err = 0;
+        bool ht_rate;
 
-found:
-        rcu_assign_pointer(ar->beacon_iter, cvif);
+        rcu_read_lock();
+        cvif = carl9170_pick_beaconing_vif(ar);
+        if (!cvif)
+                goto out_unlock;
 
         skb = ieee80211_beacon_get_tim(ar->hw, carl9170_get_vif(cvif),
                 NULL, NULL);
@@ -1558,7 +1615,6 @@ found:
                 goto err_free;
         }
 
-        txinfo = IEEE80211_SKB_CB(skb);
         spin_lock_bh(&ar->beacon_lock);
         data = (__le32 *)skb->data;
         if (cvif->beacon)
@@ -1588,43 +1644,14 @@ found:
                 goto err_unlock;
         }
 
-        ht1 = AR9170_MAC_BCN_HT1_TX_ANT0;
-        rate = &txinfo->control.rates[0];
-        carl9170_tx_rate_tpc_chains(ar, txinfo, rate, &plcp, &power, &chains);
-        if (!(txinfo->control.rates[0].flags & IEEE80211_TX_RC_MCS)) {
-                if (plcp <= AR9170_TX_PHY_RATE_CCK_11M)
-                        plcp |= ((skb->len + FCS_LEN) << (3 + 16)) + 0x0400;
-                else
-                        plcp |= ((skb->len + FCS_LEN) << 16) + 0x0010;
-        } else {
-                ht1 |= AR9170_MAC_BCN_HT1_HT_EN;
-                if (rate->flags & IEEE80211_TX_RC_SHORT_GI)
-                        plcp |= AR9170_MAC_BCN_HT2_SGI;
-
-                if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH) {
-                        ht1 |= AR9170_MAC_BCN_HT1_BWC_40M_SHARED;
-                        plcp |= AR9170_MAC_BCN_HT2_BW40;
-                }
-                if (rate->flags & IEEE80211_TX_RC_DUP_DATA) {
-                        ht1 |= AR9170_MAC_BCN_HT1_BWC_40M_DUP;
-                        plcp |= AR9170_MAC_BCN_HT2_BW40;
-                }
-
-                SET_VAL(AR9170_MAC_BCN_HT2_LEN, plcp, skb->len + FCS_LEN);
-        }
-
-        SET_VAL(AR9170_MAC_BCN_HT1_PWR_CTRL, ht1, 7);
-        SET_VAL(AR9170_MAC_BCN_HT1_TPC, ht1, power);
-        SET_VAL(AR9170_MAC_BCN_HT1_CHAIN_MASK, ht1, chains);
-        if (chains == AR9170_TX_PHY_TXCHAIN_2)
-                ht1 |= AR9170_MAC_BCN_HT1_TX_ANT1;
+        ht_rate = carl9170_tx_beacon_physet(ar, skb, &ht1, &plcp);
 
         carl9170_async_regwrite_begin(ar);
         carl9170_async_regwrite(AR9170_MAC_REG_BCN_HT1, ht1);
-        if (!(txinfo->control.rates[0].flags & IEEE80211_TX_RC_MCS))
-                carl9170_async_regwrite(AR9170_MAC_REG_BCN_PLCP, plcp);
-        else
+        if (ht_rate)
                 carl9170_async_regwrite(AR9170_MAC_REG_BCN_HT2, plcp);
+        else
+                carl9170_async_regwrite(AR9170_MAC_REG_BCN_PLCP, plcp);
 
         for (i = 0; i < DIV_ROUND_UP(skb->len, 4); i++) {
                 /*
diff --git a/drivers/net/wireless/ath/carl9170/version.h b/drivers/net/wireless/ath/carl9170/version.h
index 2ec3e9191e4d..2282847d4bb8 100644
--- a/drivers/net/wireless/ath/carl9170/version.h
+++ b/drivers/net/wireless/ath/carl9170/version.h
@@ -1,7 +1,7 @@
 #ifndef __CARL9170_SHARED_VERSION_H
 #define __CARL9170_SHARED_VERSION_H
 #define CARL9170FW_VERSION_YEAR 12
-#define CARL9170FW_VERSION_MONTH 7
-#define CARL9170FW_VERSION_DAY 7
-#define CARL9170FW_VERSION_GIT "1.9.6"
+#define CARL9170FW_VERSION_MONTH 12
+#define CARL9170FW_VERSION_DAY 15
+#define CARL9170FW_VERSION_GIT "1.9.7"
 #endif /* __CARL9170_SHARED_VERSION_H */
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index d81698015bf7..ccc4c718f124 100644
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -195,8 +195,6 @@ ath_reg_apply_beaconing_flags(struct wiphy *wiphy,
         const struct ieee80211_reg_rule *reg_rule;
         struct ieee80211_channel *ch;
         unsigned int i;
-        u32 bandwidth = 0;
-        int r;
 
         for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
 
@@ -214,11 +212,8 @@ ath_reg_apply_beaconing_flags(struct wiphy *wiphy,
                                 continue;
 
                         if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) {
-                                r = freq_reg_info(wiphy,
-                                                  ch->center_freq,
-                                                  bandwidth,
-                                                  &reg_rule);
-                                if (r)
+                                reg_rule = freq_reg_info(wiphy, ch->center_freq);
+                                if (IS_ERR(reg_rule))
                                         continue;
                                 /*
                                  * If 11d had a rule for this channel ensure
@@ -254,8 +249,6 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy,
         struct ieee80211_supported_band *sband;
         struct ieee80211_channel *ch;
         const struct ieee80211_reg_rule *reg_rule;
-        u32 bandwidth = 0;
-        int r;
 
         sband = wiphy->bands[IEEE80211_BAND_2GHZ];
         if (!sband)
@@ -283,16 +276,16 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy,
          */
 
         ch = &sband->channels[11]; /* CH 12 */
-        r = freq_reg_info(wiphy, ch->center_freq, bandwidth, &reg_rule);
-        if (!r) {
+        reg_rule = freq_reg_info(wiphy, ch->center_freq);
+        if (!IS_ERR(reg_rule)) {
                 if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
                         if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
                                 ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
         }
 
         ch = &sband->channels[12]; /* CH 13 */
-        r = freq_reg_info(wiphy, ch->center_freq, bandwidth, &reg_rule);
-        if (!r) {
+        reg_rule = freq_reg_info(wiphy, ch->center_freq);
+        if (!IS_ERR(reg_rule)) {
                 if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
                         if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
                                 ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
@@ -363,9 +356,9 @@ static u16 ath_regd_find_country_by_name(char *alpha2)
         return -1;
 }
 
-int ath_reg_notifier_apply(struct wiphy *wiphy,
-                           struct regulatory_request *request,
-                           struct ath_regulatory *reg)
+void ath_reg_notifier_apply(struct wiphy *wiphy,
+                            struct regulatory_request *request,
+                            struct ath_regulatory *reg)
 {
         struct ath_common *common = container_of(reg, struct ath_common,
                                                  regulatory);
@@ -380,7 +373,7 @@ int ath_reg_notifier_apply(struct wiphy *wiphy,
          * any pending requests in the queue.
          */
         if (!request)
-                return 0;
+                return;
 
         switch (request->initiator) {
         case NL80211_REGDOM_SET_BY_CORE:
@@ -416,8 +409,6 @@ int ath_reg_notifier_apply(struct wiphy *wiphy,
 
                 break;
         }
-
-        return 0;
 }
 EXPORT_SYMBOL(ath_reg_notifier_apply);
 
@@ -507,8 +498,8 @@ ath_get_regpair(int regdmn)
 static int
 ath_regd_init_wiphy(struct ath_regulatory *reg,
                     struct wiphy *wiphy,
-                    int (*reg_notifier)(struct wiphy *wiphy,
-                                        struct regulatory_request *request))
+                    void (*reg_notifier)(struct wiphy *wiphy,
+                                         struct regulatory_request *request))
 {
         const struct ieee80211_regdomain *regd;
 
@@ -628,8 +619,8 @@ static int __ath_regd_init(struct ath_regulatory *reg)
 int
 ath_regd_init(struct ath_regulatory *reg,
               struct wiphy *wiphy,
-              int (*reg_notifier)(struct wiphy *wiphy,
-                                  struct regulatory_request *request))
+              void (*reg_notifier)(struct wiphy *wiphy,
+                                   struct regulatory_request *request))
 {
         struct ath_common *common = container_of(reg, struct ath_common,
                                                  regulatory);
diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h
index 03a8268ccf21..37f53bd8fcb1 100644
--- a/drivers/net/wireless/ath/regd.h
+++ b/drivers/net/wireless/ath/regd.h
@@ -252,12 +252,12 @@ enum CountryCode {
 bool ath_is_world_regd(struct ath_regulatory *reg);
 bool ath_is_49ghz_allowed(u16 redomain);
 int ath_regd_init(struct ath_regulatory *reg, struct wiphy *wiphy,
-                  int (*reg_notifier)(struct wiphy *wiphy,
-                  struct regulatory_request *request));
+                  void (*reg_notifier)(struct wiphy *wiphy,
+                                       struct regulatory_request *request));
 u32 ath_regd_get_band_ctl(struct ath_regulatory *reg,
                           enum ieee80211_band band);
-int ath_reg_notifier_apply(struct wiphy *wiphy,
-                           struct regulatory_request *request,
-                           struct ath_regulatory *reg);
+void ath_reg_notifier_apply(struct wiphy *wiphy,
+                            struct regulatory_request *request,
+                            struct ath_regulatory *reg);
 
 #endif
diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/b43/tables_nphy.c
index 97d4e27bf36f..aaca60c6f575 100644
--- a/drivers/net/wireless/b43/tables_nphy.c
+++ b/drivers/net/wireless/b43/tables_nphy.c
@@ -3226,8 +3226,6 @@ struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent(
 {
         struct nphy_gain_ctl_workaround_entry *e;
         u8 phy_idx;
-        u8 tr_iso = ghz5 ? dev->dev->bus_sprom->fem.ghz5.tr_iso :
-                           dev->dev->bus_sprom->fem.ghz2.tr_iso;
 
         if (!ghz5 && dev->phy.rev >= 6 && dev->phy.radio_rev == 11)
                 return &nphy_gain_ctl_wa_phy6_radio11_ghz2;
@@ -3249,6 +3247,10 @@ struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent(
                     !b43_channel_type_is_40mhz(dev->phy.channel_type))
                         e->cliplo_gain = 0x2d;
         } else if (!ghz5 && dev->phy.rev >= 5) {
+                static const int gain_data[] = {0x0062, 0x0064, 0x006a, 0x106a,
+                                                0x106c, 0x1074, 0x107c, 0x207c};
+                u8 tr_iso = dev->dev->bus_sprom->fem.ghz2.tr_iso;
+
                 if (ext_lna) {
                         e->rfseq_init[0] &= ~0x4000;
                         e->rfseq_init[1] &= ~0x4000;
@@ -3256,26 +3258,10 @@ struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent(
                         e->rfseq_init[3] &= ~0x4000;
                         e->init_gain &= ~0x4000;
                 }
-                switch (tr_iso) {
-                case 0:
-                        e->cliplo_gain = 0x0062;
-                case 1:
-                        e->cliplo_gain = 0x0064;
-                case 2:
-                        e->cliplo_gain = 0x006a;
-                case 3:
-                        e->cliplo_gain = 0x106a;
-                case 4:
-                        e->cliplo_gain = 0x106c;
-                case 5:
-                        e->cliplo_gain = 0x1074;
-                case 6:
-                        e->cliplo_gain = 0x107c;
-                case 7:
-                        e->cliplo_gain = 0x207c;
-                default:
-                        e->cliplo_gain = 0x106a;
-                }
+                if (tr_iso > 7)
+                        tr_iso = 3;
+                e->cliplo_gain = gain_data[tr_iso];
+
         } else if (ghz5 && dev->phy.rev == 4 && ext_lna) {
                 e->rfseq_init[0] &= ~0x4000;
                 e->rfseq_init[1] &= ~0x4000;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index be35a2f99b1c..11fd1c735589 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -15,8 +15,6 @@
  */
 /* ****************** SDIO CARD Interface Functions **************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/export.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index d33e5598611b..d92d373733d7 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -14,8 +14,6 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/mmc/sdio.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index fd672bf53867..a2f32fb990fa 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -39,6 +39,7 @@
 #define BRCMF_C_GET_BSSID                       23
 #define BRCMF_C_GET_SSID                        25
 #define BRCMF_C_SET_SSID                        26
+#define BRCMF_C_TERMINATED                      28
 #define BRCMF_C_GET_CHANNEL                     29
 #define BRCMF_C_SET_CHANNEL                     30
 #define BRCMF_C_GET_SRL                         31
@@ -480,36 +481,14 @@ struct brcmf_pub {
         unsigned long drv_version;      /* Version of dongle-resident driver */
         u8 mac[ETH_ALEN];               /* MAC address obtained from dongle */
 
-        /* Additional stats for the bus level */
-
         /* Multicast data packets sent to dongle */
         unsigned long tx_multicast;
-        /* Packets flushed due to unscheduled sendup thread */
-        unsigned long rx_flushed;
-        /* Number of times dpc scheduled by watchdog timer */
-        unsigned long wd_dpc_sched;
-
-        /* Number of flow control pkts recvd */
-        unsigned long fc_packets;
-
-        /* Last error return */
-        int bcmerror;
-
-        /* Last error from dongle */
-        int dongle_error;
-
-        /* Suspend disable flag  flag */
-        int suspend_disable_flag;       /* "1" to disable all extra powersaving
-                                         during suspend */
-        int in_suspend;         /* flag set to 1 when early suspend called */
-        int dtim_skip;          /* dtim skip , default 0 means wake each dtim */
 
         struct brcmf_if *iflist[BRCMF_MAX_IFS];
 
         struct mutex proto_block;
         unsigned char proto_buf[BRCMF_DCMD_MAXLEN];
 
-        u8 macvalue[ETH_ALEN];
         atomic_t pend_8021x_cnt;
         wait_queue_head_t pend_8021x_wait;
 
@@ -519,11 +498,6 @@ struct brcmf_pub {
 #endif
 };
 
-struct bcmevent_name {
-        uint event;
-        const char *name;
-};
-
 struct brcmf_if_event {
         u8 ifidx;
         u8 action;
@@ -557,13 +531,6 @@ struct brcmf_if {
         u8 mac_addr[ETH_ALEN];
 };
 
-static inline s32 brcmf_ndev_bssidx(struct net_device *ndev)
-{
-        struct brcmf_if *ifp = netdev_priv(ndev);
-        return ifp->bssidx;
-}
-
-extern const struct bcmevent_name bcmevent_names[];
 
 extern int brcmf_netdev_wait_pend8021x(struct net_device *ndev);
 
@@ -576,6 +543,10 @@ extern int brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx,
 extern int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,
                                     void *buf, uint len);
 
+/* Remove any protocol-specific data header. */
+extern int brcmf_proto_hdrpull(struct brcmf_pub *drvr, u8 *ifidx,
+                               struct sk_buff *rxp);
+
 extern int brcmf_net_attach(struct brcmf_if *ifp);
 extern struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, int ifidx,
                                      s32 bssidx, char *name, u8 *mac_addr);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
index dd38b78a9726..64c38f4226a3 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
@@ -130,31 +130,18 @@ int brcmf_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint len)
  * interface functions from common layer
  */
 
-/* Remove any protocol-specific data header. */
-extern int brcmf_proto_hdrpull(struct device *dev, int *ifidx,
-                               struct sk_buff *rxp);
-
 extern bool brcmf_c_prec_enq(struct device *dev, struct pktq *q,
                          struct sk_buff *pkt, int prec);
 
 /* Receive frame for delivery to OS.  Callee disposes of rxp. */
-extern void brcmf_rx_frame(struct device *dev, u8 ifidx,
-                           struct sk_buff_head *rxlist);
-static inline void brcmf_rx_packet(struct device *dev, int ifidx,
-                                   struct sk_buff *pkt)
-{
-        struct sk_buff_head q;
-
-        skb_queue_head_init(&q);
-        skb_queue_tail(&q, pkt);
-        brcmf_rx_frame(dev, ifidx, &q);
-}
+extern void brcmf_rx_frames(struct device *dev, struct sk_buff_head *rxlist);
 
 /* Indication from bus module regarding presence/insertion of dongle. */
 extern int brcmf_attach(uint bus_hdrlen, struct device *dev);
 /* Indication from bus module regarding removal/absence of dongle */
 extern void brcmf_detach(struct device *dev);
-
+/* Indication from bus module that dongle should be reset */
+extern void brcmf_dev_reset(struct device *dev);
 /* Indication from bus module to change flow-control state */
 extern void brcmf_txflowblock(struct device *dev, bool state);
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
index 83923553f1ac..bb454cdab29d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
@@ -19,8 +19,6 @@
  * For certain dcmd codes, the dongle interprets string data from the host.
  ******************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/types.h>
 #include <linux/netdevice.h>
 
@@ -94,8 +92,6 @@ struct brcmf_proto_bdc_header {
 
 struct brcmf_proto {
         u16 reqid;
-        u8 pending;
-        u32 lastcmd;
         u8 bus_header[BUS_HEADER_LEN];
         struct brcmf_proto_cdc_dcmd msg;
         unsigned char buf[BRCMF_DCMD_MAXLEN + ROUND_UP_MARGIN];
@@ -107,7 +103,7 @@ static int brcmf_proto_cdc_msg(struct brcmf_pub *drvr)
         int len = le32_to_cpu(prot->msg.len) +
                         sizeof(struct brcmf_proto_cdc_dcmd);
 
-        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(CDC, "Enter\n");
 
         /* NOTE : cdc->msg.len holds the desired length of the buffer to be
          *        returned. Only up to CDC_MAX_MSG_SIZE of this buffer area
@@ -125,7 +121,7 @@ static int brcmf_proto_cdc_cmplt(struct brcmf_pub *drvr, u32 id, u32 len)
         int ret;
         struct brcmf_proto *prot = drvr->prot;
 
-        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(CDC, "Enter\n");
         len += sizeof(struct brcmf_proto_cdc_dcmd);
         do {
                 ret = brcmf_bus_rxctl(drvr->bus_if, (unsigned char *)&prot->msg,
@@ -147,20 +143,7 @@ brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,
         int ret = 0, retries = 0;
         u32 id, flags;
 
-        brcmf_dbg(TRACE, "Enter\n");
-        brcmf_dbg(CTL, "cmd %d len %d\n", cmd, len);
-
-        /* Respond "bcmerror" and "bcmerrorstr" with local cache */
-        if (cmd == BRCMF_C_GET_VAR && buf) {
-                if (!strcmp((char *)buf, "bcmerrorstr")) {
-                        strncpy((char *)buf, "bcm_error",
-                                BCME_STRLEN);
-                        goto done;
-                } else if (!strcmp((char *)buf, "bcmerror")) {
-                        *(int *)buf = drvr->dongle_error;
-                        goto done;
-                }
-        }
+        brcmf_dbg(CDC, "Enter, cmd %d len %d\n", cmd, len);
 
         memset(msg, 0, sizeof(struct brcmf_proto_cdc_dcmd));
 
@@ -210,11 +193,8 @@ retry:
         }
 
         /* Check the ERROR flag */
-        if (flags & CDC_DCMD_ERROR) {
+        if (flags & CDC_DCMD_ERROR)
                 ret = le32_to_cpu(msg->status);
-                /* Cache error from dongle */
-                drvr->dongle_error = ret;
-        }
 
 done:
         return ret;
@@ -228,8 +208,7 @@ int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,
         int ret = 0;
         u32 flags, id;
 
-        brcmf_dbg(TRACE, "Enter\n");
-        brcmf_dbg(CTL, "cmd %d len %d\n", cmd, len);
+        brcmf_dbg(CDC, "Enter, cmd %d len %d\n", cmd, len);
 
         memset(msg, 0, sizeof(struct brcmf_proto_cdc_dcmd));
 
@@ -262,11 +241,8 @@ int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,
         }
 
         /* Check the ERROR flag */
-        if (flags & CDC_DCMD_ERROR) {
+        if (flags & CDC_DCMD_ERROR)
                 ret = le32_to_cpu(msg->status);
-                /* Cache error from dongle */
-                drvr->dongle_error = ret;
-        }
 
 done:
         return ret;
@@ -287,7 +263,7 @@ void brcmf_proto_hdrpush(struct brcmf_pub *drvr, int ifidx,
 {
         struct brcmf_proto_bdc_header *h;
 
-        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(CDC, "Enter\n");
 
         /* Push BDC header used to convey priority for buses that don't */
 
@@ -305,14 +281,12 @@ void brcmf_proto_hdrpush(struct brcmf_pub *drvr, int ifidx,
         BDC_SET_IF_IDX(h, ifidx);
 }
 
-int brcmf_proto_hdrpull(struct device *dev, int *ifidx,
+int brcmf_proto_hdrpull(struct brcmf_pub *drvr, u8 *ifidx,
                         struct sk_buff *pktbuf)
 {
         struct brcmf_proto_bdc_header *h;
-        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
-        struct brcmf_pub *drvr = bus_if->drvr;
 
-        brcmf_dbg(TRACE, "Enter\n");
+        brcmf_dbg(CDC, "Enter\n");
 
         /* Pop BDC header used to convey priority for buses that don't */
 
@@ -338,7 +312,7 @@ int brcmf_proto_hdrpull(struct device *dev, int *ifidx,
         }
 
         if (h->flags & BDC_FLAG_SUM_GOOD) {
-                brcmf_dbg(INFO, "%s: BDC packet received with good rx-csum, flags 0x%x\n",
+                brcmf_dbg(CDC, "%s: BDC rcv, good checksum, flags 0x%x\n",
                           brcmf_ifname(drvr, *ifidx), h->flags);
                 pkt_set_sum_good(pktbuf, true);
         }
@@ -348,6 +322,8 @@ int brcmf_proto_hdrpull(struct device *dev, int *ifidx,
         skb_pull(pktbuf, BDC_HEADER_LEN);
         skb_pull(pktbuf, h->data_offset << 2);
 
+        if (pktbuf->len == 0)
+                return -ENODATA;
         return 0;
 }
 
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index f8b52e5b941a..4544342a0428 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -14,8 +14,6 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/netdevice.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
index f2ab01cd7966..bc013cbe06f6 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
@@ -18,21 +18,26 @@
 #define _BRCMF_DBG_H_
 
 /* message levels */
-#define BRCMF_TRACE_VAL 0x0002
-#define BRCMF_INFO_VAL  0x0004
-#define BRCMF_DATA_VAL  0x0008
-#define BRCMF_CTL_VAL   0x0010
-#define BRCMF_TIMER_VAL 0x0020
-#define BRCMF_HDRS_VAL  0x0040
-#define BRCMF_BYTES_VAL 0x0080
-#define BRCMF_INTR_VAL  0x0100
-#define BRCMF_GLOM_VAL  0x0200
-#define BRCMF_EVENT_VAL 0x0400
-#define BRCMF_BTA_VAL   0x0800
-#define BRCMF_FIL_VAL   0x1000
-#define BRCMF_USB_VAL   0x2000
-#define BRCMF_SCAN_VAL  0x4000
-#define BRCMF_CONN_VAL  0x8000
+#define BRCMF_TRACE_VAL 0x00000002
+#define BRCMF_INFO_VAL  0x00000004
+#define BRCMF_DATA_VAL  0x00000008
+#define BRCMF_CTL_VAL   0x00000010
+#define BRCMF_TIMER_VAL 0x00000020
+#define BRCMF_HDRS_VAL  0x00000040
+#define BRCMF_BYTES_VAL 0x00000080
+#define BRCMF_INTR_VAL  0x00000100
+#define BRCMF_GLOM_VAL  0x00000200
+#define BRCMF_EVENT_VAL 0x00000400
+#define BRCMF_BTA_VAL   0x00000800
+#define BRCMF_FIL_VAL   0x00001000
+#define BRCMF_USB_VAL   0x00002000
+#define BRCMF_SCAN_VAL  0x00004000
+#define BRCMF_CONN_VAL  0x00008000
+#define BRCMF_CDC_VAL   0x00010000
+
+/* set default print format */
+#undef pr_fmt
+#define pr_fmt(fmt)             KBUILD_MODNAME ": " fmt
 
 /* Macro for error messages. net_ratelimit() is used when driver
  * debugging is not selected. When debugging the driver error
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 8c28a1518409..14b8fdde6954 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -14,8 +14,6 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/kernel.h>
 #include <linux/etherdevice.h>
 #include <linux/module.h>
@@ -162,28 +160,31 @@ static void brcmf_netdev_set_multicast_list(struct net_device *ndev)
         schedule_work(&ifp->multicast_work);
 }
 
-static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,
+                                           struct net_device *ndev)
 {
         int ret;
         struct brcmf_if *ifp = netdev_priv(ndev);
         struct brcmf_pub *drvr = ifp->drvr;
+        struct ethhdr *eh;
 
         brcmf_dbg(TRACE, "Enter\n");
 
-        /* Reject if down */
-        if (!drvr->bus_if->drvr_up ||
-            (drvr->bus_if->state != BRCMF_BUS_DATA)) {
-                brcmf_err("xmit rejected drvup=%d state=%d\n",
-                          drvr->bus_if->drvr_up,
-                          drvr->bus_if->state);
+        /* Can the device send data? */
+        if (drvr->bus_if->state != BRCMF_BUS_DATA) {
+                brcmf_err("xmit rejected state=%d\n", drvr->bus_if->state);
                 netif_stop_queue(ndev);
-                return -ENODEV;
+                dev_kfree_skb(skb);
+                ret = -ENODEV;
+                goto done;
         }
 
         if (!drvr->iflist[ifp->idx]) {
                 brcmf_err("bad ifidx %d\n", ifp->idx);
                 netif_stop_queue(ndev);
-                return -ENODEV;
+                dev_kfree_skb(skb);
+                ret = -ENODEV;
+                goto done;
         }
 
         /* Make sure there's enough room for any header */
@@ -204,17 +205,20 @@ static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *ndev)
                 }
         }
 
-        /* Update multicast statistic */
-        if (skb->len >= ETH_ALEN) {
-                u8 *pktdata = (u8 *)(skb->data);
-                struct ethhdr *eh = (struct ethhdr *)pktdata;
-
-                if (is_multicast_ether_addr(eh->h_dest))
-                        drvr->tx_multicast++;
-                if (ntohs(eh->h_proto) == ETH_P_PAE)
-                        atomic_inc(&drvr->pend_8021x_cnt);
+        /* validate length for ether packet */
+        if (skb->len < sizeof(*eh)) {
+                ret = -EINVAL;
+                dev_kfree_skb(skb);
+                goto done;
         }
 
+        /* handle ethernet header */
+        eh = (struct ethhdr *)(skb->data);
+        if (is_multicast_ether_addr(eh->h_dest))
+                drvr->tx_multicast++;
+        if (ntohs(eh->h_proto) == ETH_P_PAE)
+                atomic_inc(&drvr->pend_8021x_cnt);
+
         /* If the protocol uses a data header, apply it */
         brcmf_proto_hdrpush(drvr, ifp->idx, skb);
 
@@ -228,7 +232,7 @@ done:
                 drvr->bus_if->dstats.tx_packets++;
 
         /* Return ok: we always eat the packet */
-        return 0;
+        return NETDEV_TX_OK;
 }
 
 void brcmf_txflowblock(struct device *dev, bool state)
@@ -250,8 +254,7 @@ void brcmf_txflowblock(struct device *dev, bool state)
                 }
 }
 
-void brcmf_rx_frame(struct device *dev, u8 ifidx,
-                    struct sk_buff_head *skb_list)
+void brcmf_rx_frames(struct device *dev, struct sk_buff_head *skb_list)
 {
         unsigned char *eth;
         uint len;
@@ -259,12 +262,24 @@ void brcmf_rx_frame(struct device *dev, u8 ifidx,
         struct brcmf_if *ifp;
         struct brcmf_bus *bus_if = dev_get_drvdata(dev);
         struct brcmf_pub *drvr = bus_if->drvr;
+        u8 ifidx;
+        int ret;
 
         brcmf_dbg(TRACE, "Enter\n");
 
         skb_queue_walk_safe(skb_list, skb, pnext) {
                 skb_unlink(skb, skb_list);
 
+                /* process and remove protocol-specific header
+                 */
+                ret = brcmf_proto_hdrpull(drvr, &ifidx, skb);
+                if (ret < 0) {
+                        if (ret != -ENODATA)
+                                bus_if->dstats.rx_errors++;
+                        brcmu_pkt_buf_free_skb(skb);
+                        continue;
+                }
+
                 /* Get the protocol, maintain skb around eth_type_trans()
                  * The main reason for this hack is for the limitation of
                  * Linux 2.4 where 'eth_type_trans' uses the
@@ -328,13 +343,13 @@ void brcmf_rx_frame(struct device *dev, u8 ifidx,
 
 void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success)
 {
-        uint ifidx;
+        u8 ifidx;
         struct ethhdr *eh;
         u16 type;
         struct brcmf_bus *bus_if = dev_get_drvdata(dev);
         struct brcmf_pub *drvr = bus_if->drvr;
 
-        brcmf_proto_hdrpull(dev, &ifidx, txp);
+        brcmf_proto_hdrpull(drvr, &ifidx, txp);
 
         eh = (struct ethhdr *)(txp->data);
         type = ntohs(eh->h_proto);
@@ -452,7 +467,7 @@ static int brcmf_ethtool(struct brcmf_if *ifp, void __user *uaddr)
                 sprintf(info.version, "%lu", drvr->drv_version);
                 if (copy_to_user(uaddr, &info, sizeof(info)))
                         return -EFAULT;
-                brcmf_dbg(CTL, "given %*s, returning %s\n",
+                brcmf_dbg(TRACE, "given %*s, returning %s\n",
                           (int)sizeof(drvname), drvname, info.driver);
                 break;
 
@@ -572,14 +587,9 @@ static int brcmf_netdev_open(struct net_device *ndev)
         /* Get current TOE mode from dongle */
         if (brcmf_fil_iovar_int_get(ifp, "toe_ol", &toe_ol) >= 0
             && (toe_ol & TOE_TX_CSUM_OL) != 0)
-                drvr->iflist[ifp->idx]->ndev->features |=
-                        NETIF_F_IP_CSUM;
+                ndev->features |= NETIF_F_IP_CSUM;
         else
-                drvr->iflist[ifp->idx]->ndev->features &=
-                        ~NETIF_F_IP_CSUM;
-
-        /* make sure RF is ready for work */
-        brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 0);
+                ndev->features &= ~NETIF_F_IP_CSUM;
 
         /* Allow transmit calls */
         netif_start_queue(ndev);
@@ -847,6 +857,17 @@ static void brcmf_bus_detach(struct brcmf_pub *drvr)
         }
 }
 
+void brcmf_dev_reset(struct device *dev)
+{
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_pub *drvr = bus_if->drvr;
+
+        if (drvr == NULL)
+                return;
+
+        brcmf_fil_cmd_int_set(drvr->iflist[0], BRCMF_C_TERMINATED, 1);
+}
+
 void brcmf_detach(struct device *dev)
 {
         int i;
@@ -868,9 +889,8 @@ void brcmf_detach(struct device *dev)
 
         brcmf_bus_detach(drvr);
 
-        if (drvr->prot) {
+        if (drvr->prot)
                 brcmf_proto_detach(drvr);
-        }
 
         brcmf_debugfs_detach(drvr);
         bus_if->drvr = NULL;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index cf857f1edf8c..7fef9b5ba003 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -14,8 +14,6 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
@@ -1169,7 +1167,6 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
         int errcode;
         u8 doff, sfdoff;
 
-        int ifidx = 0;
         bool usechain = bus->use_rxchain;
 
         struct brcmf_sdio_read rd_new;
@@ -1388,13 +1385,6 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                                 skb_unlink(pfirst, &bus->glom);
                                 brcmu_pkt_buf_free_skb(pfirst);
                                 continue;
-                        } else if (brcmf_proto_hdrpull(bus->sdiodev->dev,
-                                                       &ifidx, pfirst) != 0) {
-                                brcmf_err("rx protocol error\n");
-                                bus->sdiodev->bus_if->dstats.rx_errors++;
-                                skb_unlink(pfirst, &bus->glom);
-                                brcmu_pkt_buf_free_skb(pfirst);
-                                continue;
                         }
 
                         brcmf_dbg_hex_dump(BRCMF_GLOM_ON(),
@@ -1407,7 +1397,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
                 }
                 /* sent any remaining packets up */
                 if (bus->glom.qlen)
-                        brcmf_rx_frame(bus->sdiodev->dev, ifidx, &bus->glom);
+                        brcmf_rx_frames(bus->sdiodev->dev, &bus->glom);
 
                 bus->sdcnt.rxglomframes++;
                 bus->sdcnt.rxglompkts += bus->glom.qlen;
@@ -1558,10 +1548,10 @@ static void brcmf_pad(struct brcmf_sdio *bus, u16 *pad, u16 *rdlen)
 static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)
 {
         struct sk_buff *pkt;            /* Packet for event or data frames */
+        struct sk_buff_head pktlist;    /* needed for bus interface */
         u16 pad;                /* Number of pad bytes to read */
         uint rxleft = 0;        /* Remaining number of frames allowed */
         int sdret;              /* Return code from calls */
-        int ifidx = 0;
         uint rxcount = 0;       /* Total frames read */
         struct brcmf_sdio_read *rd = &bus->cur_read, rd_new;
         u8 head_read = 0;
@@ -1760,15 +1750,11 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)
                 if (pkt->len == 0) {
                         brcmu_pkt_buf_free_skb(pkt);
                         continue;
-                } else if (brcmf_proto_hdrpull(bus->sdiodev->dev, &ifidx,
-                           pkt) != 0) {
-                        brcmf_err("rx protocol error\n");
-                        brcmu_pkt_buf_free_skb(pkt);
-                        bus->sdiodev->bus_if->dstats.rx_errors++;
-                        continue;
                 }
 
-                brcmf_rx_packet(bus->sdiodev->dev, ifidx, pkt);
+                skb_queue_head_init(&pktlist);
+                skb_queue_tail(&pktlist, pkt);
+                brcmf_rx_frames(bus->sdiodev->dev, &pktlist);
         }
 
         rxcount = maxframes - rxleft;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index b1bb46c49799..14be2d5530ce 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -15,8 +15,6 @@
  */
 /* ***** SDIO interface chip backplane handle functions ***** */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/mmc/card.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 914c56fe6c5f..e15630cc3889 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -443,14 +443,15 @@ static void brcmf_usb_rx_complete(struct urb *urb)
         struct brcmf_usbreq  *req = (struct brcmf_usbreq *)urb->context;
         struct brcmf_usbdev_info *devinfo = req->devinfo;
         struct sk_buff *skb;
-        int ifidx = 0;
+        struct sk_buff_head skbq;
 
         brcmf_dbg(USB, "Enter, urb->status=%d\n", urb->status);
         brcmf_usb_del_fromq(devinfo, req);
         skb = req->skb;
         req->skb = NULL;
 
-        if (urb->status == 0) {
+        /* zero lenght packets indicate usb "failure". Do not refill */
+        if (urb->status == 0 && urb->actual_length) {
                 devinfo->bus_pub.bus->dstats.rx_packets++;
         } else {
                 devinfo->bus_pub.bus->dstats.rx_errors++;
@@ -460,13 +461,10 @@ static void brcmf_usb_rx_complete(struct urb *urb)
         }
 
         if (devinfo->bus_pub.state == BRCMFMAC_USB_STATE_UP) {
+                skb_queue_head_init(&skbq);
+                skb_queue_tail(&skbq, skb);
                 skb_put(skb, urb->actual_length);
-                if (brcmf_proto_hdrpull(devinfo->dev, &ifidx, skb) != 0) {
-                        brcmf_err("rx protocol error\n");
-                        brcmu_pkt_buf_free_skb(skb);
-                        devinfo->bus_pub.bus->dstats.rx_errors++;
-                } else
-                        brcmf_rx_packet(devinfo->dev, ifidx, skb);
+                brcmf_rx_frames(devinfo->dev, &skbq);
                 brcmf_usb_rx_refill(devinfo, req);
         } else {
                 brcmu_pkt_buf_free_skb(skb);
@@ -1520,10 +1518,23 @@ static void brcmf_release_fw(struct list_head *q)
         }
 }
 
+static int brcmf_usb_reset_device(struct device *dev, void *notused)
+{
+        /* device past is the usb interface so we
+         * need to use parent here.
+         */
+        brcmf_dev_reset(dev->parent);
+        return 0;
+}
 
 void brcmf_usb_exit(void)
 {
+        struct device_driver *drv = &brcmf_usbdrvr.drvwrap.driver;
+        int ret;
+
         brcmf_dbg(USB, "Enter\n");
+        ret = driver_for_each_device(drv, NULL, NULL,
+                                     brcmf_usb_reset_device);
         usb_deregister(&brcmf_usbdrvr);
         brcmf_release_fw(&fw_image_list);
 }
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 75464ad4fbd1..62a528e8b958 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -16,8 +16,6 @@
 
 /* Toplevel file. Relies on dhd_linux.c to send commands to the dongle. */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/kernel.h>
 #include <linux/etherdevice.h>
 #include <net/cfg80211.h>
@@ -2011,67 +2009,6 @@ done:
         return err;
 }
 
-static s32
-brcmf_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *ndev,
-                             const u8 *addr,
-                             const struct cfg80211_bitrate_mask *mask)
-{
-        struct brcmf_if *ifp = netdev_priv(ndev);
-        struct brcm_rateset_le rateset_le;
-        s32 rate;
-        s32 val;
-        s32 err_bg;
-        s32 err_a;
-        u32 legacy;
-        s32 err = 0;
-
-        brcmf_dbg(TRACE, "Enter\n");
-        if (!check_vif_up(ifp->vif))
-                return -EIO;
-
-        /* addr param is always NULL. ignore it */
-        /* Get current rateset */
-        err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_CURR_RATESET,
-                                     &rateset_le, sizeof(rateset_le));
-        if (err) {
-                brcmf_err("could not get current rateset (%d)\n", err);
-                goto done;
-        }
-
-        legacy = ffs(mask->control[IEEE80211_BAND_2GHZ].legacy & 0xFFFF);
-        if (!legacy)
-                legacy = ffs(mask->control[IEEE80211_BAND_5GHZ].legacy &
-                             0xFFFF);
-
-        val = wl_g_rates[legacy - 1].bitrate * 100000;
-
-        if (val < le32_to_cpu(rateset_le.count))
-                /* Select rate by rateset index */
-                rate = rateset_le.rates[val] & 0x7f;
-        else
-                /* Specified rate in bps */
-                rate = val / 500000;
-
-        brcmf_dbg(CONN, "rate %d mbps\n", rate / 2);
-
-        /*
-         *
-         *      Set rate override,
-         *      Since the is a/b/g-blind, both a/bg_rate are enforced.
-         */
-        err_bg = brcmf_fil_iovar_int_set(ifp, "bg_rate", rate);
-        err_a = brcmf_fil_iovar_int_set(ifp, "a_rate", rate);
-        if (err_bg && err_a) {
-                brcmf_err("could not set fixed rate (%d) (%d)\n", err_bg,
-                          err_a);
-                err = err_bg | err_a;
-        }
-
-done:
-        brcmf_dbg(TRACE, "Exit\n");
-        return err;
-}
-
 static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_info *cfg,
                                    struct brcmf_bss_info_le *bi)
 {
@@ -3704,7 +3641,6 @@ static struct cfg80211_ops wl_cfg80211_ops = {
         .set_default_key = brcmf_cfg80211_config_default_key,
         .set_default_mgmt_key = brcmf_cfg80211_config_default_mgmt_key,
         .set_power_mgmt = brcmf_cfg80211_set_power_mgmt,
-        .set_bitrate_mask = brcmf_cfg80211_set_bitrate_mask,
         .connect = brcmf_cfg80211_connect,
         .disconnect = brcmf_cfg80211_disconnect,
         .suspend = brcmf_cfg80211_suspend,
@@ -4330,9 +4266,8 @@ void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg)
 }
 
 static s32
-brcmf_dongle_roam(struct net_device *ndev, u32 roamvar, u32 bcn_timeout)
+brcmf_dongle_roam(struct brcmf_if *ifp, u32 roamvar, u32 bcn_timeout)
 {
-        struct brcmf_if *ifp = netdev_priv(ndev);
         s32 err = 0;
         __le32 roamtrigger[2];
         __le32 roam_delta[2];
@@ -4383,10 +4318,9 @@ dongle_rom_out:
 }
 
 static s32
-brcmf_dongle_scantime(struct net_device *ndev, s32 scan_assoc_time,
+brcmf_dongle_scantime(struct brcmf_if *ifp, s32 scan_assoc_time,
                       s32 scan_unassoc_time, s32 scan_passive_time)
 {
-        struct brcmf_if *ifp = netdev_priv(ndev);
         s32 err = 0;
 
         err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_CHANNEL_TIME,
@@ -4456,6 +4390,7 @@ static s32 brcmf_config_dongle(struct brcmf_cfg80211_info *cfg)
 {
         struct net_device *ndev;
         struct wireless_dev *wdev;
+        struct brcmf_if *ifp;
         s32 power_mode;
         s32 err = 0;
 
@@ -4464,35 +4399,34 @@ static s32 brcmf_config_dongle(struct brcmf_cfg80211_info *cfg)
 
         ndev = cfg_to_ndev(cfg);
         wdev = ndev->ieee80211_ptr;
+        ifp = netdev_priv(ndev);
 
-        brcmf_dongle_scantime(ndev, WL_SCAN_CHANNEL_TIME,
-                        WL_SCAN_UNASSOC_TIME, WL_SCAN_PASSIVE_TIME);
+        /* make sure RF is ready for work */
+        brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 0);
+
+        brcmf_dongle_scantime(ifp, WL_SCAN_CHANNEL_TIME,
+                              WL_SCAN_UNASSOC_TIME, WL_SCAN_PASSIVE_TIME);
 
         power_mode = cfg->pwr_save ? PM_FAST : PM_OFF;
-        err = brcmf_fil_cmd_int_set(netdev_priv(ndev), BRCMF_C_SET_PM,
-                                    power_mode);
+        err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, power_mode);
         if (err)
                 goto default_conf_out;
         brcmf_dbg(INFO, "power save set to %s\n",
                   (power_mode ? "enabled" : "disabled"));
 
-        err = brcmf_dongle_roam(ndev, (cfg->roam_on ? 0 : 1),
-                                WL_BEACON_TIMEOUT);
+        err = brcmf_dongle_roam(ifp, (cfg->roam_on ? 0 : 1), WL_BEACON_TIMEOUT);
         if (err)
                 goto default_conf_out;
         err = brcmf_cfg80211_change_iface(wdev->wiphy, ndev, wdev->iftype,
                                           NULL, NULL);
-        if (err && err != -EINPROGRESS)
+        if (err)
                 goto default_conf_out;
         err = brcmf_dongle_probecap(cfg);
         if (err)
                 goto default_conf_out;
 
-        /* -EINPROGRESS: Call commit handler */
-
-default_conf_out:
-
         cfg->dongle_up = true;
+default_conf_out:
 
         return err;
 
@@ -4501,8 +4435,6 @@ default_conf_out:
 static s32 __brcmf_cfg80211_up(struct brcmf_if *ifp)
 {
         set_bit(BRCMF_VIF_STATUS_READY, &ifp->vif->sme_state);
-        if (ifp->idx)
-                return 0;
 
         return brcmf_config_dongle(ifp->drvr->config);
 }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
index 1de94f30564f..1585cc5bf866 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
@@ -961,7 +961,6 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
                         /* if acked then clear bit and free packet */
                         if ((bindex < AMPDU_TX_BA_MAX_WSIZE)
                             && isset(bitmap, bindex)) {
-                                ini->tx_in_transit--;
                                 ini->txretry[index] = 0;
 
                                 /*
@@ -990,7 +989,6 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
                         if (retry && (ini->txretry[index] < (int)retry_limit)) {
                                 int ret;
                                 ini->txretry[index]++;
-                                ini->tx_in_transit--;
                                 ret = brcms_c_txfifo(wlc, queue, p);
                                 /*
                                  * We shouldn't be out of space in the DMA
@@ -1000,7 +998,6 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
                                 WARN_ONCE(ret, "queue %d out of txds\n", queue);
                         } else {
                                 /* Retry timeout */
-                                ini->tx_in_transit--;
                                 ieee80211_tx_info_clear_status(tx_info);
                                 tx_info->status.ampdu_ack_len = 0;
                                 tx_info->status.ampdu_len = 1;
@@ -1009,8 +1006,8 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
                                 skb_pull(p, D11_PHY_HDR_LEN);
                                 skb_pull(p, D11_TXH_LEN);
                                 brcms_dbg_ht(wlc->hw->d11core,
-                                             "BA Timeout, seq %d, in_transit %d\n",
-                                             seq, ini->tx_in_transit);
+                                             "BA Timeout, seq %d\n",
+                                             seq);
                                 ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw,
                                                             p);
                         }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
index a90b72202ec5..cdb62b8ccc79 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
@@ -670,7 +670,7 @@ brcms_reg_apply_beaconing_flags(struct wiphy *wiphy,
         struct ieee80211_supported_band *sband;
         struct ieee80211_channel *ch;
         const struct ieee80211_reg_rule *rule;
-        int band, i, ret;
+        int band, i;
 
         for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
                 sband = wiphy->bands[band];
@@ -685,9 +685,8 @@ brcms_reg_apply_beaconing_flags(struct wiphy *wiphy,
                                 continue;
 
                         if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) {
-                                ret = freq_reg_info(wiphy, ch->center_freq,
-                                                    0, &rule);
-                                if (ret)
+                                rule = freq_reg_info(wiphy, ch->center_freq);
+                                if (IS_ERR(rule))
                                         continue;
 
                                 if (!(rule->flags & NL80211_RRF_NO_IBSS))
@@ -703,8 +702,8 @@ brcms_reg_apply_beaconing_flags(struct wiphy *wiphy,
         }
 }
 
-static int brcms_reg_notifier(struct wiphy *wiphy,
-                              struct regulatory_request *request)
+static void brcms_reg_notifier(struct wiphy *wiphy,
+                               struct regulatory_request *request)
 {
         struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
         struct brcms_info *wl = hw->priv;
@@ -745,8 +744,6 @@ static int brcms_reg_notifier(struct wiphy *wiphy,
         if (wlc->pub->_nbands > 1 || wlc->band->bandtype == BRCM_BAND_2G)
                 wlc_phy_chanspec_ch14_widefilter_set(wlc->band->pi,
                                         brcms_c_japan_ccode(request->alpha2));
-
-        return 0;
 }
 
 void brcms_c_regd_init(struct brcms_c_info *wlc)
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 1fbd8ecbe2ea..7fc49ca3f597 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -362,8 +362,11 @@ brcms_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
                 return -EOPNOTSUPP;
         }
 
+        spin_lock_bh(&wl->lock);
+        memcpy(wl->pub->cur_etheraddr, vif->addr, sizeof(vif->addr));
         wl->mute_tx = false;
         brcms_c_mute(wl->wlc, false);
+        spin_unlock_bh(&wl->lock);
 
         return 0;
 }
@@ -668,7 +671,9 @@ brcms_ops_ampdu_action(struct ieee80211_hw *hw,
                 ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
                 break;
 
-        case IEEE80211_AMPDU_TX_STOP:
+        case IEEE80211_AMPDU_TX_STOP_CONT:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
                 spin_lock_bh(&wl->lock);
                 brcms_c_ampdu_flush(wl->wlc, sta, tid);
                 spin_unlock_bh(&wl->lock);
@@ -1407,9 +1412,10 @@ void brcms_add_timer(struct brcms_timer *t, uint ms, int periodic)
 #endif
         t->ms = ms;
         t->periodic = (bool) periodic;
-        t->set = true;
-
-        atomic_inc(&t->wl->callbacks);
+        if (!t->set) {
+                t->set = true;
+                atomic_inc(&t->wl->callbacks);
+        }
 
         ieee80211_queue_delayed_work(hw, &t->dly_wrk, msecs_to_jiffies(ms));
 }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 17594de4199e..c26992a60e6c 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -2473,6 +2473,7 @@ static void brcms_b_tx_fifo_resume(struct brcms_hardware *wlc_hw,
 static void brcms_b_mute(struct brcms_hardware *wlc_hw, bool mute_tx)
 {
         static const u8 null_ether_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
+        u8 *ethaddr = wlc_hw->wlc->pub->cur_etheraddr;
 
         if (mute_tx) {
                 /* suspend tx fifos */
@@ -2482,8 +2483,7 @@ static void brcms_b_mute(struct brcms_hardware *wlc_hw, bool mute_tx)
                 brcms_b_tx_fifo_suspend(wlc_hw, TX_AC_VI_FIFO);
 
                 /* zero the address match register so we do not send ACKs */
-                brcms_b_set_addrmatch(wlc_hw, RCM_MAC_OFFSET,
-                                       null_ether_addr);
+                brcms_b_set_addrmatch(wlc_hw, RCM_MAC_OFFSET, null_ether_addr);
         } else {
                 /* resume tx fifos */
                 brcms_b_tx_fifo_resume(wlc_hw, TX_DATA_FIFO);
@@ -2492,8 +2492,7 @@ static void brcms_b_mute(struct brcms_hardware *wlc_hw, bool mute_tx)
                 brcms_b_tx_fifo_resume(wlc_hw, TX_AC_VI_FIFO);
 
                 /* Restore address */
-                brcms_b_set_addrmatch(wlc_hw, RCM_MAC_OFFSET,
-                                       wlc_hw->etheraddr);
+                brcms_b_set_addrmatch(wlc_hw, RCM_MAC_OFFSET, ethaddr);
         }
 
         wlc_phy_mute_upd(wlc_hw->band->pi, mute_tx, 0);
@@ -7633,7 +7632,7 @@ brcms_b_recv(struct brcms_hardware *wlc_hw, uint fifo, bool bound)
 
         uint n = 0;
         uint bound_limit = bound ? RXBND : -1;
-        bool morepending;
+        bool morepending = false;
 
         skb_queue_head_init(&recv_frames);
 
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/scb.h b/drivers/net/wireless/brcm80211/brcmsmac/scb.h
index 51c79c7239b7..3a3d73699f83 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/scb.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/scb.h
@@ -36,7 +36,6 @@
 
 /* structure to store per-tid state for the ampdu initiator */
 struct scb_ampdu_tid_ini {
-        u8 tx_in_transit; /* number of pending mpdus in transit in driver */
         u8 tid;           /* initiator tid for easy lookup */
         /* tx retry count; indexed by seq modulo */
         u8 txretry[AMPDU_TX_BA_MAX_WSIZE];
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index 3726cd6fcd75..050ce7c70d74 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -3474,6 +3474,7 @@ struct ieee80211_ops il3945_mac_ops = {
         .sta_add = il3945_mac_sta_add,
         .sta_remove = il_mac_sta_remove,
         .tx_last_beacon = il_mac_tx_last_beacon,
+        .flush = il_mac_flush,
 };
 
 static int
@@ -3548,7 +3549,8 @@ il3945_setup_mac(struct il_priv *il)
         hw->vif_data_size = sizeof(struct il_vif_priv);
 
         /* Tell mac80211 our characteristics */
-        hw->flags = IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_SPECTRUM_MGMT;
+        hw->flags = IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_SPECTRUM_MGMT |
+                    IEEE80211_HW_SUPPORTS_PS | IEEE80211_HW_SUPPORTS_DYNAMIC_PS;
 
         hw->wiphy->interface_modes =
             BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
@@ -3557,6 +3559,8 @@ il3945_setup_mac(struct il_priv *il)
             WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS |
             WIPHY_FLAG_IBSS_RSN;
 
+        hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+
         hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945;
         /* we create the 802.11 header and a zero-length SSID element */
         hw->wiphy->max_scan_ie_len = IL3945_MAX_PROBE_REQUEST - 24 - 2;
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index c3fbf6717564..f1dc04006564 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -5712,8 +5712,8 @@ il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length)
         hw->flags =
             IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_AMPDU_AGGREGATION |
             IEEE80211_HW_NEED_DTIM_PERIOD | IEEE80211_HW_SPECTRUM_MGMT |
-            IEEE80211_HW_REPORTS_TX_ACK_STATUS;
-
+            IEEE80211_HW_REPORTS_TX_ACK_STATUS | IEEE80211_HW_SUPPORTS_PS |
+            IEEE80211_HW_SUPPORTS_DYNAMIC_PS;
         if (il->cfg->sku & IL_SKU_N)
                 hw->flags |=
                     IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |
@@ -5968,7 +5968,9 @@ il4965_mac_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                 D_HT("start Tx\n");
                 ret = il4965_tx_agg_start(il, vif, sta, tid, ssn);
                 break;
-        case IEEE80211_AMPDU_TX_STOP:
+        case IEEE80211_AMPDU_TX_STOP_CONT:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
                 D_HT("stop Tx\n");
                 ret = il4965_tx_agg_stop(il, vif, sta, tid);
                 if (test_bit(S_EXIT_PENDING, &il->status))
@@ -6306,6 +6308,7 @@ const struct ieee80211_ops il4965_mac_ops = {
         .sta_remove = il_mac_sta_remove,
         .channel_switch = il4965_mac_channel_switch,
         .tx_last_beacon = il_mac_tx_last_beacon,
+        .flush = il_mac_flush,
 };
 
 static int
@@ -6553,6 +6556,7 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         il4965_prepare_card_hw(il);
         if (!il->hw_ready) {
                 IL_WARN("Failed, HW not ready\n");
+                err = -EIO;
                 goto out_iounmap;
         }
 
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index 7e16d10a7f14..1f598604a79c 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -3958,17 +3958,21 @@ il_connection_init_rx_config(struct il_priv *il)
 
         memset(&il->staging, 0, sizeof(il->staging));
 
-        if (!il->vif) {
+        switch (il->iw_mode) {
+        case NL80211_IFTYPE_UNSPECIFIED:
                 il->staging.dev_type = RXON_DEV_TYPE_ESS;
-        } else if (il->vif->type == NL80211_IFTYPE_STATION) {
+                break;
+        case NL80211_IFTYPE_STATION:
                 il->staging.dev_type = RXON_DEV_TYPE_ESS;
                 il->staging.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;
-        } else if (il->vif->type == NL80211_IFTYPE_ADHOC) {
+                break;
+        case NL80211_IFTYPE_ADHOC:
                 il->staging.dev_type = RXON_DEV_TYPE_IBSS;
                 il->staging.flags = RXON_FLG_SHORT_PREAMBLE_MSK;
                 il->staging.filter_flags =
                     RXON_FILTER_BCON_AWARE_MSK | RXON_FILTER_ACCEPT_GRP_MSK;
-        } else {
+                break;
+        default:
                 IL_ERR("Unsupported interface type %d\n", il->vif->type);
                 return;
         }
@@ -4550,8 +4554,7 @@ out:
 EXPORT_SYMBOL(il_mac_add_interface);
 
 static void
-il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif,
-                      bool mode_change)
+il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif)
 {
         lockdep_assert_held(&il->mutex);
 
@@ -4560,9 +4563,7 @@ il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif,
                 il_force_scan_end(il);
         }
 
-        if (!mode_change)
-                il_set_mode(il);
-
+        il_set_mode(il);
 }
 
 void
@@ -4575,8 +4576,8 @@ il_mac_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 
         WARN_ON(il->vif != vif);
         il->vif = NULL;
-
-        il_teardown_interface(il, vif, false);
+        il->iw_mode = NL80211_IFTYPE_UNSPECIFIED;
+        il_teardown_interface(il, vif);
         memset(il->bssid, 0, ETH_ALEN);
 
         D_MAC80211("leave\n");
@@ -4685,18 +4686,10 @@ il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
         }
 
         /* success */
-        il_teardown_interface(il, vif, true);
         vif->type = newtype;
         vif->p2p = false;
-        err = il_set_mode(il);
-        WARN_ON(err);
-        /*
-         * We've switched internally, but submitting to the
-         * device may have failed for some reason. Mask this
-         * error, because otherwise mac80211 will not switch
-         * (and set the interface type back) and we'll be
-         * out of sync with it.
-         */
+        il->iw_mode = newtype;
+        il_teardown_interface(il, vif);
         err = 0;
 
 out:
@@ -4707,6 +4700,42 @@ out:
 }
 EXPORT_SYMBOL(il_mac_change_interface);
 
+void
+il_mac_flush(struct ieee80211_hw *hw, bool drop)
+{
+        struct il_priv *il = hw->priv;
+        unsigned long timeout = jiffies + msecs_to_jiffies(500);
+        int i;
+
+        mutex_lock(&il->mutex);
+        D_MAC80211("enter\n");
+
+        if (il->txq == NULL)
+                goto out;
+
+        for (i = 0; i < il->hw_params.max_txq_num; i++) {
+                struct il_queue *q;
+
+                if (i == il->cmd_queue)
+                        continue;
+
+                q = &il->txq[i].q;
+                if (q->read_ptr == q->write_ptr)
+                        continue;
+
+                if (time_after(jiffies, timeout)) {
+                        IL_ERR("Failed to flush queue %d\n", q->id);
+                        break;
+                }
+
+                msleep(20);
+        }
+out:
+        D_MAC80211("leave\n");
+        mutex_unlock(&il->mutex);
+}
+EXPORT_SYMBOL(il_mac_flush);
+
 /*
  * On every watchdog tick we check (latest) time stamp. If it does not
  * change during timeout period and queue is not empty we reset firmware.
diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index a9a569f432fb..37fe553b25e0 100644
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -1723,6 +1723,7 @@ void il_mac_remove_interface(struct ieee80211_hw *hw,
                              struct ieee80211_vif *vif);
 int il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                             enum nl80211_iftype newtype, bool newp2p);
+void il_mac_flush(struct ieee80211_hw *hw, bool drop);
 int il_alloc_txq_mem(struct il_priv *il);
 void il_free_txq_mem(struct il_priv *il);
 
diff --git a/drivers/net/wireless/iwlwifi/dvm/commands.h b/drivers/net/wireless/iwlwifi/dvm/commands.h
index 71ab76b2b39d..0ca99c13f7f2 100644
--- a/drivers/net/wireless/iwlwifi/dvm/commands.h
+++ b/drivers/net/wireless/iwlwifi/dvm/commands.h
@@ -3695,7 +3695,7 @@ struct iwl_bt_uart_msg {
         u8 frame5;
         u8 frame6;
         u8 frame7;
-} __attribute__((packed));
+} __packed;
 
 struct iwl_bt_coex_profile_notif {
         struct iwl_bt_uart_msg last_bt_uart_msg;
@@ -3703,7 +3703,7 @@ struct iwl_bt_coex_profile_notif {
         u8 bt_traffic_load; /* 0 .. 3? */
         u8 bt_ci_compliance; /* 0 - not complied, 1 - complied */
         u8 reserved;
-} __attribute__((packed));
+} __packed;
 
 #define IWL_BT_COEX_PRIO_TBL_SHARED_ANTENNA_POS 0
 #define IWL_BT_COEX_PRIO_TBL_SHARED_ANTENNA_MSK 0x1
@@ -3752,7 +3752,7 @@ enum bt_coex_prio_table_priorities {
 
 struct iwl_bt_coex_prio_table_cmd {
         u8 prio_tbl[BT_COEX_PRIO_TBL_EVT_MAX];
-} __attribute__((packed));
+} __packed;
 
 #define IWL_BT_COEX_ENV_CLOSE   0
 #define IWL_BT_COEX_ENV_OPEN    1
@@ -3764,7 +3764,7 @@ struct iwl_bt_coex_prot_env_cmd {
         u8 action; /* 0 = closed, 1 = open */
         u8 type; /* 0 .. 15 */
         u8 reserved[2];
-} __attribute__((packed));
+} __packed;
 
 /*
  * REPLY_D3_CONFIG
diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
index 5b9533eef54d..72c74af38138 100644
--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
@@ -157,7 +157,7 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file,
         sram = priv->dbgfs_sram_offset & ~0x3;
 
         /* read the first u32 from sram */
-        val = iwl_read_targ_mem(priv->trans, sram);
+        val = iwl_trans_read_mem32(priv->trans, sram);
 
         for (; len; len--) {
                 /* put the address at the start of every line */
@@ -176,7 +176,7 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file,
                 if (++offset == 4) {
                         sram += 4;
                         offset = 0;
-                        val = iwl_read_targ_mem(priv->trans, sram);
+                        val = iwl_trans_read_mem32(priv->trans, sram);
                 }
 
                 /* put in extra spaces and split lines for human readability */
diff --git a/drivers/net/wireless/iwlwifi/dvm/led.c b/drivers/net/wireless/iwlwifi/dvm/led.c
index bf479f709091..844a17f99a18 100644
--- a/drivers/net/wireless/iwlwifi/dvm/led.c
+++ b/drivers/net/wireless/iwlwifi/dvm/led.c
@@ -69,7 +69,7 @@ static const struct ieee80211_tpt_blink iwl_blink[] = {
 /* Set led register off */
 void iwlagn_led_enable(struct iwl_priv *priv)
 {
-        iwl_write32(priv->trans, CSR_LED_REG, CSR_LED_REG_TRUN_ON);
+        iwl_write32(priv->trans, CSR_LED_REG, CSR_LED_REG_TURN_ON);
 }
 
 /*
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index 3163e0f38c25..0353e1c0670d 100644
--- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -206,7 +206,8 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
 
 #ifdef CONFIG_PM_SLEEP
         if (priv->fw->img[IWL_UCODE_WOWLAN].sec[0].len &&
-            priv->trans->ops->wowlan_suspend &&
+            priv->trans->ops->d3_suspend &&
+            priv->trans->ops->d3_resume &&
             device_can_wakeup(priv->trans->dev)) {
                 hw->wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT |
                                           WIPHY_WOWLAN_DISCONNECT |
@@ -426,7 +427,7 @@ static int iwlagn_mac_suspend(struct ieee80211_hw *hw,
         if (ret)
                 goto error;
 
-        iwl_trans_wowlan_suspend(priv->trans);
+        iwl_trans_d3_suspend(priv->trans);
 
         goto out;
 
@@ -459,11 +460,11 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
         base = priv->device_pointers.error_event_table;
         if (iwlagn_hw_valid_rtc_data_addr(base)) {
                 spin_lock_irqsave(&priv->trans->reg_lock, flags);
-                ret = iwl_grab_nic_access_silent(priv->trans);
-                if (likely(ret == 0)) {
+                if (iwl_trans_grab_nic_access(priv->trans, true)) {
                         iwl_write32(priv->trans, HBUS_TARG_MEM_RADDR, base);
                         status = iwl_read32(priv->trans, HBUS_TARG_MEM_RDAT);
-                        iwl_release_nic_access(priv->trans);
+                        iwl_trans_release_nic_access(priv->trans);
+                        ret = 0;
                 }
                 spin_unlock_irqrestore(&priv->trans->reg_lock, flags);
 
@@ -479,7 +480,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
                         }
 
                         if (priv->wowlan_sram)
-                                _iwl_read_targ_mem_dwords(
+                                iwl_trans_read_mem(
                                       priv->trans, 0x800000,
                                       priv->wowlan_sram,
                                       img->sec[IWL_UCODE_SECTION_DATA].len / 4);
@@ -520,9 +521,6 @@ static void iwlagn_mac_tx(struct ieee80211_hw *hw,
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
-        IWL_DEBUG_TX(priv, "dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,
-                     ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate);
-
         if (iwlagn_tx_skb(priv, control->sta, skb))
                 ieee80211_free_txskb(hw, skb);
 }
@@ -679,7 +677,9 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
                 IWL_DEBUG_HT(priv, "start Tx\n");
                 ret = iwlagn_tx_agg_start(priv, vif, sta, tid, ssn);
                 break;
-        case IEEE80211_AMPDU_TX_STOP:
+        case IEEE80211_AMPDU_TX_STOP_CONT:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
                 IWL_DEBUG_HT(priv, "stop Tx\n");
                 ret = iwlagn_tx_agg_stop(priv, vif, sta, tid);
                 if ((ret == 0) && (priv->agg_tids_count > 0)) {
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
index faa05932efae..a64f361e341c 100644
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -354,7 +354,7 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
 
         /* Make sure device is powered up for SRAM reads */
         spin_lock_irqsave(&priv->trans->reg_lock, reg_flags);
-        if (unlikely(!iwl_grab_nic_access(priv->trans))) {
+        if (!iwl_trans_grab_nic_access(priv->trans, false)) {
                 spin_unlock_irqrestore(&priv->trans->reg_lock, reg_flags);
                 return;
         }
@@ -388,7 +388,7 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
                 }
         }
         /* Allow device to power down */
-        iwl_release_nic_access(priv->trans);
+        iwl_trans_release_nic_access(priv->trans);
         spin_unlock_irqrestore(&priv->trans->reg_lock, reg_flags);
 }
 
@@ -408,7 +408,8 @@ static void iwl_continuous_event_trace(struct iwl_priv *priv)
 
         base = priv->device_pointers.log_event_table;
         if (iwlagn_hw_valid_rtc_data_addr(base)) {
-                iwl_read_targ_mem_bytes(priv->trans, base, &read, sizeof(read));
+                iwl_trans_read_mem_bytes(priv->trans, base,
+                                         &read, sizeof(read));
                 capacity = read.capacity;
                 mode = read.mode;
                 num_wraps = read.wrap_counter;
@@ -1627,7 +1628,7 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv)
         }
 
         /*TODO: Update dbgfs with ISR error stats obtained below */
-        iwl_read_targ_mem_bytes(trans, base, &table, sizeof(table));
+        iwl_trans_read_mem_bytes(trans, base, &table, sizeof(table));
 
         if (ERROR_START_OFFSET <= table.valid * ERROR_ELEM_SIZE) {
                 IWL_ERR(trans, "Start IWL Error Log Dump:\n");
@@ -1717,7 +1718,7 @@ static int iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,
 
         /* Make sure device is powered up for SRAM reads */
         spin_lock_irqsave(&trans->reg_lock, reg_flags);
-        if (unlikely(!iwl_grab_nic_access(trans)))
+        if (!iwl_trans_grab_nic_access(trans, false))
                 goto out_unlock;
 
         /* Set starting address; reads will auto-increment */
@@ -1756,7 +1757,7 @@ static int iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,
         }
 
         /* Allow device to power down */
-        iwl_release_nic_access(trans);
+        iwl_trans_release_nic_access(trans);
 out_unlock:
         spin_unlock_irqrestore(&trans->reg_lock, reg_flags);
         return pos;
@@ -1835,10 +1836,10 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
         }
 
         /* event log header */
-        capacity = iwl_read_targ_mem(trans, base);
-        mode = iwl_read_targ_mem(trans, base + (1 * sizeof(u32)));
-        num_wraps = iwl_read_targ_mem(trans, base + (2 * sizeof(u32)));
-        next_entry = iwl_read_targ_mem(trans, base + (3 * sizeof(u32)));
+        capacity = iwl_trans_read_mem32(trans, base);
+        mode = iwl_trans_read_mem32(trans, base + (1 * sizeof(u32)));
+        num_wraps = iwl_trans_read_mem32(trans, base + (2 * sizeof(u32)));
+        next_entry = iwl_trans_read_mem32(trans, base + (3 * sizeof(u32)));
 
         if (capacity > logsize) {
                 IWL_ERR(priv, "Log capacity %d is bogus, limit to %d "
diff --git a/drivers/net/wireless/iwlwifi/dvm/tt.c b/drivers/net/wireless/iwlwifi/dvm/tt.c
index eb864433e59d..b28cfc8553d7 100644
--- a/drivers/net/wireless/iwlwifi/dvm/tt.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tt.c
@@ -186,8 +186,8 @@ static void iwl_tt_check_exit_ct_kill(unsigned long data)
                 }
                 iwl_read32(priv->trans, CSR_UCODE_DRV_GP1);
                 spin_lock_irqsave(&priv->trans->reg_lock, flags);
-                if (likely(iwl_grab_nic_access(priv->trans)))
-                        iwl_release_nic_access(priv->trans);
+                if (iwl_trans_grab_nic_access(priv->trans, false))
+                        iwl_trans_release_nic_access(priv->trans);
                 spin_unlock_irqrestore(&priv->trans->reg_lock, flags);
 
                 /* Reschedule the ct_kill timer to occur in
diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
index a790599fe2c2..6b01fc195940 100644
--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
@@ -231,13 +231,11 @@ static void iwlagn_tx_cmd_build_hwcrypto(struct iwl_priv *priv,
                 memcpy(tx_cmd->key, keyconf->key, keyconf->keylen);
                 if (info->flags & IEEE80211_TX_CTL_AMPDU)
                         tx_cmd->tx_flags |= TX_CMD_FLG_AGG_CCMP_MSK;
-                IWL_DEBUG_TX(priv, "tx_cmd with AES hwcrypto\n");
                 break;
 
         case WLAN_CIPHER_SUITE_TKIP:
                 tx_cmd->sec_ctl = TX_CMD_SEC_TKIP;
                 ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd->key);
-                IWL_DEBUG_TX(priv, "tx_cmd with tkip hwcrypto\n");
                 break;
 
         case WLAN_CIPHER_SUITE_WEP104:
@@ -355,8 +353,6 @@ int iwlagn_tx_skb(struct iwl_priv *priv,
                 }
         }
 
-        IWL_DEBUG_TX(priv, "station Id %d\n", sta_id);
-
         if (sta)
                 sta_priv = (void *)sta->drv_priv;
 
@@ -472,6 +468,9 @@ int iwlagn_tx_skb(struct iwl_priv *priv,
         WARN_ON_ONCE(is_agg &&
                      priv->queue_to_mac80211[txq_id] != info->hw_queue);
 
+        IWL_DEBUG_TX(priv, "TX to [%d|%d] Q:%d - seq: 0x%x\n", sta_id, tid,
+                     txq_id, seq_number);
+
         if (iwl_trans_tx(priv->trans, skb, dev_cmd, txq_id))
                 goto drop_unlock_sta;
 
@@ -541,9 +540,9 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
         spin_lock_bh(&priv->sta_lock);
 
         tid_data = &priv->tid_data[sta_id][tid];
-        txq_id = priv->tid_data[sta_id][tid].agg.txq_id;
+        txq_id = tid_data->agg.txq_id;
 
-        switch (priv->tid_data[sta_id][tid].agg.state) {
+        switch (tid_data->agg.state) {
         case IWL_EMPTYING_HW_QUEUE_ADDBA:
                 /*
                 * This can happen if the peer stops aggregation
@@ -563,9 +562,9 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
         case IWL_AGG_ON:
                 break;
         default:
-                IWL_WARN(priv, "Stopping AGG while state not ON "
-                         "or starting for %d on %d (%d)\n", sta_id, tid,
-                         priv->tid_data[sta_id][tid].agg.state);
+                IWL_WARN(priv,
+                         "Stopping AGG while state not ON or starting for %d on %d (%d)\n",
+                         sta_id, tid, tid_data->agg.state);
                 spin_unlock_bh(&priv->sta_lock);
                 return 0;
         }
@@ -578,12 +577,11 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
                         "stopping AGG on STA/TID %d/%d but hwq %d not used\n",
                         sta_id, tid, txq_id);
         } else if (tid_data->agg.ssn != tid_data->next_reclaimed) {
-                IWL_DEBUG_TX_QUEUES(priv, "Can't proceed: ssn %d, "
-                                    "next_recl = %d\n",
+                IWL_DEBUG_TX_QUEUES(priv,
+                                    "Can't proceed: ssn %d, next_recl = %d\n",
                                     tid_data->agg.ssn,
                                     tid_data->next_reclaimed);
-                priv->tid_data[sta_id][tid].agg.state =
-                        IWL_EMPTYING_HW_QUEUE_DELBA;
+                tid_data->agg.state = IWL_EMPTYING_HW_QUEUE_DELBA;
                 spin_unlock_bh(&priv->sta_lock);
                 return 0;
         }
@@ -591,8 +589,8 @@ int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,
         IWL_DEBUG_TX_QUEUES(priv, "Can proceed: ssn = next_recl = %d\n",
                             tid_data->agg.ssn);
 turn_off:
-        agg_state = priv->tid_data[sta_id][tid].agg.state;
-        priv->tid_data[sta_id][tid].agg.state = IWL_AGG_OFF;
+        agg_state = tid_data->agg.state;
+        tid_data->agg.state = IWL_AGG_OFF;
 
         spin_unlock_bh(&priv->sta_lock);
 
@@ -954,12 +952,6 @@ static void iwl_rx_reply_tx_agg(struct iwl_priv *priv,
                 if (status & (AGG_TX_STATE_FEW_BYTES_MSK |
                               AGG_TX_STATE_ABORT_MSK))
                         continue;
-
-                IWL_DEBUG_TX_REPLY(priv, "status %s (0x%08x), "
-                                   "try-count (0x%08x)\n",
-                                   iwl_get_agg_tx_fail_reason(fstatus),
-                                   fstatus & AGG_TX_STATUS_MSK,
-                                   fstatus & AGG_TX_TRY_MSK);
         }
 }
 
@@ -1079,6 +1071,8 @@ static void iwlagn_set_tx_status(struct iwl_priv *priv,
 {
         u16 status = le16_to_cpu(tx_resp->status.status);
 
+        info->flags &= ~IEEE80211_TX_CTL_AMPDU;
+
         info->status.rates[0].count = tx_resp->failure_frame + 1;
         info->flags |= iwl_tx_status_to_mac80211(status);
         iwlagn_hwrate_to_tx_control(priv, le32_to_cpu(tx_resp->rate_n_flags),
@@ -1223,16 +1217,27 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
                                            next_reclaimed);
                 }
 
-                WARN_ON(!is_agg && freed != 1);
+                if (!is_agg && freed != 1)
+                        IWL_ERR(priv, "Q: %d, freed %d\n", txq_id, freed);
 
                 /*
                  * An offchannel frame can be send only on the AUX queue, where
                  * there is no aggregation (and reordering) so it only is single
                  * skb is expected to be processed.
                  */
-                WARN_ON(is_offchannel_skb && freed != 1);
+                if (is_offchannel_skb && freed != 1)
+                        IWL_ERR(priv, "OFFCHANNEL SKB freed %d\n", freed);
         }
 
+        IWL_DEBUG_TX_REPLY(priv, "TXQ %d status %s (0x%08x)\n", txq_id,
+                           iwl_get_tx_fail_reason(status), status);
+
+        IWL_DEBUG_TX_REPLY(priv,
+                           "\t\t\t\tinitial_rate 0x%x retries %d, idx=%d ssn=%d seq_ctl=0x%x\n",
+                           le32_to_cpu(tx_resp->rate_n_flags),
+                           tx_resp->failure_frame, SEQ_TO_INDEX(sequence), ssn,
+                           le16_to_cpu(tx_resp->seq_ctl));
+
         iwl_check_abort_status(priv, tx_resp->frame_count, status);
         spin_unlock(&priv->sta_lock);
 
diff --git a/drivers/net/wireless/iwlwifi/dvm/ucode.c b/drivers/net/wireless/iwlwifi/dvm/ucode.c
index c6467e5554f5..ebec13a3329f 100644
--- a/drivers/net/wireless/iwlwifi/dvm/ucode.c
+++ b/drivers/net/wireless/iwlwifi/dvm/ucode.c
@@ -286,89 +286,6 @@ static int iwl_alive_notify(struct iwl_priv *priv)
         return iwl_send_calib_results(priv);
 }
 
-
-/**
- * iwl_verify_inst_sparse - verify runtime uCode image in card vs. host,
- *   using sample data 100 bytes apart.  If these sample points are good,
- *   it's a pretty good bet that everything between them is good, too.
- */
-static int iwl_verify_sec_sparse(struct iwl_priv *priv,
-                                  const struct fw_desc *fw_desc)
-{
-        __le32 *image = (__le32 *)fw_desc->data;
-        u32 len = fw_desc->len;
-        u32 val;
-        u32 i;
-
-        IWL_DEBUG_FW(priv, "ucode inst image size is %u\n", len);
-
-        for (i = 0; i < len; i += 100, image += 100/sizeof(u32)) {
-                /* read data comes through single port, auto-incr addr */
-                /* NOTE: Use the debugless read so we don't flood kernel log
-                 * if IWL_DL_IO is set */
-                iwl_write_direct32(priv->trans, HBUS_TARG_MEM_RADDR,
-                        i + fw_desc->offset);
-                val = iwl_read32(priv->trans, HBUS_TARG_MEM_RDAT);
-                if (val != le32_to_cpu(*image))
-                        return -EIO;
-        }
-
-        return 0;
-}
-
-static void iwl_print_mismatch_sec(struct iwl_priv *priv,
-                                    const struct fw_desc *fw_desc)
-{
-        __le32 *image = (__le32 *)fw_desc->data;
-        u32 len = fw_desc->len;
-        u32 val;
-        u32 offs;
-        int errors = 0;
-
-        IWL_DEBUG_FW(priv, "ucode inst image size is %u\n", len);
-
-        iwl_write_direct32(priv->trans, HBUS_TARG_MEM_RADDR,
-                                fw_desc->offset);
-
-        for (offs = 0;
-             offs < len && errors < 20;
-             offs += sizeof(u32), image++) {
-                /* read data comes through single port, auto-incr addr */
-                val = iwl_read32(priv->trans, HBUS_TARG_MEM_RDAT);
-                if (val != le32_to_cpu(*image)) {
-                        IWL_ERR(priv, "uCode INST section at "
-                                "offset 0x%x, is 0x%x, s/b 0x%x\n",
-                                offs, val, le32_to_cpu(*image));
-                        errors++;
-                }
-        }
-}
-
-/**
- * iwl_verify_ucode - determine which instruction image is in SRAM,
- *    and verify its contents
- */
-static int iwl_verify_ucode(struct iwl_priv *priv,
-                            enum iwl_ucode_type ucode_type)
-{
-        const struct fw_img *img = iwl_get_ucode_image(priv, ucode_type);
-
-        if (!img) {
-                IWL_ERR(priv, "Invalid ucode requested (%d)\n", ucode_type);
-                return -EINVAL;
-        }
-
-        if (!iwl_verify_sec_sparse(priv, &img->sec[IWL_UCODE_SECTION_INST])) {
-                IWL_DEBUG_FW(priv, "uCode is good in inst SRAM\n");
-                return 0;
-        }
-
-        IWL_ERR(priv, "UCODE IMAGE IN INSTRUCTION SRAM NOT VALID!!\n");
-
-        iwl_print_mismatch_sec(priv, &img->sec[IWL_UCODE_SECTION_INST]);
-        return -EIO;
-}
-
 struct iwl_alive_data {
         bool valid;
         u8 subtype;
@@ -426,7 +343,7 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
                                    alive_cmd, ARRAY_SIZE(alive_cmd),
                                    iwl_alive_fn, &alive_data);
 
-        ret = iwl_trans_start_fw(priv->trans, fw);
+        ret = iwl_trans_start_fw(priv->trans, fw, false);
         if (ret) {
                 priv->cur_ucode = old_type;
                 iwl_remove_notification(&priv->notif_wait, &alive_wait);
@@ -450,18 +367,7 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
                 return -EIO;
         }
 
-        /*
-         * This step takes a long time (60-80ms!!) and
-         * WoWLAN image should be loaded quickly, so
-         * skip it for WoWLAN.
-         */
         if (ucode_type != IWL_UCODE_WOWLAN) {
-                ret = iwl_verify_ucode(priv, ucode_type);
-                if (ret) {
-                        priv->cur_ucode = old_type;
-                        return ret;
-                }
-
                 /* delay a bit to give rfkill time to run */
                 msleep(5);
         }
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h
index 34a5287dfc2f..b419a1efac0a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/iwlwifi/iwl-csr.h
@@ -381,8 +381,8 @@
 
 /* LED */
 #define CSR_LED_BSM_CTRL_MSK (0xFFFFFFDF)
-#define CSR_LED_REG_TRUN_ON (0x78)
-#define CSR_LED_REG_TRUN_OFF (0x38)
+#define CSR_LED_REG_TURN_ON (0x60)
+#define CSR_LED_REG_TURN_OFF (0x20)
 
 /* ANA_PLL */
 #define CSR50_ANA_PLL_CFG_VAL        (0x00880300)
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h
index ec48563d3c6a..c646a90b725e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-fh.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fh.h
@@ -225,6 +225,8 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(unsigned int chnl)
 #define FH_RSCSR_CHNL0_RBDCB_WPTR_REG   (FH_MEM_RSCSR_CHNL0 + 0x008)
 #define FH_RSCSR_CHNL0_WPTR        (FH_RSCSR_CHNL0_RBDCB_WPTR_REG)
 
+#define FW_RSCSR_CHNL0_RXDCB_RDPTR_REG  (FH_MEM_RSCSR_CHNL0 + 0x00c)
+#define FH_RSCSR_CHNL0_RDPTR            FW_RSCSR_CHNL0_RXDCB_RDPTR_REG
 
 /**
  * Rx Config/Status Registers (RCSR)
@@ -257,6 +259,8 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(unsigned int chnl)
 #define FH_MEM_RCSR_CHNL0            (FH_MEM_RCSR_LOWER_BOUND)
 
 #define FH_MEM_RCSR_CHNL0_CONFIG_REG    (FH_MEM_RCSR_CHNL0)
+#define FH_MEM_RCSR_CHNL0_RBDCB_WPTR    (FH_MEM_RCSR_CHNL0 + 0x8)
+#define FH_MEM_RCSR_CHNL0_FLUSH_RB_REQ  (FH_MEM_RCSR_CHNL0 + 0x10)
 
 #define FH_RCSR_CHNL0_RX_CONFIG_RB_TIMEOUT_MSK (0x00000FF0) /* bits 4-11 */
 #define FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_MSK   (0x00001000) /* bits 12 */
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index cdaff9572059..bff3ac96c00b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -35,12 +35,12 @@
 
 #define IWL_POLL_INTERVAL 10    /* microseconds */
 
-static inline void __iwl_set_bit(struct iwl_trans *trans, u32 reg, u32 mask)
+void __iwl_set_bit(struct iwl_trans *trans, u32 reg, u32 mask)
 {
         iwl_write32(trans, reg, iwl_read32(trans, reg) | mask);
 }
 
-static inline void __iwl_clear_bit(struct iwl_trans *trans, u32 reg, u32 mask)
+void __iwl_clear_bit(struct iwl_trans *trans, u32 reg, u32 mask)
 {
         iwl_write32(trans, reg, iwl_read32(trans, reg) & ~mask);
 }
@@ -99,86 +99,16 @@ int iwl_poll_bit(struct iwl_trans *trans, u32 addr,
 }
 EXPORT_SYMBOL_GPL(iwl_poll_bit);
 
-int iwl_grab_nic_access_silent(struct iwl_trans *trans)
-{
-        int ret;
-
-        lockdep_assert_held(&trans->reg_lock);
-
-        /* this bit wakes up the NIC */
-        __iwl_set_bit(trans, CSR_GP_CNTRL,
-                      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-
-        /*
-         * These bits say the device is running, and should keep running for
-         * at least a short while (at least as long as MAC_ACCESS_REQ stays 1),
-         * but they do not indicate that embedded SRAM is restored yet;
-         * 3945 and 4965 have volatile SRAM, and must save/restore contents
-         * to/from host DRAM when sleeping/waking for power-saving.
-         * Each direction takes approximately 1/4 millisecond; with this
-         * overhead, it's a good idea to grab and hold MAC_ACCESS_REQUEST if a
-         * series of register accesses are expected (e.g. reading Event Log),
-         * to keep device from sleeping.
-         *
-         * CSR_UCODE_DRV_GP1 register bit MAC_SLEEP == 0 indicates that
-         * SRAM is okay/restored.  We don't check that here because this call
-         * is just for hardware register access; but GP1 MAC_SLEEP check is a
-         * good idea before accessing 3945/4965 SRAM (e.g. reading Event Log).
-         *
-         * 5000 series and later (including 1000 series) have non-volatile SRAM,
-         * and do not save/restore SRAM when power cycling.
-         */
-        ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
-                           CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN,
-                           (CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY |
-                            CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 15000);
-        if (ret < 0) {
-                iwl_write32(trans, CSR_RESET, CSR_RESET_REG_FLAG_FORCE_NMI);
-                return -EIO;
-        }
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(iwl_grab_nic_access_silent);
-
-bool iwl_grab_nic_access(struct iwl_trans *trans)
-{
-        int ret = iwl_grab_nic_access_silent(trans);
-        if (unlikely(ret)) {
-                u32 val = iwl_read32(trans, CSR_GP_CNTRL);
-                WARN_ONCE(1, "Timeout waiting for hardware access "
-                             "(CSR_GP_CNTRL 0x%08x)\n", val);
-                return false;
-        }
-
-        return true;
-}
-EXPORT_SYMBOL_GPL(iwl_grab_nic_access);
-
-void iwl_release_nic_access(struct iwl_trans *trans)
-{
-        lockdep_assert_held(&trans->reg_lock);
-        __iwl_clear_bit(trans, CSR_GP_CNTRL,
-                        CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-        /*
-         * Above we read the CSR_GP_CNTRL register, which will flush
-         * any previous writes, but we need the write that clears the
-         * MAC_ACCESS_REQ bit to be performed before any other writes
-         * scheduled on different CPUs (after we drop reg_lock).
-         */
-        mmiowb();
-}
-EXPORT_SYMBOL_GPL(iwl_release_nic_access);
-
 u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg)
 {
-        u32 value;
+        u32 value = 0x5a5a5a5a;
         unsigned long flags;
 
         spin_lock_irqsave(&trans->reg_lock, flags);
-        iwl_grab_nic_access(trans);
-        value = iwl_read32(trans, reg);
-        iwl_release_nic_access(trans);
+        if (iwl_trans_grab_nic_access(trans, false)) {
+                value = iwl_read32(trans, reg);
+                iwl_trans_release_nic_access(trans);
+        }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 
         return value;
@@ -190,9 +120,9 @@ void iwl_write_direct32(struct iwl_trans *trans, u32 reg, u32 value)
         unsigned long flags;
 
         spin_lock_irqsave(&trans->reg_lock, flags);
-        if (likely(iwl_grab_nic_access(trans))) {
+        if (iwl_trans_grab_nic_access(trans, false)) {
                 iwl_write32(trans, reg, value);
-                iwl_release_nic_access(trans);
+                iwl_trans_release_nic_access(trans);
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
@@ -230,12 +160,13 @@ static inline void __iwl_write_prph(struct iwl_trans *trans, u32 ofs, u32 val)
 u32 iwl_read_prph(struct iwl_trans *trans, u32 ofs)
 {
         unsigned long flags;
-        u32 val;
+        u32 val = 0x5a5a5a5a;
 
         spin_lock_irqsave(&trans->reg_lock, flags);
-        iwl_grab_nic_access(trans);
-        val = __iwl_read_prph(trans, ofs);
-        iwl_release_nic_access(trans);
+        if (iwl_trans_grab_nic_access(trans, false)) {
+                val = __iwl_read_prph(trans, ofs);
+                iwl_trans_release_nic_access(trans);
+        }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
         return val;
 }
@@ -246,9 +177,9 @@ void iwl_write_prph(struct iwl_trans *trans, u32 ofs, u32 val)
         unsigned long flags;
 
         spin_lock_irqsave(&trans->reg_lock, flags);
-        if (likely(iwl_grab_nic_access(trans))) {
+        if (iwl_trans_grab_nic_access(trans, false)) {
                 __iwl_write_prph(trans, ofs, val);
-                iwl_release_nic_access(trans);
+                iwl_trans_release_nic_access(trans);
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
@@ -259,10 +190,10 @@ void iwl_set_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask)
         unsigned long flags;
 
         spin_lock_irqsave(&trans->reg_lock, flags);
-        if (likely(iwl_grab_nic_access(trans))) {
+        if (iwl_trans_grab_nic_access(trans, false)) {
                 __iwl_write_prph(trans, ofs,
                                  __iwl_read_prph(trans, ofs) | mask);
-                iwl_release_nic_access(trans);
+                iwl_trans_release_nic_access(trans);
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
@@ -274,10 +205,10 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs,
         unsigned long flags;
 
         spin_lock_irqsave(&trans->reg_lock, flags);
-        if (likely(iwl_grab_nic_access(trans))) {
+        if (iwl_trans_grab_nic_access(trans, false)) {
                 __iwl_write_prph(trans, ofs,
                                  (__iwl_read_prph(trans, ofs) & mask) | bits);
-                iwl_release_nic_access(trans);
+                iwl_trans_release_nic_access(trans);
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
@@ -289,66 +220,11 @@ void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask)
         u32 val;
 
         spin_lock_irqsave(&trans->reg_lock, flags);
-        if (likely(iwl_grab_nic_access(trans))) {
+        if (iwl_trans_grab_nic_access(trans, false)) {
                 val = __iwl_read_prph(trans, ofs);
                 __iwl_write_prph(trans, ofs, (val & ~mask));
-                iwl_release_nic_access(trans);
+                iwl_trans_release_nic_access(trans);
         }
         spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
 EXPORT_SYMBOL_GPL(iwl_clear_bits_prph);
-
-void _iwl_read_targ_mem_dwords(struct iwl_trans *trans, u32 addr,
-                               void *buf, int dwords)
-{
-        unsigned long flags;
-        int offs;
-        u32 *vals = buf;
-
-        spin_lock_irqsave(&trans->reg_lock, flags);
-        if (likely(iwl_grab_nic_access(trans))) {
-                iwl_write32(trans, HBUS_TARG_MEM_RADDR, addr);
-                for (offs = 0; offs < dwords; offs++)
-                        vals[offs] = iwl_read32(trans, HBUS_TARG_MEM_RDAT);
-                iwl_release_nic_access(trans);
-        }
-        spin_unlock_irqrestore(&trans->reg_lock, flags);
-}
-EXPORT_SYMBOL_GPL(_iwl_read_targ_mem_dwords);
-
-u32 iwl_read_targ_mem(struct iwl_trans *trans, u32 addr)
-{
-        u32 value;
-
-        _iwl_read_targ_mem_dwords(trans, addr, &value, 1);
-
-        return value;
-}
-EXPORT_SYMBOL_GPL(iwl_read_targ_mem);
-
-int _iwl_write_targ_mem_dwords(struct iwl_trans *trans, u32 addr,
-                               const void *buf, int dwords)
-{
-        unsigned long flags;
-        int offs, result = 0;
-        const u32 *vals = buf;
-
-        spin_lock_irqsave(&trans->reg_lock, flags);
-        if (likely(iwl_grab_nic_access(trans))) {
-                iwl_write32(trans, HBUS_TARG_MEM_WADDR, addr);
-                for (offs = 0; offs < dwords; offs++)
-                        iwl_write32(trans, HBUS_TARG_MEM_WDAT, vals[offs]);
-                iwl_release_nic_access(trans);
-        } else
-                result = -EBUSY;
-        spin_unlock_irqrestore(&trans->reg_lock, flags);
-
-        return result;
-}
-EXPORT_SYMBOL_GPL(_iwl_write_targ_mem_dwords);
-
-int iwl_write_targ_mem(struct iwl_trans *trans, u32 addr, u32 val)
-{
-        return _iwl_write_targ_mem_dwords(trans, addr, &val, 1);
-}
-EXPORT_SYMBOL_GPL(iwl_write_targ_mem);
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
index 48dc753e3742..dc478068596b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -53,6 +53,8 @@ static inline u32 iwl_read32(struct iwl_trans *trans, u32 ofs)
 
 void iwl_set_bit(struct iwl_trans *trans, u32 reg, u32 mask);
 void iwl_clear_bit(struct iwl_trans *trans, u32 reg, u32 mask);
+void __iwl_set_bit(struct iwl_trans *trans, u32 reg, u32 mask);
+void __iwl_clear_bit(struct iwl_trans *trans, u32 reg, u32 mask);
 
 void iwl_set_bits_mask(struct iwl_trans *trans, u32 reg, u32 mask, u32 value);
 
@@ -61,10 +63,6 @@ int iwl_poll_bit(struct iwl_trans *trans, u32 addr,
 int iwl_poll_direct_bit(struct iwl_trans *trans, u32 addr, u32 mask,
                         int timeout);
 
-int iwl_grab_nic_access_silent(struct iwl_trans *trans);
-bool iwl_grab_nic_access(struct iwl_trans *trans);
-void iwl_release_nic_access(struct iwl_trans *trans);
-
 u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg);
 void iwl_write_direct32(struct iwl_trans *trans, u32 reg, u32 value);
 
@@ -76,19 +74,4 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs,
                             u32 bits, u32 mask);
 void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask);
 
-void _iwl_read_targ_mem_dwords(struct iwl_trans *trans, u32 addr,
-                               void *buf, int dwords);
-
-#define iwl_read_targ_mem_bytes(trans, addr, buf, bufsize)      \
-        do {                                                    \
-                BUILD_BUG_ON((bufsize) % sizeof(u32));          \
-                _iwl_read_targ_mem_dwords(trans, addr, buf,     \
-                                          (bufsize) / sizeof(u32));\
-        } while (0)
-
-int _iwl_write_targ_mem_dwords(struct iwl_trans *trans, u32 addr,
-                               const void *buf, int dwords);
-
-u32 iwl_read_targ_mem(struct iwl_trans *trans, u32 addr);
-int iwl_write_targ_mem(struct iwl_trans *trans, u32 addr, u32 val);
 #endif
diff --git a/drivers/net/wireless/iwlwifi/iwl-test.c b/drivers/net/wireless/iwlwifi/iwl-test.c
index 81e8c7126d72..1a226114fe73 100644
--- a/drivers/net/wireless/iwlwifi/iwl-test.c
+++ b/drivers/net/wireless/iwlwifi/iwl-test.c
@@ -467,18 +467,20 @@ static int iwl_test_indirect_read(struct iwl_test *tst, u32 addr, u32 size)
         if (IWL_ABS_PRPH_START <= addr &&
             addr < IWL_ABS_PRPH_START + PRPH_END) {
                         spin_lock_irqsave(&trans->reg_lock, flags);
-                        iwl_grab_nic_access(trans);
+                        if (!iwl_trans_grab_nic_access(trans, false)) {
+                                spin_unlock_irqrestore(&trans->reg_lock, flags);
+                                return -EIO;
+                        }
                         iwl_write32(trans, HBUS_TARG_PRPH_RADDR,
                                     addr | (3 << 24));
                         for (i = 0; i < size; i += 4)
                                 *(u32 *)(tst->mem.addr + i) =
                                         iwl_read32(trans, HBUS_TARG_PRPH_RDAT);
-                        iwl_release_nic_access(trans);
+                        iwl_trans_release_nic_access(trans);
                         spin_unlock_irqrestore(&trans->reg_lock, flags);
         } else { /* target memory (SRAM) */
-                _iwl_read_targ_mem_dwords(trans, addr,
-                                          tst->mem.addr,
-                                          tst->mem.size / 4);
+                iwl_trans_read_mem(trans, addr, tst->mem.addr,
+                                   tst->mem.size / 4);
         }
 
         tst->mem.nchunks =
@@ -501,28 +503,31 @@ static int iwl_test_indirect_write(struct iwl_test *tst, u32 addr,
 
         if (IWL_ABS_PRPH_START <= addr &&
             addr < IWL_ABS_PRPH_START + PRPH_END) {
-                        /* Periphery writes can be 1-3 bytes long, or DWORDs */
-                        if (size < 4) {
-                                memcpy(&val, buf, size);
-                                spin_lock_irqsave(&trans->reg_lock, flags);
-                                iwl_grab_nic_access(trans);
-                                iwl_write32(trans, HBUS_TARG_PRPH_WADDR,
-                                            (addr & 0x0000FFFF) |
-                                            ((size - 1) << 24));
-                                iwl_write32(trans, HBUS_TARG_PRPH_WDAT, val);
-                                iwl_release_nic_access(trans);
-                                /* needed after consecutive writes w/o read */
-                                mmiowb();
+                /* Periphery writes can be 1-3 bytes long, or DWORDs */
+                if (size < 4) {
+                        memcpy(&val, buf, size);
+                        spin_lock_irqsave(&trans->reg_lock, flags);
+                        if (!iwl_trans_grab_nic_access(trans, false)) {
                                 spin_unlock_irqrestore(&trans->reg_lock, flags);
-                        } else {
-                                if (size % 4)
-                                        return -EINVAL;
-                                for (i = 0; i < size; i += 4)
-                                        iwl_write_prph(trans, addr+i,
-                                                       *(u32 *)(buf+i));
+                                        return -EIO;
                         }
+                        iwl_write32(trans, HBUS_TARG_PRPH_WADDR,
+                                    (addr & 0x0000FFFF) |
+                                    ((size - 1) << 24));
+                        iwl_write32(trans, HBUS_TARG_PRPH_WDAT, val);
+                        iwl_trans_release_nic_access(trans);
+                        /* needed after consecutive writes w/o read */
+                        mmiowb();
+                        spin_unlock_irqrestore(&trans->reg_lock, flags);
+                } else {
+                        if (size % 4)
+                                return -EINVAL;
+                        for (i = 0; i < size; i += 4)
+                                iwl_write_prph(trans, addr+i,
+                                               *(u32 *)(buf+i));
+                }
         } else if (iwl_test_valid_hw_addr(tst, addr)) {
-                _iwl_write_targ_mem_dwords(trans, addr, buf, size / 4);
+                iwl_trans_write_mem(trans, addr, buf, size / 4);
         } else {
                 return -EINVAL;
         }
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index b76532e238c1..0f85eb305878 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -308,6 +308,16 @@ static inline struct page *rxb_steal_page(struct iwl_rx_cmd_buffer *r)
 #define IWL_FRAME_LIMIT 64
 
 /**
+ * enum iwl_wowlan_status - WoWLAN image/device status
+ * @IWL_D3_STATUS_ALIVE: firmware is still running after resume
+ * @IWL_D3_STATUS_RESET: device was reset while suspended
+ */
+enum iwl_d3_status {
+        IWL_D3_STATUS_ALIVE,
+        IWL_D3_STATUS_RESET,
+};
+
+/**
  * struct iwl_trans_config - transport configuration
  *
  * @op_mode: pointer to the upper layer.
@@ -321,6 +331,8 @@ static inline struct page *rxb_steal_page(struct iwl_rx_cmd_buffer *r)
  * @n_no_reclaim_cmds: # of commands in list
  * @rx_buf_size_8k: 8 kB RX buffer size needed for A-MSDUs,
  *      if unset 4k will be the RX buffer size
+ * @bc_table_dword: set to true if the BC table expects the byte count to be
+ *      in DWORD (as opposed to bytes)
  * @queue_watchdog_timeout: time (in ms) after which queues
  *      are considered stuck and will trigger device restart
  * @command_names: array of command names, must be 256 entries
@@ -335,6 +347,7 @@ struct iwl_trans_config {
         int n_no_reclaim_cmds;
 
         bool rx_buf_size_8k;
+        bool bc_table_dword;
         unsigned int queue_watchdog_timeout;
         const char **command_names;
 };
@@ -360,9 +373,12 @@ struct iwl_trans;
  *      May sleep
  * @stop_device:stops the whole device (embedded CPU put to reset)
  *      May sleep
- * @wowlan_suspend: put the device into the correct mode for WoWLAN during
+ * @d3_suspend: put the device into the correct mode for WoWLAN during
  *      suspend. This is optional, if not implemented WoWLAN will not be
  *      supported. This callback may sleep.
+ * @d3_resume: resume the device after WoWLAN, enabling the opmode to
+ *      talk to the WoWLAN image to get its status. This is optional, if not
+ *      implemented WoWLAN will not be supported. This callback may sleep.
  * @send_cmd:send a host command. Must return -ERFKILL if RFkill is asserted.
  *      If RFkill is asserted in the middle of a SYNC host command, it must
  *      return -ERFKILL straight away.
@@ -387,20 +403,27 @@ struct iwl_trans;
  * @read32: read a u32 register at offset ofs from the BAR
  * @read_prph: read a DWORD from a periphery register
  * @write_prph: write a DWORD to a periphery register
+ * @read_mem: read device's SRAM in DWORD
+ * @write_mem: write device's SRAM in DWORD. If %buf is %NULL, then the memory
+ *      will be zeroed.
  * @configure: configure parameters required by the transport layer from
  *      the op_mode. May be called several times before start_fw, can't be
  *      called after that.
  * @set_pmi: set the power pmi state
+ * @grab_nic_access: wake the NIC to be able to access non-HBUS regs
+ * @release_nic_access: let the NIC go to sleep
  */
 struct iwl_trans_ops {
 
         int (*start_hw)(struct iwl_trans *iwl_trans);
         void (*stop_hw)(struct iwl_trans *iwl_trans, bool op_mode_leaving);
-        int (*start_fw)(struct iwl_trans *trans, const struct fw_img *fw);
+        int (*start_fw)(struct iwl_trans *trans, const struct fw_img *fw,
+                        bool run_in_rfkill);
         void (*fw_alive)(struct iwl_trans *trans, u32 scd_addr);
         void (*stop_device)(struct iwl_trans *trans);
 
-        void (*wowlan_suspend)(struct iwl_trans *trans);
+        void (*d3_suspend)(struct iwl_trans *trans);
+        int (*d3_resume)(struct iwl_trans *trans, enum iwl_d3_status *status);
 
         int (*send_cmd)(struct iwl_trans *trans, struct iwl_host_cmd *cmd);
 
@@ -424,9 +447,15 @@ struct iwl_trans_ops {
         u32 (*read32)(struct iwl_trans *trans, u32 ofs);
         u32 (*read_prph)(struct iwl_trans *trans, u32 ofs);
         void (*write_prph)(struct iwl_trans *trans, u32 ofs, u32 val);
+        int (*read_mem)(struct iwl_trans *trans, u32 addr,
+                        void *buf, int dwords);
+        int (*write_mem)(struct iwl_trans *trans, u32 addr,
+                         void *buf, int dwords);
         void (*configure)(struct iwl_trans *trans,
                           const struct iwl_trans_config *trans_cfg);
         void (*set_pmi)(struct iwl_trans *trans, bool state);
+        bool (*grab_nic_access)(struct iwl_trans *trans, bool silent);
+        void (*release_nic_access)(struct iwl_trans *trans);
 };
 
 /**
@@ -528,13 +557,14 @@ static inline void iwl_trans_fw_alive(struct iwl_trans *trans, u32 scd_addr)
 }
 
 static inline int iwl_trans_start_fw(struct iwl_trans *trans,
-                                     const struct fw_img *fw)
+                                     const struct fw_img *fw,
+                                     bool run_in_rfkill)
 {
         might_sleep();
 
         WARN_ON_ONCE(!trans->rx_mpdu_cmd);
 
-        return trans->ops->start_fw(trans, fw);
+        return trans->ops->start_fw(trans, fw, run_in_rfkill);
 }
 
 static inline void iwl_trans_stop_device(struct iwl_trans *trans)
@@ -546,10 +576,17 @@ static inline void iwl_trans_stop_device(struct iwl_trans *trans)
         trans->state = IWL_TRANS_NO_FW;
 }
 
-static inline void iwl_trans_wowlan_suspend(struct iwl_trans *trans)
+static inline void iwl_trans_d3_suspend(struct iwl_trans *trans)
+{
+        might_sleep();
+        trans->ops->d3_suspend(trans);
+}
+
+static inline int iwl_trans_d3_resume(struct iwl_trans *trans,
+                                      enum iwl_d3_status *status)
 {
         might_sleep();
-        trans->ops->wowlan_suspend(trans);
+        return trans->ops->d3_resume(trans, status);
 }
 
 static inline int iwl_trans_send_cmd(struct iwl_trans *trans,
@@ -636,7 +673,7 @@ static inline int iwl_trans_wait_tx_queue_empty(struct iwl_trans *trans)
 }
 
 static inline int iwl_trans_dbgfs_register(struct iwl_trans *trans,
-                                            struct dentry *dir)
+                                           struct dentry *dir)
 {
         return trans->ops->dbgfs_register(trans, dir);
 }
@@ -679,11 +716,57 @@ static inline void iwl_trans_write_prph(struct iwl_trans *trans, u32 ofs,
         return trans->ops->write_prph(trans, ofs, val);
 }
 
+static inline int iwl_trans_read_mem(struct iwl_trans *trans, u32 addr,
+                                     void *buf, int dwords)
+{
+        return trans->ops->read_mem(trans, addr, buf, dwords);
+}
+
+#define iwl_trans_read_mem_bytes(trans, addr, buf, bufsize)                   \
+        do {                                                                  \
+                if (__builtin_constant_p(bufsize))                            \
+                        BUILD_BUG_ON((bufsize) % sizeof(u32));                \
+                iwl_trans_read_mem(trans, addr, buf, (bufsize) / sizeof(u32));\
+        } while (0)
+
+static inline u32 iwl_trans_read_mem32(struct iwl_trans *trans, u32 addr)
+{
+        u32 value;
+
+        if (WARN_ON(iwl_trans_read_mem(trans, addr, &value, 1)))
+                return 0xa5a5a5a5;
+
+        return value;
+}
+
+static inline int iwl_trans_write_mem(struct iwl_trans *trans, u32 addr,
+                                      void *buf, int dwords)
+{
+        return trans->ops->write_mem(trans, addr, buf, dwords);
+}
+
+static inline u32 iwl_trans_write_mem32(struct iwl_trans *trans, u32 addr,
+                                        u32 val)
+{
+        return iwl_trans_write_mem(trans, addr, &val, 1);
+}
+
 static inline void iwl_trans_set_pmi(struct iwl_trans *trans, bool state)
 {
         trans->ops->set_pmi(trans, state);
 }
 
+#define iwl_trans_grab_nic_access(trans, silent)        \
+        __cond_lock(nic_access,                         \
+                    likely((trans)->ops->grab_nic_access(trans, silent)))
+
+static inline void __releases(nic_access)
+iwl_trans_release_nic_access(struct iwl_trans *trans)
+{
+        trans->ops->release_nic_access(trans);
+        __release(nic_access);
+}
+
 /*****************************************************
 * driver (transport) register/unregister functions
 ******************************************************/
diff --git a/drivers/net/wireless/iwlwifi/pcie/internal.h b/drivers/net/wireless/iwlwifi/pcie/internal.h
index d91d2e8c62f5..20735a008cab 100644
--- a/drivers/net/wireless/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/iwlwifi/pcie/internal.h
@@ -222,8 +222,6 @@ struct iwl_txq {
  * @rx_replenish: work that will be called when buffers need to be allocated
  * @drv - pointer to iwl_drv
  * @trans: pointer to the generic transport area
- * @irq - the irq number for the device
- * @irq_requested: true when the irq has been requested
  * @scd_base_addr: scheduler sram base address in SRAM
  * @scd_bc_tbls: pointer to the byte count table of the scheduler
  * @kw: keep warm address
@@ -234,6 +232,7 @@ struct iwl_txq {
  * @status - transport specific status flags
  * @cmd_queue - command queue number
  * @rx_buf_size_8k: 8 kB RX buffer size
+ * @bc_table_dword: true if the BC table expects DWORD (as opposed to bytes)
  * @rx_page_order: page order for receive buffer size
  * @wd_timeout: queue watchdog timeout (jiffies)
  */
@@ -249,11 +248,9 @@ struct iwl_trans_pcie {
         int ict_index;
         u32 inta;
         bool use_ict;
-        bool irq_requested;
         struct tasklet_struct irq_tasklet;
         struct isr_statistics isr_stats;
 
-        unsigned int irq;
         spinlock_t irq_lock;
         u32 inta_mask;
         u32 scd_base_addr;
@@ -279,6 +276,7 @@ struct iwl_trans_pcie {
         u8 no_reclaim_cmds[MAX_NO_RECLAIM_CMDS];
 
         bool rx_buf_size_8k;
+        bool bc_table_dword;
         u32 rx_page_order;
 
         const char **command_names;
@@ -359,6 +357,8 @@ void iwl_pcie_hcmd_complete(struct iwl_trans *trans,
                             struct iwl_rx_cmd_buffer *rxb, int handler_status);
 void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
                             struct sk_buff_head *skbs);
+void iwl_trans_pcie_tx_reset(struct iwl_trans *trans);
+
 /*****************************************************
 * Error handling
 ******************************************************/
diff --git a/drivers/net/wireless/iwlwifi/pcie/rx.c b/drivers/net/wireless/iwlwifi/pcie/rx.c
index 8389cd38338b..4e6591d24e61 100644
--- a/drivers/net/wireless/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/rx.c
@@ -436,7 +436,7 @@ static int iwl_pcie_rx_alloc(struct iwl_trans *trans)
 err_rb_stts:
         dma_free_coherent(dev, sizeof(__le32) * RX_QUEUE_SIZE,
                           rxq->bd, rxq->bd_dma);
-        memset(&rxq->bd_dma, 0, sizeof(rxq->bd_dma));
+        rxq->bd_dma = 0;
         rxq->bd = NULL;
 err_bd:
         return -ENOMEM;
@@ -455,6 +455,10 @@ static void iwl_pcie_rx_hw_init(struct iwl_trans *trans, struct iwl_rxq *rxq)
 
         /* Stop Rx DMA */
         iwl_write_direct32(trans, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);
+        /* reset and flush pointers */
+        iwl_write_direct32(trans, FH_MEM_RCSR_CHNL0_RBDCB_WPTR, 0);
+        iwl_write_direct32(trans, FH_MEM_RCSR_CHNL0_FLUSH_RB_REQ, 0);
+        iwl_write_direct32(trans, FH_RSCSR_CHNL0_RDPTR, 0);
 
         /* Reset driver's Rx queue write index */
         iwl_write_direct32(trans, FH_RSCSR_CHNL0_RBDCB_WPTR_REG, 0);
@@ -491,7 +495,6 @@ int iwl_pcie_rx_init(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         struct iwl_rxq *rxq = &trans_pcie->rxq;
-
         int i, err;
         unsigned long flags;
 
@@ -518,6 +521,7 @@ int iwl_pcie_rx_init(struct iwl_trans *trans)
         rxq->read = rxq->write = 0;
         rxq->write_actual = 0;
         rxq->free_count = 0;
+        memset(rxq->rb_stts, 0, sizeof(*rxq->rb_stts));
         spin_unlock_irqrestore(&rxq->lock, flags);
 
         iwl_pcie_rx_replenish(trans);
@@ -545,13 +549,15 @@ void iwl_pcie_rx_free(struct iwl_trans *trans)
                 return;
         }
 
+        cancel_work_sync(&trans_pcie->rx_replenish);
+
         spin_lock_irqsave(&rxq->lock, flags);
         iwl_pcie_rxq_free_rbs(trans);
         spin_unlock_irqrestore(&rxq->lock, flags);
 
         dma_free_coherent(trans->dev, sizeof(__le32) * RX_QUEUE_SIZE,
                           rxq->bd, rxq->bd_dma);
-        memset(&rxq->bd_dma, 0, sizeof(rxq->bd_dma));
+        rxq->bd_dma = 0;
         rxq->bd = NULL;
 
         if (rxq->rb_stts)
@@ -560,7 +566,7 @@ void iwl_pcie_rx_free(struct iwl_trans *trans)
                                   rxq->rb_stts, rxq->rb_stts_dma);
         else
                 IWL_DEBUG_INFO(trans, "Free rxq->rb_stts which is NULL\n");
-        memset(&rxq->rb_stts_dma, 0, sizeof(rxq->rb_stts_dma));
+        rxq->rb_stts_dma = 0;
         rxq->rb_stts = NULL;
 }
 
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 35708b959ad6..c57641eb83d5 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -75,21 +75,16 @@
 #include "iwl-agn-hw.h"
 #include "internal.h"
 
-static void iwl_pcie_set_pwr_vmain(struct iwl_trans *trans)
+static void iwl_pcie_set_pwr(struct iwl_trans *trans, bool vaux)
 {
-/*
- * (for documentation purposes)
- * to set power to V_AUX, do:
-
-                if (pci_pme_capable(priv->pci_dev, PCI_D3cold))
-                        iwl_set_bits_mask_prph(trans, APMG_PS_CTRL_REG,
-                                               APMG_PS_CTRL_VAL_PWR_SRC_VAUX,
-                                               ~APMG_PS_CTRL_MSK_PWR_SRC);
- */
-
-        iwl_set_bits_mask_prph(trans, APMG_PS_CTRL_REG,
-                               APMG_PS_CTRL_VAL_PWR_SRC_VMAIN,
-                               ~APMG_PS_CTRL_MSK_PWR_SRC);
+        if (vaux && pci_pme_capable(to_pci_dev(trans->dev), PCI_D3cold))
+                iwl_set_bits_mask_prph(trans, APMG_PS_CTRL_REG,
+                                       APMG_PS_CTRL_VAL_PWR_SRC_VAUX,
+                                       ~APMG_PS_CTRL_MSK_PWR_SRC);
+        else
+                iwl_set_bits_mask_prph(trans, APMG_PS_CTRL_REG,
+                                       APMG_PS_CTRL_VAL_PWR_SRC_VMAIN,
+                                       ~APMG_PS_CTRL_MSK_PWR_SRC);
 }
 
 /* PCI registers */
@@ -259,7 +254,7 @@ static int iwl_pcie_nic_init(struct iwl_trans *trans)
 
         spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
 
-        iwl_pcie_set_pwr_vmain(trans);
+        iwl_pcie_set_pwr(trans, false);
 
         iwl_op_mode_nic_config(trans->op_mode);
 
@@ -435,7 +430,7 @@ static int iwl_pcie_load_given_ucode(struct iwl_trans *trans,
 }
 
 static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
-                                   const struct fw_img *fw)
+                                   const struct fw_img *fw, bool run_in_rfkill)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         int ret;
@@ -454,7 +449,7 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
         /* If platform's RF_KILL switch is NOT set to KILL */
         hw_rfkill = iwl_is_rfkill_set(trans);
         iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
-        if (hw_rfkill)
+        if (hw_rfkill && !run_in_rfkill)
                 return -ERFKILL;
 
         iwl_write32(trans, CSR_INT, 0xFFFFFFFF);
@@ -534,12 +529,6 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
 
         iwl_enable_rfkill_int(trans);
 
-        /* wait to make sure we flush pending tasklet*/
-        synchronize_irq(trans_pcie->irq);
-        tasklet_kill(&trans_pcie->irq_tasklet);
-
-        cancel_work_sync(&trans_pcie->rx_replenish);
-
         /* stop and reset the on-board processor */
         iwl_write32(trans, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
 
@@ -551,46 +540,87 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
         clear_bit(STATUS_RFKILL, &trans_pcie->status);
 }
 
-static void iwl_trans_pcie_wowlan_suspend(struct iwl_trans *trans)
+static void iwl_trans_pcie_d3_suspend(struct iwl_trans *trans)
 {
         /* let the ucode operate on its own */
         iwl_write32(trans, CSR_UCODE_DRV_GP1_SET,
                     CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);
 
         iwl_disable_interrupts(trans);
+        iwl_pcie_disable_ict(trans);
+
         iwl_clear_bit(trans, CSR_GP_CNTRL,
                       CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+        iwl_clear_bit(trans, CSR_GP_CNTRL,
+                      CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
+
+        /*
+         * reset TX queues -- some of their registers reset during S3
+         * so if we don't reset everything here the D3 image would try
+         * to execute some invalid memory upon resume
+         */
+        iwl_trans_pcie_tx_reset(trans);
+
+        iwl_pcie_set_pwr(trans, true);
 }
 
-static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
+static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,
+                                    enum iwl_d3_status *status)
 {
-        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        int err;
-        bool hw_rfkill;
+        u32 val;
+        int ret;
 
-        trans_pcie->inta_mask = CSR_INI_SET_MASK;
+        iwl_pcie_set_pwr(trans, false);
 
-        if (!trans_pcie->irq_requested) {
-                tasklet_init(&trans_pcie->irq_tasklet, (void (*)(unsigned long))
-                        iwl_pcie_tasklet, (unsigned long)trans);
+        val = iwl_read32(trans, CSR_RESET);
+        if (val & CSR_RESET_REG_FLAG_NEVO_RESET) {
+                *status = IWL_D3_STATUS_RESET;
+                return 0;
+        }
 
-                iwl_pcie_alloc_ict(trans);
+        /*
+         * Also enables interrupts - none will happen as the device doesn't
+         * know we're waking it up, only when the opmode actually tells it
+         * after this call.
+         */
+        iwl_pcie_reset_ict(trans);
 
-                err = request_irq(trans_pcie->irq, iwl_pcie_isr_ict,
-                                  IRQF_SHARED, DRV_NAME, trans);
-                if (err) {
-                        IWL_ERR(trans, "Error allocating IRQ %d\n",
-                                trans_pcie->irq);
-                        goto error;
-                }
+        iwl_set_bit(trans, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+        iwl_set_bit(trans, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
 
-                trans_pcie->irq_requested = true;
+        ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
+                           CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
+                           CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
+                           25000);
+        if (ret) {
+                IWL_ERR(trans, "Failed to resume the device (mac ready)\n");
+                return ret;
         }
 
+        iwl_trans_pcie_tx_reset(trans);
+
+        ret = iwl_pcie_rx_init(trans);
+        if (ret) {
+                IWL_ERR(trans, "Failed to resume the device (RX reset)\n");
+                return ret;
+        }
+
+        iwl_write32(trans, CSR_UCODE_DRV_GP1_CLR,
+                    CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);
+
+        *status = IWL_D3_STATUS_ALIVE;
+        return 0;
+}
+
+static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
+{
+        bool hw_rfkill;
+        int err;
+
         err = iwl_pcie_prepare_card_hw(trans);
         if (err) {
                 IWL_ERR(trans, "Error while preparing HW: %d\n", err);
-                goto err_free_irq;
+                return err;
         }
 
         iwl_pcie_apm_init(trans);
@@ -601,15 +631,7 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
         hw_rfkill = iwl_is_rfkill_set(trans);
         iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
 
-        return err;
-
-err_free_irq:
-        trans_pcie->irq_requested = false;
-        free_irq(trans_pcie->irq, trans);
-error:
-        iwl_pcie_free_ict(trans);
-        tasklet_kill(&trans_pcie->irq_tasklet);
-        return err;
+        return 0;
 }
 
 static void iwl_trans_pcie_stop_hw(struct iwl_trans *trans,
@@ -703,19 +725,21 @@ static void iwl_trans_pcie_configure(struct iwl_trans *trans,
                 msecs_to_jiffies(trans_cfg->queue_watchdog_timeout);
 
         trans_pcie->command_names = trans_cfg->command_names;
+        trans_pcie->bc_table_dword = trans_cfg->bc_table_dword;
 }
 
 void iwl_trans_pcie_free(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
+        synchronize_irq(trans_pcie->pci_dev->irq);
+        tasklet_kill(&trans_pcie->irq_tasklet);
+
         iwl_pcie_tx_free(trans);
         iwl_pcie_rx_free(trans);
 
-        if (trans_pcie->irq_requested == true) {
-                free_irq(trans_pcie->irq, trans);
-                iwl_pcie_free_ict(trans);
-        }
+        free_irq(trans_pcie->pci_dev->irq, trans);
+        iwl_pcie_free_ict(trans);
 
         pci_disable_msi(trans_pcie->pci_dev);
         iounmap(trans_pcie->hw_base);
@@ -751,13 +775,112 @@ static int iwl_trans_pcie_resume(struct iwl_trans *trans)
         hw_rfkill = iwl_is_rfkill_set(trans);
         iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
 
-        if (!hw_rfkill)
-                iwl_enable_interrupts(trans);
-
         return 0;
 }
 #endif /* CONFIG_PM_SLEEP */
 
+static bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent)
+{
+        int ret;
+
+        lockdep_assert_held(&trans->reg_lock);
+
+        /* this bit wakes up the NIC */
+        __iwl_set_bit(trans, CSR_GP_CNTRL,
+                      CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+
+        /*
+         * These bits say the device is running, and should keep running for
+         * at least a short while (at least as long as MAC_ACCESS_REQ stays 1),
+         * but they do not indicate that embedded SRAM is restored yet;
+         * 3945 and 4965 have volatile SRAM, and must save/restore contents
+         * to/from host DRAM when sleeping/waking for power-saving.
+         * Each direction takes approximately 1/4 millisecond; with this
+         * overhead, it's a good idea to grab and hold MAC_ACCESS_REQUEST if a
+         * series of register accesses are expected (e.g. reading Event Log),
+         * to keep device from sleeping.
+         *
+         * CSR_UCODE_DRV_GP1 register bit MAC_SLEEP == 0 indicates that
+         * SRAM is okay/restored.  We don't check that here because this call
+         * is just for hardware register access; but GP1 MAC_SLEEP check is a
+         * good idea before accessing 3945/4965 SRAM (e.g. reading Event Log).
+         *
+         * 5000 series and later (including 1000 series) have non-volatile SRAM,
+         * and do not save/restore SRAM when power cycling.
+         */
+        ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
+                           CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN,
+                           (CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY |
+                            CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 15000);
+        if (unlikely(ret < 0)) {
+                iwl_write32(trans, CSR_RESET, CSR_RESET_REG_FLAG_FORCE_NMI);
+                if (!silent) {
+                        u32 val = iwl_read32(trans, CSR_GP_CNTRL);
+                        WARN_ONCE(1,
+                                  "Timeout waiting for hardware access (CSR_GP_CNTRL 0x%08x)\n",
+                                  val);
+                        return false;
+                }
+        }
+
+        return true;
+}
+
+static void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans)
+{
+        lockdep_assert_held(&trans->reg_lock);
+        __iwl_clear_bit(trans, CSR_GP_CNTRL,
+                        CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+        /*
+         * Above we read the CSR_GP_CNTRL register, which will flush
+         * any previous writes, but we need the write that clears the
+         * MAC_ACCESS_REQ bit to be performed before any other writes
+         * scheduled on different CPUs (after we drop reg_lock).
+         */
+        mmiowb();
+}
+
+static int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr,
+                                   void *buf, int dwords)
+{
+        unsigned long flags;
+        int offs, ret = 0;
+        u32 *vals = buf;
+
+        spin_lock_irqsave(&trans->reg_lock, flags);
+        if (iwl_trans_grab_nic_access(trans, false)) {
+                iwl_write32(trans, HBUS_TARG_MEM_RADDR, addr);
+                for (offs = 0; offs < dwords; offs++)
+                        vals[offs] = iwl_read32(trans, HBUS_TARG_MEM_RDAT);
+                iwl_trans_release_nic_access(trans);
+        } else {
+                ret = -EBUSY;
+        }
+        spin_unlock_irqrestore(&trans->reg_lock, flags);
+        return ret;
+}
+
+static int iwl_trans_pcie_write_mem(struct iwl_trans *trans, u32 addr,
+                                    void *buf, int dwords)
+{
+        unsigned long flags;
+        int offs, ret = 0;
+        u32 *vals = buf;
+
+        spin_lock_irqsave(&trans->reg_lock, flags);
+        if (iwl_trans_grab_nic_access(trans, false)) {
+                iwl_write32(trans, HBUS_TARG_MEM_WADDR, addr);
+                for (offs = 0; offs < dwords; offs++)
+                        iwl_write32(trans, HBUS_TARG_MEM_WDAT,
+                                    vals ? vals[offs] : 0);
+                iwl_trans_release_nic_access(trans);
+        } else {
+                ret = -EBUSY;
+        }
+        spin_unlock_irqrestore(&trans->reg_lock, flags);
+        return ret;
+}
+
 #define IWL_FLUSH_WAIT_MS       2000
 
 static int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans)
@@ -767,6 +890,8 @@ static int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans)
         struct iwl_queue *q;
         int cnt;
         unsigned long now = jiffies;
+        u32 scd_sram_addr;
+        u8 buf[16];
         int ret = 0;
 
         /* waiting for all the tx frames complete might take a while */
@@ -780,11 +905,50 @@ static int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans)
                         msleep(1);
 
                 if (q->read_ptr != q->write_ptr) {
-                        IWL_ERR(trans, "fail to flush all tx fifo queues\n");
+                        IWL_ERR(trans,
+                                "fail to flush all tx fifo queues Q %d\n", cnt);
                         ret = -ETIMEDOUT;
                         break;
                 }
         }
+
+        if (!ret)
+                return 0;
+
+        IWL_ERR(trans, "Current SW read_ptr %d write_ptr %d\n",
+                txq->q.read_ptr, txq->q.write_ptr);
+
+        scd_sram_addr = trans_pcie->scd_base_addr +
+                        SCD_TX_STTS_QUEUE_OFFSET(txq->q.id);
+        iwl_trans_read_mem_bytes(trans, scd_sram_addr, buf, sizeof(buf));
+
+        iwl_print_hex_error(trans, buf, sizeof(buf));
+
+        for (cnt = 0; cnt < FH_TCSR_CHNL_NUM; cnt++)
+                IWL_ERR(trans, "FH TRBs(%d) = 0x%08x\n", cnt,
+                        iwl_read_direct32(trans, FH_TX_TRB_REG(cnt)));
+
+        for (cnt = 0; cnt < trans->cfg->base_params->num_of_queues; cnt++) {
+                u32 status = iwl_read_prph(trans, SCD_QUEUE_STATUS_BITS(cnt));
+                u8 fifo = (status >> SCD_QUEUE_STTS_REG_POS_TXF) & 0x7;
+                bool active = !!(status & BIT(SCD_QUEUE_STTS_REG_POS_ACTIVE));
+                u32 tbl_dw =
+                        iwl_trans_read_mem32(trans, trans_pcie->scd_base_addr +
+                                             SCD_TRANS_TBL_OFFSET_QUEUE(cnt));
+
+                if (cnt & 0x1)
+                        tbl_dw = (tbl_dw & 0xFFFF0000) >> 16;
+                else
+                        tbl_dw = tbl_dw & 0x0000FFFF;
+
+                IWL_ERR(trans,
+                        "Q %d is %sactive and mapped to fifo %d ra_tid 0x%04x [%d,%d]\n",
+                        cnt, active ? "" : "in", fifo, tbl_dw,
+                        iwl_read_prph(trans,
+                                      SCD_QUEUE_RDPTR(cnt)) & (txq->q.n_bd - 1),
+                        iwl_read_prph(trans, SCD_QUEUE_WRPTR(cnt)));
+        }
+
         return ret;
 }
 
@@ -1212,7 +1376,8 @@ static const struct iwl_trans_ops trans_ops_pcie = {
         .start_fw = iwl_trans_pcie_start_fw,
         .stop_device = iwl_trans_pcie_stop_device,
 
-        .wowlan_suspend = iwl_trans_pcie_wowlan_suspend,
+        .d3_suspend = iwl_trans_pcie_d3_suspend,
+        .d3_resume = iwl_trans_pcie_d3_resume,
 
         .send_cmd = iwl_trans_pcie_send_hcmd,
 
@@ -1235,8 +1400,12 @@ static const struct iwl_trans_ops trans_ops_pcie = {
         .read32 = iwl_trans_pcie_read32,
         .read_prph = iwl_trans_pcie_read_prph,
         .write_prph = iwl_trans_pcie_write_prph,
+        .read_mem = iwl_trans_pcie_read_mem,
+        .write_mem = iwl_trans_pcie_write_mem,
         .configure = iwl_trans_pcie_configure,
         .set_pmi = iwl_trans_pcie_set_pmi,
+        .grab_nic_access = iwl_trans_pcie_grab_nic_access,
+        .release_nic_access = iwl_trans_pcie_release_nic_access
 };
 
 struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
@@ -1318,7 +1487,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
         }
 
         trans->dev = &pdev->dev;
-        trans_pcie->irq = pdev->irq;
         trans_pcie->pci_dev = pdev;
         trans->hw_rev = iwl_read32(trans, CSR_HW_REV);
         trans->hw_id = (pdev->device << 16) + pdev->subsystem_device;
@@ -1344,8 +1512,27 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
         if (!trans->dev_cmd_pool)
                 goto out_pci_disable_msi;
 
+        trans_pcie->inta_mask = CSR_INI_SET_MASK;
+
+        tasklet_init(&trans_pcie->irq_tasklet, (void (*)(unsigned long))
+                     iwl_pcie_tasklet, (unsigned long)trans);
+
+        if (iwl_pcie_alloc_ict(trans))
+                goto out_free_cmd_pool;
+
+        err = request_irq(pdev->irq, iwl_pcie_isr_ict,
+                          IRQF_SHARED, DRV_NAME, trans);
+        if (err) {
+                IWL_ERR(trans, "Error allocating IRQ %d\n", pdev->irq);
+                goto out_free_ict;
+        }
+
         return trans;
 
+out_free_ict:
+        iwl_pcie_free_ict(trans);
+out_free_cmd_pool:
+        kmem_cache_destroy(trans->dev_cmd_pool);
 out_pci_disable_msi:
         pci_disable_msi(pdev);
 out_pci_release_regions:
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index 6c5b867c353a..a93f06762b96 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -160,7 +160,7 @@ static void iwl_pcie_txq_stuck_timer(unsigned long data)
         IWL_ERR(trans, "Current SW read_ptr %d write_ptr %d\n",
                 txq->q.read_ptr, txq->q.write_ptr);
 
-        iwl_read_targ_mem_bytes(trans, scd_sram_addr, buf, sizeof(buf));
+        iwl_trans_read_mem_bytes(trans, scd_sram_addr, buf, sizeof(buf));
 
         iwl_print_hex_error(trans, buf, sizeof(buf));
 
@@ -173,9 +173,9 @@ static void iwl_pcie_txq_stuck_timer(unsigned long data)
                 u8 fifo = (status >> SCD_QUEUE_STTS_REG_POS_TXF) & 0x7;
                 bool active = !!(status & BIT(SCD_QUEUE_STTS_REG_POS_ACTIVE));
                 u32 tbl_dw =
-                        iwl_read_targ_mem(trans,
-                                          trans_pcie->scd_base_addr +
-                                          SCD_TRANS_TBL_OFFSET_QUEUE(i));
+                        iwl_trans_read_mem32(trans,
+                                             trans_pcie->scd_base_addr +
+                                             SCD_TRANS_TBL_OFFSET_QUEUE(i));
 
                 if (i & 0x1)
                         tbl_dw = (tbl_dw & 0xFFFF0000) >> 16;
@@ -237,7 +237,10 @@ static void iwl_pcie_txq_update_byte_cnt_tbl(struct iwl_trans *trans,
                 break;
         }
 
-        bc_ent = cpu_to_le16((len & 0xFFF) | (sta_id << 12));
+        if (trans_pcie->bc_table_dword)
+                len = DIV_ROUND_UP(len, 4);
+
+        bc_ent = cpu_to_le16(len | (sta_id << 12));
 
         scd_bc_tbl[txq_id].tfd_offset[write_ptr] = bc_ent;
 
@@ -306,6 +309,9 @@ void iwl_pcie_txq_inc_wr_ptr(struct iwl_trans *trans, struct iwl_txq *txq)
                                 return;
                         }
 
+                        IWL_DEBUG_TX(trans, "Q:%d WR: 0x%x\n", txq_id,
+                                     txq->q.write_ptr);
+
                         iwl_write_direct32(trans, HBUS_TARG_WRPTR,
                                      txq->q.write_ptr | (txq_id << 8));
 
@@ -612,7 +618,7 @@ static void iwl_pcie_txq_free(struct iwl_trans *trans, int txq_id)
         if (txq->q.n_bd) {
                 dma_free_coherent(dev, sizeof(struct iwl_tfd) *
                                   txq->q.n_bd, txq->tfds, txq->q.dma_addr);
-                memset(&txq->q.dma_addr, 0, sizeof(txq->q.dma_addr));
+                txq->q.dma_addr = 0;
         }
 
         kfree(txq->entries);
@@ -638,9 +644,11 @@ static void iwl_pcie_txq_set_sched(struct iwl_trans *trans, u32 mask)
 void iwl_pcie_tx_start(struct iwl_trans *trans, u32 scd_base_addr)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-        u32 a;
+        int nq = trans->cfg->base_params->num_of_queues;
         int chan;
         u32 reg_val;
+        int clear_dwords = (SCD_TRANS_TBL_OFFSET_QUEUE(nq) -
+                                SCD_CONTEXT_MEM_LOWER_BOUND) / sizeof(u32);
 
         /* make sure all queue are not stopped/used */
         memset(trans_pcie->queue_stopped, 0, sizeof(trans_pcie->queue_stopped));
@@ -652,20 +660,10 @@ void iwl_pcie_tx_start(struct iwl_trans *trans, u32 scd_base_addr)
         WARN_ON(scd_base_addr != 0 &&
                 scd_base_addr != trans_pcie->scd_base_addr);
 
-        a = trans_pcie->scd_base_addr + SCD_CONTEXT_MEM_LOWER_BOUND;
-        /* reset conext data memory */
-        for (; a < trans_pcie->scd_base_addr + SCD_CONTEXT_MEM_UPPER_BOUND;
-                a += 4)
-                iwl_write_targ_mem(trans, a, 0);
-        /* reset tx status memory */
-        for (; a < trans_pcie->scd_base_addr + SCD_TX_STTS_MEM_UPPER_BOUND;
-                a += 4)
-                iwl_write_targ_mem(trans, a, 0);
-        for (; a < trans_pcie->scd_base_addr +
-               SCD_TRANS_TBL_OFFSET_QUEUE(
-                                trans->cfg->base_params->num_of_queues);
-               a += 4)
-                iwl_write_targ_mem(trans, a, 0);
+        /* reset context data, TX status and translation data */
+        iwl_trans_write_mem(trans, trans_pcie->scd_base_addr +
+                                   SCD_CONTEXT_MEM_LOWER_BOUND,
+                            NULL, clear_dwords);
 
         iwl_write_prph(trans, SCD_DRAM_BASE_ADDR,
                        trans_pcie->scd_bc_tbls.dma >> 10);
@@ -697,6 +695,29 @@ void iwl_pcie_tx_start(struct iwl_trans *trans, u32 scd_base_addr)
                             APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
 }
 
+void iwl_trans_pcie_tx_reset(struct iwl_trans *trans)
+{
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+        int txq_id;
+
+        for (txq_id = 0; txq_id < trans->cfg->base_params->num_of_queues;
+             txq_id++) {
+                struct iwl_txq *txq = &trans_pcie->txq[txq_id];
+
+                iwl_write_direct32(trans, FH_MEM_CBBC_QUEUE(txq_id),
+                                   txq->q.dma_addr >> 8);
+                iwl_pcie_txq_unmap(trans, txq_id);
+                txq->q.read_ptr = 0;
+                txq->q.write_ptr = 0;
+        }
+
+        /* Tell NIC where to find the "keep warm" buffer */
+        iwl_write_direct32(trans, FH_KW_MEM_ADDR_REG,
+                           trans_pcie->kw.dma >> 4);
+
+        iwl_pcie_tx_start(trans, trans_pcie->scd_base_addr);
+}
+
 /*
  * iwl_pcie_tx_stop - Stop all Tx DMA channels
  */
@@ -1002,14 +1023,14 @@ static int iwl_pcie_txq_set_ratid_map(struct iwl_trans *trans, u16 ra_tid,
         tbl_dw_addr = trans_pcie->scd_base_addr +
                         SCD_TRANS_TBL_OFFSET_QUEUE(txq_id);
 
-        tbl_dw = iwl_read_targ_mem(trans, tbl_dw_addr);
+        tbl_dw = iwl_trans_read_mem32(trans, tbl_dw_addr);
 
         if (txq_id & 0x1)
                 tbl_dw = (scd_q2ratid << 16) | (tbl_dw & 0x0000FFFF);
         else
                 tbl_dw = scd_q2ratid | (tbl_dw & 0xFFFF0000);
 
-        iwl_write_targ_mem(trans, tbl_dw_addr, tbl_dw);
+        iwl_trans_write_mem32(trans, tbl_dw_addr, tbl_dw);
 
         return 0;
 }
@@ -1068,9 +1089,9 @@ void iwl_trans_pcie_txq_enable(struct iwl_trans *trans, int txq_id, int fifo,
         iwl_write_prph(trans, SCD_QUEUE_RDPTR(txq_id), ssn);
 
         /* Set up Tx window size and frame limit for this queue */
-        iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +
+        iwl_trans_write_mem32(trans, trans_pcie->scd_base_addr +
                         SCD_CONTEXT_QUEUE_OFFSET(txq_id), 0);
-        iwl_write_targ_mem(trans, trans_pcie->scd_base_addr +
+        iwl_trans_write_mem32(trans, trans_pcie->scd_base_addr +
                         SCD_CONTEXT_QUEUE_OFFSET(txq_id) + sizeof(u32),
                         ((frame_limit << SCD_QUEUE_CTX_REG2_WIN_SIZE_POS) &
                                 SCD_QUEUE_CTX_REG2_WIN_SIZE_MSK) |
@@ -1101,8 +1122,8 @@ void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id)
 
         iwl_pcie_txq_set_inactive(trans, txq_id);
 
-        _iwl_write_targ_mem_dwords(trans, stts_addr,
-                                   zero_val, ARRAY_SIZE(zero_val));
+        iwl_trans_write_mem(trans, stts_addr, (void *)zero_val,
+                            ARRAY_SIZE(zero_val));
 
         iwl_pcie_txq_unmap(trans, txq_id);
 
@@ -1642,10 +1663,6 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
         tx_cmd->dram_lsb_ptr = cpu_to_le32(scratch_phys);
         tx_cmd->dram_msb_ptr = iwl_get_dma_hi_addr(scratch_phys);
 
-        IWL_DEBUG_TX(trans, "sequence nr = 0X%x\n",
-                     le16_to_cpu(dev_cmd->hdr.sequence));
-        IWL_DEBUG_TX(trans, "tx_flags = 0X%x\n", le32_to_cpu(tx_cmd->tx_flags));
-
         /* Set up entry for this TFD in Tx byte-count array */
         iwl_pcie_txq_update_byte_cnt_tbl(trans, txq, le16_to_cpu(tx_cmd->len));
 
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index ec6d5d6b452e..230f8ebbe289 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -2132,6 +2132,21 @@ static void lbs_cfg_set_regulatory_hint(struct lbs_private *priv)
         lbs_deb_leave(LBS_DEB_CFG80211);
 }
 
+static void lbs_reg_notifier(struct wiphy *wiphy,
+                             struct regulatory_request *request)
+{
+        struct lbs_private *priv = wiphy_priv(wiphy);
+
+        lbs_deb_enter_args(LBS_DEB_CFG80211, "cfg80211 regulatory domain "
+                        "callback for domain %c%c\n", request->alpha2[0],
+                        request->alpha2[1]);
+
+        memcpy(priv->country_code, request->alpha2, sizeof(request->alpha2));
+        if (lbs_iface_active(priv))
+                lbs_set_11d_domain_info(priv);
+
+        lbs_deb_leave(LBS_DEB_CFG80211);
+}
 
 /*
  * This function get's called after lbs_setup_firmware() determined the
@@ -2184,24 +2199,6 @@ int lbs_cfg_register(struct lbs_private *priv)
         return ret;
 }
 
-int lbs_reg_notifier(struct wiphy *wiphy,
-                struct regulatory_request *request)
-{
-        struct lbs_private *priv = wiphy_priv(wiphy);
-        int ret = 0;
-
-        lbs_deb_enter_args(LBS_DEB_CFG80211, "cfg80211 regulatory domain "
-                        "callback for domain %c%c\n", request->alpha2[0],
-                        request->alpha2[1]);
-
-        memcpy(priv->country_code, request->alpha2, sizeof(request->alpha2));
-        if (lbs_iface_active(priv))
-                ret = lbs_set_11d_domain_info(priv);
-
-        lbs_deb_leave(LBS_DEB_CFG80211);
-        return ret;
-}
-
 void lbs_scan_deinit(struct lbs_private *priv)
 {
         lbs_deb_enter(LBS_DEB_CFG80211);
diff --git a/drivers/net/wireless/libertas/cfg.h b/drivers/net/wireless/libertas/cfg.h
index 558168ce634d..10995f59fe34 100644
--- a/drivers/net/wireless/libertas/cfg.h
+++ b/drivers/net/wireless/libertas/cfg.h
@@ -10,9 +10,6 @@ struct wireless_dev *lbs_cfg_alloc(struct device *dev);
 int lbs_cfg_register(struct lbs_private *priv);
 void lbs_cfg_free(struct lbs_private *priv);
 
-int lbs_reg_notifier(struct wiphy *wiphy,
-                struct regulatory_request *request);
-
 void lbs_send_disconnect_notification(struct lbs_private *priv);
 void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event);
 
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index ff9085502bea..b73e497fe770 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -48,6 +48,10 @@ static int channels = 1;
 module_param(channels, int, 0444);
 MODULE_PARM_DESC(channels, "Number of concurrent channels");
 
+static bool paged_rx = false;
+module_param(paged_rx, bool, 0644);
+MODULE_PARM_DESC(paged_rx, "Use paged SKBs for RX instead of linear ones");
+
 /**
  * enum hwsim_regtest - the type of regulatory tests we offer
  *
@@ -333,11 +337,11 @@ struct mac80211_hwsim_data {
         int scan_chan_idx;
 
         struct ieee80211_channel *channel;
-        unsigned long beacon_int; /* in jiffies unit */
+        u64 beacon_int  /* beacon interval in us */;
         unsigned int rx_filter;
         bool started, idle, scanning;
         struct mutex mutex;
-        struct timer_list beacon_timer;
+        struct tasklet_hrtimer beacon_timer;
         enum ps_mode {
                 PS_DISABLED, PS_ENABLED, PS_AUTO_POLL, PS_MANUAL_POLL
         } ps;
@@ -357,7 +361,10 @@ struct mac80211_hwsim_data {
         int power_level;
 
         /* difference between this hw's clock and the real clock, in usecs */
-        u64 tsf_offset;
+        s64 tsf_offset;
+        s64 bcn_delta;
+        /* absolute beacon transmission time. Used to cover up "tx" delay. */
+        u64 abs_bcn_ts;
 };
 
 
@@ -405,15 +412,19 @@ static netdev_tx_t hwsim_mon_xmit(struct sk_buff *skb,
         return NETDEV_TX_OK;
 }
 
+static inline u64 mac80211_hwsim_get_tsf_raw(void)
+{
+        return ktime_to_us(ktime_get_real());
+}
+
 static __le64 __mac80211_hwsim_get_tsf(struct mac80211_hwsim_data *data)
 {
-        struct timeval tv = ktime_to_timeval(ktime_get_real());
-        u64 now = tv.tv_sec * USEC_PER_SEC + tv.tv_usec;
+        u64 now = mac80211_hwsim_get_tsf_raw();
         return cpu_to_le64(now + data->tsf_offset);
 }
 
 static u64 mac80211_hwsim_get_tsf(struct ieee80211_hw *hw,
-                struct ieee80211_vif *vif)
+                                  struct ieee80211_vif *vif)
 {
         struct mac80211_hwsim_data *data = hw->priv;
         return le64_to_cpu(__mac80211_hwsim_get_tsf(data));
@@ -423,9 +434,13 @@ static void mac80211_hwsim_set_tsf(struct ieee80211_hw *hw,
                 struct ieee80211_vif *vif, u64 tsf)
 {
         struct mac80211_hwsim_data *data = hw->priv;
-        struct timeval tv = ktime_to_timeval(ktime_get_real());
-        u64 now = tv.tv_sec * USEC_PER_SEC + tv.tv_usec;
-        data->tsf_offset = tsf - now;
+        u64 now = mac80211_hwsim_get_tsf(hw, vif);
+        u32 bcn_int = data->beacon_int;
+        s64 delta = tsf - now;
+
+        data->tsf_offset += delta;
+        /* adjust after beaconing with new timestamp at old TBTT */
+        data->bcn_delta = do_div(delta, bcn_int);
 }
 
 static void mac80211_hwsim_monitor_rx(struct ieee80211_hw *hw,
@@ -696,7 +711,7 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw,
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         struct ieee80211_rx_status rx_status;
-        struct ieee80211_rate *txrate = ieee80211_get_tx_rate(hw, info);
+        u64 now;
 
         memset(&rx_status, 0, sizeof(rx_status));
         rx_status.flag |= RX_FLAG_MACTIME_START;
@@ -722,11 +737,23 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw,
         secpath_reset(skb);
         nf_reset(skb);
 
+        /*
+         * Get absolute mactime here so all HWs RX at the "same time", and
+         * absolute TX time for beacon mactime so the timestamp matches.
+         * Giving beacons a different mactime than non-beacons looks messy, but
+         * it helps the Toffset be exact and a ~10us mactime discrepancy
+         * probably doesn't really matter.
+         */
+        if (ieee80211_is_beacon(hdr->frame_control) ||
+            ieee80211_is_probe_resp(hdr->frame_control))
+                now = data->abs_bcn_ts;
+        else
+                now = mac80211_hwsim_get_tsf_raw();
+
         /* Copy skb to all enabled radios that are on the current frequency */
         spin_lock(&hwsim_radio_lock);
         list_for_each_entry(data2, &hwsim_radios, list) {
                 struct sk_buff *nskb;
-                struct ieee80211_mgmt *mgmt;
                 struct tx_iter_data tx_iter_data = {
                         .receive = false,
                         .channel = chan,
@@ -755,24 +782,30 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw,
                  * reserve some space for our vendor and the normal
                  * radiotap header, since we're copying anyway
                  */
-                nskb = skb_copy_expand(skb, 64, 0, GFP_ATOMIC);
-                if (nskb == NULL)
-                        continue;
+                if (skb->len < PAGE_SIZE && paged_rx) {
+                        struct page *page = alloc_page(GFP_ATOMIC);
+
+                        if (!page)
+                                continue;
+
+                        nskb = dev_alloc_skb(128);
+                        if (!nskb) {
+                                __free_page(page);
+                                continue;
+                        }
+
+                        memcpy(page_address(page), skb->data, skb->len);
+                        skb_add_rx_frag(nskb, 0, page, 0, skb->len, skb->len);
+                } else {
+                        nskb = skb_copy(skb, GFP_ATOMIC);
+                        if (!nskb)
+                                continue;
+                }
 
                 if (mac80211_hwsim_addr_match(data2, hdr->addr1))
                         ack = true;
 
-                /* set bcn timestamp relative to receiver mactime */
-                rx_status.mactime =
-                                le64_to_cpu(__mac80211_hwsim_get_tsf(data2));
-                mgmt = (struct ieee80211_mgmt *) nskb->data;
-                if (ieee80211_is_beacon(mgmt->frame_control) ||
-                    ieee80211_is_probe_resp(mgmt->frame_control))
-                        mgmt->u.beacon.timestamp = cpu_to_le64(
-                                rx_status.mactime +
-                                (data->tsf_offset - data2->tsf_offset) +
-                                24 * 8 * 10 / txrate->bitrate);
-
+                rx_status.mactime = now + data2->tsf_offset;
 #if 0
                 /*
                  * Don't enable this code by default as the OUI 00:00:00
@@ -896,7 +929,7 @@ static void mac80211_hwsim_stop(struct ieee80211_hw *hw)
 {
         struct mac80211_hwsim_data *data = hw->priv;
         data->started = false;
-        del_timer(&data->beacon_timer);
+        tasklet_hrtimer_cancel(&data->beacon_timer);
         wiphy_debug(hw->wiphy, "%s\n", __func__);
 }
 
@@ -962,7 +995,11 @@ static void mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,
 static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac,
                                      struct ieee80211_vif *vif)
 {
-        struct ieee80211_hw *hw = arg;
+        struct mac80211_hwsim_data *data = arg;
+        struct ieee80211_hw *hw = data->hw;
+        struct ieee80211_tx_info *info;
+        struct ieee80211_rate *txrate;
+        struct ieee80211_mgmt *mgmt;
         struct sk_buff *skb;
 
         hwsim_check_magic(vif);
@@ -975,26 +1012,48 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac,
         skb = ieee80211_beacon_get(hw, vif);
         if (skb == NULL)
                 return;
+        info = IEEE80211_SKB_CB(skb);
+        txrate = ieee80211_get_tx_rate(hw, info);
+
+        mgmt = (struct ieee80211_mgmt *) skb->data;
+        /* fake header transmission time */
+        data->abs_bcn_ts = mac80211_hwsim_get_tsf_raw();
+        mgmt->u.beacon.timestamp = cpu_to_le64(data->abs_bcn_ts +
+                                               data->tsf_offset +
+                                               24 * 8 * 10 / txrate->bitrate);
 
         mac80211_hwsim_tx_frame(hw, skb,
                                 rcu_dereference(vif->chanctx_conf)->def.chan);
 }
 
-
-static void mac80211_hwsim_beacon(unsigned long arg)
+static enum hrtimer_restart
+mac80211_hwsim_beacon(struct hrtimer *timer)
 {
-        struct ieee80211_hw *hw = (struct ieee80211_hw *) arg;
-        struct mac80211_hwsim_data *data = hw->priv;
+        struct mac80211_hwsim_data *data =
+                container_of(timer, struct mac80211_hwsim_data,
+                             beacon_timer.timer);
+        struct ieee80211_hw *hw = data->hw;
+        u64 bcn_int = data->beacon_int;
+        ktime_t next_bcn;
 
         if (!data->started)
-                return;
+                goto out;
 
         ieee80211_iterate_active_interfaces_atomic(
                 hw, IEEE80211_IFACE_ITER_NORMAL,
-                mac80211_hwsim_beacon_tx, hw);
+                mac80211_hwsim_beacon_tx, data);
+
+        /* beacon at new TBTT + beacon interval */
+        if (data->bcn_delta) {
+                bcn_int -= data->bcn_delta;
+                data->bcn_delta = 0;
+        }
 
-        data->beacon_timer.expires = jiffies + data->beacon_int;
-        add_timer(&data->beacon_timer);
+        next_bcn = ktime_add(hrtimer_get_expires(timer),
+                             ns_to_ktime(bcn_int * 1000));
+        tasklet_hrtimer_start(&data->beacon_timer, next_bcn, HRTIMER_MODE_ABS);
+out:
+        return HRTIMER_NORESTART;
 }
 
 static const char *hwsim_chantypes[] = {
@@ -1032,9 +1091,16 @@ static int mac80211_hwsim_config(struct ieee80211_hw *hw, u32 changed)
 
         data->power_level = conf->power_level;
         if (!data->started || !data->beacon_int)
-                del_timer(&data->beacon_timer);
-        else
-                mod_timer(&data->beacon_timer, jiffies + data->beacon_int);
+                tasklet_hrtimer_cancel(&data->beacon_timer);
+        else if (!hrtimer_is_queued(&data->beacon_timer.timer)) {
+                u64 tsf = mac80211_hwsim_get_tsf(hw, NULL);
+                u32 bcn_int = data->beacon_int;
+                u64 until_tbtt = bcn_int - do_div(tsf, bcn_int);
+
+                tasklet_hrtimer_start(&data->beacon_timer,
+                                      ns_to_ktime(until_tbtt * 1000),
+                                      HRTIMER_MODE_REL);
+        }
 
         return 0;
 }
@@ -1084,12 +1150,26 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,
 
         if (changed & BSS_CHANGED_BEACON_INT) {
                 wiphy_debug(hw->wiphy, "  BCNINT: %d\n", info->beacon_int);
-                data->beacon_int = 1024 * info->beacon_int / 1000 * HZ / 1000;
-                if (WARN_ON(!data->beacon_int))
-                        data->beacon_int = 1;
-                if (data->started)
-                        mod_timer(&data->beacon_timer,
-                                  jiffies + data->beacon_int);
+                data->beacon_int = info->beacon_int * 1024;
+        }
+
+        if (changed & BSS_CHANGED_BEACON_ENABLED) {
+                wiphy_debug(hw->wiphy, "  BCN EN: %d\n", info->enable_beacon);
+                if (data->started &&
+                    !hrtimer_is_queued(&data->beacon_timer.timer) &&
+                    info->enable_beacon) {
+                        u64 tsf, until_tbtt;
+                        u32 bcn_int;
+                        if (WARN_ON(!data->beacon_int))
+                                data->beacon_int = 1000 * 1024;
+                        tsf = mac80211_hwsim_get_tsf(hw, vif);
+                        bcn_int = data->beacon_int;
+                        until_tbtt = bcn_int - do_div(tsf, bcn_int);
+                        tasklet_hrtimer_start(&data->beacon_timer,
+                                              ns_to_ktime(until_tbtt * 1000),
+                                              HRTIMER_MODE_REL);
+                } else if (!info->enable_beacon)
+                        tasklet_hrtimer_cancel(&data->beacon_timer);
         }
 
         if (changed & BSS_CHANGED_ERP_CTS_PROT) {
@@ -1292,7 +1372,9 @@ static int mac80211_hwsim_ampdu_action(struct ieee80211_hw *hw,
         case IEEE80211_AMPDU_TX_START:
                 ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
                 break;
-        case IEEE80211_AMPDU_TX_STOP:
+        case IEEE80211_AMPDU_TX_STOP_CONT:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
                 ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
                 break;
         case IEEE80211_AMPDU_TX_OPERATIONAL:
@@ -2370,8 +2452,9 @@ static int __init init_mac80211_hwsim(void)
                                                         data->debugfs, data,
                                                         &hwsim_fops_group);
 
-                setup_timer(&data->beacon_timer, mac80211_hwsim_beacon,
-                            (unsigned long) hw);
+                tasklet_hrtimer_init(&data->beacon_timer,
+                                     mac80211_hwsim_beacon,
+                                     CLOCK_REALTIME, HRTIMER_MODE_ABS);
 
                 list_add_tail(&data->list, &hwsim_radios);
         }
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c
index 245a371f1a43..9cd6216c61e6 100644
--- a/drivers/net/wireless/mwifiex/11n.c
+++ b/drivers/net/wireless/mwifiex/11n.c
@@ -53,7 +53,9 @@ mwifiex_fill_cap_info(struct mwifiex_private *priv, u8 radio_type,
                sizeof(sband->ht_cap.mcs));
 
         if (priv->bss_mode == NL80211_IFTYPE_STATION ||
-            sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
+            (sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 &&
+             (priv->adapter->sec_chan_offset !=
+                                        IEEE80211_HT_PARAM_CHA_SEC_NONE)))
                 /* Set MCS32 for infra mode or ad-hoc mode with 40MHz support */
                 SETHT_MCS32(ht_cap->ht_cap.mcs.rx_mask);
 
diff --git a/drivers/net/wireless/mwifiex/11n_aggr.c b/drivers/net/wireless/mwifiex/11n_aggr.c
index 68d52cfc1ebd..af8fe6352eed 100644
--- a/drivers/net/wireless/mwifiex/11n_aggr.c
+++ b/drivers/net/wireless/mwifiex/11n_aggr.c
@@ -278,14 +278,16 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
                 dev_dbg(adapter->dev, "data: -EBUSY is returned\n");
                 break;
         case -1:
-                adapter->data_sent = false;
+                if (adapter->iface_type != MWIFIEX_PCIE)
+                        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, 1, ret);
                 return 0;
         case -EINPROGRESS:
-                adapter->data_sent = false;
+                if (adapter->iface_type != MWIFIEX_PCIE)
+                        adapter->data_sent = false;
                 break;
         case 0:
                 mwifiex_write_data_complete(adapter, skb_aggr, 1, ret);
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index ad3baa7e7982..ab92e799cf75 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -519,8 +519,8 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy)
  *      - Set by user
  *      - Set bt Country IE
  */
-static int mwifiex_reg_notifier(struct wiphy *wiphy,
-                                struct regulatory_request *request)
+static void mwifiex_reg_notifier(struct wiphy *wiphy,
+                                 struct regulatory_request *request)
 {
         struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);
 
@@ -540,8 +540,6 @@ static int mwifiex_reg_notifier(struct wiphy *wiphy,
                 break;
         }
         mwifiex_send_domain_info_cmd_fw(wiphy);
-
-        return 0;
 }
 
 /*
@@ -1327,6 +1325,7 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
         }
 
         mwifiex_set_ht_params(priv, bss_cfg, params);
+        mwifiex_set_wmm_params(priv, bss_cfg, params);
 
         if (params->inactivity_timeout > 0) {
                 /* sta_ao_timer/ps_sta_ao_timer is in unit of 100ms */
@@ -1459,7 +1458,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
         struct cfg80211_ssid req_ssid;
         int ret, auth_type = 0;
         struct cfg80211_bss *bss = NULL;
-        u8 is_scanning_required = 0, config_bands = 0;
+        u8 is_scanning_required = 0;
 
         memset(&req_ssid, 0, sizeof(struct cfg80211_ssid));
 
@@ -1478,19 +1477,6 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
         /* disconnect before try to associate */
         mwifiex_deauthenticate(priv, NULL);
 
-        if (channel) {
-                if (mode == NL80211_IFTYPE_STATION) {
-                        if (channel->band == IEEE80211_BAND_2GHZ)
-                                config_bands = BAND_B | BAND_G | BAND_GN;
-                        else
-                                config_bands = BAND_A | BAND_AN;
-
-                        if (!((config_bands | priv->adapter->fw_bands) &
-                              ~priv->adapter->fw_bands))
-                                priv->adapter->config_bands = config_bands;
-                }
-        }
-
         /* As this is new association, clear locally stored
          * keys and security related flags */
         priv->sec_info.wpa_enabled = false;
@@ -1707,7 +1693,7 @@ static int mwifiex_set_ibss_params(struct mwifiex_private *priv,
 
                 if (cfg80211_get_chandef_type(&params->chandef) !=
                                                 NL80211_CHAN_NO_HT)
-                        config_bands |= BAND_GN;
+                        config_bands |= BAND_G | BAND_GN;
         } else {
                 if (cfg80211_get_chandef_type(&params->chandef) ==
                                                 NL80211_CHAN_NO_HT)
@@ -2260,6 +2246,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
         wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
         wiphy->flags |= WIPHY_FLAG_HAVE_AP_SME |
                         WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD |
+                        WIPHY_FLAG_AP_UAPSD |
                         WIPHY_FLAG_CUSTOM_REGULATORY |
                         WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
 
diff --git a/drivers/net/wireless/mwifiex/decl.h b/drivers/net/wireless/mwifiex/decl.h
index e9357d87d327..e8a569aaa2e8 100644
--- a/drivers/net/wireless/mwifiex/decl.h
+++ b/drivers/net/wireless/mwifiex/decl.h
@@ -26,6 +26,7 @@
 #include <linux/wait.h>
 #include <linux/timer.h>
 #include <linux/ieee80211.h>
+#include <net/mac80211.h>
 
 
 #define MWIFIEX_MAX_BSS_NUM         (3)
@@ -58,6 +59,8 @@
 #define MWIFIEX_RTS_MAX_VALUE              (2347)
 #define MWIFIEX_FRAG_MIN_VALUE             (256)
 #define MWIFIEX_FRAG_MAX_VALUE             (2346)
+#define MWIFIEX_WMM_VERSION                0x01
+#define MWIFIEX_WMM_SUBTYPE                0x01
 
 #define MWIFIEX_RETRY_LIMIT                14
 #define MWIFIEX_SDIO_BLOCK_SIZE            256
@@ -126,4 +129,19 @@ enum mwifiex_wmm_ac_e {
         WMM_AC_VI,
         WMM_AC_VO
 } __packed;
+
+struct ieee_types_wmm_ac_parameters {
+        u8 aci_aifsn_bitmap;
+        u8 ecw_bitmap;
+        __le16 tx_op_limit;
+} __packed;
+
+struct mwifiex_types_wmm_info {
+        u8 oui[4];
+        u8 subtype;
+        u8 version;
+        u8 qos_info;
+        u8 reserved;
+        struct ieee_types_wmm_ac_parameters ac_params[IEEE80211_NUM_ACS];
+} __packed;
 #endif /* !_MWIFIEX_DECL_H_ */
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index 4dc8e2e9a889..ebe2f6a7984c 100644
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -330,6 +330,9 @@ enum P2P_MODES {
 #define HOST_SLEEP_CFG_GPIO_DEF         0xff
 #define HOST_SLEEP_CFG_GAP_DEF          0
 
+#define MWIFIEX_TIMEOUT_FOR_AP_RESP             0xfffc
+#define MWIFIEX_STATUS_CODE_AUTH_TIMEOUT        2
+
 #define CMD_F_HOSTCMD           (1 << 0)
 #define CMD_F_CANCELED          (1 << 1)
 
@@ -1131,12 +1134,6 @@ struct ieee_types_vendor_header {
         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:
@@ -1186,6 +1183,11 @@ struct mwifiex_ie_types_htcap {
         struct ieee80211_ht_cap ht_cap;
 } __packed;
 
+struct mwifiex_ie_types_wmmcap {
+        struct mwifiex_ie_types_header header;
+        struct mwifiex_types_wmm_info wmm_info;
+} __packed;
+
 struct mwifiex_ie_types_htinfo {
         struct mwifiex_ie_types_header header;
         struct ieee80211_ht_operation ht_oper;
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 39f03ce5a5b1..e00b8060aff7 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -591,6 +591,12 @@ int mwifiex_init_fw(struct mwifiex_adapter *adapter)
                                 return -1;
                 }
         }
+
+        if (adapter->if_ops.init_fw_port) {
+                if (adapter->if_ops.init_fw_port(adapter))
+                        return -1;
+        }
+
         for (i = 0; i < adapter->priv_num; i++) {
                 if (adapter->priv[i]) {
                         ret = mwifiex_sta_init_cmd(adapter->priv[i], first_sta);
diff --git a/drivers/net/wireless/mwifiex/ioctl.h b/drivers/net/wireless/mwifiex/ioctl.h
index 4e31c6013ebe..6095b3e53f4e 100644
--- a/drivers/net/wireless/mwifiex/ioctl.h
+++ b/drivers/net/wireless/mwifiex/ioctl.h
@@ -20,7 +20,6 @@
 #ifndef _MWIFIEX_IOCTL_H_
 #define _MWIFIEX_IOCTL_H_
 
-#include <net/mac80211.h>
 #include <net/lib80211.h>
 
 enum {
@@ -107,6 +106,8 @@ struct mwifiex_uap_bss_param {
         u8 rates[MWIFIEX_SUPPORTED_RATES];
         u32 sta_ao_timer;
         u32 ps_sta_ao_timer;
+        u8 qos_info;
+        struct mwifiex_types_wmm_info wmm_info;
 };
 
 enum {
diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/mwifiex/join.c
index 88664ae667ba..893d809ba83c 100644
--- a/drivers/net/wireless/mwifiex/join.c
+++ b/drivers/net/wireless/mwifiex/join.c
@@ -615,23 +615,33 @@ int mwifiex_ret_802_11_associate(struct mwifiex_private *priv,
         struct ieee_types_assoc_rsp *assoc_rsp;
         struct mwifiex_bssdescriptor *bss_desc;
         u8 enable_data = true;
+        u16 cap_info, status_code;
 
         assoc_rsp = (struct ieee_types_assoc_rsp *) &resp->params;
 
+        cap_info = le16_to_cpu(assoc_rsp->cap_info_bitmap);
+        status_code = le16_to_cpu(assoc_rsp->status_code);
+
         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)) {
+        if (status_code) {
                 priv->adapter->dbg.num_cmd_assoc_failure++;
                 dev_err(priv->adapter->dev,
                         "ASSOC_RESP: failed, status code=%d err=%#x a_id=%#x\n",
-                        le16_to_cpu(assoc_rsp->status_code),
-                        le16_to_cpu(assoc_rsp->cap_info_bitmap),
-                        le16_to_cpu(assoc_rsp->a_id));
+                        status_code, cap_info, le16_to_cpu(assoc_rsp->a_id));
+
+                if (cap_info == MWIFIEX_TIMEOUT_FOR_AP_RESP) {
+                        if (status_code == MWIFIEX_STATUS_CODE_AUTH_TIMEOUT)
+                                ret = WLAN_STATUS_AUTH_TIMEOUT;
+                        else
+                                ret = WLAN_STATUS_UNSPECIFIED_FAILURE;
+                } else {
+                        ret = status_code;
+                }
 
-                ret = le16_to_cpu(assoc_rsp->status_code);
                 goto done;
         }
 
@@ -969,6 +979,16 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
                                         priv->adapter->config_bands);
                 mwifiex_fill_cap_info(priv, radio_type, ht_cap);
 
+                if (adapter->sec_chan_offset ==
+                                        IEEE80211_HT_PARAM_CHA_SEC_NONE) {
+                        u16 tmp_ht_cap;
+
+                        tmp_ht_cap = le16_to_cpu(ht_cap->ht_cap.cap_info);
+                        tmp_ht_cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+                        tmp_ht_cap &= ~IEEE80211_HT_CAP_SGI_40;
+                        ht_cap->ht_cap.cap_info = cpu_to_le16(tmp_ht_cap);
+                }
+
                 pos += sizeof(struct mwifiex_ie_types_htcap);
                 cmd_append_size += sizeof(struct mwifiex_ie_types_htcap);
 
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 1b3cfc821940..51044e3ea89b 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -599,8 +599,10 @@ struct mwifiex_if_ops {
         int (*cmdrsp_complete) (struct mwifiex_adapter *, struct sk_buff *);
         int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *);
         int (*data_complete) (struct mwifiex_adapter *, struct sk_buff *);
+        int (*init_fw_port) (struct mwifiex_adapter *);
         int (*dnld_fw) (struct mwifiex_adapter *, struct mwifiex_fw_image *);
         void (*card_reset) (struct mwifiex_adapter *);
+        int (*clean_pcie_ring) (struct mwifiex_adapter *adapter);
 };
 
 struct mwifiex_adapter {
@@ -890,6 +892,10 @@ void mwifiex_set_ht_params(struct mwifiex_private *priv,
                            struct cfg80211_ap_settings *params);
 void mwifiex_set_uap_rates(struct mwifiex_uap_bss_param *bss_cfg,
                            struct cfg80211_ap_settings *params);
+void
+mwifiex_set_wmm_params(struct mwifiex_private *priv,
+                       struct mwifiex_uap_bss_param *bss_cfg,
+                       struct cfg80211_ap_settings *params);
 
 /*
  * This function checks if the queuing is RA based or not.
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index 13fbc4eb1595..237949c070cc 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -39,17 +39,20 @@ static struct semaphore add_remove_card_sem;
 static int mwifiex_pcie_enable_host_int(struct mwifiex_adapter *adapter);
 static int mwifiex_pcie_resume(struct pci_dev *pdev);
 
-/*
- * This function is called after skb allocation to update
- * "skb->cb" with physical address of data pointer.
- */
-static phys_addr_t *mwifiex_update_sk_buff_pa(struct sk_buff *skb)
+static int
+mwifiex_map_pci_memory(struct mwifiex_adapter *adapter, struct sk_buff *skb,
+                       int size, int flags)
 {
-        phys_addr_t *buf_pa = MWIFIEX_SKB_PACB(skb);
-
-        *buf_pa = (phys_addr_t)virt_to_phys(skb->data);
+        struct pcie_service_card *card = adapter->card;
+        dma_addr_t buf_pa;
 
-        return buf_pa;
+        buf_pa = pci_map_single(card->dev, skb->data, size, flags);
+        if (pci_dma_mapping_error(card->dev, buf_pa)) {
+                dev_err(adapter->dev, "failed to map pci memory!\n");
+                return -1;
+        }
+        memcpy(skb->cb, &buf_pa, sizeof(dma_addr_t));
+        return 0;
 }
 
 /*
@@ -60,8 +63,8 @@ static bool mwifiex_pcie_ok_to_access_hw(struct mwifiex_adapter *adapter)
         u32 *cookie_addr;
         struct pcie_service_card *card = adapter->card;
 
-        if (card->sleep_cookie) {
-                cookie_addr = (u32 *)card->sleep_cookie->data;
+        if (card->sleep_cookie_vbase) {
+                cookie_addr = (u32 *)card->sleep_cookie_vbase;
                 dev_dbg(adapter->dev, "info: ACCESS_HW: sleep cookie=0x%x\n",
                         *cookie_addr);
                 if (*cookie_addr == FW_AWAKE_COOKIE)
@@ -161,7 +164,7 @@ static int mwifiex_pcie_suspend(struct pci_dev *pdev, pm_message_t state)
 
         if (pdev) {
                 card = (struct pcie_service_card *) pci_get_drvdata(pdev);
-                if (!card || card->adapter) {
+                if (!card || !card->adapter) {
                         pr_err("Card or adapter structure is not valid\n");
                         return 0;
                 }
@@ -366,9 +369,7 @@ static int mwifiex_pcie_enable_host_int(struct mwifiex_adapter *adapter)
 static int mwifiex_pcie_create_txbd_ring(struct mwifiex_adapter *adapter)
 {
         struct pcie_service_card *card = adapter->card;
-        struct sk_buff *skb;
         int i;
-        phys_addr_t *buf_pa;
 
         /*
          * driver maintaines the write pointer and firmware maintaines the read
@@ -384,16 +385,18 @@ static int mwifiex_pcie_create_txbd_ring(struct mwifiex_adapter *adapter)
                                                         MWIFIEX_MAX_TXRX_BD;
         dev_dbg(adapter->dev, "info: txbd_ring: Allocating %d bytes\n",
                 card->txbd_ring_size);
-        card->txbd_ring_vbase = kzalloc(card->txbd_ring_size, GFP_KERNEL);
+        card->txbd_ring_vbase = pci_alloc_consistent(card->dev,
+                                                     card->txbd_ring_size,
+                                                     &card->txbd_ring_pbase);
         if (!card->txbd_ring_vbase) {
-                dev_err(adapter->dev, "Unable to alloc buffer for txbd ring\n");
+                dev_err(adapter->dev,
+                        "allocate consistent memory (%d bytes) failed!\n",
+                        card->txbd_ring_size);
                 return -ENOMEM;
         }
-        card->txbd_ring_pbase = virt_to_phys(card->txbd_ring_vbase);
-
         dev_dbg(adapter->dev,
                 "info: txbd_ring - base: %p, pbase: %#x:%x, len: %x\n",
-                card->txbd_ring_vbase, (u32)card->txbd_ring_pbase,
+                card->txbd_ring_vbase, (unsigned int)card->txbd_ring_pbase,
                 (u32)((u64)card->txbd_ring_pbase >> 32), card->txbd_ring_size);
 
         for (i = 0; i < MWIFIEX_MAX_TXRX_BD; i++) {
@@ -402,24 +405,9 @@ static int mwifiex_pcie_create_txbd_ring(struct mwifiex_adapter *adapter)
                                       (sizeof(struct mwifiex_pcie_buf_desc)
                                        * i));
 
-                /* Allocate buffer here so that firmware can DMA data from it */
-                skb = dev_alloc_skb(MWIFIEX_RX_DATA_BUF_SIZE);
-                if (!skb) {
-                        dev_err(adapter->dev, "Unable to allocate skb for TX ring.\n");
-                        kfree(card->txbd_ring_vbase);
-                        return -ENOMEM;
-                }
-                buf_pa = mwifiex_update_sk_buff_pa(skb);
-
-                skb_put(skb, MWIFIEX_RX_DATA_BUF_SIZE);
-                dev_dbg(adapter->dev, "info: TX ring: add new skb base: %p, "
-                        "buf_base: %p, buf_pbase: %#x:%x, buf_len: %#x\n",
-                        skb, skb->data, (u32)*buf_pa,
-                        (u32)(((u64)*buf_pa >> 32)), skb->len);
-
-                card->tx_buf_list[i] = skb;
-                card->txbd_ring[i]->paddr = *buf_pa;
-                card->txbd_ring[i]->len = (u16)skb->len;
+                card->tx_buf_list[i] = NULL;
+                card->txbd_ring[i]->paddr = 0;
+                card->txbd_ring[i]->len = 0;
                 card->txbd_ring[i]->flags = 0;
         }
 
@@ -429,11 +417,16 @@ static int mwifiex_pcie_create_txbd_ring(struct mwifiex_adapter *adapter)
 static int mwifiex_pcie_delete_txbd_ring(struct mwifiex_adapter *adapter)
 {
         struct pcie_service_card *card = adapter->card;
+        struct sk_buff *skb;
         int i;
 
         for (i = 0; i < MWIFIEX_MAX_TXRX_BD; i++) {
-                if (card->tx_buf_list[i])
-                        dev_kfree_skb_any(card->tx_buf_list[i]);
+                if (card->tx_buf_list[i]) {
+                        skb = card->tx_buf_list[i];
+                        pci_unmap_single(card->dev, card->txbd_ring[i]->paddr,
+                                         skb->len, PCI_DMA_TODEVICE);
+                        dev_kfree_skb_any(skb);
+                }
                 card->tx_buf_list[i] = NULL;
                 card->txbd_ring[i]->paddr = 0;
                 card->txbd_ring[i]->len = 0;
@@ -441,11 +434,15 @@ static int mwifiex_pcie_delete_txbd_ring(struct mwifiex_adapter *adapter)
                 card->txbd_ring[i] = NULL;
         }
 
-        kfree(card->txbd_ring_vbase);
+        if (card->txbd_ring_vbase)
+                pci_free_consistent(card->dev, card->txbd_ring_size,
+                                    card->txbd_ring_vbase,
+                                    card->txbd_ring_pbase);
         card->txbd_ring_size = 0;
         card->txbd_wrptr = 0;
         card->txbd_rdptr = 0 | MWIFIEX_BD_FLAG_ROLLOVER_IND;
         card->txbd_ring_vbase = NULL;
+        card->txbd_ring_pbase = 0;
 
         return 0;
 }
@@ -458,7 +455,7 @@ static int mwifiex_pcie_create_rxbd_ring(struct mwifiex_adapter *adapter)
         struct pcie_service_card *card = adapter->card;
         struct sk_buff *skb;
         int i;
-        phys_addr_t *buf_pa;
+        dma_addr_t buf_pa;
 
         /*
          * driver maintaines the read pointer and firmware maintaines the write
@@ -472,13 +469,15 @@ static int mwifiex_pcie_create_rxbd_ring(struct mwifiex_adapter *adapter)
                                                         MWIFIEX_MAX_TXRX_BD;
         dev_dbg(adapter->dev, "info: rxbd_ring: Allocating %d bytes\n",
                 card->rxbd_ring_size);
-        card->rxbd_ring_vbase = kzalloc(card->rxbd_ring_size, GFP_KERNEL);
+        card->rxbd_ring_vbase = pci_alloc_consistent(card->dev,
+                                                     card->rxbd_ring_size,
+                                                     &card->rxbd_ring_pbase);
         if (!card->rxbd_ring_vbase) {
-                dev_err(adapter->dev, "Unable to allocate buffer for "
-                                "rxbd_ring.\n");
+                dev_err(adapter->dev,
+                        "allocate consistent memory (%d bytes) failed!\n",
+                        card->rxbd_ring_size);
                 return -ENOMEM;
         }
-        card->rxbd_ring_pbase = virt_to_phys(card->rxbd_ring_vbase);
 
         dev_dbg(adapter->dev,
                 "info: rxbd_ring - base: %p, pbase: %#x:%x, len: %#x\n",
@@ -500,16 +499,20 @@ static int mwifiex_pcie_create_rxbd_ring(struct mwifiex_adapter *adapter)
                         kfree(card->rxbd_ring_vbase);
                         return -ENOMEM;
                 }
-                buf_pa = mwifiex_update_sk_buff_pa(skb);
-                skb_put(skb, MWIFIEX_RX_DATA_BUF_SIZE);
+                if (mwifiex_map_pci_memory(adapter, skb,
+                                           MWIFIEX_RX_DATA_BUF_SIZE,
+                                           PCI_DMA_FROMDEVICE))
+                        return -1;
+
+                MWIFIEX_SKB_PACB(skb, &buf_pa);
 
                 dev_dbg(adapter->dev, "info: RX ring: add new skb base: %p, "
                         "buf_base: %p, buf_pbase: %#x:%x, buf_len: %#x\n",
-                        skb, skb->data, (u32)*buf_pa, (u32)((u64)*buf_pa >> 32),
+                        skb, skb->data, (u32)buf_pa, (u32)((u64)buf_pa >> 32),
                         skb->len);
 
                 card->rx_buf_list[i] = skb;
-                card->rxbd_ring[i]->paddr = *buf_pa;
+                card->rxbd_ring[i]->paddr = buf_pa;
                 card->rxbd_ring[i]->len = (u16)skb->len;
                 card->rxbd_ring[i]->flags = 0;
         }
@@ -523,11 +526,17 @@ static int mwifiex_pcie_create_rxbd_ring(struct mwifiex_adapter *adapter)
 static int mwifiex_pcie_delete_rxbd_ring(struct mwifiex_adapter *adapter)
 {
         struct pcie_service_card *card = adapter->card;
+        struct sk_buff *skb;
         int i;
 
         for (i = 0; i < MWIFIEX_MAX_TXRX_BD; i++) {
-                if (card->rx_buf_list[i])
-                        dev_kfree_skb_any(card->rx_buf_list[i]);
+                if (card->rx_buf_list[i]) {
+                        skb = card->rx_buf_list[i];
+                        pci_unmap_single(card->dev, card->rxbd_ring[i]->paddr ,
+                                         MWIFIEX_RX_DATA_BUF_SIZE,
+                                         PCI_DMA_FROMDEVICE);
+                        dev_kfree_skb_any(skb);
+                }
                 card->rx_buf_list[i] = NULL;
                 card->rxbd_ring[i]->paddr = 0;
                 card->rxbd_ring[i]->len = 0;
@@ -535,11 +544,15 @@ static int mwifiex_pcie_delete_rxbd_ring(struct mwifiex_adapter *adapter)
                 card->rxbd_ring[i] = NULL;
         }
 
-        kfree(card->rxbd_ring_vbase);
+        if (card->rxbd_ring_vbase)
+                pci_free_consistent(card->dev, card->rxbd_ring_size,
+                                    card->rxbd_ring_vbase,
+                                    card->rxbd_ring_pbase);
         card->rxbd_ring_size = 0;
         card->rxbd_wrptr = 0;
         card->rxbd_rdptr = 0 | MWIFIEX_BD_FLAG_ROLLOVER_IND;
         card->rxbd_ring_vbase = NULL;
+        card->rxbd_ring_pbase = 0;
 
         return 0;
 }
@@ -552,7 +565,7 @@ static int mwifiex_pcie_create_evtbd_ring(struct mwifiex_adapter *adapter)
         struct pcie_service_card *card = adapter->card;
         struct sk_buff *skb;
         int i;
-        phys_addr_t *buf_pa;
+        dma_addr_t buf_pa;
 
         /*
          * driver maintaines the read pointer and firmware maintaines the write
@@ -566,13 +579,15 @@ static int mwifiex_pcie_create_evtbd_ring(struct mwifiex_adapter *adapter)
                                                         MWIFIEX_MAX_EVT_BD;
         dev_dbg(adapter->dev, "info: evtbd_ring: Allocating %d bytes\n",
                 card->evtbd_ring_size);
-        card->evtbd_ring_vbase = kzalloc(card->evtbd_ring_size, GFP_KERNEL);
+        card->evtbd_ring_vbase = pci_alloc_consistent(card->dev,
+                                                      card->evtbd_ring_size,
+                                                      &card->evtbd_ring_pbase);
         if (!card->evtbd_ring_vbase) {
                 dev_err(adapter->dev,
-                        "Unable to allocate buffer. Terminating download\n");
+                        "allocate consistent memory (%d bytes) failed!\n",
+                        card->evtbd_ring_size);
                 return -ENOMEM;
         }
-        card->evtbd_ring_pbase = virt_to_phys(card->evtbd_ring_vbase);
 
         dev_dbg(adapter->dev,
                 "info: CMDRSP/EVT bd_ring - base: %p pbase: %#x:%x len: %#x\n",
@@ -594,16 +609,20 @@ static int mwifiex_pcie_create_evtbd_ring(struct mwifiex_adapter *adapter)
                         kfree(card->evtbd_ring_vbase);
                         return -ENOMEM;
                 }
-                buf_pa = mwifiex_update_sk_buff_pa(skb);
                 skb_put(skb, MAX_EVENT_SIZE);
 
+                if (mwifiex_map_pci_memory(adapter, skb, MAX_EVENT_SIZE,
+                                           PCI_DMA_FROMDEVICE))
+                        return -1;
+
+                MWIFIEX_SKB_PACB(skb, &buf_pa);
                 dev_dbg(adapter->dev, "info: Evt ring: add new skb. base: %p, "
                         "buf_base: %p, buf_pbase: %#x:%x, buf_len: %#x\n",
-                        skb, skb->data, (u32)*buf_pa, (u32)((u64)*buf_pa >> 32),
+                        skb, skb->data, (u32)buf_pa, (u32)((u64)buf_pa >> 32),
                         skb->len);
 
                 card->evt_buf_list[i] = skb;
-                card->evtbd_ring[i]->paddr = *buf_pa;
+                card->evtbd_ring[i]->paddr = buf_pa;
                 card->evtbd_ring[i]->len = (u16)skb->len;
                 card->evtbd_ring[i]->flags = 0;
         }
@@ -617,11 +636,16 @@ static int mwifiex_pcie_create_evtbd_ring(struct mwifiex_adapter *adapter)
 static int mwifiex_pcie_delete_evtbd_ring(struct mwifiex_adapter *adapter)
 {
         struct pcie_service_card *card = adapter->card;
+        struct sk_buff *skb;
         int i;
 
         for (i = 0; i < MWIFIEX_MAX_EVT_BD; i++) {
-                if (card->evt_buf_list[i])
-                        dev_kfree_skb_any(card->evt_buf_list[i]);
+                if (card->evt_buf_list[i]) {
+                        skb = card->evt_buf_list[i];
+                        pci_unmap_single(card->dev, card->evtbd_ring[i]->paddr,
+                                         MAX_EVENT_SIZE, PCI_DMA_FROMDEVICE);
+                        dev_kfree_skb_any(skb);
+                }
                 card->evt_buf_list[i] = NULL;
                 card->evtbd_ring[i]->paddr = 0;
                 card->evtbd_ring[i]->len = 0;
@@ -629,11 +653,15 @@ static int mwifiex_pcie_delete_evtbd_ring(struct mwifiex_adapter *adapter)
                 card->evtbd_ring[i] = NULL;
         }
 
-        kfree(card->evtbd_ring_vbase);
+        if (card->evtbd_ring_vbase)
+                pci_free_consistent(card->dev, card->evtbd_ring_size,
+                                    card->evtbd_ring_vbase,
+                                    card->evtbd_ring_pbase);
         card->evtbd_wrptr = 0;
         card->evtbd_rdptr = 0 | MWIFIEX_BD_FLAG_ROLLOVER_IND;
         card->evtbd_ring_size = 0;
         card->evtbd_ring_vbase = NULL;
+        card->evtbd_ring_pbase = 0;
 
         return 0;
 }
@@ -653,21 +681,12 @@ static int mwifiex_pcie_alloc_cmdrsp_buf(struct mwifiex_adapter *adapter)
                         "Unable to allocate skb for command response data.\n");
                 return -ENOMEM;
         }
-        mwifiex_update_sk_buff_pa(skb);
         skb_put(skb, MWIFIEX_UPLD_SIZE);
-        card->cmdrsp_buf = skb;
+        if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE,
+                                   PCI_DMA_FROMDEVICE))
+                return -1;
 
-        skb = NULL;
-        /* Allocate memory for sending command to firmware */
-        skb = dev_alloc_skb(MWIFIEX_SIZE_OF_CMD_BUFFER);
-        if (!skb) {
-                dev_err(adapter->dev,
-                        "Unable to allocate skb for command data.\n");
-                return -ENOMEM;
-        }
-        mwifiex_update_sk_buff_pa(skb);
-        skb_put(skb, MWIFIEX_SIZE_OF_CMD_BUFFER);
-        card->cmd_buf = skb;
+        card->cmdrsp_buf = skb;
 
         return 0;
 }
@@ -678,18 +697,26 @@ static int mwifiex_pcie_alloc_cmdrsp_buf(struct mwifiex_adapter *adapter)
 static int mwifiex_pcie_delete_cmdrsp_buf(struct mwifiex_adapter *adapter)
 {
         struct pcie_service_card *card;
+        dma_addr_t buf_pa;
 
         if (!adapter)
                 return 0;
 
         card = adapter->card;
 
-        if (card && card->cmdrsp_buf)
+        if (card && card->cmdrsp_buf) {
+                MWIFIEX_SKB_PACB(card->cmdrsp_buf, &buf_pa);
+                pci_unmap_single(card->dev, buf_pa, MWIFIEX_UPLD_SIZE,
+                                 PCI_DMA_FROMDEVICE);
                 dev_kfree_skb_any(card->cmdrsp_buf);
+        }
 
-        if (card && card->cmd_buf)
+        if (card && card->cmd_buf) {
+                MWIFIEX_SKB_PACB(card->cmd_buf, &buf_pa);
+                pci_unmap_single(card->dev, buf_pa, MWIFIEX_SIZE_OF_CMD_BUFFER,
+                                 PCI_DMA_TODEVICE);
                 dev_kfree_skb_any(card->cmd_buf);
-
+        }
         return 0;
 }
 
@@ -698,27 +725,19 @@ static int mwifiex_pcie_delete_cmdrsp_buf(struct mwifiex_adapter *adapter)
  */
 static int mwifiex_pcie_alloc_sleep_cookie_buf(struct mwifiex_adapter *adapter)
 {
-        struct sk_buff *skb;
         struct pcie_service_card *card = adapter->card;
 
-        /* Allocate memory for sleep cookie */
-        skb = dev_alloc_skb(sizeof(u32));
-        if (!skb) {
-                dev_err(adapter->dev,
-                        "Unable to allocate skb for sleep cookie!\n");
+        card->sleep_cookie_vbase = pci_alloc_consistent(card->dev, sizeof(u32),
+                                                     &card->sleep_cookie_pbase);
+        if (!card->sleep_cookie_vbase) {
+                dev_err(adapter->dev, "pci_alloc_consistent failed!\n");
                 return -ENOMEM;
         }
-        mwifiex_update_sk_buff_pa(skb);
-        skb_put(skb, sizeof(u32));
-
         /* Init val of Sleep Cookie */
-        *(u32 *)skb->data = FW_AWAKE_COOKIE;
+        *(u32 *)card->sleep_cookie_vbase = FW_AWAKE_COOKIE;
 
         dev_dbg(adapter->dev, "alloc_scook: sleep cookie=0x%x\n",
-                *((u32 *)skb->data));
-
-        /* Save the sleep cookie */
-        card->sleep_cookie = skb;
+                *((u32 *)card->sleep_cookie_vbase));
 
         return 0;
 }
@@ -735,24 +754,57 @@ static int mwifiex_pcie_delete_sleep_cookie_buf(struct mwifiex_adapter *adapter)
 
         card = adapter->card;
 
-        if (card && card->sleep_cookie) {
-                dev_kfree_skb_any(card->sleep_cookie);
-                card->sleep_cookie = NULL;
+        if (card && card->sleep_cookie_vbase) {
+                pci_free_consistent(card->dev, sizeof(u32),
+                                    card->sleep_cookie_vbase,
+                                    card->sleep_cookie_pbase);
+                card->sleep_cookie_vbase = NULL;
         }
 
         return 0;
 }
 
+/* This function flushes the TX buffer descriptor ring
+ * This function defined as handler is also called while cleaning TXRX
+ * during disconnect/ bss stop.
+ */
+static int mwifiex_clean_pcie_ring_buf(struct mwifiex_adapter *adapter)
+{
+        struct pcie_service_card *card = adapter->card;
+        u32 rdptr;
+
+        /* Read the TX ring read pointer set by firmware */
+        if (mwifiex_read_reg(adapter, REG_TXBD_RDPTR, &rdptr)) {
+                dev_err(adapter->dev,
+                        "Flush TXBD: failed to read REG_TXBD_RDPTR\n");
+                return -1;
+        }
+
+        if (!mwifiex_pcie_txbd_empty(card, rdptr)) {
+                card->txbd_flush = 1;
+                /* write pointer already set at last send
+                 * send dnld-rdy intr again, wait for completion.
+                 */
+                if (mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT,
+                                      CPU_INTR_DNLD_RDY)) {
+                        dev_err(adapter->dev,
+                                "failed to assert dnld-rdy interrupt.\n");
+                        return -1;
+                }
+        }
+        return 0;
+}
+
 /*
- * This function sends data buffer to device
+ * This function unmaps and frees downloaded data buffer
  */
-static int
-mwifiex_pcie_send_data(struct mwifiex_adapter *adapter, struct sk_buff *skb)
+static int mwifiex_pcie_send_data_complete(struct mwifiex_adapter *adapter)
 {
+        const u32 num_tx_buffs = MWIFIEX_MAX_TXRX_BD;
+        struct sk_buff *skb;
+        dma_addr_t buf_pa;
+        u32 wrdoneidx, rdptr, unmap_count = 0;
         struct pcie_service_card *card = adapter->card;
-        u32 wrindx, rdptr;
-        phys_addr_t *buf_pa;
-        __le16 *tmp;
 
         if (!mwifiex_pcie_ok_to_access_hw(adapter))
                 mwifiex_pm_wakeup_card(adapter);
@@ -760,34 +812,112 @@ mwifiex_pcie_send_data(struct mwifiex_adapter *adapter, struct sk_buff *skb)
         /* Read the TX ring read pointer set by firmware */
         if (mwifiex_read_reg(adapter, REG_TXBD_RDPTR, &rdptr)) {
                 dev_err(adapter->dev,
-                        "SEND DATA: failed to read REG_TXBD_RDPTR\n");
+                        "SEND COMP: failed to read REG_TXBD_RDPTR\n");
                 return -1;
         }
 
-        wrindx = card->txbd_wrptr & MWIFIEX_TXBD_MASK;
+        dev_dbg(adapter->dev, "SEND COMP: rdptr_prev=0x%x, rdptr=0x%x\n",
+                card->txbd_rdptr, rdptr);
 
-        dev_dbg(adapter->dev, "info: SEND DATA: <Rd: %#x, Wr: %#x>\n", rdptr,
-                card->txbd_wrptr);
-        if (((card->txbd_wrptr & MWIFIEX_TXBD_MASK) !=
-                        (rdptr & MWIFIEX_TXBD_MASK)) ||
-            ((card->txbd_wrptr & MWIFIEX_BD_FLAG_ROLLOVER_IND) !=
-                        (rdptr & MWIFIEX_BD_FLAG_ROLLOVER_IND))) {
-                struct sk_buff *skb_data;
+        /* free from previous txbd_rdptr to current txbd_rdptr */
+        while (((card->txbd_rdptr & MWIFIEX_TXBD_MASK) !=
+                (rdptr & MWIFIEX_TXBD_MASK)) ||
+               ((card->txbd_rdptr & MWIFIEX_BD_FLAG_ROLLOVER_IND) !=
+                (rdptr & MWIFIEX_BD_FLAG_ROLLOVER_IND))) {
+                wrdoneidx = card->txbd_rdptr & MWIFIEX_TXBD_MASK;
+
+                skb = card->tx_buf_list[wrdoneidx];
+                if (skb) {
+                        dev_dbg(adapter->dev,
+                                "SEND COMP: Detach skb %p at txbd_rdidx=%d\n",
+                                skb, wrdoneidx);
+                        MWIFIEX_SKB_PACB(skb, &buf_pa);
+                        pci_unmap_single(card->dev, buf_pa, skb->len,
+                                         PCI_DMA_TODEVICE);
+
+                        unmap_count++;
+
+                        if (card->txbd_flush)
+                                mwifiex_write_data_complete(adapter, skb, 0,
+                                                            -1);
+                        else
+                                mwifiex_write_data_complete(adapter, skb, 0, 0);
+                }
+
+                card->tx_buf_list[wrdoneidx] = NULL;
+                card->txbd_ring[wrdoneidx]->paddr = 0;
+                card->rxbd_ring[wrdoneidx]->len = 0;
+                card->rxbd_ring[wrdoneidx]->flags = 0;
+                card->txbd_rdptr++;
+
+                if ((card->txbd_rdptr & MWIFIEX_TXBD_MASK) == num_tx_buffs)
+                        card->txbd_rdptr = ((card->txbd_rdptr &
+                                            MWIFIEX_BD_FLAG_ROLLOVER_IND) ^
+                                            MWIFIEX_BD_FLAG_ROLLOVER_IND);
+        }
+
+        if (unmap_count)
+                adapter->data_sent = false;
+
+        if (card->txbd_flush) {
+                if (((card->txbd_wrptr & MWIFIEX_TXBD_MASK) ==
+                     (card->txbd_rdptr & MWIFIEX_TXBD_MASK)) &&
+                    ((card->txbd_wrptr & MWIFIEX_BD_FLAG_ROLLOVER_IND) !=
+                     (card->txbd_rdptr & MWIFIEX_BD_FLAG_ROLLOVER_IND)))
+                        card->txbd_flush = 0;
+                else
+                        mwifiex_clean_pcie_ring_buf(adapter);
+        }
+
+        return 0;
+}
+
+/* This function sends data buffer to device. First 4 bytes of payload
+ * are filled with payload length and payload type. Then this payload
+ * is mapped to PCI device memory. Tx ring pointers are advanced accordingly.
+ * Download ready interrupt to FW is deffered if Tx ring is not full and
+ * additional payload can be accomodated.
+ */
+static int
+mwifiex_pcie_send_data(struct mwifiex_adapter *adapter, struct sk_buff *skb,
+                       struct mwifiex_tx_param *tx_param)
+{
+        struct pcie_service_card *card = adapter->card;
+        u32 wrindx;
+        int ret;
+        dma_addr_t buf_pa;
+        __le16 *tmp;
+
+        if (!(skb->data && skb->len)) {
+                dev_err(adapter->dev, "%s(): invalid parameter <%p, %#x>\n",
+                        __func__, skb->data, skb->len);
+                return -1;
+        }
+
+        if (!mwifiex_pcie_ok_to_access_hw(adapter))
+                mwifiex_pm_wakeup_card(adapter);
+
+        dev_dbg(adapter->dev, "info: SEND DATA: <Rd: %#x, Wr: %#x>\n",
+                card->txbd_rdptr, card->txbd_wrptr);
+        if (mwifiex_pcie_txbd_not_full(card)) {
                 u8 *payload;
 
                 adapter->data_sent = true;
-                skb_data = card->tx_buf_list[wrindx];
-                memcpy(skb_data->data, skb->data, skb->len);
-                payload = skb_data->data;
+                payload = skb->data;
                 tmp = (__le16 *)&payload[0];
                 *tmp = cpu_to_le16((u16)skb->len);
                 tmp = (__le16 *)&payload[2];
                 *tmp = cpu_to_le16(MWIFIEX_TYPE_DATA);
-                skb_put(skb_data, MWIFIEX_RX_DATA_BUF_SIZE - skb_data->len);
-                skb_trim(skb_data, skb->len);
-                buf_pa = MWIFIEX_SKB_PACB(skb_data);
-                card->txbd_ring[wrindx]->paddr = *buf_pa;
-                card->txbd_ring[wrindx]->len = (u16)skb_data->len;
+
+                if (mwifiex_map_pci_memory(adapter, skb, skb->len ,
+                                           PCI_DMA_TODEVICE))
+                        return -1;
+
+                wrindx = card->txbd_wrptr & MWIFIEX_TXBD_MASK;
+                MWIFIEX_SKB_PACB(skb, &buf_pa);
+                card->tx_buf_list[wrindx] = skb;
+                card->txbd_ring[wrindx]->paddr = buf_pa;
+                card->txbd_ring[wrindx]->len = (u16)skb->len;
                 card->txbd_ring[wrindx]->flags = MWIFIEX_BD_FLAG_FIRST_DESC |
                                                 MWIFIEX_BD_FLAG_LAST_DESC;
 
@@ -802,19 +932,28 @@ mwifiex_pcie_send_data(struct mwifiex_adapter *adapter, struct sk_buff *skb)
                                       card->txbd_wrptr)) {
                         dev_err(adapter->dev,
                                 "SEND DATA: failed to write REG_TXBD_WRPTR\n");
-                        return 0;
+                        ret = -1;
+                        goto done_unmap;
                 }
-
-                /* Send the TX ready interrupt */
-                if (mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT,
-                                      CPU_INTR_DNLD_RDY)) {
-                        dev_err(adapter->dev,
-                                "SEND DATA: failed to assert door-bell intr\n");
-                        return -1;
+                if ((mwifiex_pcie_txbd_not_full(card)) &&
+                    tx_param->next_pkt_len) {
+                        /* have more packets and TxBD still can hold more */
+                        dev_dbg(adapter->dev,
+                                "SEND DATA: delay dnld-rdy interrupt.\n");
+                        adapter->data_sent = false;
+                } else {
+                        /* Send the TX ready interrupt */
+                        if (mwifiex_write_reg(adapter, PCIE_CPU_INT_EVENT,
+                                              CPU_INTR_DNLD_RDY)) {
+                                dev_err(adapter->dev,
+                                        "SEND DATA: failed to assert dnld-rdy interrupt.\n");
+                                ret = -1;
+                                goto done_unmap;
+                        }
                 }
                 dev_dbg(adapter->dev, "info: SEND DATA: Updated <Rd: %#x, Wr: "
                         "%#x> and sent packet to firmware successfully\n",
-                        rdptr, card->txbd_wrptr);
+                        card->txbd_rdptr, card->txbd_wrptr);
         } else {
                 dev_dbg(adapter->dev,
                         "info: TX Ring full, can't send packets to fw\n");
@@ -827,7 +966,15 @@ mwifiex_pcie_send_data(struct mwifiex_adapter *adapter, struct sk_buff *skb)
                 return -EBUSY;
         }
 
-        return 0;
+        return -EINPROGRESS;
+done_unmap:
+        MWIFIEX_SKB_PACB(skb, &buf_pa);
+        pci_unmap_single(card->dev, buf_pa, skb->len, PCI_DMA_TODEVICE);
+        card->tx_buf_list[wrindx] = NULL;
+        card->txbd_ring[wrindx]->paddr = 0;
+        card->txbd_ring[wrindx]->len = 0;
+        card->txbd_ring[wrindx]->flags = 0;
+        return ret;
 }
 
 /*
@@ -838,9 +985,13 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)
 {
         struct pcie_service_card *card = adapter->card;
         u32 wrptr, rd_index;
+        dma_addr_t buf_pa;
         int ret = 0;
         struct sk_buff *skb_tmp = NULL;
 
+        if (!mwifiex_pcie_ok_to_access_hw(adapter))
+                mwifiex_pm_wakeup_card(adapter);
+
         /* Read the RX ring Write pointer set by firmware */
         if (mwifiex_read_reg(adapter, REG_RXBD_WRPTR, &wrptr)) {
                 dev_err(adapter->dev,
@@ -848,6 +999,7 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)
                 ret = -1;
                 goto done;
         }
+        card->rxbd_wrptr = wrptr;
 
         while (((wrptr & MWIFIEX_RXBD_MASK) !=
                 (card->rxbd_rdptr & MWIFIEX_RXBD_MASK)) ||
@@ -855,27 +1007,50 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)
                 (card->rxbd_rdptr & MWIFIEX_BD_FLAG_ROLLOVER_IND))) {
                 struct sk_buff *skb_data;
                 u16 rx_len;
+                __le16 pkt_len;
 
                 rd_index = card->rxbd_rdptr & MWIFIEX_RXBD_MASK;
                 skb_data = card->rx_buf_list[rd_index];
 
+                MWIFIEX_SKB_PACB(skb_data, &buf_pa);
+                pci_unmap_single(card->dev, buf_pa, MWIFIEX_RX_DATA_BUF_SIZE,
+                                 PCI_DMA_FROMDEVICE);
+                card->rx_buf_list[rd_index] = NULL;
+
                 /* Get data length from interface header -
-                   first byte is len, second byte is type */
-                rx_len = *((u16 *)skb_data->data);
+                 * first 2 bytes for len, next 2 bytes is for type
+                 */
+                pkt_len = *((__le16 *)skb_data->data);
+                rx_len = le16_to_cpu(pkt_len);
+                skb_put(skb_data, rx_len);
                 dev_dbg(adapter->dev,
                         "info: RECV DATA: Rd=%#x, Wr=%#x, Len=%d\n",
                         card->rxbd_rdptr, wrptr, rx_len);
-                skb_tmp = dev_alloc_skb(rx_len);
+                skb_pull(skb_data, INTF_HEADER_LEN);
+                mwifiex_handle_rx_packet(adapter, skb_data);
+
+                skb_tmp = dev_alloc_skb(MWIFIEX_RX_DATA_BUF_SIZE);
                 if (!skb_tmp) {
-                        dev_dbg(adapter->dev,
-                                "info: Failed to alloc skb for RX\n");
-                        ret = -EBUSY;
-                        goto done;
+                        dev_err(adapter->dev,
+                                "Unable to allocate skb.\n");
+                        return -ENOMEM;
                 }
 
-                skb_put(skb_tmp, rx_len);
+                if (mwifiex_map_pci_memory(adapter, skb_tmp,
+                                           MWIFIEX_RX_DATA_BUF_SIZE,
+                                           PCI_DMA_FROMDEVICE))
+                        return -1;
+
+                MWIFIEX_SKB_PACB(skb_tmp, &buf_pa);
+
+                dev_dbg(adapter->dev,
+                        "RECV DATA: Attach new sk_buff %p at rxbd_rdidx=%d\n",
+                        skb_tmp, rd_index);
+                card->rx_buf_list[rd_index] = skb_tmp;
+                card->rxbd_ring[rd_index]->paddr = buf_pa;
+                card->rxbd_ring[rd_index]->len = skb_tmp->len;
+                card->rxbd_ring[rd_index]->flags = 0;
 
-                memcpy(skb_tmp->data, skb_data->data + INTF_HEADER_LEN, rx_len);
                 if ((++card->rxbd_rdptr & MWIFIEX_RXBD_MASK) ==
                                                         MWIFIEX_MAX_TXRX_BD) {
                         card->rxbd_rdptr = ((card->rxbd_rdptr &
@@ -903,12 +1078,10 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)
                 }
                 dev_dbg(adapter->dev,
                         "info: RECV DATA: Rcvd packet from fw successfully\n");
-                mwifiex_handle_rx_packet(adapter, skb_tmp);
+                card->rxbd_wrptr = wrptr;
         }
 
 done:
-        if (ret && skb_tmp)
-                dev_kfree_skb_any(skb_tmp);
         return ret;
 }
 
@@ -918,32 +1091,41 @@ done:
 static int
 mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
 {
-        phys_addr_t *buf_pa = MWIFIEX_SKB_PACB(skb);
+        dma_addr_t buf_pa;
+        struct pcie_service_card *card = adapter->card;
 
-        if (!(skb->data && skb->len && *buf_pa)) {
+        if (!(skb->data && skb->len)) {
                 dev_err(adapter->dev,
-                        "Invalid parameter in %s <%p, %#x:%x, %x>\n",
-                        __func__, skb->data, skb->len,
-                        (u32)*buf_pa, (u32)((u64)*buf_pa >> 32));
+                        "Invalid parameter in %s <%p. len %d>\n",
+                        __func__, skb->data, skb->len);
                 return -1;
         }
 
+        if (mwifiex_map_pci_memory(adapter, skb, skb->len , PCI_DMA_TODEVICE))
+                return -1;
+
+        MWIFIEX_SKB_PACB(skb, &buf_pa);
+
         /* Write the lower 32bits of the physical address to scratch
          * register 0 */
-        if (mwifiex_write_reg(adapter, PCIE_SCRATCH_0_REG, (u32)*buf_pa)) {
+        if (mwifiex_write_reg(adapter, PCIE_SCRATCH_0_REG, (u32)buf_pa)) {
                 dev_err(adapter->dev,
                         "%s: failed to write download command to boot code.\n",
                         __func__);
+                pci_unmap_single(card->dev, buf_pa, MWIFIEX_UPLD_SIZE,
+                                 PCI_DMA_TODEVICE);
                 return -1;
         }
 
         /* Write the upper 32bits of the physical address to scratch
          * register 1 */
         if (mwifiex_write_reg(adapter, PCIE_SCRATCH_1_REG,
-                              (u32)((u64)*buf_pa >> 32))) {
+                              (u32)((u64)buf_pa >> 32))) {
                 dev_err(adapter->dev,
                         "%s: failed to write download command to boot code.\n",
                         __func__);
+                pci_unmap_single(card->dev, buf_pa, MWIFIEX_UPLD_SIZE,
+                                 PCI_DMA_TODEVICE);
                 return -1;
         }
 
@@ -952,6 +1134,8 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
                 dev_err(adapter->dev,
                         "%s: failed to write command len to scratch reg 2\n",
                         __func__);
+                pci_unmap_single(card->dev, buf_pa, MWIFIEX_UPLD_SIZE,
+                                 PCI_DMA_TODEVICE);
                 return -1;
         }
 
@@ -960,22 +1144,39 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
                               CPU_INTR_DOOR_BELL)) {
                 dev_err(adapter->dev,
                         "%s: failed to assert door-bell intr\n", __func__);
+                pci_unmap_single(card->dev, buf_pa,
+                                 MWIFIEX_UPLD_SIZE, PCI_DMA_TODEVICE);
                 return -1;
         }
 
         return 0;
 }
 
-/*
- * This function downloads commands to the device
+/* This function init rx port in firmware which in turn enables to receive data
+ * from device before transmitting any packet.
+ */
+static int mwifiex_pcie_init_fw_port(struct mwifiex_adapter *adapter)
+{
+        struct pcie_service_card *card = adapter->card;
+
+        /* Write the RX ring read pointer in to REG_RXBD_RDPTR */
+        if (mwifiex_write_reg(adapter, REG_RXBD_RDPTR, card->rxbd_rdptr | 0)) {
+                dev_err(adapter->dev,
+                        "RECV DATA: failed to write REG_RXBD_RDPTR\n");
+                return -1;
+        }
+        return 0;
+}
+
+/* This function downloads commands to the device
  */
 static int
 mwifiex_pcie_send_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
 {
         struct pcie_service_card *card = adapter->card;
         int ret = 0;
-        phys_addr_t *cmd_buf_pa;
-        phys_addr_t *cmdrsp_buf_pa;
+        dma_addr_t cmd_buf_pa, cmdrsp_buf_pa;
+        u8 *payload = (u8 *)skb->data;
 
         if (!(skb->data && skb->len)) {
                 dev_err(adapter->dev, "Invalid parameter in %s <%p, %#x>\n",
@@ -990,17 +1191,18 @@ mwifiex_pcie_send_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
                 return -EBUSY;
         }
 
-        /* Make sure a command buffer is available */
-        if (!card->cmd_buf) {
-                dev_err(adapter->dev, "Command buffer not available\n");
-                return -EBUSY;
-        }
+        if (!mwifiex_pcie_ok_to_access_hw(adapter))
+                mwifiex_pm_wakeup_card(adapter);
 
         adapter->cmd_sent = true;
-        /* Copy the given skb in to DMA accessable shared buffer */
-        skb_put(card->cmd_buf, MWIFIEX_SIZE_OF_CMD_BUFFER - card->cmd_buf->len);
-        skb_trim(card->cmd_buf, skb->len);
-        memcpy(card->cmd_buf->data, skb->data, skb->len);
+
+        *(__le16 *)&payload[0] = cpu_to_le16((u16)skb->len);
+        *(__le16 *)&payload[2] = cpu_to_le16(MWIFIEX_TYPE_CMD);
+
+        if (mwifiex_map_pci_memory(adapter, skb, skb->len, PCI_DMA_TODEVICE))
+                return -1;
+
+        card->cmd_buf = skb;
 
         /* To send a command, the driver will:
                 1. Write the 64bit physical address of the data buffer to
@@ -1013,11 +1215,11 @@ mwifiex_pcie_send_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
         */
 
         if (card->cmdrsp_buf) {
-                cmdrsp_buf_pa = MWIFIEX_SKB_PACB(card->cmdrsp_buf);
+                MWIFIEX_SKB_PACB(card->cmdrsp_buf, &cmdrsp_buf_pa);
                 /* Write the lower 32bits of the cmdrsp buffer physical
                    address */
                 if (mwifiex_write_reg(adapter, REG_CMDRSP_ADDR_LO,
-                                      (u32)*cmdrsp_buf_pa)) {
+                                      (u32)cmdrsp_buf_pa)) {
                         dev_err(adapter->dev,
                                 "Failed to write download cmd to boot code.\n");
                         ret = -1;
@@ -1026,7 +1228,7 @@ mwifiex_pcie_send_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
                 /* Write the upper 32bits of the cmdrsp buffer physical
                    address */
                 if (mwifiex_write_reg(adapter, REG_CMDRSP_ADDR_HI,
-                                      (u32)((u64)*cmdrsp_buf_pa >> 32))) {
+                                      (u32)((u64)cmdrsp_buf_pa >> 32))) {
                         dev_err(adapter->dev,
                                 "Failed to write download cmd to boot code.\n");
                         ret = -1;
@@ -1034,9 +1236,9 @@ mwifiex_pcie_send_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
                 }
         }
 
-        cmd_buf_pa = MWIFIEX_SKB_PACB(card->cmd_buf);
+        MWIFIEX_SKB_PACB(card->cmd_buf, &cmd_buf_pa);
         /* Write the lower 32bits of the physical address to REG_CMD_ADDR_LO */
-        if (mwifiex_write_reg(adapter, REG_CMD_ADDR_LO, (u32)*cmd_buf_pa)) {
+        if (mwifiex_write_reg(adapter, REG_CMD_ADDR_LO, (u32)cmd_buf_pa)) {
                 dev_err(adapter->dev,
                         "Failed to write download cmd to boot code.\n");
                 ret = -1;
@@ -1044,7 +1246,7 @@ mwifiex_pcie_send_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
         }
         /* Write the upper 32bits of the physical address to REG_CMD_ADDR_HI */
         if (mwifiex_write_reg(adapter, REG_CMD_ADDR_HI,
-                              (u32)((u64)*cmd_buf_pa >> 32))) {
+                              (u32)((u64)cmd_buf_pa >> 32))) {
                 dev_err(adapter->dev,
                         "Failed to write download cmd to boot code.\n");
                 ret = -1;
@@ -1083,11 +1285,22 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter)
         struct pcie_service_card *card = adapter->card;
         struct sk_buff *skb = card->cmdrsp_buf;
         int count = 0;
+        u16 rx_len;
+        __le16 pkt_len;
+        dma_addr_t buf_pa;
 
         dev_dbg(adapter->dev, "info: Rx CMD Response\n");
 
+        MWIFIEX_SKB_PACB(skb, &buf_pa);
+        pci_unmap_single(card->dev, buf_pa, MWIFIEX_UPLD_SIZE,
+                         PCI_DMA_FROMDEVICE);
+
+        pkt_len = *((__le16 *)skb->data);
+        rx_len = le16_to_cpu(pkt_len);
+        skb_trim(skb, rx_len);
+        skb_pull(skb, INTF_HEADER_LEN);
+
         if (!adapter->curr_cmd) {
-                skb_pull(skb, INTF_HEADER_LEN);
                 if (adapter->ps_state == PS_STATE_SLEEP_CFM) {
                         mwifiex_process_sleep_confirm_resp(adapter, skb->data,
                                                            skb->len);
@@ -1100,9 +1313,12 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter)
                 }
                 memcpy(adapter->upld_buf, skb->data,
                        min_t(u32, MWIFIEX_SIZE_OF_CMD_BUFFER, skb->len));
-                skb_push(skb, INTF_HEADER_LEN);
+                if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE,
+                                           PCI_DMA_FROMDEVICE))
+                        return -1;
+
+                MWIFIEX_SKB_PACB(skb, &buf_pa);
         } else if (mwifiex_pcie_ok_to_access_hw(adapter)) {
-                skb_pull(skb, INTF_HEADER_LEN);
                 adapter->curr_cmd->resp_skb = skb;
                 adapter->cmd_resp_received = true;
                 /* Take the pointer and set it to CMD node and will
@@ -1136,10 +1352,23 @@ static int mwifiex_pcie_cmdrsp_complete(struct mwifiex_adapter *adapter,
                                         struct sk_buff *skb)
 {
         struct pcie_service_card *card = adapter->card;
+        dma_addr_t buf_pa;
+        struct sk_buff *skb_tmp;
 
         if (skb) {
                 card->cmdrsp_buf = skb;
                 skb_push(card->cmdrsp_buf, INTF_HEADER_LEN);
+                if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE,
+                                           PCI_DMA_FROMDEVICE))
+                        return -1;
+        }
+
+        skb_tmp = card->cmd_buf;
+        if (skb_tmp) {
+                MWIFIEX_SKB_PACB(skb_tmp, &buf_pa);
+                pci_unmap_single(card->dev, buf_pa, MWIFIEX_UPLD_SIZE,
+                                 PCI_DMA_FROMDEVICE);
+                card->cmd_buf = NULL;
         }
 
         return 0;
@@ -1153,6 +1382,10 @@ static int mwifiex_pcie_process_event_ready(struct mwifiex_adapter *adapter)
         struct pcie_service_card *card = adapter->card;
         u32 rdptr = card->evtbd_rdptr & MWIFIEX_EVTBD_MASK;
         u32 wrptr, event;
+        dma_addr_t buf_pa;
+
+        if (!mwifiex_pcie_ok_to_access_hw(adapter))
+                mwifiex_pm_wakeup_card(adapter);
 
         if (adapter->event_received) {
                 dev_dbg(adapter->dev, "info: Event being processed, "
@@ -1184,6 +1417,10 @@ static int mwifiex_pcie_process_event_ready(struct mwifiex_adapter *adapter)
 
                 dev_dbg(adapter->dev, "info: Read Index: %d\n", rdptr);
                 skb_cmd = card->evt_buf_list[rdptr];
+                MWIFIEX_SKB_PACB(skb_cmd, &buf_pa);
+                pci_unmap_single(card->dev, buf_pa, MAX_EVENT_SIZE,
+                                 PCI_DMA_FROMDEVICE);
+
                 /* Take the pointer and set it to event pointer in adapter
                    and will return back after event handling callback */
                 card->evt_buf_list[rdptr] = NULL;
@@ -1228,7 +1465,7 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter,
         int ret = 0;
         u32 rdptr = card->evtbd_rdptr & MWIFIEX_EVTBD_MASK;
         u32 wrptr;
-        phys_addr_t *buf_pa;
+        dma_addr_t buf_pa;
 
         if (!skb)
                 return 0;
@@ -1248,9 +1485,14 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter,
 
         if (!card->evt_buf_list[rdptr]) {
                 skb_push(skb, INTF_HEADER_LEN);
+                if (mwifiex_map_pci_memory(adapter, skb,
+                                           MAX_EVENT_SIZE,
+                                           PCI_DMA_FROMDEVICE))
+                        return -1;
+                MWIFIEX_SKB_PACB(skb, &buf_pa);
                 card->evt_buf_list[rdptr] = skb;
-                buf_pa = MWIFIEX_SKB_PACB(skb);
-                card->evtbd_ring[rdptr]->paddr = *buf_pa;
+                MWIFIEX_SKB_PACB(skb, &buf_pa);
+                card->evtbd_ring[rdptr]->paddr = buf_pa;
                 card->evtbd_ring[rdptr]->len = (u16)skb->len;
                 card->evtbd_ring[rdptr]->flags = 0;
                 skb = NULL;
@@ -1299,11 +1541,8 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
         struct sk_buff *skb;
         u32 txlen, tx_blocks = 0, tries, len;
         u32 block_retry_cnt = 0;
-
-        if (!adapter) {
-                pr_err("adapter structure is not valid\n");
-                return -1;
-        }
+        dma_addr_t buf_pa;
+        struct pcie_service_card *card = adapter->card;
 
         if (!firmware || !firmware_len) {
                 dev_err(adapter->dev,
@@ -1325,7 +1564,6 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
                 ret = -ENOMEM;
                 goto done;
         }
-        mwifiex_update_sk_buff_pa(skb);
 
         /* Perform firmware data transfer */
         do {
@@ -1400,6 +1638,9 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
                         ret = -1;
                         goto done;
                 }
+
+                MWIFIEX_SKB_PACB(skb, &buf_pa);
+
                 /* Wait for the command done interrupt */
                 do {
                         if (mwifiex_read_reg(adapter, PCIE_CPU_INT_STATUS,
@@ -1407,11 +1648,17 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
                                 dev_err(adapter->dev, "%s: Failed to read "
                                         "interrupt status during fw dnld.\n",
                                         __func__);
+                                pci_unmap_single(card->dev, buf_pa, skb->len,
+                                                 PCI_DMA_TODEVICE);
                                 ret = -1;
                                 goto done;
                         }
                 } while ((ireg_intr & CPU_INTR_DOOR_BELL) ==
                          CPU_INTR_DOOR_BELL);
+
+                pci_unmap_single(card->dev, buf_pa, skb->len,
+                                 PCI_DMA_TODEVICE);
+
                 offset += txlen;
         } while (true);
 
@@ -1594,39 +1841,40 @@ exit:
 static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
 {
         int ret;
-        u32 pcie_ireg = 0;
+        u32 pcie_ireg;
         unsigned long flags;
 
         spin_lock_irqsave(&adapter->int_lock, flags);
         /* Clear out unused interrupts */
-        adapter->int_status &= HOST_INTR_MASK;
+        pcie_ireg = adapter->int_status;
+        adapter->int_status = 0;
         spin_unlock_irqrestore(&adapter->int_lock, flags);
 
-        while (adapter->int_status & HOST_INTR_MASK) {
-                if (adapter->int_status & HOST_INTR_DNLD_DONE) {
-                        adapter->int_status &= ~HOST_INTR_DNLD_DONE;
-                        if (adapter->data_sent) {
-                                dev_dbg(adapter->dev, "info: DATA sent intr\n");
-                                adapter->data_sent = false;
-                        }
+        while (pcie_ireg & HOST_INTR_MASK) {
+                if (pcie_ireg & HOST_INTR_DNLD_DONE) {
+                        pcie_ireg &= ~HOST_INTR_DNLD_DONE;
+                        dev_dbg(adapter->dev, "info: TX DNLD Done\n");
+                        ret = mwifiex_pcie_send_data_complete(adapter);
+                        if (ret)
+                                return ret;
                 }
-                if (adapter->int_status & HOST_INTR_UPLD_RDY) {
-                        adapter->int_status &= ~HOST_INTR_UPLD_RDY;
+                if (pcie_ireg & HOST_INTR_UPLD_RDY) {
+                        pcie_ireg &= ~HOST_INTR_UPLD_RDY;
                         dev_dbg(adapter->dev, "info: Rx DATA\n");
                         ret = mwifiex_pcie_process_recv_data(adapter);
                         if (ret)
                                 return ret;
                 }
-                if (adapter->int_status & HOST_INTR_EVENT_RDY) {
-                        adapter->int_status &= ~HOST_INTR_EVENT_RDY;
+                if (pcie_ireg & HOST_INTR_EVENT_RDY) {
+                        pcie_ireg &= ~HOST_INTR_EVENT_RDY;
                         dev_dbg(adapter->dev, "info: Rx EVENT\n");
                         ret = mwifiex_pcie_process_event_ready(adapter);
                         if (ret)
                                 return ret;
                 }
 
-                if (adapter->int_status & HOST_INTR_CMD_DONE) {
-                        adapter->int_status &= ~HOST_INTR_CMD_DONE;
+                if (pcie_ireg & HOST_INTR_CMD_DONE) {
+                        pcie_ireg &= ~HOST_INTR_CMD_DONE;
                         if (adapter->cmd_sent) {
                                 dev_dbg(adapter->dev,
                                         "info: CMD sent Interrupt\n");
@@ -1654,8 +1902,6 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
                                                  "Write register failed\n");
                                         return -1;
                                 }
-                                adapter->int_status |= pcie_ireg;
-                                adapter->int_status &= HOST_INTR_MASK;
                         }
 
                 }
@@ -1687,7 +1933,7 @@ static int mwifiex_pcie_host_to_card(struct mwifiex_adapter *adapter, u8 type,
         }
 
         if (type == MWIFIEX_TYPE_DATA)
-                return mwifiex_pcie_send_data(adapter, skb);
+                return mwifiex_pcie_send_data(adapter, skb, tx_param);
         else if (type == MWIFIEX_TYPE_CMD)
                 return mwifiex_pcie_send_cmd(adapter, skb);
 
@@ -1814,15 +2060,8 @@ static void mwifiex_pcie_cleanup(struct mwifiex_adapter *adapter)
         struct pcie_service_card *card = adapter->card;
         struct pci_dev *pdev = card->dev;
 
-        mwifiex_pcie_delete_sleep_cookie_buf(adapter);
-        mwifiex_pcie_delete_cmdrsp_buf(adapter);
-        mwifiex_pcie_delete_evtbd_ring(adapter);
-        mwifiex_pcie_delete_rxbd_ring(adapter);
-        mwifiex_pcie_delete_txbd_ring(adapter);
-        card->cmdrsp_buf = NULL;
-
-        dev_dbg(adapter->dev, "Clearing driver ready signature\n");
         if (user_rmmod) {
+                dev_dbg(adapter->dev, "Clearing driver ready signature\n");
                 if (mwifiex_write_reg(adapter, REG_DRV_READY, 0x00000000))
                         dev_err(adapter->dev,
                                 "Failed to write driver not-ready signature\n");
@@ -1879,6 +2118,13 @@ static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter)
         if (card) {
                 dev_dbg(adapter->dev, "%s(): calling free_irq()\n", __func__);
                 free_irq(card->dev->irq, card->dev);
+
+                mwifiex_pcie_delete_sleep_cookie_buf(adapter);
+                mwifiex_pcie_delete_cmdrsp_buf(adapter);
+                mwifiex_pcie_delete_evtbd_ring(adapter);
+                mwifiex_pcie_delete_rxbd_ring(adapter);
+                mwifiex_pcie_delete_txbd_ring(adapter);
+                card->cmdrsp_buf = NULL;
         }
 }
 
@@ -1900,6 +2146,8 @@ static struct mwifiex_if_ops pcie_ops = {
         .event_complete =               mwifiex_pcie_event_complete,
         .update_mp_end_port =           NULL,
         .cleanup_mpa_buf =              NULL,
+        .init_fw_port =                 mwifiex_pcie_init_fw_port,
+        .clean_pcie_ring =              mwifiex_clean_pcie_ring_buf,
 };
 
 /*
diff --git a/drivers/net/wireless/mwifiex/pcie.h b/drivers/net/wireless/mwifiex/pcie.h
index 2f218f9a3fd3..37eeb2ca6b29 100644
--- a/drivers/net/wireless/mwifiex/pcie.h
+++ b/drivers/net/wireless/mwifiex/pcie.h
@@ -114,11 +114,12 @@ struct pcie_service_card {
         struct pci_dev *dev;
         struct mwifiex_adapter *adapter;
 
+        u8 txbd_flush;
         u32 txbd_wrptr;
         u32 txbd_rdptr;
         u32 txbd_ring_size;
         u8 *txbd_ring_vbase;
-        phys_addr_t txbd_ring_pbase;
+        dma_addr_t txbd_ring_pbase;
         struct mwifiex_pcie_buf_desc *txbd_ring[MWIFIEX_MAX_TXRX_BD];
         struct sk_buff *tx_buf_list[MWIFIEX_MAX_TXRX_BD];
 
@@ -126,7 +127,7 @@ struct pcie_service_card {
         u32 rxbd_rdptr;
         u32 rxbd_ring_size;
         u8 *rxbd_ring_vbase;
-        phys_addr_t rxbd_ring_pbase;
+        dma_addr_t rxbd_ring_pbase;
         struct mwifiex_pcie_buf_desc *rxbd_ring[MWIFIEX_MAX_TXRX_BD];
         struct sk_buff *rx_buf_list[MWIFIEX_MAX_TXRX_BD];
 
@@ -134,15 +135,39 @@ struct pcie_service_card {
         u32 evtbd_rdptr;
         u32 evtbd_ring_size;
         u8 *evtbd_ring_vbase;
-        phys_addr_t evtbd_ring_pbase;
+        dma_addr_t evtbd_ring_pbase;
         struct mwifiex_pcie_buf_desc *evtbd_ring[MWIFIEX_MAX_EVT_BD];
         struct sk_buff *evt_buf_list[MWIFIEX_MAX_EVT_BD];
 
         struct sk_buff *cmd_buf;
         struct sk_buff *cmdrsp_buf;
-        struct sk_buff *sleep_cookie;
+        u8 *sleep_cookie_vbase;
+        dma_addr_t sleep_cookie_pbase;
         void __iomem *pci_mmap;
         void __iomem *pci_mmap1;
 };
 
+static inline int
+mwifiex_pcie_txbd_empty(struct pcie_service_card *card, u32 rdptr)
+{
+        if (((card->txbd_wrptr & MWIFIEX_TXBD_MASK) ==
+                        (rdptr & MWIFIEX_TXBD_MASK)) &&
+            ((card->txbd_wrptr & MWIFIEX_BD_FLAG_ROLLOVER_IND) !=
+                        (rdptr & MWIFIEX_BD_FLAG_ROLLOVER_IND)))
+                return 1;
+
+        return 0;
+}
+
+static inline int
+mwifiex_pcie_txbd_not_full(struct pcie_service_card *card)
+{
+        if (((card->txbd_wrptr & MWIFIEX_TXBD_MASK) !=
+             (card->txbd_rdptr & MWIFIEX_TXBD_MASK)) ||
+            ((card->txbd_wrptr & MWIFIEX_BD_FLAG_ROLLOVER_IND) !=
+             (card->txbd_rdptr & MWIFIEX_BD_FLAG_ROLLOVER_IND)))
+                return 1;
+
+        return 0;
+}
 #endif /* _MWIFIEX_PCIE_H */
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index 5d87195390f8..c4607859d59d 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -931,7 +931,6 @@ mwifiex_cmd_pcie_host_spec(struct mwifiex_private *priv,
         struct host_cmd_ds_pcie_details *host_spec =
                                         &cmd->params.pcie_host_spec;
         struct pcie_service_card *card = priv->adapter->card;
-        phys_addr_t *buf_pa;
 
         cmd->command = cpu_to_le16(HostCmd_CMD_PCIE_DESC_DETAILS);
         cmd->size = cpu_to_le16(sizeof(struct
@@ -953,10 +952,11 @@ mwifiex_cmd_pcie_host_spec(struct mwifiex_private *priv,
         host_spec->evtbd_addr_lo = (u32)(card->evtbd_ring_pbase);
         host_spec->evtbd_addr_hi = (u32)(((u64)card->evtbd_ring_pbase)>>32);
         host_spec->evtbd_count = MWIFIEX_MAX_EVT_BD;
-        if (card->sleep_cookie) {
-                buf_pa = MWIFIEX_SKB_PACB(card->sleep_cookie);
-                host_spec->sleep_cookie_addr_lo = (u32) *buf_pa;
-                host_spec->sleep_cookie_addr_hi = (u32) (((u64)*buf_pa) >> 32);
+        if (card->sleep_cookie_vbase) {
+                host_spec->sleep_cookie_addr_lo =
+                                                (u32)(card->sleep_cookie_pbase);
+                host_spec->sleep_cookie_addr_hi =
+                                 (u32)(((u64)(card->sleep_cookie_pbase)) >> 32);
                 dev_dbg(priv->adapter->dev, "sleep_cook_lo phy addr: 0x%x\n",
                         host_spec->sleep_cookie_addr_lo);
         }
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 60e88b58039d..f542bb8ccbc8 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -283,6 +283,20 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
                 if (ret)
                         goto done;
 
+                if (bss_desc) {
+                        u8 config_bands = 0;
+
+                        if (mwifiex_band_to_radio_type((u8) bss_desc->bss_band)
+                            == HostCmd_SCAN_RADIO_TYPE_BG)
+                                config_bands = BAND_B | BAND_G | BAND_GN;
+                        else
+                                config_bands = BAND_A | BAND_AN;
+
+                        if (!((config_bands | adapter->fw_bands) &
+                              ~adapter->fw_bands))
+                                adapter->config_bands = config_bands;
+                }
+
                 ret = mwifiex_check_network_compatibility(priv, bss_desc);
                 if (ret)
                         goto done;
diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c
index 8c80024c30ff..296faec14365 100644
--- a/drivers/net/wireless/mwifiex/txrx.c
+++ b/drivers/net/wireless/mwifiex/txrx.c
@@ -117,14 +117,16 @@ int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,
                 dev_dbg(adapter->dev, "data: -EBUSY is returned\n");
                 break;
         case -1:
-                adapter->data_sent = false;
+                if (adapter->iface_type != MWIFIEX_PCIE)
+                        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, 0, ret);
                 break;
         case -EINPROGRESS:
-                adapter->data_sent = false;
+                if (adapter->iface_type != MWIFIEX_PCIE)
+                        adapter->data_sent = false;
                 break;
         case 0:
                 mwifiex_write_data_complete(adapter, skb, 0, ret);
diff --git a/drivers/net/wireless/mwifiex/uap_cmd.c b/drivers/net/wireless/mwifiex/uap_cmd.c
index 8dd72240f162..6e76a15a8950 100644
--- a/drivers/net/wireless/mwifiex/uap_cmd.c
+++ b/drivers/net/wireless/mwifiex/uap_cmd.c
@@ -219,6 +219,7 @@ void mwifiex_set_sys_config_invalid_data(struct mwifiex_uap_bss_param *config)
         config->rts_threshold = 0x7FFF;
         config->frag_threshold = 0x7FFF;
         config->retry_limit = 0x7F;
+        config->qos_info = 0xFF;
 }
 
 /* This function parses BSS related parameters from structure
@@ -297,6 +298,38 @@ mwifiex_uap_bss_wpa(u8 **tlv_buf, void *cmd_buf, u16 *param_size)
         return;
 }
 
+/* This function parses WMM related parameters from cfg80211_ap_settings
+ * structure and updates bss_config structure.
+ */
+void
+mwifiex_set_wmm_params(struct mwifiex_private *priv,
+                       struct mwifiex_uap_bss_param *bss_cfg,
+                       struct cfg80211_ap_settings *params)
+{
+        const u8 *vendor_ie;
+        struct ieee_types_header *wmm_ie;
+        u8 wmm_oui[] = {0x00, 0x50, 0xf2, 0x02};
+
+        vendor_ie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
+                                            WLAN_OUI_TYPE_MICROSOFT_WMM,
+                                            params->beacon.tail,
+                                            params->beacon.tail_len);
+        if (vendor_ie) {
+                wmm_ie = (struct ieee_types_header *)vendor_ie;
+                memcpy(&bss_cfg->wmm_info, wmm_ie + 1,
+                       sizeof(bss_cfg->wmm_info));
+                priv->wmm_enabled = 1;
+        } else {
+                memset(&bss_cfg->wmm_info, 0, sizeof(bss_cfg->wmm_info));
+                memcpy(&bss_cfg->wmm_info.oui, wmm_oui, sizeof(wmm_oui));
+                bss_cfg->wmm_info.subtype = MWIFIEX_WMM_SUBTYPE;
+                bss_cfg->wmm_info.version = MWIFIEX_WMM_VERSION;
+                priv->wmm_enabled = 0;
+        }
+
+        bss_cfg->qos_info = 0x00;
+        return;
+}
 /* This function parses BSS related parameters from structure
  * and prepares TLVs specific to WEP encryption.
  * These TLVs are appended to command buffer.
@@ -354,6 +387,7 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)
         struct host_cmd_tlv_rates *tlv_rates;
         struct host_cmd_tlv_ageout_timer *ao_timer, *ps_ao_timer;
         struct mwifiex_ie_types_htcap *htcap;
+        struct mwifiex_ie_types_wmmcap *wmm_cap;
         struct mwifiex_uap_bss_param *bss_cfg = cmd_buf;
         int i;
         u16 cmd_size = *param_size;
@@ -507,6 +541,16 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)
                 tlv += sizeof(struct mwifiex_ie_types_htcap);
         }
 
+        if (bss_cfg->wmm_info.qos_info != 0xFF) {
+                wmm_cap = (struct mwifiex_ie_types_wmmcap *)tlv;
+                wmm_cap->header.type = cpu_to_le16(WLAN_EID_VENDOR_SPECIFIC);
+                wmm_cap->header.len = cpu_to_le16(sizeof(wmm_cap->wmm_info));
+                memcpy(&wmm_cap->wmm_info, &bss_cfg->wmm_info,
+                       sizeof(wmm_cap->wmm_info));
+                cmd_size += sizeof(struct mwifiex_ie_types_wmmcap);
+                tlv += sizeof(struct mwifiex_ie_types_wmmcap);
+        }
+
         if (bss_cfg->sta_ao_timer) {
                 ao_timer = (struct host_cmd_tlv_ageout_timer *)tlv;
                 ao_timer->tlv.type = cpu_to_le16(TLV_TYPE_UAP_AO_TIMER);
diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/mwifiex/usb.c
index 63ac9f2d11ae..5d4a10a8a005 100644
--- a/drivers/net/wireless/mwifiex/usb.c
+++ b/drivers/net/wireless/mwifiex/usb.c
@@ -786,21 +786,6 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter)
         return 0;
 }
 
-/* This function reads one block of firmware data. */
-static int mwifiex_get_fw_data(struct mwifiex_adapter *adapter,
-                               u32 offset, u32 len, u8 *buf)
-{
-        if (!buf || !len)
-                return -1;
-
-        if (offset + len > adapter->firmware->size)
-                return -1;
-
-        memcpy(buf, adapter->firmware->data + offset, len);
-
-        return 0;
-}
-
 static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
                                     struct mwifiex_fw_image *fw)
 {
@@ -836,23 +821,14 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
                         dlen = 0;
                 } else {
                         /* copy the header of the fw_data to get the length */
-                        if (firmware)
-                                memcpy(&fwdata->fw_hdr, &firmware[tlen],
-                                       sizeof(struct fw_header));
-                        else
-                                mwifiex_get_fw_data(adapter, tlen,
-                                                    sizeof(struct fw_header),
-                                                    (u8 *)&fwdata->fw_hdr);
+                        memcpy(&fwdata->fw_hdr, &firmware[tlen],
+                               sizeof(struct fw_header));
 
                         dlen = le32_to_cpu(fwdata->fw_hdr.data_len);
                         dnld_cmd = le32_to_cpu(fwdata->fw_hdr.dnld_cmd);
                         tlen += sizeof(struct fw_header);
 
-                        if (firmware)
-                                memcpy(fwdata->data, &firmware[tlen], dlen);
-                        else
-                                mwifiex_get_fw_data(adapter, tlen, dlen,
-                                                    (u8 *)fwdata->data);
+                        memcpy(fwdata->data, &firmware[tlen], dlen);
 
                         fwdata->seq_num = cpu_to_le32(fw_seqnum);
                         tlen += dlen;
diff --git a/drivers/net/wireless/mwifiex/util.h b/drivers/net/wireless/mwifiex/util.h
index f6d36b9654a0..cb2d0582bd36 100644
--- a/drivers/net/wireless/mwifiex/util.h
+++ b/drivers/net/wireless/mwifiex/util.h
@@ -22,16 +22,16 @@
 
 static inline struct mwifiex_rxinfo *MWIFIEX_SKB_RXCB(struct sk_buff *skb)
 {
-        return (struct mwifiex_rxinfo *)(skb->cb + sizeof(phys_addr_t));
+        return (struct mwifiex_rxinfo *)(skb->cb + sizeof(dma_addr_t));
 }
 
 static inline struct mwifiex_txinfo *MWIFIEX_SKB_TXCB(struct sk_buff *skb)
 {
-        return (struct mwifiex_txinfo *)(skb->cb + sizeof(phys_addr_t));
+        return (struct mwifiex_txinfo *)(skb->cb + sizeof(dma_addr_t));
 }
 
-static inline phys_addr_t *MWIFIEX_SKB_PACB(struct sk_buff *skb)
+static inline void MWIFIEX_SKB_PACB(struct sk_buff *skb, dma_addr_t *buf_pa)
 {
-        return (phys_addr_t *)skb->cb;
+        memcpy(buf_pa, skb->cb, sizeof(dma_addr_t));
 }
 #endif /* !_MWIFIEX_UTIL_H_ */
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c
index 818f871ae987..135d96df2063 100644
--- a/drivers/net/wireless/mwifiex/wmm.c
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -568,6 +568,8 @@ mwifiex_clean_txrx(struct mwifiex_private *priv)
         mwifiex_wmm_delete_all_ralist(priv);
         memcpy(tos_to_tid, ac_to_tid, sizeof(tos_to_tid));
 
+        if (priv->adapter->if_ops.clean_pcie_ring)
+                priv->adapter->if_ops.clean_pcie_ring(priv->adapter);
         spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, flags);
 }
 
@@ -1206,13 +1208,15 @@ mwifiex_send_processed_packet(struct mwifiex_private *priv,
                                        ra_list_flags);
                 break;
         case -1:
-                adapter->data_sent = false;
+                if (adapter->iface_type != MWIFIEX_PCIE)
+                        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, 0, ret);
                 break;
         case -EINPROGRESS:
-                adapter->data_sent = false;
+                if (adapter->iface_type != MWIFIEX_PCIE)
+                        adapter->data_sent = false;
         default:
                 break;
         }
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 83564d36e801..224cf917744a 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -101,6 +101,18 @@ MODULE_PARM_DESC(ap_mode_default,
 #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)
 
+/* txpriorities are mapped with hw queues.
+ * Each hw queue has a txpriority.
+ */
+#define TOTAL_HW_TX_QUEUES      8
+
+/* Each HW queue can have one AMPDU stream.
+ * But, because one of the hw queue is reserved,
+ * maximum AMPDU queues that can be created are
+ * one short of total tx queues.
+ */
+#define MWL8K_NUM_AMPDU_STREAMS (TOTAL_HW_TX_QUEUES - 1)
+
 struct rxd_ops {
         int rxd_size;
         void (*rxd_init)(void *rxd, dma_addr_t next_dma_addr);
@@ -160,7 +172,6 @@ struct mwl8k_ampdu_stream {
         u8 tid;
         u8 state;
         u8 idx;
-        u8 txq_idx; /* index of this stream in priv->txq */
 };
 
 struct mwl8k_priv {
@@ -202,6 +213,8 @@ struct mwl8k_priv {
         int fw_mutex_depth;
         struct completion *hostcmd_wait;
 
+        atomic_t watchdog_event_pending;
+
         /* lock held over TX and TX reap */
         spinlock_t tx_lock;
 
@@ -1516,6 +1529,9 @@ static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw)
                         return -EBUSY;
         }
 
+        if (atomic_read(&priv->watchdog_event_pending))
+                return 0;
+
         /*
          * The TX queues are stopped at this point, so this test
          * doesn't need to take ->tx_lock.
@@ -1537,6 +1553,14 @@ static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw)
                 spin_unlock_bh(&priv->tx_lock);
                 timeout = wait_for_completion_timeout(&tx_wait,
                             msecs_to_jiffies(MWL8K_TX_WAIT_TIMEOUT_MS));
+
+                if (atomic_read(&priv->watchdog_event_pending)) {
+                        spin_lock_bh(&priv->tx_lock);
+                        priv->tx_wait = NULL;
+                        spin_unlock_bh(&priv->tx_lock);
+                        return 0;
+                }
+
                 spin_lock_bh(&priv->tx_lock);
 
                 if (timeout) {
@@ -1564,6 +1588,7 @@ static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw)
 
                 rc = -ETIMEDOUT;
         }
+        priv->tx_wait = NULL;
         spin_unlock_bh(&priv->tx_lock);
 
         return rc;
@@ -1734,14 +1759,13 @@ mwl8k_add_stream(struct ieee80211_hw *hw, struct ieee80211_sta *sta, u8 tid)
         struct mwl8k_priv *priv = hw->priv;
         int i;
 
-        for (i = 0; i < priv->num_ampdu_queues; i++) {
+        for (i = 0; i < MWL8K_NUM_AMPDU_STREAMS; 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;
@@ -1782,7 +1806,7 @@ 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++) {
+        for (i = 0; i < MWL8K_NUM_AMPDU_STREAMS; i++) {
                 struct mwl8k_ampdu_stream *stream;
                 stream = &priv->ampdu[i];
                 if (stream->state == AMPDU_NO_STREAM)
@@ -1829,6 +1853,13 @@ static inline void mwl8k_tx_count_packet(struct ieee80211_sta *sta, u8 tid)
                 tx_stats->pkts++;
 }
 
+/* The hardware ampdu queues start from 5.
+ * txpriorities for ampdu queues are
+ * 5 6 7 0 1 2 3 4 ie., queue 5 is highest
+ * and queue 3 is lowest (queue 4 is reserved)
+ */
+#define BA_QUEUE                5
+
 static void
 mwl8k_txq_xmit(struct ieee80211_hw *hw,
                int index,
@@ -1928,8 +1959,13 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw,
                 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;
+                                WARN_ON(!(qos & MWL8K_QOS_ACK_POLICY_BLOCKACK));
+                                txpriority = (BA_QUEUE + stream->idx) %
+                                             TOTAL_HW_TX_QUEUES;
+                                if (stream->idx <= 1)
+                                        index = stream->idx +
+                                                MWL8K_TX_WMM_QUEUES;
+
                         } else if (stream->state == AMPDU_STREAM_NEW) {
                                 /* We get here if the driver sends us packets
                                  * after we've initiated a stream, but before
@@ -1971,6 +2007,9 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw,
                         }
                 }
                 spin_unlock(&priv->stream_lock);
+        } else {
+                qos &= ~MWL8K_QOS_ACK_POLICY_MASK;
+                qos |= MWL8K_QOS_ACK_POLICY_NORMAL;
         }
 
         dma = pci_map_single(priv->pdev, skb->data,
@@ -3578,7 +3617,11 @@ static int mwl8k_cmd_get_watchdog_bitmap(struct ieee80211_hw *hw, u8 *bitmap)
         return rc;
 }
 
-#define INVALID_BA      0xAA
+#define MWL8K_WMM_QUEUE_NUMBER  3
+
+static void mwl8k_destroy_ba(struct ieee80211_hw *hw,
+                             u8 idx);
+
 static void mwl8k_watchdog_ba_events(struct work_struct *work)
 {
         int rc;
@@ -3586,24 +3629,41 @@ static void mwl8k_watchdog_ba_events(struct work_struct *work)
         struct mwl8k_ampdu_stream *streams;
         struct mwl8k_priv *priv =
                 container_of(work, struct mwl8k_priv, watchdog_ba_handle);
+        struct ieee80211_hw *hw = priv->hw;
+        int i;
+        u32 status = 0;
+
+        mwl8k_fw_lock(hw);
 
         rc = mwl8k_cmd_get_watchdog_bitmap(priv->hw, &bitmap);
         if (rc)
-                return;
+                goto done;
 
-        if (bitmap == INVALID_BA)
-                return;
+        spin_lock(&priv->stream_lock);
 
         /* 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);
+        for (i = 0; i < TOTAL_HW_TX_QUEUES; i++) {
+                if (bitmap & (1 << i)) {
+                        stream_index = (i + MWL8K_WMM_QUEUE_NUMBER) %
+                                       TOTAL_HW_TX_QUEUES;
+                        streams = &priv->ampdu[stream_index];
+                        if (streams->state == AMPDU_STREAM_ACTIVE) {
+                                ieee80211_stop_tx_ba_session(streams->sta,
+                                                             streams->tid);
+                                spin_unlock(&priv->stream_lock);
+                                mwl8k_destroy_ba(hw, stream_index);
+                                spin_lock(&priv->stream_lock);
+                        }
+                }
+        }
 
+        spin_unlock(&priv->stream_lock);
+done:
+        atomic_dec(&priv->watchdog_event_pending);
+        status = ioread32(priv->regs + MWL8K_HIU_A2H_INTERRUPT_STATUS_MASK);
+        iowrite32((status | MWL8K_A2H_INT_BA_WATCHDOG),
+                  priv->regs + MWL8K_HIU_A2H_INTERRUPT_STATUS_MASK);
+        mwl8k_fw_unlock(hw);
         return;
 }
 
@@ -3763,7 +3823,7 @@ mwl8k_create_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream,
 }
 
 static void mwl8k_destroy_ba(struct ieee80211_hw *hw,
-                             struct mwl8k_ampdu_stream *stream)
+                             u8 idx)
 {
         struct mwl8k_cmd_bastream *cmd;
 
@@ -3775,10 +3835,10 @@ static void mwl8k_destroy_ba(struct ieee80211_hw *hw,
         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);
+        cmd->destroy_params.ba_context = cpu_to_le32(idx);
         mwl8k_post_cmd(hw, &cmd->header);
 
-        wiphy_debug(hw->wiphy, "Deleted BA stream index %d\n", stream->idx);
+        wiphy_debug(hw->wiphy, "Deleted BA stream index %d\n", idx);
 
         kfree(cmd);
 }
@@ -3875,7 +3935,30 @@ static int mwl8k_cmd_set_new_stn_del(struct ieee80211_hw *hw,
                                      struct ieee80211_vif *vif, u8 *addr)
 {
         struct mwl8k_cmd_set_new_stn *cmd;
-        int rc;
+        struct mwl8k_priv *priv = hw->priv;
+        int rc, i;
+        u8 idx;
+
+        spin_lock(&priv->stream_lock);
+        /* Destroy any active ampdu streams for this sta */
+        for (i = 0; i < MWL8K_NUM_AMPDU_STREAMS; i++) {
+                struct mwl8k_ampdu_stream *s;
+                s = &priv->ampdu[i];
+                if (s->state != AMPDU_NO_STREAM) {
+                        if (memcmp(s->sta->addr, addr, ETH_ALEN) == 0) {
+                                if (s->state == AMPDU_STREAM_ACTIVE) {
+                                        idx = s->idx;
+                                        spin_unlock(&priv->stream_lock);
+                                        mwl8k_destroy_ba(hw, idx);
+                                        spin_lock(&priv->stream_lock);
+                                } else if (s->state == AMPDU_STREAM_NEW) {
+                                        mwl8k_remove_stream(hw, s);
+                                }
+                        }
+                }
+        }
+
+        spin_unlock(&priv->stream_lock);
 
         cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
         if (cmd == NULL)
@@ -4303,6 +4386,10 @@ static irqreturn_t mwl8k_interrupt(int irq, void *dev_id)
         }
 
         if (status & MWL8K_A2H_INT_BA_WATCHDOG) {
+                iowrite32(~MWL8K_A2H_INT_BA_WATCHDOG,
+                          priv->regs + MWL8K_HIU_A2H_INTERRUPT_STATUS_MASK);
+
+                atomic_inc(&priv->watchdog_event_pending);
                 status &= ~MWL8K_A2H_INT_BA_WATCHDOG;
                 ieee80211_queue_work(hw, &priv->watchdog_ba_handle);
         }
@@ -4446,6 +4533,8 @@ static int mwl8k_start(struct ieee80211_hw *hw)
                 priv->irq = -1;
                 tasklet_disable(&priv->poll_tx_task);
                 tasklet_disable(&priv->poll_rx_task);
+        } else {
+                ieee80211_wake_queues(hw);
         }
 
         return rc;
@@ -5094,7 +5183,7 @@ mwl8k_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
         int i, rc = 0;
         struct mwl8k_priv *priv = hw->priv;
         struct mwl8k_ampdu_stream *stream;
-        u8 *addr = sta->addr;
+        u8 *addr = sta->addr, idx;
         struct mwl8k_sta *sta_info = MWL8K_STA(sta);
 
         if (!(hw->flags & IEEE80211_HW_AMPDU_AGGREGATION))
@@ -5172,11 +5261,14 @@ mwl8k_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                 }
                 ieee80211_start_tx_ba_cb_irqsafe(vif, addr, tid);
                 break;
-        case IEEE80211_AMPDU_TX_STOP:
+        case IEEE80211_AMPDU_TX_STOP_CONT:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
                 if (stream) {
                         if (stream->state == AMPDU_STREAM_ACTIVE) {
+                                idx = stream->idx;
                                 spin_unlock(&priv->stream_lock);
-                                mwl8k_destroy_ba(hw, stream);
+                                mwl8k_destroy_ba(hw, idx);
                                 spin_lock(&priv->stream_lock);
                         }
                         mwl8k_remove_stream(hw, stream);
@@ -5192,8 +5284,9 @@ mwl8k_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                 if (!rc)
                         stream->state = AMPDU_STREAM_ACTIVE;
                 else {
+                        idx = stream->idx;
                         spin_unlock(&priv->stream_lock);
-                        mwl8k_destroy_ba(hw, stream);
+                        mwl8k_destroy_ba(hw, idx);
                         spin_lock(&priv->stream_lock);
                         wiphy_debug(hw->wiphy,
                                 "Failed adding stream for sta %pM tid %d\n",
@@ -5256,7 +5349,7 @@ enum {
         MWL8366,
 };
 
-#define MWL8K_8366_AP_FW_API 2
+#define MWL8K_8366_AP_FW_API 3
 #define _MWL8K_8366_AP_FW(api) "mwl8k/fmimage_8366_ap-" #api ".fw"
 #define MWL8K_8366_AP_FW(api) _MWL8K_8366_AP_FW(api)
 
@@ -5464,6 +5557,7 @@ static int mwl8k_probe_hw(struct ieee80211_hw *hw)
                 if (priv->rxd_ops == NULL) {
                         wiphy_err(hw->wiphy,
                                   "Driver does not have AP firmware image support for this hardware\n");
+                        rc = -ENOENT;
                         goto err_stop_firmware;
                 }
         } else {
@@ -5473,6 +5567,7 @@ static int mwl8k_probe_hw(struct ieee80211_hw *hw)
         priv->sniffer_enabled = false;
         priv->wmm_enabled = false;
         priv->pending_tx_pkts = 0;
+        atomic_set(&priv->watchdog_event_pending, 0);
 
         rc = mwl8k_rxq_init(hw, 0);
         if (rc)
@@ -5809,6 +5904,7 @@ static int mwl8k_probe(struct pci_dev *pdev,
         priv->sram = pci_iomap(pdev, 0, 0x10000);
         if (priv->sram == NULL) {
                 wiphy_err(hw->wiphy, "Cannot map device SRAM\n");
+                rc = -EIO;
                 goto err_iounmap;
         }
 
@@ -5821,6 +5917,7 @@ static int mwl8k_probe(struct pci_dev *pdev,
                 priv->regs = pci_iomap(pdev, 2, 0x10000);
                 if (priv->regs == NULL) {
                         wiphy_err(hw->wiphy, "Cannot map device registers\n");
+                        rc = -EIO;
                         goto err_iounmap;
                 }
         }
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 933e5d941937..57e3af8ebb4b 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -559,6 +559,7 @@ static int p54p_probe(struct pci_dev *pdev,
         mem_len = pci_resource_len(pdev, 0);
         if (mem_len < sizeof(struct p54p_csr)) {
                 dev_err(&pdev->dev, "Too short PCI resources\n");
+                err = -ENODEV;
                 goto err_disable_dev;
         }
 
@@ -568,8 +569,10 @@ static int p54p_probe(struct pci_dev *pdev,
                 goto err_disable_dev;
         }
 
-        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) ||
-            pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {
+        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+        if (!err)
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
+        if (err) {
                 dev_err(&pdev->dev, "No suitable DMA available\n");
                 goto err_free_reg;
         }
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 4e44b1af119a..1c22b81e6ef3 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -1503,6 +1503,7 @@ static int prism54_get_auth(struct net_device *ndev,
                         case DOT11_AUTH_BOTH:
                         case DOT11_AUTH_SK:
                                 param->value = IW_AUTH_ALG_SHARED_KEY;
+                                break;
                         case DOT11_AUTH_NONE:
                         default:
                                 param->value = 0;
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 598ca1cafb95..e7cf37f550d1 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -1107,12 +1107,15 @@ static int ray_get_essid(struct net_device *dev, struct iw_request_info *info,
                          union iwreq_data *wrqu, char *extra)
 {
         ray_dev_t *local = netdev_priv(dev);
+        UCHAR tmp[IW_ESSID_MAX_SIZE + 1];
 
         /* Get the essid that was set */
         memcpy(extra, local->sparm.b5.a_current_ess_id, IW_ESSID_MAX_SIZE);
+        memcpy(tmp, local->sparm.b5.a_current_ess_id, IW_ESSID_MAX_SIZE);
+        tmp[IW_ESSID_MAX_SIZE] = '\0';
 
         /* Push it out ! */
-        wrqu->essid.length = strlen(extra);
+        wrqu->essid.length = strlen(tmp);
         wrqu->essid.flags = 1;  /* active */
 
         return 0;
@@ -1842,6 +1845,8 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id)
         UCHAR tmp;
         UCHAR cmd;
         UCHAR status;
+        UCHAR memtmp[ESSID_SIZE + 1];
+
 
         if (dev == NULL)        /* Note that we want interrupts with dev->start == 0 */
                 return IRQ_NONE;
@@ -1901,17 +1906,21 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id)
                         break;
                 case CCS_START_NETWORK:
                 case CCS_JOIN_NETWORK:
+                        memcpy(memtmp, local->sparm.b4.a_current_ess_id,
+                                                                ESSID_SIZE);
+                        memtmp[ESSID_SIZE] = '\0';
+
                         if (status == CCS_COMMAND_COMPLETE) {
                                 if (readb
                                     (&pccs->var.start_network.net_initiated) ==
                                     1) {
                                         dev_dbg(&link->dev,
                                               "ray_cs interrupt network \"%s\" started\n",
-                                              local->sparm.b4.a_current_ess_id);
+                                              memtmp);
                                 } else {
                                         dev_dbg(&link->dev,
                                               "ray_cs interrupt network \"%s\" joined\n",
-                                              local->sparm.b4.a_current_ess_id);
+                                              memtmp);
                                 }
                                 memcpy_fromio(&local->bss_id,
                                               pccs->var.start_network.bssid,
@@ -1939,12 +1948,12 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id)
                                 if (status == CCS_START_NETWORK) {
                                         dev_dbg(&link->dev,
                                               "ray_cs interrupt network \"%s\" start failed\n",
-                                              local->sparm.b4.a_current_ess_id);
+                                              memtmp);
                                         local->timer.function = start_net;
                                 } else {
                                         dev_dbg(&link->dev,
                                               "ray_cs interrupt network \"%s\" join failed\n",
-                                              local->sparm.b4.a_current_ess_id);
+                                              memtmp);
                                         local->timer.function = join_net;
                                 }
                                 add_timer(&local->timer);
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 197b4466a5d2..a5c694f23d33 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1296,8 +1296,7 @@ void rt2800_config_filter(struct rt2x00_dev *rt2x00dev,
                            !(filter_flags & FIF_CONTROL));
         rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_PSPOLL,
                            !(filter_flags & FIF_PSPOLL));
-        rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_BA,
-                           !(filter_flags & FIF_CONTROL));
+        rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_BA, 0);
         rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_BAR,
                            !(filter_flags & FIF_CONTROL));
         rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_CNTL,
@@ -3866,6 +3865,400 @@ static u8 rt2800_init_rx_filter(struct rt2x00_dev *rt2x00dev,
         return rfcsr24;
 }
 
+static void rt2800_init_rfcsr_305x_soc(struct rt2x00_dev *rt2x00dev)
+{
+        rt2800_rfcsr_write(rt2x00dev, 0, 0x50);
+        rt2800_rfcsr_write(rt2x00dev, 1, 0x01);
+        rt2800_rfcsr_write(rt2x00dev, 2, 0xf7);
+        rt2800_rfcsr_write(rt2x00dev, 3, 0x75);
+        rt2800_rfcsr_write(rt2x00dev, 4, 0x40);
+        rt2800_rfcsr_write(rt2x00dev, 5, 0x03);
+        rt2800_rfcsr_write(rt2x00dev, 6, 0x02);
+        rt2800_rfcsr_write(rt2x00dev, 7, 0x50);
+        rt2800_rfcsr_write(rt2x00dev, 8, 0x39);
+        rt2800_rfcsr_write(rt2x00dev, 9, 0x0f);
+        rt2800_rfcsr_write(rt2x00dev, 10, 0x60);
+        rt2800_rfcsr_write(rt2x00dev, 11, 0x21);
+        rt2800_rfcsr_write(rt2x00dev, 12, 0x75);
+        rt2800_rfcsr_write(rt2x00dev, 13, 0x75);
+        rt2800_rfcsr_write(rt2x00dev, 14, 0x90);
+        rt2800_rfcsr_write(rt2x00dev, 15, 0x58);
+        rt2800_rfcsr_write(rt2x00dev, 16, 0xb3);
+        rt2800_rfcsr_write(rt2x00dev, 17, 0x92);
+        rt2800_rfcsr_write(rt2x00dev, 18, 0x2c);
+        rt2800_rfcsr_write(rt2x00dev, 19, 0x02);
+        rt2800_rfcsr_write(rt2x00dev, 20, 0xba);
+        rt2800_rfcsr_write(rt2x00dev, 21, 0xdb);
+        rt2800_rfcsr_write(rt2x00dev, 22, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 23, 0x31);
+        rt2800_rfcsr_write(rt2x00dev, 24, 0x08);
+        rt2800_rfcsr_write(rt2x00dev, 25, 0x01);
+        rt2800_rfcsr_write(rt2x00dev, 26, 0x25);
+        rt2800_rfcsr_write(rt2x00dev, 27, 0x23);
+        rt2800_rfcsr_write(rt2x00dev, 28, 0x13);
+        rt2800_rfcsr_write(rt2x00dev, 29, 0x83);
+        rt2800_rfcsr_write(rt2x00dev, 30, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 31, 0x00);
+}
+
+static void rt2800_init_rfcsr_30xx(struct rt2x00_dev *rt2x00dev)
+{
+        rt2800_rfcsr_write(rt2x00dev, 4, 0x40);
+        rt2800_rfcsr_write(rt2x00dev, 5, 0x03);
+        rt2800_rfcsr_write(rt2x00dev, 6, 0x02);
+        rt2800_rfcsr_write(rt2x00dev, 7, 0x60);
+        rt2800_rfcsr_write(rt2x00dev, 9, 0x0f);
+        rt2800_rfcsr_write(rt2x00dev, 10, 0x41);
+        rt2800_rfcsr_write(rt2x00dev, 11, 0x21);
+        rt2800_rfcsr_write(rt2x00dev, 12, 0x7b);
+        rt2800_rfcsr_write(rt2x00dev, 14, 0x90);
+        rt2800_rfcsr_write(rt2x00dev, 15, 0x58);
+        rt2800_rfcsr_write(rt2x00dev, 16, 0xb3);
+        rt2800_rfcsr_write(rt2x00dev, 17, 0x92);
+        rt2800_rfcsr_write(rt2x00dev, 18, 0x2c);
+        rt2800_rfcsr_write(rt2x00dev, 19, 0x02);
+        rt2800_rfcsr_write(rt2x00dev, 20, 0xba);
+        rt2800_rfcsr_write(rt2x00dev, 21, 0xdb);
+        rt2800_rfcsr_write(rt2x00dev, 24, 0x16);
+        rt2800_rfcsr_write(rt2x00dev, 25, 0x01);
+        rt2800_rfcsr_write(rt2x00dev, 29, 0x1f);
+}
+
+static void rt2800_init_rfcsr_3290(struct rt2x00_dev *rt2x00dev)
+{
+        rt2800_rfcsr_write(rt2x00dev, 1, 0x0f);
+        rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
+        rt2800_rfcsr_write(rt2x00dev, 3, 0x08);
+        rt2800_rfcsr_write(rt2x00dev, 4, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 6, 0xa0);
+        rt2800_rfcsr_write(rt2x00dev, 8, 0xf3);
+        rt2800_rfcsr_write(rt2x00dev, 9, 0x02);
+        rt2800_rfcsr_write(rt2x00dev, 10, 0x53);
+        rt2800_rfcsr_write(rt2x00dev, 11, 0x4a);
+        rt2800_rfcsr_write(rt2x00dev, 12, 0x46);
+        rt2800_rfcsr_write(rt2x00dev, 13, 0x9f);
+        rt2800_rfcsr_write(rt2x00dev, 18, 0x02);
+        rt2800_rfcsr_write(rt2x00dev, 22, 0x20);
+        rt2800_rfcsr_write(rt2x00dev, 25, 0x83);
+        rt2800_rfcsr_write(rt2x00dev, 26, 0x82);
+        rt2800_rfcsr_write(rt2x00dev, 27, 0x09);
+        rt2800_rfcsr_write(rt2x00dev, 29, 0x10);
+        rt2800_rfcsr_write(rt2x00dev, 30, 0x10);
+        rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
+        rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
+        rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 34, 0x05);
+        rt2800_rfcsr_write(rt2x00dev, 35, 0x12);
+        rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 38, 0x85);
+        rt2800_rfcsr_write(rt2x00dev, 39, 0x1b);
+        rt2800_rfcsr_write(rt2x00dev, 40, 0x0b);
+        rt2800_rfcsr_write(rt2x00dev, 41, 0xbb);
+        rt2800_rfcsr_write(rt2x00dev, 42, 0xd5);
+        rt2800_rfcsr_write(rt2x00dev, 43, 0x7b);
+        rt2800_rfcsr_write(rt2x00dev, 44, 0x0e);
+        rt2800_rfcsr_write(rt2x00dev, 45, 0xa2);
+        rt2800_rfcsr_write(rt2x00dev, 46, 0x73);
+        rt2800_rfcsr_write(rt2x00dev, 47, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 48, 0x10);
+        rt2800_rfcsr_write(rt2x00dev, 49, 0x98);
+        rt2800_rfcsr_write(rt2x00dev, 52, 0x38);
+        rt2800_rfcsr_write(rt2x00dev, 53, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 54, 0x78);
+        rt2800_rfcsr_write(rt2x00dev, 55, 0x43);
+        rt2800_rfcsr_write(rt2x00dev, 56, 0x02);
+        rt2800_rfcsr_write(rt2x00dev, 57, 0x80);
+        rt2800_rfcsr_write(rt2x00dev, 58, 0x7f);
+        rt2800_rfcsr_write(rt2x00dev, 59, 0x09);
+        rt2800_rfcsr_write(rt2x00dev, 60, 0x45);
+        rt2800_rfcsr_write(rt2x00dev, 61, 0xc1);
+}
+
+static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)
+{
+        rt2800_rfcsr_write(rt2x00dev, 0, 0xf0);
+        rt2800_rfcsr_write(rt2x00dev, 1, 0x23);
+        rt2800_rfcsr_write(rt2x00dev, 2, 0x50);
+        rt2800_rfcsr_write(rt2x00dev, 3, 0x18);
+        rt2800_rfcsr_write(rt2x00dev, 4, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 5, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 6, 0x33);
+        rt2800_rfcsr_write(rt2x00dev, 7, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 8, 0xf1);
+        rt2800_rfcsr_write(rt2x00dev, 9, 0x02);
+        rt2800_rfcsr_write(rt2x00dev, 10, 0xd2);
+        rt2800_rfcsr_write(rt2x00dev, 11, 0x42);
+        rt2800_rfcsr_write(rt2x00dev, 12, 0x1c);
+        rt2800_rfcsr_write(rt2x00dev, 13, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 14, 0x5a);
+        rt2800_rfcsr_write(rt2x00dev, 15, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 16, 0x01);
+        rt2800_rfcsr_write(rt2x00dev, 18, 0x45);
+        rt2800_rfcsr_write(rt2x00dev, 19, 0x02);
+        rt2800_rfcsr_write(rt2x00dev, 20, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 21, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 22, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 23, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 24, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 25, 0x80);
+        rt2800_rfcsr_write(rt2x00dev, 26, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 27, 0x03);
+        rt2800_rfcsr_write(rt2x00dev, 28, 0x03);
+        rt2800_rfcsr_write(rt2x00dev, 29, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 30, 0x10);
+        rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
+        rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
+        rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 34, 0x01);
+        rt2800_rfcsr_write(rt2x00dev, 35, 0x03);
+        rt2800_rfcsr_write(rt2x00dev, 36, 0xbd);
+        rt2800_rfcsr_write(rt2x00dev, 37, 0x3c);
+        rt2800_rfcsr_write(rt2x00dev, 38, 0x5f);
+        rt2800_rfcsr_write(rt2x00dev, 39, 0xc5);
+        rt2800_rfcsr_write(rt2x00dev, 40, 0x33);
+        rt2800_rfcsr_write(rt2x00dev, 41, 0x5b);
+        rt2800_rfcsr_write(rt2x00dev, 42, 0x5b);
+        rt2800_rfcsr_write(rt2x00dev, 43, 0xdb);
+        rt2800_rfcsr_write(rt2x00dev, 44, 0xdb);
+        rt2800_rfcsr_write(rt2x00dev, 45, 0xdb);
+        rt2800_rfcsr_write(rt2x00dev, 46, 0xdd);
+        rt2800_rfcsr_write(rt2x00dev, 47, 0x0d);
+        rt2800_rfcsr_write(rt2x00dev, 48, 0x14);
+        rt2800_rfcsr_write(rt2x00dev, 49, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 50, 0x2d);
+        rt2800_rfcsr_write(rt2x00dev, 51, 0x7f);
+        rt2800_rfcsr_write(rt2x00dev, 52, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 53, 0x52);
+        rt2800_rfcsr_write(rt2x00dev, 54, 0x1b);
+        rt2800_rfcsr_write(rt2x00dev, 55, 0x7f);
+        rt2800_rfcsr_write(rt2x00dev, 56, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 57, 0x52);
+        rt2800_rfcsr_write(rt2x00dev, 58, 0x1b);
+        rt2800_rfcsr_write(rt2x00dev, 59, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 60, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 61, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 62, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 63, 0x00);
+}
+
+static void rt2800_init_rfcsr_3390(struct rt2x00_dev *rt2x00dev)
+{
+        rt2800_rfcsr_write(rt2x00dev, 0, 0xa0);
+        rt2800_rfcsr_write(rt2x00dev, 1, 0xe1);
+        rt2800_rfcsr_write(rt2x00dev, 2, 0xf1);
+        rt2800_rfcsr_write(rt2x00dev, 3, 0x62);
+        rt2800_rfcsr_write(rt2x00dev, 4, 0x40);
+        rt2800_rfcsr_write(rt2x00dev, 5, 0x8b);
+        rt2800_rfcsr_write(rt2x00dev, 6, 0x42);
+        rt2800_rfcsr_write(rt2x00dev, 7, 0x34);
+        rt2800_rfcsr_write(rt2x00dev, 8, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 9, 0xc0);
+        rt2800_rfcsr_write(rt2x00dev, 10, 0x61);
+        rt2800_rfcsr_write(rt2x00dev, 11, 0x21);
+        rt2800_rfcsr_write(rt2x00dev, 12, 0x3b);
+        rt2800_rfcsr_write(rt2x00dev, 13, 0xe0);
+        rt2800_rfcsr_write(rt2x00dev, 14, 0x90);
+        rt2800_rfcsr_write(rt2x00dev, 15, 0x53);
+        rt2800_rfcsr_write(rt2x00dev, 16, 0xe0);
+        rt2800_rfcsr_write(rt2x00dev, 17, 0x94);
+        rt2800_rfcsr_write(rt2x00dev, 18, 0x5c);
+        rt2800_rfcsr_write(rt2x00dev, 19, 0x4a);
+        rt2800_rfcsr_write(rt2x00dev, 20, 0xb2);
+        rt2800_rfcsr_write(rt2x00dev, 21, 0xf6);
+        rt2800_rfcsr_write(rt2x00dev, 22, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 23, 0x14);
+        rt2800_rfcsr_write(rt2x00dev, 24, 0x08);
+        rt2800_rfcsr_write(rt2x00dev, 25, 0x3d);
+        rt2800_rfcsr_write(rt2x00dev, 26, 0x85);
+        rt2800_rfcsr_write(rt2x00dev, 27, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 28, 0x41);
+        rt2800_rfcsr_write(rt2x00dev, 29, 0x8f);
+        rt2800_rfcsr_write(rt2x00dev, 30, 0x20);
+        rt2800_rfcsr_write(rt2x00dev, 31, 0x0f);
+}
+
+static void rt2800_init_rfcsr_3572(struct rt2x00_dev *rt2x00dev)
+{
+        rt2800_rfcsr_write(rt2x00dev, 0, 0x70);
+        rt2800_rfcsr_write(rt2x00dev, 1, 0x81);
+        rt2800_rfcsr_write(rt2x00dev, 2, 0xf1);
+        rt2800_rfcsr_write(rt2x00dev, 3, 0x02);
+        rt2800_rfcsr_write(rt2x00dev, 4, 0x4c);
+        rt2800_rfcsr_write(rt2x00dev, 5, 0x05);
+        rt2800_rfcsr_write(rt2x00dev, 6, 0x4a);
+        rt2800_rfcsr_write(rt2x00dev, 7, 0xd8);
+        rt2800_rfcsr_write(rt2x00dev, 9, 0xc3);
+        rt2800_rfcsr_write(rt2x00dev, 10, 0xf1);
+        rt2800_rfcsr_write(rt2x00dev, 11, 0xb9);
+        rt2800_rfcsr_write(rt2x00dev, 12, 0x70);
+        rt2800_rfcsr_write(rt2x00dev, 13, 0x65);
+        rt2800_rfcsr_write(rt2x00dev, 14, 0xa0);
+        rt2800_rfcsr_write(rt2x00dev, 15, 0x53);
+        rt2800_rfcsr_write(rt2x00dev, 16, 0x4c);
+        rt2800_rfcsr_write(rt2x00dev, 17, 0x23);
+        rt2800_rfcsr_write(rt2x00dev, 18, 0xac);
+        rt2800_rfcsr_write(rt2x00dev, 19, 0x93);
+        rt2800_rfcsr_write(rt2x00dev, 20, 0xb3);
+        rt2800_rfcsr_write(rt2x00dev, 21, 0xd0);
+        rt2800_rfcsr_write(rt2x00dev, 22, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 23, 0x3c);
+        rt2800_rfcsr_write(rt2x00dev, 24, 0x16);
+        rt2800_rfcsr_write(rt2x00dev, 25, 0x15);
+        rt2800_rfcsr_write(rt2x00dev, 26, 0x85);
+        rt2800_rfcsr_write(rt2x00dev, 27, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 28, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 29, 0x9b);
+        rt2800_rfcsr_write(rt2x00dev, 30, 0x09);
+        rt2800_rfcsr_write(rt2x00dev, 31, 0x10);
+}
+
+static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
+{
+        rt2800_rfcsr_write(rt2x00dev, 1, 0x0f);
+        rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
+        rt2800_rfcsr_write(rt2x00dev, 3, 0x88);
+        rt2800_rfcsr_write(rt2x00dev, 5, 0x10);
+        if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F))
+                rt2800_rfcsr_write(rt2x00dev, 6, 0xe0);
+        else
+                rt2800_rfcsr_write(rt2x00dev, 6, 0xa0);
+        rt2800_rfcsr_write(rt2x00dev, 7, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 10, 0x53);
+        rt2800_rfcsr_write(rt2x00dev, 11, 0x4a);
+        rt2800_rfcsr_write(rt2x00dev, 12, 0xc6);
+        rt2800_rfcsr_write(rt2x00dev, 13, 0x9f);
+        rt2800_rfcsr_write(rt2x00dev, 14, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 15, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 16, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 18, 0x03);
+        rt2800_rfcsr_write(rt2x00dev, 19, 0x00);
+
+        rt2800_rfcsr_write(rt2x00dev, 20, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 21, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 22, 0x20);
+        rt2800_rfcsr_write(rt2x00dev, 23, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 24, 0x00);
+        if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F))
+                rt2800_rfcsr_write(rt2x00dev, 25, 0x80);
+        else
+                rt2800_rfcsr_write(rt2x00dev, 25, 0xc0);
+        rt2800_rfcsr_write(rt2x00dev, 26, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 27, 0x09);
+        rt2800_rfcsr_write(rt2x00dev, 28, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 29, 0x10);
+
+        rt2800_rfcsr_write(rt2x00dev, 30, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
+        rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
+        rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 34, 0x07);
+        rt2800_rfcsr_write(rt2x00dev, 35, 0x12);
+        rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 37, 0x08);
+        rt2800_rfcsr_write(rt2x00dev, 38, 0x85);
+        rt2800_rfcsr_write(rt2x00dev, 39, 0x1b);
+
+        if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F))
+                rt2800_rfcsr_write(rt2x00dev, 40, 0x0b);
+        else
+                rt2800_rfcsr_write(rt2x00dev, 40, 0x4b);
+        rt2800_rfcsr_write(rt2x00dev, 41, 0xbb);
+        rt2800_rfcsr_write(rt2x00dev, 42, 0xd2);
+        rt2800_rfcsr_write(rt2x00dev, 43, 0x9a);
+        rt2800_rfcsr_write(rt2x00dev, 44, 0x0e);
+        rt2800_rfcsr_write(rt2x00dev, 45, 0xa2);
+        if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F))
+                rt2800_rfcsr_write(rt2x00dev, 46, 0x73);
+        else
+                rt2800_rfcsr_write(rt2x00dev, 46, 0x7b);
+        rt2800_rfcsr_write(rt2x00dev, 47, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 48, 0x10);
+        rt2800_rfcsr_write(rt2x00dev, 49, 0x94);
+
+        rt2800_rfcsr_write(rt2x00dev, 52, 0x38);
+        if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F))
+                rt2800_rfcsr_write(rt2x00dev, 53, 0x00);
+        else
+                rt2800_rfcsr_write(rt2x00dev, 53, 0x84);
+        rt2800_rfcsr_write(rt2x00dev, 54, 0x78);
+        rt2800_rfcsr_write(rt2x00dev, 55, 0x44);
+        rt2800_rfcsr_write(rt2x00dev, 56, 0x22);
+        rt2800_rfcsr_write(rt2x00dev, 57, 0x80);
+        rt2800_rfcsr_write(rt2x00dev, 58, 0x7f);
+        rt2800_rfcsr_write(rt2x00dev, 59, 0x63);
+
+        rt2800_rfcsr_write(rt2x00dev, 60, 0x45);
+        if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F))
+                rt2800_rfcsr_write(rt2x00dev, 61, 0xd1);
+        else
+                rt2800_rfcsr_write(rt2x00dev, 61, 0xdd);
+        rt2800_rfcsr_write(rt2x00dev, 62, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 63, 0x00);
+}
+
+static void rt2800_init_rfcsr_5392(struct rt2x00_dev *rt2x00dev)
+{
+        rt2800_rfcsr_write(rt2x00dev, 1, 0x17);
+        rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
+        rt2800_rfcsr_write(rt2x00dev, 3, 0x88);
+        rt2800_rfcsr_write(rt2x00dev, 5, 0x10);
+        rt2800_rfcsr_write(rt2x00dev, 6, 0xe0);
+        rt2800_rfcsr_write(rt2x00dev, 7, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 10, 0x53);
+        rt2800_rfcsr_write(rt2x00dev, 11, 0x4a);
+        rt2800_rfcsr_write(rt2x00dev, 12, 0x46);
+        rt2800_rfcsr_write(rt2x00dev, 13, 0x9f);
+        rt2800_rfcsr_write(rt2x00dev, 14, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 15, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 16, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 18, 0x03);
+        rt2800_rfcsr_write(rt2x00dev, 19, 0x4d);
+        rt2800_rfcsr_write(rt2x00dev, 20, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 21, 0x8d);
+        rt2800_rfcsr_write(rt2x00dev, 22, 0x20);
+        rt2800_rfcsr_write(rt2x00dev, 23, 0x0b);
+        rt2800_rfcsr_write(rt2x00dev, 24, 0x44);
+        rt2800_rfcsr_write(rt2x00dev, 25, 0x80);
+        rt2800_rfcsr_write(rt2x00dev, 26, 0x82);
+        rt2800_rfcsr_write(rt2x00dev, 27, 0x09);
+        rt2800_rfcsr_write(rt2x00dev, 28, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 29, 0x10);
+        rt2800_rfcsr_write(rt2x00dev, 30, 0x10);
+        rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
+        rt2800_rfcsr_write(rt2x00dev, 32, 0x20);
+        rt2800_rfcsr_write(rt2x00dev, 33, 0xC0);
+        rt2800_rfcsr_write(rt2x00dev, 34, 0x07);
+        rt2800_rfcsr_write(rt2x00dev, 35, 0x12);
+        rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 37, 0x08);
+        rt2800_rfcsr_write(rt2x00dev, 38, 0x89);
+        rt2800_rfcsr_write(rt2x00dev, 39, 0x1b);
+        rt2800_rfcsr_write(rt2x00dev, 40, 0x0f);
+        rt2800_rfcsr_write(rt2x00dev, 41, 0xbb);
+        rt2800_rfcsr_write(rt2x00dev, 42, 0xd5);
+        rt2800_rfcsr_write(rt2x00dev, 43, 0x9b);
+        rt2800_rfcsr_write(rt2x00dev, 44, 0x0e);
+        rt2800_rfcsr_write(rt2x00dev, 45, 0xa2);
+        rt2800_rfcsr_write(rt2x00dev, 46, 0x73);
+        rt2800_rfcsr_write(rt2x00dev, 47, 0x0c);
+        rt2800_rfcsr_write(rt2x00dev, 48, 0x10);
+        rt2800_rfcsr_write(rt2x00dev, 49, 0x94);
+        rt2800_rfcsr_write(rt2x00dev, 50, 0x94);
+        rt2800_rfcsr_write(rt2x00dev, 51, 0x3a);
+        rt2800_rfcsr_write(rt2x00dev, 52, 0x48);
+        rt2800_rfcsr_write(rt2x00dev, 53, 0x44);
+        rt2800_rfcsr_write(rt2x00dev, 54, 0x38);
+        rt2800_rfcsr_write(rt2x00dev, 55, 0x43);
+        rt2800_rfcsr_write(rt2x00dev, 56, 0xa1);
+        rt2800_rfcsr_write(rt2x00dev, 57, 0x00);
+        rt2800_rfcsr_write(rt2x00dev, 58, 0x39);
+        rt2800_rfcsr_write(rt2x00dev, 59, 0x07);
+        rt2800_rfcsr_write(rt2x00dev, 60, 0x45);
+        rt2800_rfcsr_write(rt2x00dev, 61, 0x91);
+        rt2800_rfcsr_write(rt2x00dev, 62, 0x39);
+        rt2800_rfcsr_write(rt2x00dev, 63, 0x07);
+}
+
 static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
 {
         struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
@@ -3889,6 +4282,7 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
         /*
          * Init RF calibration.
          */
+
         if (rt2x00_rt(rt2x00dev, RT3290) ||
             rt2x00_rt(rt2x00dev, RT5390) ||
             rt2x00_rt(rt2x00dev, RT5392)) {
@@ -3907,379 +4301,35 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
                 rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
         }
 
-        if (rt2x00_rt(rt2x00dev, RT3070) ||
-            rt2x00_rt(rt2x00dev, RT3071) ||
-            rt2x00_rt(rt2x00dev, RT3090)) {
-                rt2800_rfcsr_write(rt2x00dev, 4, 0x40);
-                rt2800_rfcsr_write(rt2x00dev, 5, 0x03);
-                rt2800_rfcsr_write(rt2x00dev, 6, 0x02);
-                rt2800_rfcsr_write(rt2x00dev, 7, 0x60);
-                rt2800_rfcsr_write(rt2x00dev, 9, 0x0f);
-                rt2800_rfcsr_write(rt2x00dev, 10, 0x41);
-                rt2800_rfcsr_write(rt2x00dev, 11, 0x21);
-                rt2800_rfcsr_write(rt2x00dev, 12, 0x7b);
-                rt2800_rfcsr_write(rt2x00dev, 14, 0x90);
-                rt2800_rfcsr_write(rt2x00dev, 15, 0x58);
-                rt2800_rfcsr_write(rt2x00dev, 16, 0xb3);
-                rt2800_rfcsr_write(rt2x00dev, 17, 0x92);
-                rt2800_rfcsr_write(rt2x00dev, 18, 0x2c);
-                rt2800_rfcsr_write(rt2x00dev, 19, 0x02);
-                rt2800_rfcsr_write(rt2x00dev, 20, 0xba);
-                rt2800_rfcsr_write(rt2x00dev, 21, 0xdb);
-                rt2800_rfcsr_write(rt2x00dev, 24, 0x16);
-                rt2800_rfcsr_write(rt2x00dev, 25, 0x01);
-                rt2800_rfcsr_write(rt2x00dev, 29, 0x1f);
-        } else if (rt2x00_rt(rt2x00dev, RT3290)) {
-                rt2800_rfcsr_write(rt2x00dev, 1, 0x0f);
-                rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
-                rt2800_rfcsr_write(rt2x00dev, 3, 0x08);
-                rt2800_rfcsr_write(rt2x00dev, 4, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 6, 0xa0);
-                rt2800_rfcsr_write(rt2x00dev, 8, 0xf3);
-                rt2800_rfcsr_write(rt2x00dev, 9, 0x02);
-                rt2800_rfcsr_write(rt2x00dev, 10, 0x53);
-                rt2800_rfcsr_write(rt2x00dev, 11, 0x4a);
-                rt2800_rfcsr_write(rt2x00dev, 12, 0x46);
-                rt2800_rfcsr_write(rt2x00dev, 13, 0x9f);
-                rt2800_rfcsr_write(rt2x00dev, 18, 0x02);
-                rt2800_rfcsr_write(rt2x00dev, 22, 0x20);
-                rt2800_rfcsr_write(rt2x00dev, 25, 0x83);
-                rt2800_rfcsr_write(rt2x00dev, 26, 0x82);
-                rt2800_rfcsr_write(rt2x00dev, 27, 0x09);
-                rt2800_rfcsr_write(rt2x00dev, 29, 0x10);
-                rt2800_rfcsr_write(rt2x00dev, 30, 0x10);
-                rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
-                rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
-                rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 34, 0x05);
-                rt2800_rfcsr_write(rt2x00dev, 35, 0x12);
-                rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 38, 0x85);
-                rt2800_rfcsr_write(rt2x00dev, 39, 0x1b);
-                rt2800_rfcsr_write(rt2x00dev, 40, 0x0b);
-                rt2800_rfcsr_write(rt2x00dev, 41, 0xbb);
-                rt2800_rfcsr_write(rt2x00dev, 42, 0xd5);
-                rt2800_rfcsr_write(rt2x00dev, 43, 0x7b);
-                rt2800_rfcsr_write(rt2x00dev, 44, 0x0e);
-                rt2800_rfcsr_write(rt2x00dev, 45, 0xa2);
-                rt2800_rfcsr_write(rt2x00dev, 46, 0x73);
-                rt2800_rfcsr_write(rt2x00dev, 47, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 48, 0x10);
-                rt2800_rfcsr_write(rt2x00dev, 49, 0x98);
-                rt2800_rfcsr_write(rt2x00dev, 52, 0x38);
-                rt2800_rfcsr_write(rt2x00dev, 53, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 54, 0x78);
-                rt2800_rfcsr_write(rt2x00dev, 55, 0x43);
-                rt2800_rfcsr_write(rt2x00dev, 56, 0x02);
-                rt2800_rfcsr_write(rt2x00dev, 57, 0x80);
-                rt2800_rfcsr_write(rt2x00dev, 58, 0x7f);
-                rt2800_rfcsr_write(rt2x00dev, 59, 0x09);
-                rt2800_rfcsr_write(rt2x00dev, 60, 0x45);
-                rt2800_rfcsr_write(rt2x00dev, 61, 0xc1);
-        } else if (rt2x00_rt(rt2x00dev, RT3390)) {
-                rt2800_rfcsr_write(rt2x00dev, 0, 0xa0);
-                rt2800_rfcsr_write(rt2x00dev, 1, 0xe1);
-                rt2800_rfcsr_write(rt2x00dev, 2, 0xf1);
-                rt2800_rfcsr_write(rt2x00dev, 3, 0x62);
-                rt2800_rfcsr_write(rt2x00dev, 4, 0x40);
-                rt2800_rfcsr_write(rt2x00dev, 5, 0x8b);
-                rt2800_rfcsr_write(rt2x00dev, 6, 0x42);
-                rt2800_rfcsr_write(rt2x00dev, 7, 0x34);
-                rt2800_rfcsr_write(rt2x00dev, 8, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 9, 0xc0);
-                rt2800_rfcsr_write(rt2x00dev, 10, 0x61);
-                rt2800_rfcsr_write(rt2x00dev, 11, 0x21);
-                rt2800_rfcsr_write(rt2x00dev, 12, 0x3b);
-                rt2800_rfcsr_write(rt2x00dev, 13, 0xe0);
-                rt2800_rfcsr_write(rt2x00dev, 14, 0x90);
-                rt2800_rfcsr_write(rt2x00dev, 15, 0x53);
-                rt2800_rfcsr_write(rt2x00dev, 16, 0xe0);
-                rt2800_rfcsr_write(rt2x00dev, 17, 0x94);
-                rt2800_rfcsr_write(rt2x00dev, 18, 0x5c);
-                rt2800_rfcsr_write(rt2x00dev, 19, 0x4a);
-                rt2800_rfcsr_write(rt2x00dev, 20, 0xb2);
-                rt2800_rfcsr_write(rt2x00dev, 21, 0xf6);
-                rt2800_rfcsr_write(rt2x00dev, 22, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 23, 0x14);
-                rt2800_rfcsr_write(rt2x00dev, 24, 0x08);
-                rt2800_rfcsr_write(rt2x00dev, 25, 0x3d);
-                rt2800_rfcsr_write(rt2x00dev, 26, 0x85);
-                rt2800_rfcsr_write(rt2x00dev, 27, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 28, 0x41);
-                rt2800_rfcsr_write(rt2x00dev, 29, 0x8f);
-                rt2800_rfcsr_write(rt2x00dev, 30, 0x20);
-                rt2800_rfcsr_write(rt2x00dev, 31, 0x0f);
-        } else if (rt2x00_rt(rt2x00dev, RT3572)) {
-                rt2800_rfcsr_write(rt2x00dev, 0, 0x70);
-                rt2800_rfcsr_write(rt2x00dev, 1, 0x81);
-                rt2800_rfcsr_write(rt2x00dev, 2, 0xf1);
-                rt2800_rfcsr_write(rt2x00dev, 3, 0x02);
-                rt2800_rfcsr_write(rt2x00dev, 4, 0x4c);
-                rt2800_rfcsr_write(rt2x00dev, 5, 0x05);
-                rt2800_rfcsr_write(rt2x00dev, 6, 0x4a);
-                rt2800_rfcsr_write(rt2x00dev, 7, 0xd8);
-                rt2800_rfcsr_write(rt2x00dev, 9, 0xc3);
-                rt2800_rfcsr_write(rt2x00dev, 10, 0xf1);
-                rt2800_rfcsr_write(rt2x00dev, 11, 0xb9);
-                rt2800_rfcsr_write(rt2x00dev, 12, 0x70);
-                rt2800_rfcsr_write(rt2x00dev, 13, 0x65);
-                rt2800_rfcsr_write(rt2x00dev, 14, 0xa0);
-                rt2800_rfcsr_write(rt2x00dev, 15, 0x53);
-                rt2800_rfcsr_write(rt2x00dev, 16, 0x4c);
-                rt2800_rfcsr_write(rt2x00dev, 17, 0x23);
-                rt2800_rfcsr_write(rt2x00dev, 18, 0xac);
-                rt2800_rfcsr_write(rt2x00dev, 19, 0x93);
-                rt2800_rfcsr_write(rt2x00dev, 20, 0xb3);
-                rt2800_rfcsr_write(rt2x00dev, 21, 0xd0);
-                rt2800_rfcsr_write(rt2x00dev, 22, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 23, 0x3c);
-                rt2800_rfcsr_write(rt2x00dev, 24, 0x16);
-                rt2800_rfcsr_write(rt2x00dev, 25, 0x15);
-                rt2800_rfcsr_write(rt2x00dev, 26, 0x85);
-                rt2800_rfcsr_write(rt2x00dev, 27, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 28, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 29, 0x9b);
-                rt2800_rfcsr_write(rt2x00dev, 30, 0x09);
-                rt2800_rfcsr_write(rt2x00dev, 31, 0x10);
-        } else if (rt2800_is_305x_soc(rt2x00dev)) {
-                rt2800_rfcsr_write(rt2x00dev, 0, 0x50);
-                rt2800_rfcsr_write(rt2x00dev, 1, 0x01);
-                rt2800_rfcsr_write(rt2x00dev, 2, 0xf7);
-                rt2800_rfcsr_write(rt2x00dev, 3, 0x75);
-                rt2800_rfcsr_write(rt2x00dev, 4, 0x40);
-                rt2800_rfcsr_write(rt2x00dev, 5, 0x03);
-                rt2800_rfcsr_write(rt2x00dev, 6, 0x02);
-                rt2800_rfcsr_write(rt2x00dev, 7, 0x50);
-                rt2800_rfcsr_write(rt2x00dev, 8, 0x39);
-                rt2800_rfcsr_write(rt2x00dev, 9, 0x0f);
-                rt2800_rfcsr_write(rt2x00dev, 10, 0x60);
-                rt2800_rfcsr_write(rt2x00dev, 11, 0x21);
-                rt2800_rfcsr_write(rt2x00dev, 12, 0x75);
-                rt2800_rfcsr_write(rt2x00dev, 13, 0x75);
-                rt2800_rfcsr_write(rt2x00dev, 14, 0x90);
-                rt2800_rfcsr_write(rt2x00dev, 15, 0x58);
-                rt2800_rfcsr_write(rt2x00dev, 16, 0xb3);
-                rt2800_rfcsr_write(rt2x00dev, 17, 0x92);
-                rt2800_rfcsr_write(rt2x00dev, 18, 0x2c);
-                rt2800_rfcsr_write(rt2x00dev, 19, 0x02);
-                rt2800_rfcsr_write(rt2x00dev, 20, 0xba);
-                rt2800_rfcsr_write(rt2x00dev, 21, 0xdb);
-                rt2800_rfcsr_write(rt2x00dev, 22, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 23, 0x31);
-                rt2800_rfcsr_write(rt2x00dev, 24, 0x08);
-                rt2800_rfcsr_write(rt2x00dev, 25, 0x01);
-                rt2800_rfcsr_write(rt2x00dev, 26, 0x25);
-                rt2800_rfcsr_write(rt2x00dev, 27, 0x23);
-                rt2800_rfcsr_write(rt2x00dev, 28, 0x13);
-                rt2800_rfcsr_write(rt2x00dev, 29, 0x83);
-                rt2800_rfcsr_write(rt2x00dev, 30, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 31, 0x00);
+        if (rt2800_is_305x_soc(rt2x00dev)) {
+                rt2800_init_rfcsr_305x_soc(rt2x00dev);
                 return 0;
-        } else if (rt2x00_rt(rt2x00dev, RT3352)) {
-                rt2800_rfcsr_write(rt2x00dev, 0, 0xf0);
-                rt2800_rfcsr_write(rt2x00dev, 1, 0x23);
-                rt2800_rfcsr_write(rt2x00dev, 2, 0x50);
-                rt2800_rfcsr_write(rt2x00dev, 3, 0x18);
-                rt2800_rfcsr_write(rt2x00dev, 4, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 5, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 6, 0x33);
-                rt2800_rfcsr_write(rt2x00dev, 7, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 8, 0xf1);
-                rt2800_rfcsr_write(rt2x00dev, 9, 0x02);
-                rt2800_rfcsr_write(rt2x00dev, 10, 0xd2);
-                rt2800_rfcsr_write(rt2x00dev, 11, 0x42);
-                rt2800_rfcsr_write(rt2x00dev, 12, 0x1c);
-                rt2800_rfcsr_write(rt2x00dev, 13, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 14, 0x5a);
-                rt2800_rfcsr_write(rt2x00dev, 15, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 16, 0x01);
-                rt2800_rfcsr_write(rt2x00dev, 18, 0x45);
-                rt2800_rfcsr_write(rt2x00dev, 19, 0x02);
-                rt2800_rfcsr_write(rt2x00dev, 20, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 21, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 22, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 23, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 24, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 25, 0x80);
-                rt2800_rfcsr_write(rt2x00dev, 26, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 27, 0x03);
-                rt2800_rfcsr_write(rt2x00dev, 28, 0x03);
-                rt2800_rfcsr_write(rt2x00dev, 29, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 30, 0x10);
-                rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
-                rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
-                rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 34, 0x01);
-                rt2800_rfcsr_write(rt2x00dev, 35, 0x03);
-                rt2800_rfcsr_write(rt2x00dev, 36, 0xbd);
-                rt2800_rfcsr_write(rt2x00dev, 37, 0x3c);
-                rt2800_rfcsr_write(rt2x00dev, 38, 0x5f);
-                rt2800_rfcsr_write(rt2x00dev, 39, 0xc5);
-                rt2800_rfcsr_write(rt2x00dev, 40, 0x33);
-                rt2800_rfcsr_write(rt2x00dev, 41, 0x5b);
-                rt2800_rfcsr_write(rt2x00dev, 42, 0x5b);
-                rt2800_rfcsr_write(rt2x00dev, 43, 0xdb);
-                rt2800_rfcsr_write(rt2x00dev, 44, 0xdb);
-                rt2800_rfcsr_write(rt2x00dev, 45, 0xdb);
-                rt2800_rfcsr_write(rt2x00dev, 46, 0xdd);
-                rt2800_rfcsr_write(rt2x00dev, 47, 0x0d);
-                rt2800_rfcsr_write(rt2x00dev, 48, 0x14);
-                rt2800_rfcsr_write(rt2x00dev, 49, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 50, 0x2d);
-                rt2800_rfcsr_write(rt2x00dev, 51, 0x7f);
-                rt2800_rfcsr_write(rt2x00dev, 52, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 53, 0x52);
-                rt2800_rfcsr_write(rt2x00dev, 54, 0x1b);
-                rt2800_rfcsr_write(rt2x00dev, 55, 0x7f);
-                rt2800_rfcsr_write(rt2x00dev, 56, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 57, 0x52);
-                rt2800_rfcsr_write(rt2x00dev, 58, 0x1b);
-                rt2800_rfcsr_write(rt2x00dev, 59, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 60, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 61, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 62, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 63, 0x00);
-        } else if (rt2x00_rt(rt2x00dev, RT5390)) {
-                rt2800_rfcsr_write(rt2x00dev, 1, 0x0f);
-                rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
-                rt2800_rfcsr_write(rt2x00dev, 3, 0x88);
-                rt2800_rfcsr_write(rt2x00dev, 5, 0x10);
-                if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F))
-                        rt2800_rfcsr_write(rt2x00dev, 6, 0xe0);
-                else
-                        rt2800_rfcsr_write(rt2x00dev, 6, 0xa0);
-                rt2800_rfcsr_write(rt2x00dev, 7, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 10, 0x53);
-                rt2800_rfcsr_write(rt2x00dev, 11, 0x4a);
-                rt2800_rfcsr_write(rt2x00dev, 12, 0xc6);
-                rt2800_rfcsr_write(rt2x00dev, 13, 0x9f);
-                rt2800_rfcsr_write(rt2x00dev, 14, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 15, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 16, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 18, 0x03);
-                rt2800_rfcsr_write(rt2x00dev, 19, 0x00);
-
-                rt2800_rfcsr_write(rt2x00dev, 20, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 21, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 22, 0x20);
-                rt2800_rfcsr_write(rt2x00dev, 23, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 24, 0x00);
-                if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F))
-                        rt2800_rfcsr_write(rt2x00dev, 25, 0x80);
-                else
-                        rt2800_rfcsr_write(rt2x00dev, 25, 0xc0);
-                rt2800_rfcsr_write(rt2x00dev, 26, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 27, 0x09);
-                rt2800_rfcsr_write(rt2x00dev, 28, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 29, 0x10);
-
-                rt2800_rfcsr_write(rt2x00dev, 30, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
-                rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
-                rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 34, 0x07);
-                rt2800_rfcsr_write(rt2x00dev, 35, 0x12);
-                rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 37, 0x08);
-                rt2800_rfcsr_write(rt2x00dev, 38, 0x85);
-                rt2800_rfcsr_write(rt2x00dev, 39, 0x1b);
-
-                if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F))
-                        rt2800_rfcsr_write(rt2x00dev, 40, 0x0b);
-                else
-                        rt2800_rfcsr_write(rt2x00dev, 40, 0x4b);
-                rt2800_rfcsr_write(rt2x00dev, 41, 0xbb);
-                rt2800_rfcsr_write(rt2x00dev, 42, 0xd2);
-                rt2800_rfcsr_write(rt2x00dev, 43, 0x9a);
-                rt2800_rfcsr_write(rt2x00dev, 44, 0x0e);
-                rt2800_rfcsr_write(rt2x00dev, 45, 0xa2);
-                if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F))
-                        rt2800_rfcsr_write(rt2x00dev, 46, 0x73);
-                else
-                        rt2800_rfcsr_write(rt2x00dev, 46, 0x7b);
-                rt2800_rfcsr_write(rt2x00dev, 47, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 48, 0x10);
-                rt2800_rfcsr_write(rt2x00dev, 49, 0x94);
-
-                rt2800_rfcsr_write(rt2x00dev, 52, 0x38);
-                if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F))
-                        rt2800_rfcsr_write(rt2x00dev, 53, 0x00);
-                else
-                        rt2800_rfcsr_write(rt2x00dev, 53, 0x84);
-                rt2800_rfcsr_write(rt2x00dev, 54, 0x78);
-                rt2800_rfcsr_write(rt2x00dev, 55, 0x44);
-                rt2800_rfcsr_write(rt2x00dev, 56, 0x22);
-                rt2800_rfcsr_write(rt2x00dev, 57, 0x80);
-                rt2800_rfcsr_write(rt2x00dev, 58, 0x7f);
-                rt2800_rfcsr_write(rt2x00dev, 59, 0x63);
-
-                rt2800_rfcsr_write(rt2x00dev, 60, 0x45);
-                if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F))
-                        rt2800_rfcsr_write(rt2x00dev, 61, 0xd1);
-                else
-                        rt2800_rfcsr_write(rt2x00dev, 61, 0xdd);
-                rt2800_rfcsr_write(rt2x00dev, 62, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 63, 0x00);
-        } else if (rt2x00_rt(rt2x00dev, RT5392)) {
-                rt2800_rfcsr_write(rt2x00dev, 1, 0x17);
-                rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
-                rt2800_rfcsr_write(rt2x00dev, 3, 0x88);
-                rt2800_rfcsr_write(rt2x00dev, 5, 0x10);
-                rt2800_rfcsr_write(rt2x00dev, 6, 0xe0);
-                rt2800_rfcsr_write(rt2x00dev, 7, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 10, 0x53);
-                rt2800_rfcsr_write(rt2x00dev, 11, 0x4a);
-                rt2800_rfcsr_write(rt2x00dev, 12, 0x46);
-                rt2800_rfcsr_write(rt2x00dev, 13, 0x9f);
-                rt2800_rfcsr_write(rt2x00dev, 14, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 15, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 16, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 18, 0x03);
-                rt2800_rfcsr_write(rt2x00dev, 19, 0x4d);
-                rt2800_rfcsr_write(rt2x00dev, 20, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 21, 0x8d);
-                rt2800_rfcsr_write(rt2x00dev, 22, 0x20);
-                rt2800_rfcsr_write(rt2x00dev, 23, 0x0b);
-                rt2800_rfcsr_write(rt2x00dev, 24, 0x44);
-                rt2800_rfcsr_write(rt2x00dev, 25, 0x80);
-                rt2800_rfcsr_write(rt2x00dev, 26, 0x82);
-                rt2800_rfcsr_write(rt2x00dev, 27, 0x09);
-                rt2800_rfcsr_write(rt2x00dev, 28, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 29, 0x10);
-                rt2800_rfcsr_write(rt2x00dev, 30, 0x10);
-                rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
-                rt2800_rfcsr_write(rt2x00dev, 32, 0x20);
-                rt2800_rfcsr_write(rt2x00dev, 33, 0xC0);
-                rt2800_rfcsr_write(rt2x00dev, 34, 0x07);
-                rt2800_rfcsr_write(rt2x00dev, 35, 0x12);
-                rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 37, 0x08);
-                rt2800_rfcsr_write(rt2x00dev, 38, 0x89);
-                rt2800_rfcsr_write(rt2x00dev, 39, 0x1b);
-                rt2800_rfcsr_write(rt2x00dev, 40, 0x0f);
-                rt2800_rfcsr_write(rt2x00dev, 41, 0xbb);
-                rt2800_rfcsr_write(rt2x00dev, 42, 0xd5);
-                rt2800_rfcsr_write(rt2x00dev, 43, 0x9b);
-                rt2800_rfcsr_write(rt2x00dev, 44, 0x0e);
-                rt2800_rfcsr_write(rt2x00dev, 45, 0xa2);
-                rt2800_rfcsr_write(rt2x00dev, 46, 0x73);
-                rt2800_rfcsr_write(rt2x00dev, 47, 0x0c);
-                rt2800_rfcsr_write(rt2x00dev, 48, 0x10);
-                rt2800_rfcsr_write(rt2x00dev, 49, 0x94);
-                rt2800_rfcsr_write(rt2x00dev, 50, 0x94);
-                rt2800_rfcsr_write(rt2x00dev, 51, 0x3a);
-                rt2800_rfcsr_write(rt2x00dev, 52, 0x48);
-                rt2800_rfcsr_write(rt2x00dev, 53, 0x44);
-                rt2800_rfcsr_write(rt2x00dev, 54, 0x38);
-                rt2800_rfcsr_write(rt2x00dev, 55, 0x43);
-                rt2800_rfcsr_write(rt2x00dev, 56, 0xa1);
-                rt2800_rfcsr_write(rt2x00dev, 57, 0x00);
-                rt2800_rfcsr_write(rt2x00dev, 58, 0x39);
-                rt2800_rfcsr_write(rt2x00dev, 59, 0x07);
-                rt2800_rfcsr_write(rt2x00dev, 60, 0x45);
-                rt2800_rfcsr_write(rt2x00dev, 61, 0x91);
-                rt2800_rfcsr_write(rt2x00dev, 62, 0x39);
-                rt2800_rfcsr_write(rt2x00dev, 63, 0x07);
+        }
+
+        switch (rt2x00dev->chip.rt) {
+        case RT3070:
+        case RT3071:
+        case RT3090:
+                rt2800_init_rfcsr_30xx(rt2x00dev);
+                break;
+        case RT3290:
+                rt2800_init_rfcsr_3290(rt2x00dev);
+                break;
+        case RT3352:
+                rt2800_init_rfcsr_3352(rt2x00dev);
+                break;
+        case RT3390:
+                rt2800_init_rfcsr_3390(rt2x00dev);
+                break;
+        case RT3572:
+                rt2800_init_rfcsr_3572(rt2x00dev);
+                break;
+        case RT5390:
+                rt2800_init_rfcsr_5390(rt2x00dev);
+                break;
+        case RT5392:
+                rt2800_init_rfcsr_5392(rt2x00dev);
+                break;
         }
 
         if (rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070F)) {
@@ -4620,12 +4670,14 @@ static void rt2800_efuse_read(struct rt2x00_dev *rt2x00dev, unsigned int i)
         mutex_unlock(&rt2x00dev->csr_mutex);
 }
 
-void rt2800_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev)
+int rt2800_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev)
 {
         unsigned int i;
 
         for (i = 0; i < EEPROM_SIZE / sizeof(u16); i += 8)
                 rt2800_efuse_read(rt2x00dev, i);
+
+        return 0;
 }
 EXPORT_SYMBOL_GPL(rt2800_read_eeprom_efuse);
 
@@ -4635,11 +4687,14 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         u16 word;
         u8 *mac;
         u8 default_lna_gain;
+        int retval;
 
         /*
          * Read the EEPROM.
          */
-        rt2800_read_eeprom(rt2x00dev);
+        retval = rt2800_read_eeprom(rt2x00dev);
+        if (retval)
+                return retval;
 
         /*
          * Start validation of the data that has been read.
@@ -5090,8 +5145,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
             IEEE80211_HW_SUPPORTS_PS |
             IEEE80211_HW_PS_NULLFUNC_STACK |
             IEEE80211_HW_AMPDU_AGGREGATION |
-            IEEE80211_HW_REPORTS_TX_ACK_STATUS |
-            IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL;
+            IEEE80211_HW_REPORTS_TX_ACK_STATUS;
 
         /*
          * Don't set IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING for USB devices
@@ -5484,7 +5538,9 @@ int rt2800_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
         case IEEE80211_AMPDU_TX_START:
                 ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
                 break;
-        case IEEE80211_AMPDU_TX_STOP:
+        case IEEE80211_AMPDU_TX_STOP_CONT:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
                 ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
                 break;
         case IEEE80211_AMPDU_TX_OPERATIONAL:
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.h b/drivers/net/wireless/rt2x00/rt2800lib.h
index a128ceadcb3e..6ec739466db4 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.h
+++ b/drivers/net/wireless/rt2x00/rt2800lib.h
@@ -43,7 +43,7 @@ struct rt2800_ops {
                             const unsigned int offset,
                             const struct rt2x00_field32 field, u32 *reg);
 
-        void (*read_eeprom)(struct rt2x00_dev *rt2x00dev);
+        int (*read_eeprom)(struct rt2x00_dev *rt2x00dev);
         bool (*hwcrypt_disabled)(struct rt2x00_dev *rt2x00dev);
 
         int (*drv_write_firmware)(struct rt2x00_dev *rt2x00dev,
@@ -117,11 +117,11 @@ static inline int rt2800_regbusy_read(struct rt2x00_dev *rt2x00dev,
         return rt2800ops->regbusy_read(rt2x00dev, offset, field, reg);
 }
 
-static inline void rt2800_read_eeprom(struct rt2x00_dev *rt2x00dev)
+static inline int rt2800_read_eeprom(struct rt2x00_dev *rt2x00dev)
 {
         const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
 
-        rt2800ops->read_eeprom(rt2x00dev);
+        return rt2800ops->read_eeprom(rt2x00dev);
 }
 
 static inline bool rt2800_hwcrypt_disabled(struct rt2x00_dev *rt2x00dev)
@@ -207,7 +207,7 @@ int rt2800_enable_radio(struct rt2x00_dev *rt2x00dev);
 void rt2800_disable_radio(struct rt2x00_dev *rt2x00dev);
 
 int rt2800_efuse_detect(struct rt2x00_dev *rt2x00dev);
-void rt2800_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev);
+int rt2800_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev);
 
 int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev);
 
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 9224d874bf24..0e8d1705e368 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -90,17 +90,22 @@ static void rt2800pci_mcu_status(struct rt2x00_dev *rt2x00dev, const u8 token)
 }
 
 #if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)
-static void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
+static int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
 {
         void __iomem *base_addr = ioremap(0x1F040000, EEPROM_SIZE);
 
+        if (!base_addr)
+                return -ENOMEM;
+
         memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE);
 
         iounmap(base_addr);
+        return 0;
 }
 #else
-static inline void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
+static inline int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
 {
+        return -ENOMEM;
 }
 #endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */
 
@@ -135,7 +140,7 @@ static void rt2800pci_eepromregister_write(struct eeprom_93cx6 *eeprom)
         rt2x00pci_register_write(rt2x00dev, E2PROM_CSR, reg);
 }
 
-static void rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev)
+static int rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev)
 {
         struct eeprom_93cx6 eeprom;
         u32 reg;
@@ -164,6 +169,8 @@ static void rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev)
 
         eeprom_93cx6_multiread(&eeprom, EEPROM_BASE, rt2x00dev->eeprom,
                                EEPROM_SIZE / sizeof(u16));
+
+        return 0;
 }
 
 static int rt2800pci_efuse_detect(struct rt2x00_dev *rt2x00dev)
@@ -171,13 +178,14 @@ static int rt2800pci_efuse_detect(struct rt2x00_dev *rt2x00dev)
         return rt2800_efuse_detect(rt2x00dev);
 }
 
-static inline void rt2800pci_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev)
+static inline int rt2800pci_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev)
 {
-        rt2800_read_eeprom_efuse(rt2x00dev);
+        return rt2800_read_eeprom_efuse(rt2x00dev);
 }
 #else
-static inline void rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev)
+static inline int rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev)
 {
+        return -EOPNOTSUPP;
 }
 
 static inline int rt2800pci_efuse_detect(struct rt2x00_dev *rt2x00dev)
@@ -185,8 +193,9 @@ static inline int rt2800pci_efuse_detect(struct rt2x00_dev *rt2x00dev)
         return 0;
 }
 
-static inline void rt2800pci_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev)
+static inline int rt2800pci_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev)
 {
+        return -EOPNOTSUPP;
 }
 #endif /* CONFIG_PCI */
 
@@ -970,14 +979,18 @@ static irqreturn_t rt2800pci_interrupt(int irq, void *dev_instance)
 /*
  * Device probe functions.
  */
-static void rt2800pci_read_eeprom(struct rt2x00_dev *rt2x00dev)
+static int rt2800pci_read_eeprom(struct rt2x00_dev *rt2x00dev)
 {
+        int retval;
+
         if (rt2x00_is_soc(rt2x00dev))
-                rt2800pci_read_eeprom_soc(rt2x00dev);
+                retval = rt2800pci_read_eeprom_soc(rt2x00dev);
         else if (rt2800pci_efuse_detect(rt2x00dev))
-                rt2800pci_read_eeprom_efuse(rt2x00dev);
+                retval = rt2800pci_read_eeprom_efuse(rt2x00dev);
         else
-                rt2800pci_read_eeprom_pci(rt2x00dev);
+                retval = rt2800pci_read_eeprom_pci(rt2x00dev);
+
+        return retval;
 }
 
 static const struct ieee80211_ops rt2800pci_mac80211_ops = {
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 5c149b58ab46..4721cada1591 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -735,13 +735,17 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry,
 /*
  * Device probe functions.
  */
-static void rt2800usb_read_eeprom(struct rt2x00_dev *rt2x00dev)
+static int rt2800usb_read_eeprom(struct rt2x00_dev *rt2x00dev)
 {
+        int retval;
+
         if (rt2800_efuse_detect(rt2x00dev))
-                rt2800_read_eeprom_efuse(rt2x00dev);
+                retval = rt2800_read_eeprom_efuse(rt2x00dev);
         else
-                rt2x00usb_eeprom_read(rt2x00dev, rt2x00dev->eeprom,
-                                      EEPROM_SIZE);
+                retval = rt2x00usb_eeprom_read(rt2x00dev, rt2x00dev->eeprom,
+                                               EEPROM_SIZE);
+
+        return retval;
 }
 
 static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev)
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 0751b35ef6dc..b52512b8ac5f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -1016,6 +1016,26 @@ struct rt2x00_dev {
          * Protect the interrupt mask register.
          */
         spinlock_t irqmask_lock;
+
+        /*
+         * List of BlockAckReq TX entries that need driver BlockAck processing.
+         */
+        struct list_head bar_list;
+        spinlock_t bar_list_lock;
+};
+
+struct rt2x00_bar_list_entry {
+        struct list_head list;
+        struct rcu_head head;
+
+        struct queue_entry *entry;
+        int block_acked;
+
+        /* Relevant parts of the IEEE80211 BAR header */
+        __u8 ra[6];
+        __u8 ta[6];
+        __le16 control;
+        __le16 start_seq_num;
 };
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 44f8b3f3cbed..b40a53857498 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -271,6 +271,50 @@ void rt2x00lib_dmadone(struct queue_entry *entry)
 }
 EXPORT_SYMBOL_GPL(rt2x00lib_dmadone);
 
+static inline int rt2x00lib_txdone_bar_status(struct queue_entry *entry)
+{
+        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
+        struct ieee80211_bar *bar = (void *) entry->skb->data;
+        struct rt2x00_bar_list_entry *bar_entry;
+        int ret;
+
+        if (likely(!ieee80211_is_back_req(bar->frame_control)))
+                return 0;
+
+        /*
+         * Unlike all other frames, the status report for BARs does
+         * not directly come from the hardware as it is incapable of
+         * matching a BA to a previously send BAR. The hardware will
+         * report all BARs as if they weren't acked at all.
+         *
+         * Instead the RX-path will scan for incoming BAs and set the
+         * block_acked flag if it sees one that was likely caused by
+         * a BAR from us.
+         *
+         * Remove remaining BARs here and return their status for
+         * TX done processing.
+         */
+        ret = 0;
+        rcu_read_lock();
+        list_for_each_entry_rcu(bar_entry, &rt2x00dev->bar_list, list) {
+                if (bar_entry->entry != entry)
+                        continue;
+
+                spin_lock_bh(&rt2x00dev->bar_list_lock);
+                /* Return whether this BAR was blockacked or not */
+                ret = bar_entry->block_acked;
+                /* Remove the BAR from our checklist */
+                list_del_rcu(&bar_entry->list);
+                spin_unlock_bh(&rt2x00dev->bar_list_lock);
+                kfree_rcu(bar_entry, head);
+
+                break;
+        }
+        rcu_read_unlock();
+
+        return ret;
+}
+
 void rt2x00lib_txdone(struct queue_entry *entry,
                       struct txdone_entry_desc *txdesc)
 {
@@ -324,9 +368,12 @@ void rt2x00lib_txdone(struct queue_entry *entry,
         rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TXDONE, entry->skb);
 
         /*
-         * Determine if the frame has been successfully transmitted.
+         * Determine if the frame has been successfully transmitted and
+         * remove BARs from our check list while checking for their
+         * TX status.
          */
         success =
+            rt2x00lib_txdone_bar_status(entry) ||
             test_bit(TXDONE_SUCCESS, &txdesc->flags) ||
             test_bit(TXDONE_UNKNOWN, &txdesc->flags);
 
@@ -491,6 +538,50 @@ static void rt2x00lib_sleep(struct work_struct *work)
                                  IEEE80211_CONF_CHANGE_PS);
 }
 
+static void rt2x00lib_rxdone_check_ba(struct rt2x00_dev *rt2x00dev,
+                                      struct sk_buff *skb,
+                                      struct rxdone_entry_desc *rxdesc)
+{
+        struct rt2x00_bar_list_entry *entry;
+        struct ieee80211_bar *ba = (void *)skb->data;
+
+        if (likely(!ieee80211_is_back(ba->frame_control)))
+                return;
+
+        if (rxdesc->size < sizeof(*ba) + FCS_LEN)
+                return;
+
+        rcu_read_lock();
+        list_for_each_entry_rcu(entry, &rt2x00dev->bar_list, list) {
+
+                if (ba->start_seq_num != entry->start_seq_num)
+                        continue;
+
+#define TID_CHECK(a, b) (                                               \
+        ((a) & cpu_to_le16(IEEE80211_BAR_CTRL_TID_INFO_MASK)) ==        \
+        ((b) & cpu_to_le16(IEEE80211_BAR_CTRL_TID_INFO_MASK)))          \
+
+                if (!TID_CHECK(ba->control, entry->control))
+                        continue;
+
+#undef TID_CHECK
+
+                if (compare_ether_addr(ba->ra, entry->ta))
+                        continue;
+
+                if (compare_ether_addr(ba->ta, entry->ra))
+                        continue;
+
+                /* Mark BAR since we received the according BA */
+                spin_lock_bh(&rt2x00dev->bar_list_lock);
+                entry->block_acked = 1;
+                spin_unlock_bh(&rt2x00dev->bar_list_lock);
+                break;
+        }
+        rcu_read_unlock();
+
+}
+
 static void rt2x00lib_rxdone_check_ps(struct rt2x00_dev *rt2x00dev,
                                       struct sk_buff *skb,
                                       struct rxdone_entry_desc *rxdesc)
@@ -674,6 +765,12 @@ void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp)
         rt2x00lib_rxdone_check_ps(rt2x00dev, entry->skb, &rxdesc);
 
         /*
+         * Check for incoming BlockAcks to match to the BlockAckReqs
+         * we've send out.
+         */
+        rt2x00lib_rxdone_check_ba(rt2x00dev, entry->skb, &rxdesc);
+
+        /*
          * Update extra components
          */
         rt2x00link_update_stats(rt2x00dev, entry->skb, &rxdesc);
@@ -1183,6 +1280,8 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
 
         spin_lock_init(&rt2x00dev->irqmask_lock);
         mutex_init(&rt2x00dev->csr_mutex);
+        INIT_LIST_HEAD(&rt2x00dev->bar_list);
+        spin_lock_init(&rt2x00dev->bar_list_lock);
 
         set_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags);
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index e488b944a034..f35d85a71bbc 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -582,6 +582,48 @@ static void rt2x00queue_kick_tx_queue(struct data_queue *queue,
                 queue->rt2x00dev->ops->lib->kick_queue(queue);
 }
 
+static void rt2x00queue_bar_check(struct queue_entry *entry)
+{
+        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
+        struct ieee80211_bar *bar = (void *) (entry->skb->data +
+                                    rt2x00dev->ops->extra_tx_headroom);
+        struct rt2x00_bar_list_entry *bar_entry;
+
+        if (likely(!ieee80211_is_back_req(bar->frame_control)))
+                return;
+
+        bar_entry = kmalloc(sizeof(*bar_entry), GFP_ATOMIC);
+
+        /*
+         * If the alloc fails we still send the BAR out but just don't track
+         * it in our bar list. And as a result we will report it to mac80211
+         * back as failed.
+         */
+        if (!bar_entry)
+                return;
+
+        bar_entry->entry = entry;
+        bar_entry->block_acked = 0;
+
+        /*
+         * Copy the relevant parts of the 802.11 BAR into out check list
+         * such that we can use RCU for less-overhead in the RX path since
+         * sending BARs and processing the according BlockAck should be
+         * the exception.
+         */
+        memcpy(bar_entry->ra, bar->ra, sizeof(bar->ra));
+        memcpy(bar_entry->ta, bar->ta, sizeof(bar->ta));
+        bar_entry->control = bar->control;
+        bar_entry->start_seq_num = bar->start_seq_num;
+
+        /*
+         * Insert BAR into our BAR check list.
+         */
+        spin_lock_bh(&rt2x00dev->bar_list_lock);
+        list_add_tail_rcu(&bar_entry->list, &rt2x00dev->bar_list);
+        spin_unlock_bh(&rt2x00dev->bar_list_lock);
+}
+
 int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
                                bool local)
 {
@@ -680,6 +722,11 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
                 goto out;
         }
 
+        /*
+         * Put BlockAckReqs into our check list for driver BA processing.
+         */
+        rt2x00queue_bar_check(entry);
+
         set_bit(ENTRY_DATA_PENDING, &entry->flags);
 
         rt2x00queue_index_inc(entry, Q_INDEX);
diff --git a/drivers/net/wireless/rtlwifi/Kconfig b/drivers/net/wireless/rtlwifi/Kconfig
index 21b1bbb93a7e..b80bc4612581 100644
--- a/drivers/net/wireless/rtlwifi/Kconfig
+++ b/drivers/net/wireless/rtlwifi/Kconfig
@@ -57,12 +57,12 @@ config RTL8192CU
 
 config RTLWIFI
         tristate
-        depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE
+        depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE || RTL8723AE
         default m
 
 config RTLWIFI_DEBUG
         bool "Additional debugging output"
-        depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE
+        depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE || RTL8723AE
         default y
 
 config RTL8192C_COMMON
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index be33aa14c8af..d3ce9fbef00e 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -879,7 +879,9 @@ static int rtl_op_ampdu_action(struct ieee80211_hw *hw,
                          "IEEE80211_AMPDU_TX_START: TID:%d\n", tid);
                 return rtl_tx_agg_start(hw, sta, tid, ssn);
                 break;
-        case IEEE80211_AMPDU_TX_STOP:
+        case IEEE80211_AMPDU_TX_STOP_CONT:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
                 RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
                          "IEEE80211_AMPDU_TX_STOP: TID:%d\n", tid);
                 return rtl_tx_agg_stop(hw, sta, tid);
diff --git a/drivers/net/wireless/rtlwifi/regd.c b/drivers/net/wireless/rtlwifi/regd.c
index c1608cddc529..d7d0d4948b01 100644
--- a/drivers/net/wireless/rtlwifi/regd.c
+++ b/drivers/net/wireless/rtlwifi/regd.c
@@ -158,8 +158,6 @@ static void _rtl_reg_apply_beaconing_flags(struct wiphy *wiphy,
         const struct ieee80211_reg_rule *reg_rule;
         struct ieee80211_channel *ch;
         unsigned int i;
-        u32 bandwidth = 0;
-        int r;
 
         for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
 
@@ -174,9 +172,8 @@ static void _rtl_reg_apply_beaconing_flags(struct wiphy *wiphy,
                             (ch->flags & IEEE80211_CHAN_RADAR))
                                 continue;
                         if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) {
-                                r = freq_reg_info(wiphy, ch->center_freq,
-                                                  bandwidth, &reg_rule);
-                                if (r)
+                                reg_rule = freq_reg_info(wiphy, ch->center_freq);
+                                if (IS_ERR(reg_rule))
                                         continue;
 
                                 /*
@@ -211,8 +208,6 @@ static void _rtl_reg_apply_active_scan_flags(struct wiphy *wiphy,
         struct ieee80211_supported_band *sband;
         struct ieee80211_channel *ch;
         const struct ieee80211_reg_rule *reg_rule;
-        u32 bandwidth = 0;
-        int r;
 
         if (!wiphy->bands[IEEE80211_BAND_2GHZ])
                 return;
@@ -240,16 +235,16 @@ static void _rtl_reg_apply_active_scan_flags(struct wiphy *wiphy,
          */
 
         ch = &sband->channels[11];      /* CH 12 */
-        r = freq_reg_info(wiphy, ch->center_freq, bandwidth, &reg_rule);
-        if (!r) {
+        reg_rule = freq_reg_info(wiphy, ch->center_freq);
+        if (!IS_ERR(reg_rule)) {
                 if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
                         if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
                                 ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
         }
 
         ch = &sband->channels[12];      /* CH 13 */
-        r = freq_reg_info(wiphy, ch->center_freq, bandwidth, &reg_rule);
-        if (!r) {
+        reg_rule = freq_reg_info(wiphy, ch->center_freq);
+        if (!IS_ERR(reg_rule)) {
                 if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))
                         if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)
                                 ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;
@@ -303,9 +298,9 @@ static void _rtl_reg_apply_world_flags(struct wiphy *wiphy,
         return;
 }
 
-static int _rtl_reg_notifier_apply(struct wiphy *wiphy,
-                                   struct regulatory_request *request,
-                                   struct rtl_regulatory *reg)
+static void _rtl_reg_notifier_apply(struct wiphy *wiphy,
+                                    struct regulatory_request *request,
+                                    struct rtl_regulatory *reg)
 {
         /* We always apply this */
         _rtl_reg_apply_radar_flags(wiphy);
@@ -319,8 +314,6 @@ static int _rtl_reg_notifier_apply(struct wiphy *wiphy,
                 _rtl_reg_apply_world_flags(wiphy, request->initiator, reg);
                 break;
         }
-
-        return 0;
 }
 
 static const struct ieee80211_regdomain *_rtl_regdomain_select(
@@ -353,9 +346,9 @@ static const struct ieee80211_regdomain *_rtl_regdomain_select(
 
 static int _rtl_regd_init_wiphy(struct rtl_regulatory *reg,
                                 struct wiphy *wiphy,
-                                int (*reg_notifier) (struct wiphy *wiphy,
-                                                     struct regulatory_request *
-                                                     request))
+                                void (*reg_notifier) (struct wiphy *wiphy,
+                                                      struct regulatory_request *
+                                                      request))
 {
         const struct ieee80211_regdomain *regd;
 
@@ -384,7 +377,7 @@ static struct country_code_to_enum_rd *_rtl_regd_find_country(u16 countrycode)
 }
 
 int rtl_regd_init(struct ieee80211_hw *hw,
-                  int (*reg_notifier) (struct wiphy *wiphy,
+                  void (*reg_notifier) (struct wiphy *wiphy,
                                        struct regulatory_request *request))
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
@@ -426,12 +419,12 @@ int rtl_regd_init(struct ieee80211_hw *hw,
         return 0;
 }
 
-int rtl_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)
+void rtl_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)
 {
         struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
         RT_TRACE(rtlpriv, COMP_REGD, DBG_LOUD, "\n");
 
-        return _rtl_reg_notifier_apply(wiphy, request, &rtlpriv->regd);
+        _rtl_reg_notifier_apply(wiphy, request, &rtlpriv->regd);
 }
diff --git a/drivers/net/wireless/rtlwifi/regd.h b/drivers/net/wireless/rtlwifi/regd.h
index 70ef2f418a44..4e1f4f00e6e9 100644
--- a/drivers/net/wireless/rtlwifi/regd.h
+++ b/drivers/net/wireless/rtlwifi/regd.h
@@ -55,7 +55,7 @@ enum country_code_type_t {
 };
 
 int rtl_regd_init(struct ieee80211_hw *hw,
-                  int (*reg_notifier) (struct wiphy *wiphy,
-                                       struct regulatory_request *request));
-int rtl_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request);
+                  void (*reg_notifier) (struct wiphy *wiphy,
+                                        struct regulatory_request *request));
+void rtl_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request);
 #endif
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
index a0fbf284420e..cdb570ffb4b5 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c
@@ -452,7 +452,7 @@ static void _rtl92de_translate_rx_signal_stuff(struct ieee80211_hw *hw,
         u8 *praddr;
         u16 type, cfc;
         __le16 fc;
-        bool packet_matchbssid, packet_toself, packet_beacon;
+        bool packet_matchbssid, packet_toself, packet_beacon = false;
 
         tmp_buf = skb->data + pstats->rx_drvinfo_size + pstats->rx_bufshift;
         hdr = (struct ieee80211_hdr *)tmp_buf;
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
index 206561d7282f..f8431a3c2c9d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c
@@ -480,7 +480,7 @@ static void _rtl92se_translate_rx_signal_stuff(struct ieee80211_hw *hw,
         u8 *praddr;
         __le16 fc;
         u16 type, cfc;
-        bool packet_matchbssid, packet_toself, packet_beacon;
+        bool packet_matchbssid, packet_toself, packet_beacon = false;
 
         tmp_buf = skb->data + pstats->rx_drvinfo_size + pstats->rx_bufshift;
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
index a313be8c21d2..ce8ad12bce5b 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c
@@ -247,7 +247,7 @@ static void _rtl8723ae_translate_rx_signal_stuff(struct ieee80211_hw *hw,
         u8 *psaddr;
         __le16 fc;
         u16 type;
-        bool packet_matchbssid, packet_toself, packet_beacon;
+        bool packet_matchbssid, packet_toself, packet_beacon = false;
 
         tmp_buf = skb->data + pstatus->rx_drvinfo_size + pstatus->rx_bufshift;
 
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index ea9d8e011bc9..ce6e62a37e14 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -89,8 +89,8 @@ static int wl12xx_set_authorized(struct wl1271 *wl,
         return 0;
 }
 
-static int wl1271_reg_notify(struct wiphy *wiphy,
-                             struct regulatory_request *request)
+static void wl1271_reg_notify(struct wiphy *wiphy,
+                              struct regulatory_request *request)
 {
         struct ieee80211_supported_band *band;
         struct ieee80211_channel *ch;
@@ -107,8 +107,6 @@ static int wl1271_reg_notify(struct wiphy *wiphy,
                                      IEEE80211_CHAN_PASSIVE_SCAN;
 
         }
-
-        return 0;
 }
 
 static int wl1271_set_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif,
@@ -4575,7 +4573,9 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw,
          * Falling break here on purpose for all TX APDU commands.
          */
         case IEEE80211_AMPDU_TX_START:
-        case IEEE80211_AMPDU_TX_STOP:
+        case IEEE80211_AMPDU_TX_STOP_CONT:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH:
+        case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
         case IEEE80211_AMPDU_TX_OPERATIONAL:
                 ret = -EINVAL;
                 break;
diff --git a/drivers/nfc/Kconfig b/drivers/nfc/Kconfig
index ec857676c39f..80c728b28828 100644
--- a/drivers/nfc/Kconfig
+++ b/drivers/nfc/Kconfig
@@ -5,19 +5,6 @@
 menu "Near Field Communication (NFC) devices"
         depends on NFC
 
-config PN544_HCI_NFC
-        tristate "HCI PN544 NFC driver"
-        depends on I2C && NFC_HCI && NFC_SHDLC
-        select CRC_CCITT
-        default n
-        ---help---
-          NXP PN544 i2c driver.
-          This is a driver based on the SHDLC and HCI NFC kernel layers and
-          will thus not work with NXP libnfc library.
-
-          To compile this driver as a module, choose m here. The module will
-          be called pn544_hci.
-
 config NFC_PN533
         tristate "NXP PN533 USB driver"
         depends on USB
@@ -39,4 +26,6 @@ config NFC_WILINK
           Say Y here to compile support for Texas Instrument's NFC WiLink driver
           into the kernel or say M to compile it as module.
 
+source "drivers/nfc/pn544/Kconfig"
+
 endmenu
diff --git a/drivers/nfc/Makefile b/drivers/nfc/Makefile
index 36c359043f54..574bbc04d97a 100644
--- a/drivers/nfc/Makefile
+++ b/drivers/nfc/Makefile
@@ -2,7 +2,7 @@
 # Makefile for nfc devices
 #
 
-obj-$(CONFIG_PN544_HCI_NFC)     += pn544/
+obj-$(CONFIG_NFC_PN544)         += pn544/
 obj-$(CONFIG_NFC_PN533)         += pn533.o
 obj-$(CONFIG_NFC_WILINK)        += nfcwilink.o
 
diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
index 50b1ee41afc6..3b731acbc408 100644
--- a/drivers/nfc/nfcwilink.c
+++ b/drivers/nfc/nfcwilink.c
@@ -526,7 +526,7 @@ static int nfcwilink_probe(struct platform_device *pdev)
 
         nfc_dev_dbg(&pdev->dev, "probe entry");
 
-        drv = kzalloc(sizeof(struct nfcwilink), GFP_KERNEL);
+        drv = devm_kzalloc(&pdev->dev, sizeof(struct nfcwilink), GFP_KERNEL);
         if (!drv) {
                 rc = -ENOMEM;
                 goto exit;
@@ -542,12 +542,13 @@ static int nfcwilink_probe(struct platform_device *pdev)
 
         drv->ndev = nci_allocate_device(&nfcwilink_ops,
                                         protocols,
+                                        NFC_SE_NONE,
                                         NFCWILINK_HDR_LEN,
                                         0);
         if (!drv->ndev) {
                 nfc_dev_err(&pdev->dev, "nci_allocate_device failed");
                 rc = -ENOMEM;
-                goto free_exit;
+                goto exit;
         }
 
         nci_set_parent_dev(drv->ndev, &pdev->dev);
@@ -566,9 +567,6 @@ static int nfcwilink_probe(struct platform_device *pdev)
 free_dev_exit:
         nci_free_device(drv->ndev);
 
-free_exit:
-        kfree(drv);
-
 exit:
         return rc;
 }
@@ -588,8 +586,6 @@ static int nfcwilink_remove(struct platform_device *pdev)
         nci_unregister_device(ndev);
         nci_free_device(ndev);
 
-        kfree(drv);
-
         dev_set_drvdata(&pdev->dev, NULL);
 
         return 0;
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index ada681b01a17..f696318cfb51 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -41,11 +41,6 @@
 #define SONY_VENDOR_ID         0x054c
 #define PASORI_PRODUCT_ID      0x02e1
 
-#define PN533_QUIRKS_TYPE_A          BIT(0)
-#define PN533_QUIRKS_TYPE_F          BIT(1)
-#define PN533_QUIRKS_DEP             BIT(2)
-#define PN533_QUIRKS_RAW_EXCHANGE    BIT(3)
-
 #define PN533_DEVICE_STD    0x1
 #define PN533_DEVICE_PASORI 0x2
 
@@ -84,14 +79,18 @@ MODULE_DEVICE_TABLE(usb, pn533_table);
 #define PN533_LISTEN_TIME 2
 
 /* frame definitions */
-#define PN533_NORMAL_FRAME_MAX_LEN 262  /* 6   (PREAMBLE, SOF, LEN, LCS, TFI)
-                                           254 (DATA)
-                                           2   (DCS, postamble) */
-
-#define PN533_FRAME_TAIL_SIZE 2
-#define PN533_FRAME_SIZE(f) (sizeof(struct pn533_frame) + f->datalen + \
-                                PN533_FRAME_TAIL_SIZE)
-#define PN533_FRAME_ACK_SIZE (sizeof(struct pn533_frame) + 1)
+#define PN533_FRAME_HEADER_LEN (sizeof(struct pn533_frame) \
+                                        + 2) /* data[0] TFI, data[1] CC */
+#define PN533_FRAME_TAIL_LEN 2 /* data[len] DCS, data[len + 1] postamble*/
+
+/*
+ * Max extended frame payload len, excluding TFI and CC
+ * which are already in PN533_FRAME_HEADER_LEN.
+ */
+#define PN533_FRAME_MAX_PAYLOAD_LEN 263
+
+#define PN533_FRAME_ACK_SIZE 6 /* Preamble (1), SoPC (2), ACK Code (2),
+                                  Postamble (1) */
 #define PN533_FRAME_CHECKSUM(f) (f->data[f->datalen])
 #define PN533_FRAME_POSTAMBLE(f) (f->data[f->datalen + 1])
 
@@ -105,8 +104,6 @@ MODULE_DEVICE_TABLE(usb, pn533_table);
 
 /* PN533 Commands */
 #define PN533_FRAME_CMD(f) (f->data[1])
-#define PN533_FRAME_CMD_PARAMS_PTR(f) (&f->data[2])
-#define PN533_FRAME_CMD_PARAMS_LEN(f) (f->datalen - 2)
 
 #define PN533_CMD_GET_FIRMWARE_VERSION 0x02
 #define PN533_CMD_RF_CONFIGURATION 0x32
@@ -120,6 +117,7 @@ MODULE_DEVICE_TABLE(usb, pn533_table);
 #define PN533_CMD_TG_INIT_AS_TARGET 0x8c
 #define PN533_CMD_TG_GET_DATA 0x86
 #define PN533_CMD_TG_SET_DATA 0x8e
+#define PN533_CMD_UNDEF 0xff
 
 #define PN533_CMD_RESPONSE(cmd) (cmd + 1)
 
@@ -128,13 +126,12 @@ MODULE_DEVICE_TABLE(usb, pn533_table);
 #define PN533_CMD_MI_MASK 0x40
 #define PN533_CMD_RET_SUCCESS 0x00
 
-/* PN533 status codes */
-#define PN533_STATUS_TARGET_RELEASED 0x29
-
 struct pn533;
 
-typedef int (*pn533_cmd_complete_t) (struct pn533 *dev, void *arg,
-                                        u8 *params, int params_len);
+typedef int (*pn533_cmd_complete_t) (struct pn533 *dev, void *arg, int status);
+
+typedef int (*pn533_send_async_complete_t) (struct pn533 *dev, void *arg,
+                                        struct sk_buff *resp);
 
 /* structs for pn533 commands */
 
@@ -282,11 +279,6 @@ const struct pn533_poll_modulations poll_mod[] = {
 
 /* PN533_CMD_IN_ATR */
 
-struct pn533_cmd_activate_param {
-        u8 tg;
-        u8 next;
-} __packed;
-
 struct pn533_cmd_activate_response {
         u8 status;
         u8 nfcid3t[10];
@@ -299,14 +291,6 @@ struct pn533_cmd_activate_response {
         u8 gt[];
 } __packed;
 
-/* PN533_CMD_IN_JUMP_FOR_DEP */
-struct pn533_cmd_jump_dep {
-        u8 active;
-        u8 baud;
-        u8 next;
-        u8 data[];
-} __packed;
-
 struct pn533_cmd_jump_dep_response {
         u8 status;
         u8 tg;
@@ -329,32 +313,13 @@ struct pn533_cmd_jump_dep_response {
 #define PN533_INIT_TARGET_RESP_ACTIVE     0x1
 #define PN533_INIT_TARGET_RESP_DEP        0x4
 
-struct pn533_cmd_init_target {
-        u8 mode;
-        u8 mifare[6];
-        u8 felica[18];
-        u8 nfcid3[10];
-        u8 gb_len;
-        u8 gb[];
-} __packed;
-
-struct pn533_cmd_init_target_response {
-        u8 mode;
-        u8 cmd[];
-} __packed;
-
 struct pn533 {
         struct usb_device *udev;
         struct usb_interface *interface;
         struct nfc_dev *nfc_dev;
 
         struct urb *out_urb;
-        int out_maxlen;
-        struct pn533_frame *out_frame;
-
         struct urb *in_urb;
-        int in_maxlen;
-        struct pn533_frame *in_frame;
 
         struct sk_buff_head resp_q;
 
@@ -365,12 +330,12 @@ struct pn533 {
         struct work_struct mi_work;
         struct work_struct tg_work;
         struct timer_list listen_timer;
-        struct pn533_frame *wq_in_frame;
         int wq_in_error;
         int cancel_listen;
 
         pn533_cmd_complete_t cmd_complete;
         void *cmd_complete_arg;
+        void *cmd_complete_mi_arg;
         struct mutex cmd_lock;
         u8 cmd;
 
@@ -391,16 +356,17 @@ struct pn533 {
 
         struct list_head cmd_queue;
         u8 cmd_pending;
+
+        struct pn533_frame_ops *ops;
 };
 
 struct pn533_cmd {
         struct list_head queue;
-        struct pn533_frame *out_frame;
-        struct pn533_frame *in_frame;
-        int in_frame_len;
-        pn533_cmd_complete_t cmd_complete;
+        u8 cmd_code;
+        struct sk_buff *req;
+        struct sk_buff *resp;
+        int resp_len;
         void *arg;
-        gfp_t flags;
 };
 
 struct pn533_frame {
@@ -411,6 +377,22 @@ struct pn533_frame {
         u8 data[];
 } __packed;
 
+struct pn533_frame_ops {
+        void (*tx_frame_init)(void *frame, u8 cmd_code);
+        void (*tx_frame_finish)(void *frame);
+        void (*tx_update_payload_len)(void *frame, int len);
+        int tx_header_len;
+        int tx_tail_len;
+
+        bool (*rx_is_frame_valid)(void *frame);
+        int (*rx_frame_size)(void *frame);
+        int rx_header_len;
+        int rx_tail_len;
+
+        int max_payload_len;
+        u8 (*get_cmd_code)(void *frame);
+};
+
 /* The rule: value + checksum = 0 */
 static inline u8 pn533_checksum(u8 value)
 {
@@ -429,37 +411,21 @@ static u8 pn533_data_checksum(u8 *data, int datalen)
         return pn533_checksum(sum);
 }
 
-/**
- * pn533_tx_frame_ack - create a ack frame
- * @frame:      The frame to be set as ack
- *
- * Ack is different type of standard frame. As a standard frame, it has
- * preamble and start_frame. However the checksum of this frame must fail,
- * i.e. datalen + datalen_checksum must NOT be zero. When the checksum test
- * fails and datalen = 0 and datalen_checksum = 0xFF, the frame is a ack.
- * After datalen_checksum field, the postamble is placed.
- */
-static void pn533_tx_frame_ack(struct pn533_frame *frame)
+static void pn533_tx_frame_init(void *_frame, u8 cmd_code)
 {
-        frame->preamble = 0;
-        frame->start_frame = cpu_to_be16(PN533_SOF);
-        frame->datalen = 0;
-        frame->datalen_checksum = 0xFF;
-        /* data[0] is used as postamble */
-        frame->data[0] = 0;
-}
+        struct pn533_frame *frame = _frame;
 
-static void pn533_tx_frame_init(struct pn533_frame *frame, u8 cmd)
-{
         frame->preamble = 0;
         frame->start_frame = cpu_to_be16(PN533_SOF);
         PN533_FRAME_IDENTIFIER(frame) = PN533_DIR_OUT;
-        PN533_FRAME_CMD(frame) = cmd;
+        PN533_FRAME_CMD(frame) = cmd_code;
         frame->datalen = 2;
 }
 
-static void pn533_tx_frame_finish(struct pn533_frame *frame)
+static void pn533_tx_frame_finish(void *_frame)
 {
+        struct pn533_frame *frame = _frame;
+
         frame->datalen_checksum = pn533_checksum(frame->datalen);
 
         PN533_FRAME_CHECKSUM(frame) =
@@ -468,9 +434,17 @@ static void pn533_tx_frame_finish(struct pn533_frame *frame)
         PN533_FRAME_POSTAMBLE(frame) = 0;
 }
 
-static bool pn533_rx_frame_is_valid(struct pn533_frame *frame)
+static void pn533_tx_update_payload_len(void *_frame, int len)
+{
+        struct pn533_frame *frame = _frame;
+
+        frame->datalen += len;
+}
+
+static bool pn533_rx_frame_is_valid(void *_frame)
 {
         u8 checksum;
+        struct pn533_frame *frame = _frame;
 
         if (frame->start_frame != cpu_to_be16(PN533_SOF))
                 return false;
@@ -497,28 +471,48 @@ static bool pn533_rx_frame_is_ack(struct pn533_frame *frame)
         return true;
 }
 
-static bool pn533_rx_frame_is_cmd_response(struct pn533_frame *frame, u8 cmd)
+static inline int pn533_rx_frame_size(void *frame)
+{
+        struct pn533_frame *f = frame;
+
+        return sizeof(struct pn533_frame) + f->datalen + PN533_FRAME_TAIL_LEN;
+}
+
+static u8 pn533_get_cmd_code(void *frame)
+{
+        struct pn533_frame *f = frame;
+
+        return PN533_FRAME_CMD(f);
+}
+
+struct pn533_frame_ops pn533_std_frame_ops = {
+        .tx_frame_init = pn533_tx_frame_init,
+        .tx_frame_finish = pn533_tx_frame_finish,
+        .tx_update_payload_len = pn533_tx_update_payload_len,
+        .tx_header_len = PN533_FRAME_HEADER_LEN,
+        .tx_tail_len = PN533_FRAME_TAIL_LEN,
+
+        .rx_is_frame_valid = pn533_rx_frame_is_valid,
+        .rx_frame_size = pn533_rx_frame_size,
+        .rx_header_len = PN533_FRAME_HEADER_LEN,
+        .rx_tail_len = PN533_FRAME_TAIL_LEN,
+
+        .max_payload_len =  PN533_FRAME_MAX_PAYLOAD_LEN,
+        .get_cmd_code = pn533_get_cmd_code,
+};
+
+static bool pn533_rx_frame_is_cmd_response(struct pn533 *dev, void *frame)
 {
-        return (PN533_FRAME_CMD(frame) == PN533_CMD_RESPONSE(cmd));
+        return (dev->ops->get_cmd_code(frame) == PN533_CMD_RESPONSE(dev->cmd));
 }
 
 
 static void pn533_wq_cmd_complete(struct work_struct *work)
 {
         struct pn533 *dev = container_of(work, struct pn533, cmd_complete_work);
-        struct pn533_frame *in_frame;
         int rc;
 
-        in_frame = dev->wq_in_frame;
-
-        if (dev->wq_in_error)
-                rc = dev->cmd_complete(dev, dev->cmd_complete_arg, NULL,
-                                                        dev->wq_in_error);
-        else
-                rc = dev->cmd_complete(dev, dev->cmd_complete_arg,
-                                        PN533_FRAME_CMD_PARAMS_PTR(in_frame),
-                                        PN533_FRAME_CMD_PARAMS_LEN(in_frame));
-
+        rc = dev->cmd_complete(dev, dev->cmd_complete_arg, dev->wq_in_error);
         if (rc != -EINPROGRESS)
                 queue_work(dev->wq, &dev->cmd_work);
 }
@@ -526,46 +520,47 @@ static void pn533_wq_cmd_complete(struct work_struct *work)
 static void pn533_recv_response(struct urb *urb)
 {
         struct pn533 *dev = urb->context;
-        struct pn533_frame *in_frame;
-
-        dev->wq_in_frame = NULL;
+        u8 *in_frame;
 
         switch (urb->status) {
         case 0:
-                /* success */
-                break;
+                break; /* success */
         case -ECONNRESET:
         case -ENOENT:
-        case -ESHUTDOWN:
-                nfc_dev_dbg(&dev->interface->dev, "Urb shutting down with"
-                                                " status: %d", urb->status);
+                nfc_dev_dbg(&dev->interface->dev,
+                            "The urb has been canceled (status %d)",
+                            urb->status);
                 dev->wq_in_error = urb->status;
                 goto sched_wq;
+                break;
+        case -ESHUTDOWN:
         default:
-                nfc_dev_err(&dev->interface->dev, "Nonzero urb status received:"
-                                                        " %d", urb->status);
+                nfc_dev_err(&dev->interface->dev,
+                            "Urb failure (status %d)", urb->status);
                 dev->wq_in_error = urb->status;
                 goto sched_wq;
         }
 
         in_frame = dev->in_urb->transfer_buffer;
 
-        if (!pn533_rx_frame_is_valid(in_frame)) {
+        nfc_dev_dbg(&dev->interface->dev, "Received a frame.");
+        print_hex_dump(KERN_DEBUG, "PN533 RX: ", DUMP_PREFIX_NONE, 16, 1,
+                       in_frame, dev->ops->rx_frame_size(in_frame), false);
+
+        if (!dev->ops->rx_is_frame_valid(in_frame)) {
                 nfc_dev_err(&dev->interface->dev, "Received an invalid frame");
                 dev->wq_in_error = -EIO;
                 goto sched_wq;
         }
 
-        if (!pn533_rx_frame_is_cmd_response(in_frame, dev->cmd)) {
-                nfc_dev_err(&dev->interface->dev, "The received frame is not "
-                                                "response to the last command");
+        if (!pn533_rx_frame_is_cmd_response(dev, in_frame)) {
+                nfc_dev_err(&dev->interface->dev,
+                            "It it not the response to the last command");
                 dev->wq_in_error = -EIO;
                 goto sched_wq;
         }
 
-        nfc_dev_dbg(&dev->interface->dev, "Received a valid frame");
         dev->wq_in_error = 0;
-        dev->wq_in_frame = in_frame;
 
 sched_wq:
         queue_work(dev->wq, &dev->cmd_complete_work);
@@ -586,18 +581,19 @@ static void pn533_recv_ack(struct urb *urb)
 
         switch (urb->status) {
         case 0:
-                /* success */
-                break;
+                break; /* success */
         case -ECONNRESET:
         case -ENOENT:
-        case -ESHUTDOWN:
-                nfc_dev_dbg(&dev->interface->dev, "Urb shutting down with"
-                                                " status: %d", urb->status);
+                nfc_dev_dbg(&dev->interface->dev,
+                            "The urb has been stopped (status %d)",
+                            urb->status);
                 dev->wq_in_error = urb->status;
                 goto sched_wq;
+                break;
+        case -ESHUTDOWN:
         default:
-                nfc_dev_err(&dev->interface->dev, "Nonzero urb status received:"
-                                                        " %d", urb->status);
+                nfc_dev_err(&dev->interface->dev,
+                            "Urb failure (status %d)", urb->status);
                 dev->wq_in_error = urb->status;
                 goto sched_wq;
         }
@@ -610,12 +606,10 @@ static void pn533_recv_ack(struct urb *urb)
                 goto sched_wq;
         }
 
-        nfc_dev_dbg(&dev->interface->dev, "Received a valid ack");
-
         rc = pn533_submit_urb_for_response(dev, GFP_ATOMIC);
         if (rc) {
-                nfc_dev_err(&dev->interface->dev, "usb_submit_urb failed with"
-                                                        " result %d", rc);
+                nfc_dev_err(&dev->interface->dev,
+                            "usb_submit_urb failed with result %d", rc);
                 dev->wq_in_error = rc;
                 goto sched_wq;
         }
@@ -623,7 +617,6 @@ static void pn533_recv_ack(struct urb *urb)
         return;
 
 sched_wq:
-        dev->wq_in_frame = NULL;
         queue_work(dev->wq, &dev->cmd_complete_work);
 }
 
@@ -636,47 +629,46 @@ static int pn533_submit_urb_for_ack(struct pn533 *dev, gfp_t flags)
 
 static int pn533_send_ack(struct pn533 *dev, gfp_t flags)
 {
+        u8 ack[PN533_FRAME_ACK_SIZE] = {0x00, 0x00, 0xff, 0x00, 0xff, 0x00};
+        /* spec 7.1.1.3:  Preamble, SoPC (2), ACK Code (2), Postamble */
         int rc;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        pn533_tx_frame_ack(dev->out_frame);
-
-        dev->out_urb->transfer_buffer = dev->out_frame;
-        dev->out_urb->transfer_buffer_length = PN533_FRAME_ACK_SIZE;
+        dev->out_urb->transfer_buffer = ack;
+        dev->out_urb->transfer_buffer_length = sizeof(ack);
         rc = usb_submit_urb(dev->out_urb, flags);
 
         return rc;
 }
 
-static int __pn533_send_cmd_frame_async(struct pn533 *dev,
-                                        struct pn533_frame *out_frame,
-                                        struct pn533_frame *in_frame,
-                                        int in_frame_len,
+static int __pn533_send_frame_async(struct pn533 *dev,
+                                        struct sk_buff *out,
+                                        struct sk_buff *in,
+                                        int in_len,
                                         pn533_cmd_complete_t cmd_complete,
-                                        void *arg, gfp_t flags)
+                                        void *arg)
 {
         int rc;
 
-        nfc_dev_dbg(&dev->interface->dev, "Sending command 0x%x",
-                                                PN533_FRAME_CMD(out_frame));
-
-        dev->cmd = PN533_FRAME_CMD(out_frame);
+        dev->cmd = dev->ops->get_cmd_code(out->data);
         dev->cmd_complete = cmd_complete;
         dev->cmd_complete_arg = arg;
 
-        dev->out_urb->transfer_buffer = out_frame;
-        dev->out_urb->transfer_buffer_length =
-                                PN533_FRAME_SIZE(out_frame);
+        dev->out_urb->transfer_buffer = out->data;
+        dev->out_urb->transfer_buffer_length = out->len;
 
-        dev->in_urb->transfer_buffer = in_frame;
-        dev->in_urb->transfer_buffer_length = in_frame_len;
+        dev->in_urb->transfer_buffer = in->data;
+        dev->in_urb->transfer_buffer_length = in_len;
 
-        rc = usb_submit_urb(dev->out_urb, flags);
+        print_hex_dump(KERN_DEBUG, "PN533 TX: ", DUMP_PREFIX_NONE, 16, 1,
+                       out->data, out->len, false);
+
+        rc = usb_submit_urb(dev->out_urb, GFP_KERNEL);
         if (rc)
                 return rc;
 
-        rc = pn533_submit_urb_for_ack(dev, flags);
+        rc = pn533_submit_urb_for_ack(dev, GFP_KERNEL);
         if (rc)
                 goto error;
 
@@ -687,146 +679,325 @@ error:
         return rc;
 }
 
-static void pn533_wq_cmd(struct work_struct *work)
+static void pn533_build_cmd_frame(struct pn533 *dev, u8 cmd_code,
+                                  struct sk_buff *skb)
 {
-        struct pn533 *dev = container_of(work, struct pn533, cmd_work);
-        struct pn533_cmd *cmd;
+        /* payload is already there, just update datalen */
+        int payload_len = skb->len;
+        struct pn533_frame_ops *ops = dev->ops;
 
-        mutex_lock(&dev->cmd_lock);
 
-        if (list_empty(&dev->cmd_queue)) {
-                dev->cmd_pending = 0;
-                mutex_unlock(&dev->cmd_lock);
-                return;
-        }
+        skb_push(skb, ops->tx_header_len);
+        skb_put(skb, ops->tx_tail_len);
 
-        cmd = list_first_entry(&dev->cmd_queue, struct pn533_cmd, queue);
+        ops->tx_frame_init(skb->data, cmd_code);
+        ops->tx_update_payload_len(skb->data, payload_len);
+        ops->tx_frame_finish(skb->data);
+}
 
-        list_del(&cmd->queue);
+struct pn533_send_async_complete_arg {
+        pn533_send_async_complete_t  complete_cb;
+        void *complete_cb_context;
+        struct sk_buff *resp;
+        struct sk_buff *req;
+};
 
-        mutex_unlock(&dev->cmd_lock);
+static int pn533_send_async_complete(struct pn533 *dev, void *_arg, int status)
+{
+        struct pn533_send_async_complete_arg *arg = _arg;
 
-        __pn533_send_cmd_frame_async(dev, cmd->out_frame, cmd->in_frame,
-                                     cmd->in_frame_len, cmd->cmd_complete,
-                                     cmd->arg, cmd->flags);
+        struct sk_buff *req = arg->req;
+        struct sk_buff *resp = arg->resp;
 
-        kfree(cmd);
+        int rc;
+
+        dev_kfree_skb(req);
+
+        if (status < 0) {
+                arg->complete_cb(dev, arg->complete_cb_context,
+                                 ERR_PTR(status));
+                dev_kfree_skb(resp);
+                kfree(arg);
+                return status;
+        }
+
+        skb_put(resp, dev->ops->rx_frame_size(resp->data));
+        skb_pull(resp, dev->ops->rx_header_len);
+        skb_trim(resp, resp->len - dev->ops->rx_tail_len);
+
+        rc = arg->complete_cb(dev, arg->complete_cb_context, resp);
+
+        kfree(arg);
+        return rc;
 }
 
-static int pn533_send_cmd_frame_async(struct pn533 *dev,
-                                        struct pn533_frame *out_frame,
-                                        struct pn533_frame *in_frame,
-                                        int in_frame_len,
-                                        pn533_cmd_complete_t cmd_complete,
-                                        void *arg, gfp_t flags)
+static int __pn533_send_async(struct pn533 *dev, u8 cmd_code,
+                              struct sk_buff *req, struct sk_buff *resp,
+                              int resp_len,
+                              pn533_send_async_complete_t complete_cb,
+                              void *complete_cb_context)
 {
         struct pn533_cmd *cmd;
+        struct pn533_send_async_complete_arg *arg;
         int rc = 0;
 
-        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
+        nfc_dev_dbg(&dev->interface->dev, "Sending command 0x%x", cmd_code);
+
+        arg = kzalloc(sizeof(*arg), GFP_KERNEL);
+        if (!arg)
+                return -ENOMEM;
+
+        arg->complete_cb = complete_cb;
+        arg->complete_cb_context = complete_cb_context;
+        arg->resp = resp;
+        arg->req = req;
+
+        pn533_build_cmd_frame(dev, cmd_code, req);
 
         mutex_lock(&dev->cmd_lock);
 
         if (!dev->cmd_pending) {
-                rc = __pn533_send_cmd_frame_async(dev, out_frame, in_frame,
-                                                  in_frame_len, cmd_complete,
-                                                  arg, flags);
-                if (!rc)
-                        dev->cmd_pending = 1;
+                rc = __pn533_send_frame_async(dev, req, resp, resp_len,
+                                              pn533_send_async_complete, arg);
+                if (rc)
+                        goto error;
 
+                dev->cmd_pending = 1;
                 goto unlock;
         }
 
-        nfc_dev_dbg(&dev->interface->dev, "%s Queueing command", __func__);
+        nfc_dev_dbg(&dev->interface->dev, "%s Queueing command 0x%x", __func__,
+                    cmd_code);
 
-        cmd = kzalloc(sizeof(struct pn533_cmd), flags);
+        cmd = kzalloc(sizeof(struct pn533_cmd), GFP_KERNEL);
         if (!cmd) {
                 rc = -ENOMEM;
-                goto unlock;
+                goto error;
         }
 
         INIT_LIST_HEAD(&cmd->queue);
-        cmd->out_frame = out_frame;
-        cmd->in_frame = in_frame;
-        cmd->in_frame_len = in_frame_len;
-        cmd->cmd_complete = cmd_complete;
+        cmd->cmd_code = cmd_code;
+        cmd->req = req;
+        cmd->resp = resp;
+        cmd->resp_len = resp_len;
         cmd->arg = arg;
-        cmd->flags = flags;
 
         list_add_tail(&cmd->queue, &dev->cmd_queue);
 
+        goto unlock;
+
+error:
+        kfree(arg);
 unlock:
         mutex_unlock(&dev->cmd_lock);
+        return rc;
+}
+
+static int pn533_send_data_async(struct pn533 *dev, u8 cmd_code,
+                                 struct sk_buff *req,
+                                 pn533_send_async_complete_t complete_cb,
+                                 void *complete_cb_context)
+{
+        struct sk_buff *resp;
+        int rc;
+        int  resp_len = dev->ops->rx_header_len +
+                        dev->ops->max_payload_len +
+                        dev->ops->rx_tail_len;
+
+        resp = nfc_alloc_recv_skb(resp_len, GFP_KERNEL);
+        if (!resp)
+                return -ENOMEM;
+
+        rc = __pn533_send_async(dev, cmd_code, req, resp, resp_len, complete_cb,
+                                complete_cb_context);
+        if (rc)
+                dev_kfree_skb(resp);
 
         return rc;
 }
 
-struct pn533_sync_cmd_response {
+static int pn533_send_cmd_async(struct pn533 *dev, u8 cmd_code,
+                                struct sk_buff *req,
+                                pn533_send_async_complete_t complete_cb,
+                                void *complete_cb_context)
+{
+        struct sk_buff *resp;
         int rc;
-        struct completion done;
-};
+        int  resp_len = dev->ops->rx_header_len +
+                        dev->ops->max_payload_len +
+                        dev->ops->rx_tail_len;
+
+        resp = alloc_skb(resp_len, GFP_KERNEL);
+        if (!resp)
+                return -ENOMEM;
+
+        rc = __pn533_send_async(dev, cmd_code, req, resp, resp_len, complete_cb,
+                                complete_cb_context);
+        if (rc)
+                dev_kfree_skb(resp);
 
-static int pn533_sync_cmd_complete(struct pn533 *dev, void *_arg,
-                                        u8 *params, int params_len)
+        return rc;
+}
+
+/*
+ * pn533_send_cmd_direct_async
+ *
+ * The function sends a piority cmd directly to the chip omiting the cmd
+ * queue. It's intended to be used by chaining mechanism of received responses
+ * where the host has to request every single chunk of data before scheduling
+ * next cmd from the queue.
+ */
+static int pn533_send_cmd_direct_async(struct pn533 *dev, u8 cmd_code,
+                                       struct sk_buff *req,
+                                       pn533_send_async_complete_t complete_cb,
+                                       void *complete_cb_context)
 {
-        struct pn533_sync_cmd_response *arg = _arg;
+        struct pn533_send_async_complete_arg *arg;
+        struct sk_buff *resp;
+        int rc;
+        int resp_len = dev->ops->rx_header_len +
+                       dev->ops->max_payload_len +
+                       dev->ops->rx_tail_len;
 
-        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
+        resp = alloc_skb(resp_len, GFP_KERNEL);
+        if (!resp)
+                return -ENOMEM;
+
+        arg = kzalloc(sizeof(*arg), GFP_KERNEL);
+        if (!arg) {
+                dev_kfree_skb(resp);
+                return -ENOMEM;
+        }
 
-        arg->rc = 0;
+        arg->complete_cb = complete_cb;
+        arg->complete_cb_context = complete_cb_context;
+        arg->resp = resp;
+        arg->req = req;
 
-        if (params_len < 0) /* error */
-                arg->rc = params_len;
+        pn533_build_cmd_frame(dev, cmd_code, req);
 
+        rc = __pn533_send_frame_async(dev, req, resp, resp_len,
+                                      pn533_send_async_complete, arg);
+        if (rc < 0) {
+                dev_kfree_skb(resp);
+                kfree(arg);
+        }
+
+        return rc;
+}
+
+static void pn533_wq_cmd(struct work_struct *work)
+{
+        struct pn533 *dev = container_of(work, struct pn533, cmd_work);
+        struct pn533_cmd *cmd;
+
+        mutex_lock(&dev->cmd_lock);
+
+        if (list_empty(&dev->cmd_queue)) {
+                dev->cmd_pending = 0;
+                mutex_unlock(&dev->cmd_lock);
+                return;
+        }
+
+        cmd = list_first_entry(&dev->cmd_queue, struct pn533_cmd, queue);
+
+        list_del(&cmd->queue);
+
+        mutex_unlock(&dev->cmd_lock);
+
+        __pn533_send_frame_async(dev, cmd->req, cmd->resp, cmd->resp_len,
+                                 pn533_send_async_complete, cmd->arg);
+
+        kfree(cmd);
+}
+
+struct pn533_sync_cmd_response {
+        struct sk_buff *resp;
+        struct completion done;
+};
+
+static int pn533_send_sync_complete(struct pn533 *dev, void *_arg,
+                                    struct sk_buff *resp)
+{
+        struct pn533_sync_cmd_response *arg = _arg;
+
+        arg->resp = resp;
         complete(&arg->done);
 
         return 0;
 }
 
-static int pn533_send_cmd_frame_sync(struct pn533 *dev,
-                                                struct pn533_frame *out_frame,
-                                                struct pn533_frame *in_frame,
-                                                int in_frame_len)
+/*  pn533_send_cmd_sync
+ *
+ *  Please note the req parameter is freed inside the function to
+ *  limit a number of return value interpretations by the caller.
+ *
+ *  1. negative in case of error during TX path -> req should be freed
+ *
+ *  2. negative in case of error during RX path -> req should not be freed
+ *     as it's been already freed at the begining of RX path by
+ *     async_complete_cb.
+ *
+ *  3. valid pointer in case of succesfult RX path
+ *
+ *  A caller has to check a return value with IS_ERR macro. If the test pass,
+ *  the returned pointer is valid.
+ *
+ * */
+static struct sk_buff *pn533_send_cmd_sync(struct pn533 *dev, u8 cmd_code,
+                                               struct sk_buff *req)
 {
         int rc;
         struct pn533_sync_cmd_response arg;
 
-        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
-
         init_completion(&arg.done);
 
-        rc = pn533_send_cmd_frame_async(dev, out_frame, in_frame, in_frame_len,
-                                pn533_sync_cmd_complete, &arg, GFP_KERNEL);
-        if (rc)
-                return rc;
+        rc = pn533_send_cmd_async(dev, cmd_code, req,
+                                  pn533_send_sync_complete, &arg);
+        if (rc) {
+                dev_kfree_skb(req);
+                return ERR_PTR(rc);
+        }
 
         wait_for_completion(&arg.done);
 
-        return arg.rc;
+        return arg.resp;
 }
 
 static void pn533_send_complete(struct urb *urb)
 {
         struct pn533 *dev = urb->context;
 
-        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
-
         switch (urb->status) {
         case 0:
-                /* success */
-                break;
+                break; /* success */
         case -ECONNRESET:
         case -ENOENT:
-        case -ESHUTDOWN:
-                nfc_dev_dbg(&dev->interface->dev, "Urb shutting down with"
-                                                " status: %d", urb->status);
+                nfc_dev_dbg(&dev->interface->dev,
+                            "The urb has been stopped (status %d)",
+                            urb->status);
                 break;
+        case -ESHUTDOWN:
         default:
-                nfc_dev_dbg(&dev->interface->dev, "Nonzero urb status received:"
-                                                        " %d", urb->status);
+                nfc_dev_err(&dev->interface->dev,
+                            "Urb failure (status %d)", urb->status);
         }
 }
 
+static struct sk_buff *pn533_alloc_skb(struct pn533 *dev, unsigned int size)
+{
+        struct sk_buff *skb;
+
+        skb = alloc_skb(dev->ops->tx_header_len +
+                        size +
+                        dev->ops->tx_tail_len, GFP_KERNEL);
+
+        if (skb)
+                skb_reserve(skb, dev->ops->tx_header_len);
+
+        return skb;
+}
+
 struct pn533_target_type_a {
         __be16 sens_res;
         u8 sel_res;
@@ -867,9 +1038,9 @@ static bool pn533_target_type_a_is_valid(struct pn533_target_type_a *type_a,
         platconf = PN533_TYPE_A_SENS_RES_PLATCONF(type_a->sens_res);
 
         if ((ssd == PN533_TYPE_A_SENS_RES_SSD_JEWEL &&
-                        platconf != PN533_TYPE_A_SENS_RES_PLATCONF_JEWEL) ||
-                        (ssd != PN533_TYPE_A_SENS_RES_SSD_JEWEL &&
-                        platconf == PN533_TYPE_A_SENS_RES_PLATCONF_JEWEL))
+             platconf != PN533_TYPE_A_SENS_RES_PLATCONF_JEWEL) ||
+            (ssd != PN533_TYPE_A_SENS_RES_SSD_JEWEL &&
+             platconf == PN533_TYPE_A_SENS_RES_PLATCONF_JEWEL))
                 return false;
 
         /* Requirements 4.8.2.1, 4.8.2.3, 4.8.2.5 and 4.8.2.7 from NFC Forum */
@@ -884,7 +1055,7 @@ static int pn533_target_found_type_a(struct nfc_target *nfc_tgt, u8 *tgt_data,
 {
         struct pn533_target_type_a *tgt_type_a;
 
-        tgt_type_a = (struct pn533_target_type_a *) tgt_data;
+        tgt_type_a = (struct pn533_target_type_a *)tgt_data;
 
         if (!pn533_target_type_a_is_valid(tgt_type_a, tgt_data_len))
                 return -EPROTO;
@@ -942,14 +1113,13 @@ static int pn533_target_found_felica(struct nfc_target *nfc_tgt, u8 *tgt_data,
 {
         struct pn533_target_felica *tgt_felica;
 
-        tgt_felica = (struct pn533_target_felica *) tgt_data;
+        tgt_felica = (struct pn533_target_felica *)tgt_data;
 
         if (!pn533_target_felica_is_valid(tgt_felica, tgt_data_len))
                 return -EPROTO;
 
-        if (tgt_felica->nfcid2[0] == PN533_FELICA_SENSF_NFCID2_DEP_B1 &&
-                                        tgt_felica->nfcid2[1] ==
-                                        PN533_FELICA_SENSF_NFCID2_DEP_B2)
+        if ((tgt_felica->nfcid2[0] == PN533_FELICA_SENSF_NFCID2_DEP_B1) &&
+            (tgt_felica->nfcid2[1] == PN533_FELICA_SENSF_NFCID2_DEP_B2))
                 nfc_tgt->supported_protocols = NFC_PROTO_NFC_DEP_MASK;
         else
                 nfc_tgt->supported_protocols = NFC_PROTO_FELICA_MASK;
@@ -979,9 +1149,9 @@ static bool pn533_target_jewel_is_valid(struct pn533_target_jewel *jewel,
         platconf = PN533_TYPE_A_SENS_RES_PLATCONF(jewel->sens_res);
 
         if ((ssd == PN533_TYPE_A_SENS_RES_SSD_JEWEL &&
-                        platconf != PN533_TYPE_A_SENS_RES_PLATCONF_JEWEL) ||
-                        (ssd != PN533_TYPE_A_SENS_RES_SSD_JEWEL &&
-                        platconf == PN533_TYPE_A_SENS_RES_PLATCONF_JEWEL))
+             platconf != PN533_TYPE_A_SENS_RES_PLATCONF_JEWEL) ||
+            (ssd != PN533_TYPE_A_SENS_RES_SSD_JEWEL &&
+             platconf == PN533_TYPE_A_SENS_RES_PLATCONF_JEWEL))
                 return false;
 
         return true;
@@ -992,7 +1162,7 @@ static int pn533_target_found_jewel(struct nfc_target *nfc_tgt, u8 *tgt_data,
 {
         struct pn533_target_jewel *tgt_jewel;
 
-        tgt_jewel = (struct pn533_target_jewel *) tgt_data;
+        tgt_jewel = (struct pn533_target_jewel *)tgt_data;
 
         if (!pn533_target_jewel_is_valid(tgt_jewel, tgt_data_len))
                 return -EPROTO;
@@ -1051,7 +1221,7 @@ static int pn533_target_found_type_b(struct nfc_target *nfc_tgt, u8 *tgt_data,
 {
         struct pn533_target_type_b *tgt_type_b;
 
-        tgt_type_b = (struct pn533_target_type_b *) tgt_data;
+        tgt_type_b = (struct pn533_target_type_b *)tgt_data;
 
         if (!pn533_target_type_b_is_valid(tgt_type_b, tgt_data_len))
                 return -EPROTO;
@@ -1061,50 +1231,37 @@ static int pn533_target_found_type_b(struct nfc_target *nfc_tgt, u8 *tgt_data,
         return 0;
 }
 
-struct pn533_poll_response {
-        u8 nbtg;
-        u8 tg;
-        u8 target_data[];
-} __packed;
-
-static int pn533_target_found(struct pn533 *dev,
-                        struct pn533_poll_response *resp, int resp_len)
+static int pn533_target_found(struct pn533 *dev, u8 tg, u8 *tgdata,
+                              int tgdata_len)
 {
-        int target_data_len;
         struct nfc_target nfc_tgt;
         int rc;
 
         nfc_dev_dbg(&dev->interface->dev, "%s - modulation=%d", __func__,
-                                                        dev->poll_mod_curr);
+                    dev->poll_mod_curr);
 
-        if (resp->tg != 1)
+        if (tg != 1)
                 return -EPROTO;
 
         memset(&nfc_tgt, 0, sizeof(struct nfc_target));
 
-        target_data_len = resp_len - sizeof(struct pn533_poll_response);
-
         switch (dev->poll_mod_curr) {
         case PN533_POLL_MOD_106KBPS_A:
-                rc = pn533_target_found_type_a(&nfc_tgt, resp->target_data,
-                                                        target_data_len);
+                rc = pn533_target_found_type_a(&nfc_tgt, tgdata, tgdata_len);
                 break;
         case PN533_POLL_MOD_212KBPS_FELICA:
         case PN533_POLL_MOD_424KBPS_FELICA:
-                rc = pn533_target_found_felica(&nfc_tgt, resp->target_data,
-                                                        target_data_len);
+                rc = pn533_target_found_felica(&nfc_tgt, tgdata, tgdata_len);
                 break;
         case PN533_POLL_MOD_106KBPS_JEWEL:
-                rc = pn533_target_found_jewel(&nfc_tgt, resp->target_data,
-                                                        target_data_len);
+                rc = pn533_target_found_jewel(&nfc_tgt, tgdata, tgdata_len);
                 break;
         case PN533_POLL_MOD_847KBPS_B:
-                rc = pn533_target_found_type_b(&nfc_tgt, resp->target_data,
-                                                        target_data_len);
+                rc = pn533_target_found_type_b(&nfc_tgt, tgdata, tgdata_len);
                 break;
         default:
-                nfc_dev_err(&dev->interface->dev, "Unknown current poll"
-                                                                " modulation");
+                nfc_dev_err(&dev->interface->dev,
+                            "Unknown current poll modulation");
                 return -EPROTO;
         }
 
@@ -1112,13 +1269,14 @@ static int pn533_target_found(struct pn533 *dev,
                 return rc;
 
         if (!(nfc_tgt.supported_protocols & dev->poll_protocols)) {
-                nfc_dev_dbg(&dev->interface->dev, "The target found does not"
-                                                " have the desired protocol");
+                nfc_dev_dbg(&dev->interface->dev,
+                            "The Tg found doesn't have the desired protocol");
                 return -EAGAIN;
         }
 
-        nfc_dev_dbg(&dev->interface->dev, "Target found - supported protocols: "
-                                        "0x%x", nfc_tgt.supported_protocols);
+        nfc_dev_dbg(&dev->interface->dev,
+                    "Target found - supported protocols: 0x%x",
+                    nfc_tgt.supported_protocols);
 
         dev->tgt_available_prots = nfc_tgt.supported_protocols;
 
@@ -1140,7 +1298,7 @@ static void pn533_poll_reset_mod_list(struct pn533 *dev)
 static void pn533_poll_add_mod(struct pn533 *dev, u8 mod_index)
 {
         dev->poll_mod_active[dev->poll_mod_count] =
-                (struct pn533_poll_modulations *) &poll_mod[mod_index];
+                (struct pn533_poll_modulations *)&poll_mod[mod_index];
         dev->poll_mod_count++;
 }
 
@@ -1149,13 +1307,13 @@ static void pn533_poll_create_mod_list(struct pn533 *dev,
 {
         pn533_poll_reset_mod_list(dev);
 
-        if (im_protocols & NFC_PROTO_MIFARE_MASK
-            || im_protocols & NFC_PROTO_ISO14443_MASK
-            || im_protocols & NFC_PROTO_NFC_DEP_MASK)
+        if ((im_protocols & NFC_PROTO_MIFARE_MASK) ||
+            (im_protocols & NFC_PROTO_ISO14443_MASK) ||
+            (im_protocols & NFC_PROTO_NFC_DEP_MASK))
                 pn533_poll_add_mod(dev, PN533_POLL_MOD_106KBPS_A);
 
-        if (im_protocols & NFC_PROTO_FELICA_MASK
-            || im_protocols & NFC_PROTO_NFC_DEP_MASK) {
+        if (im_protocols & NFC_PROTO_FELICA_MASK ||
+            im_protocols & NFC_PROTO_NFC_DEP_MASK) {
                 pn533_poll_add_mod(dev, PN533_POLL_MOD_212KBPS_FELICA);
                 pn533_poll_add_mod(dev, PN533_POLL_MOD_424KBPS_FELICA);
         }
@@ -1170,16 +1328,20 @@ static void pn533_poll_create_mod_list(struct pn533 *dev,
                 pn533_poll_add_mod(dev, PN533_LISTEN_MOD);
 }
 
-static int pn533_start_poll_complete(struct pn533 *dev, u8 *params, int params_len)
+static int pn533_start_poll_complete(struct pn533 *dev, struct sk_buff *resp)
 {
-        struct pn533_poll_response *resp;
-        int rc;
+        u8 nbtg, tg, *tgdata;
+        int rc, tgdata_len;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        resp = (struct pn533_poll_response *) params;
-        if (resp->nbtg) {
-                rc = pn533_target_found(dev, resp, params_len);
+        nbtg = resp->data[0];
+        tg = resp->data[1];
+        tgdata = &resp->data[2];
+        tgdata_len = resp->len - 2;  /* nbtg + tg */
+
+        if (nbtg) {
+                rc = pn533_target_found(dev, tg, tgdata, tgdata_len);
 
                 /* We must stop the poll after a valid target found */
                 if (rc == 0) {
@@ -1191,158 +1353,134 @@ static int pn533_start_poll_complete(struct pn533 *dev, u8 *params, int params_l
         return -EAGAIN;
 }
 
-static int pn533_init_target_frame(struct pn533_frame *frame,
-                                   u8 *gb, size_t gb_len)
+static struct sk_buff *pn533_alloc_poll_tg_frame(struct pn533 *dev)
 {
-        struct pn533_cmd_init_target *cmd;
-        size_t cmd_len;
+        struct sk_buff *skb;
+        u8 *felica, *nfcid3, *gb;
+
+        u8 *gbytes = dev->gb;
+        size_t gbytes_len = dev->gb_len;
+
         u8 felica_params[18] = {0x1, 0xfe, /* DEP */
                                 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, /* random */
                                 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
                                 0xff, 0xff}; /* System code */
+
         u8 mifare_params[6] = {0x1, 0x1, /* SENS_RES */
                                0x0, 0x0, 0x0,
                                0x40}; /* SEL_RES for DEP */
 
-        cmd_len = sizeof(struct pn533_cmd_init_target) + gb_len + 1;
-        cmd = kzalloc(cmd_len, GFP_KERNEL);
-        if (cmd == NULL)
-                return -ENOMEM;
+        unsigned int skb_len = 36 + /* mode (1), mifare (6),
+                                       felica (18), nfcid3 (10), gb_len (1) */
+                               gbytes_len +
+                               1;  /* len Tk*/
 
-        pn533_tx_frame_init(frame, PN533_CMD_TG_INIT_AS_TARGET);
+        skb = pn533_alloc_skb(dev, skb_len);
+        if (!skb)
+                return NULL;
 
         /* DEP support only */
-        cmd->mode |= PN533_INIT_TARGET_DEP;
+        *skb_put(skb, 1) |= PN533_INIT_TARGET_DEP;
+
+        /* MIFARE params */
+        memcpy(skb_put(skb, 6), mifare_params, 6);
 
         /* Felica params */
-        memcpy(cmd->felica, felica_params, 18);
-        get_random_bytes(cmd->felica + 2, 6);
+        felica = skb_put(skb, 18);
+        memcpy(felica, felica_params, 18);
+        get_random_bytes(felica + 2, 6);
 
         /* NFCID3 */
-        memset(cmd->nfcid3, 0, 10);
-        memcpy(cmd->nfcid3, cmd->felica, 8);
-
-        /* MIFARE params */
-        memcpy(cmd->mifare, mifare_params, 6);
+        nfcid3 = skb_put(skb, 10);
+        memset(nfcid3, 0, 10);
+        memcpy(nfcid3, felica, 8);
 
         /* General bytes */
-        cmd->gb_len = gb_len;
-        memcpy(cmd->gb, gb, gb_len);
-
-        /* Len Tk */
-        cmd->gb[gb_len] = 0;
-
-        memcpy(PN533_FRAME_CMD_PARAMS_PTR(frame), cmd, cmd_len);
+        *skb_put(skb, 1) = gbytes_len;
 
-        frame->datalen += cmd_len;
+        gb = skb_put(skb, gbytes_len);
+        memcpy(gb, gbytes, gbytes_len);
 
-        pn533_tx_frame_finish(frame);
-
-        kfree(cmd);
+        /* Len Tk */
+        *skb_put(skb, 1) = 0;
 
-        return 0;
+        return skb;
 }
 
-#define PN533_CMD_DATAEXCH_HEAD_LEN (sizeof(struct pn533_frame) + 3)
+#define PN533_CMD_DATAEXCH_HEAD_LEN 1
 #define PN533_CMD_DATAEXCH_DATA_MAXLEN 262
 static int pn533_tm_get_data_complete(struct pn533 *dev, void *arg,
-                                      u8 *params, int params_len)
+                                      struct sk_buff *resp)
 {
-        struct sk_buff *skb_resp = arg;
-        struct pn533_frame *in_frame = (struct pn533_frame *) skb_resp->data;
+        u8 status;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        if (params_len < 0) {
-                nfc_dev_err(&dev->interface->dev,
-                            "Error %d when starting as a target",
-                            params_len);
+        if (IS_ERR(resp))
+                return PTR_ERR(resp);
 
-                return params_len;
-        }
+        status = resp->data[0];
+        skb_pull(resp, sizeof(status));
 
-        if (params_len > 0 && params[0] != 0) {
+        if (status != 0) {
                 nfc_tm_deactivated(dev->nfc_dev);
-
                 dev->tgt_mode = 0;
-
-                kfree_skb(skb_resp);
+                dev_kfree_skb(resp);
                 return 0;
         }
 
-        skb_put(skb_resp, PN533_FRAME_SIZE(in_frame));
-        skb_pull(skb_resp, PN533_CMD_DATAEXCH_HEAD_LEN);
-        skb_trim(skb_resp, skb_resp->len - PN533_FRAME_TAIL_SIZE);
-
-        return nfc_tm_data_received(dev->nfc_dev, skb_resp);
+        return nfc_tm_data_received(dev->nfc_dev, resp);
 }
 
 static void pn533_wq_tg_get_data(struct work_struct *work)
 {
         struct pn533 *dev = container_of(work, struct pn533, tg_work);
-        struct pn533_frame *in_frame;
-        struct sk_buff *skb_resp;
-        size_t skb_resp_len;
 
-        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
+        struct sk_buff *skb;
+        int rc;
 
-        skb_resp_len = PN533_CMD_DATAEXCH_HEAD_LEN +
-                PN533_CMD_DATAEXCH_DATA_MAXLEN +
-                PN533_FRAME_TAIL_SIZE;
+        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        skb_resp = nfc_alloc_recv_skb(skb_resp_len, GFP_KERNEL);
-        if (!skb_resp)
+        skb = pn533_alloc_skb(dev, 0);
+        if (!skb)
                 return;
 
-        in_frame = (struct pn533_frame *)skb_resp->data;
+        rc = pn533_send_data_async(dev, PN533_CMD_TG_GET_DATA, skb,
+                                   pn533_tm_get_data_complete, NULL);
 
-        pn533_tx_frame_init(dev->out_frame, PN533_CMD_TG_GET_DATA);
-        pn533_tx_frame_finish(dev->out_frame);
-
-        pn533_send_cmd_frame_async(dev, dev->out_frame, in_frame,
-                                   skb_resp_len,
-                                   pn533_tm_get_data_complete,
-                                   skb_resp, GFP_KERNEL);
+        if (rc < 0)
+                dev_kfree_skb(skb);
 
         return;
 }
 
 #define ATR_REQ_GB_OFFSET 17
-static int pn533_init_target_complete(struct pn533 *dev, u8 *params, int params_len)
+static int pn533_init_target_complete(struct pn533 *dev, struct sk_buff *resp)
 {
-        struct pn533_cmd_init_target_response *resp;
-        u8 frame, comm_mode = NFC_COMM_PASSIVE, *gb;
+        u8 mode, *cmd, comm_mode = NFC_COMM_PASSIVE, *gb;
         size_t gb_len;
         int rc;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        if (params_len < 0) {
-                nfc_dev_err(&dev->interface->dev,
-                            "Error %d when starting as a target",
-                            params_len);
-
-                return params_len;
-        }
-
-        if (params_len < ATR_REQ_GB_OFFSET + 1)
+        if (resp->len < ATR_REQ_GB_OFFSET + 1)
                 return -EINVAL;
 
-        resp = (struct pn533_cmd_init_target_response *) params;
+        mode = resp->data[0];
+        cmd = &resp->data[1];
 
-        nfc_dev_dbg(&dev->interface->dev, "Target mode 0x%x param len %d\n",
-                    resp->mode, params_len);
+        nfc_dev_dbg(&dev->interface->dev, "Target mode 0x%x len %d\n",
+                    mode, resp->len);
 
-        frame = resp->mode & PN533_INIT_TARGET_RESP_FRAME_MASK;
-        if (frame == PN533_INIT_TARGET_RESP_ACTIVE)
+        if ((mode & PN533_INIT_TARGET_RESP_FRAME_MASK) ==
+            PN533_INIT_TARGET_RESP_ACTIVE)
                 comm_mode = NFC_COMM_ACTIVE;
 
-        /* Again, only DEP */
-        if ((resp->mode & PN533_INIT_TARGET_RESP_DEP) == 0)
+        if ((mode & PN533_INIT_TARGET_RESP_DEP) == 0)  /* Only DEP supported */
                 return -EOPNOTSUPP;
 
-        gb = resp->cmd + ATR_REQ_GB_OFFSET;
-        gb_len = params_len - (ATR_REQ_GB_OFFSET + 1);
+        gb = cmd + ATR_REQ_GB_OFFSET;
+        gb_len = resp->len - (ATR_REQ_GB_OFFSET + 1);
 
         rc = nfc_tm_activated(dev->nfc_dev, NFC_PROTO_NFC_DEP_MASK,
                               comm_mode, gb, gb_len);
@@ -1353,7 +1491,6 @@ static int pn533_init_target_complete(struct pn533 *dev, u8 *params, int params_
         }
 
         dev->tgt_mode = 1;
-
         queue_work(dev->wq, &dev->tg_work);
 
         return 0;
@@ -1361,7 +1498,7 @@ static int pn533_init_target_complete(struct pn533 *dev, u8 *params, int params_
 
 static void pn533_listen_mode_timer(unsigned long data)
 {
-        struct pn533 *dev = (struct pn533 *) data;
+        struct pn533 *dev = (struct pn533 *)data;
 
         nfc_dev_dbg(&dev->interface->dev, "Listen mode timeout");
 
@@ -1376,88 +1513,104 @@ static void pn533_listen_mode_timer(unsigned long data)
 }
 
 static int pn533_poll_complete(struct pn533 *dev, void *arg,
-                               u8 *params, int params_len)
+                               struct sk_buff *resp)
 {
         struct pn533_poll_modulations *cur_mod;
         int rc;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        if (params_len == -ENOENT) {
-                if (dev->poll_mod_count != 0)
-                        return 0;
-
-                nfc_dev_err(&dev->interface->dev,
-                            "Polling operation has been stopped");
-
-                goto stop_poll;
-        }
+        if (IS_ERR(resp)) {
+                rc = PTR_ERR(resp);
 
-        if (params_len < 0) {
-                nfc_dev_err(&dev->interface->dev,
-                            "Error %d when running poll", params_len);
+                nfc_dev_err(&dev->interface->dev, "%s  Poll complete error %d",
+                            __func__, rc);
 
-                goto stop_poll;
+                if (rc == -ENOENT) {
+                        if (dev->poll_mod_count != 0)
+                                return rc;
+                        else
+                                goto stop_poll;
+                } else if (rc < 0) {
+                        nfc_dev_err(&dev->interface->dev,
+                                    "Error %d when running poll", rc);
+                        goto stop_poll;
+                }
         }
 
         cur_mod = dev->poll_mod_active[dev->poll_mod_curr];
 
-        if (cur_mod->len == 0) {
+        if (cur_mod->len == 0) { /* Target mode */
                 del_timer(&dev->listen_timer);
-
-                return pn533_init_target_complete(dev, params, params_len);
-        } else {
-                rc = pn533_start_poll_complete(dev, params, params_len);
-                if (!rc)
-                        return rc;
+                rc = pn533_init_target_complete(dev, resp);
+                goto done;
         }
 
-        pn533_poll_next_mod(dev);
+        /* Initiator mode */
+        rc = pn533_start_poll_complete(dev, resp);
+        if (!rc)
+                goto done;
 
+        pn533_poll_next_mod(dev);
         queue_work(dev->wq, &dev->poll_work);
 
-        return 0;
+done:
+        dev_kfree_skb(resp);
+        return rc;
 
 stop_poll:
+        nfc_dev_err(&dev->interface->dev, "Polling operation has been stopped");
+
         pn533_poll_reset_mod_list(dev);
         dev->poll_protocols = 0;
-        return 0;
+        return rc;
 }
 
-static void pn533_build_poll_frame(struct pn533 *dev,
-                                   struct pn533_frame *frame,
-                                   struct pn533_poll_modulations *mod)
+static struct sk_buff *pn533_alloc_poll_in_frame(struct pn533 *dev,
+                                        struct pn533_poll_modulations *mod)
 {
-        nfc_dev_dbg(&dev->interface->dev, "mod len %d\n", mod->len);
+        struct sk_buff *skb;
 
-        if (mod->len == 0) {
-                /* Listen mode */
-                pn533_init_target_frame(frame, dev->gb, dev->gb_len);
-        } else {
-                /* Polling mode */
-                pn533_tx_frame_init(frame, PN533_CMD_IN_LIST_PASSIVE_TARGET);
+        skb = pn533_alloc_skb(dev, mod->len);
+        if (!skb)
+                return NULL;
 
-                memcpy(PN533_FRAME_CMD_PARAMS_PTR(frame), &mod->data, mod->len);
-                frame->datalen += mod->len;
+        memcpy(skb_put(skb, mod->len), &mod->data, mod->len);
 
-                pn533_tx_frame_finish(frame);
-        }
+        return skb;
 }
 
 static int pn533_send_poll_frame(struct pn533 *dev)
 {
-        struct pn533_poll_modulations *cur_mod;
+        struct pn533_poll_modulations *mod;
+        struct sk_buff *skb;
         int rc;
+        u8 cmd_code;
 
-        cur_mod = dev->poll_mod_active[dev->poll_mod_curr];
+        mod = dev->poll_mod_active[dev->poll_mod_curr];
 
-        pn533_build_poll_frame(dev, dev->out_frame, cur_mod);
+        nfc_dev_dbg(&dev->interface->dev, "%s mod len %d\n",
+                    __func__, mod->len);
 
-        rc = pn533_send_cmd_frame_async(dev, dev->out_frame, dev->in_frame,
-                                dev->in_maxlen, pn533_poll_complete,
-                                NULL, GFP_KERNEL);
-        if (rc)
+        if (mod->len == 0) {  /* Listen mode */
+                cmd_code = PN533_CMD_TG_INIT_AS_TARGET;
+                skb = pn533_alloc_poll_tg_frame(dev);
+        } else {  /* Polling mode */
+                cmd_code =  PN533_CMD_IN_LIST_PASSIVE_TARGET;
+                skb = pn533_alloc_poll_in_frame(dev, mod);
+        }
+
+        if (!skb) {
+                nfc_dev_err(&dev->interface->dev, "Failed to allocate skb.");
+                return -ENOMEM;
+        }
+
+        rc = pn533_send_cmd_async(dev, cmd_code, skb, pn533_poll_complete,
+                                  NULL);
+        if (rc < 0) {
+                dev_kfree_skb(skb);
                 nfc_dev_err(&dev->interface->dev, "Polling loop error %d", rc);
+        }
 
         return rc;
 }
@@ -1533,8 +1686,8 @@ static void pn533_stop_poll(struct nfc_dev *nfc_dev)
         del_timer(&dev->listen_timer);
 
         if (!dev->poll_mod_count) {
-                nfc_dev_dbg(&dev->interface->dev, "Polling operation was not"
-                                                                " running");
+                nfc_dev_dbg(&dev->interface->dev,
+                            "Polling operation was not running");
                 return;
         }
 
@@ -1549,38 +1702,38 @@ static void pn533_stop_poll(struct nfc_dev *nfc_dev)
 
 static int pn533_activate_target_nfcdep(struct pn533 *dev)
 {
-        struct pn533_cmd_activate_param param;
-        struct pn533_cmd_activate_response *resp;
+        struct pn533_cmd_activate_response *rsp;
         u16 gt_len;
         int rc;
 
-        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
+        struct sk_buff *skb;
+        struct sk_buff *resp;
 
-        pn533_tx_frame_init(dev->out_frame, PN533_CMD_IN_ATR);
+        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        param.tg = 1;
-        param.next = 0;
-        memcpy(PN533_FRAME_CMD_PARAMS_PTR(dev->out_frame), &param,
-                                sizeof(struct pn533_cmd_activate_param));
-        dev->out_frame->datalen += sizeof(struct pn533_cmd_activate_param);
+        skb = pn533_alloc_skb(dev, sizeof(u8) * 2); /*TG + Next*/
+        if (!skb)
+                return -ENOMEM;
 
-        pn533_tx_frame_finish(dev->out_frame);
+        *skb_put(skb, sizeof(u8)) = 1; /* TG */
+        *skb_put(skb, sizeof(u8)) = 0; /* Next */
 
-        rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame,
-                                                                dev->in_maxlen);
-        if (rc)
-                return rc;
+        resp = pn533_send_cmd_sync(dev, PN533_CMD_IN_ATR, skb);
+        if (IS_ERR(resp))
+                return PTR_ERR(resp);
 
-        resp = (struct pn533_cmd_activate_response *)
-                                PN533_FRAME_CMD_PARAMS_PTR(dev->in_frame);
-        rc = resp->status & PN533_CMD_RET_MASK;
-        if (rc != PN533_CMD_RET_SUCCESS)
+        rsp = (struct pn533_cmd_activate_response *)resp->data;
+        rc = rsp->status & PN533_CMD_RET_MASK;
+        if (rc != PN533_CMD_RET_SUCCESS) {
+                dev_kfree_skb(resp);
                 return -EIO;
+        }
 
         /* ATR_RES general bytes are located at offset 16 */
-        gt_len = PN533_FRAME_CMD_PARAMS_LEN(dev->in_frame) - 16;
-        rc = nfc_set_remote_general_bytes(dev->nfc_dev, resp->gt, gt_len);
+        gt_len = resp->len - 16;
+        rc = nfc_set_remote_general_bytes(dev->nfc_dev, rsp->gt, gt_len);
 
+        dev_kfree_skb(resp);
         return rc;
 }
 
@@ -1591,38 +1744,38 @@ static int pn533_activate_target(struct nfc_dev *nfc_dev,
         int rc;
 
         nfc_dev_dbg(&dev->interface->dev, "%s - protocol=%u", __func__,
-                                                                protocol);
+                    protocol);
 
         if (dev->poll_mod_count) {
-                nfc_dev_err(&dev->interface->dev, "Cannot activate while"
-                                                                " polling");
+                nfc_dev_err(&dev->interface->dev,
+                            "Cannot activate while polling");
                 return -EBUSY;
         }
 
         if (dev->tgt_active_prot) {
-                nfc_dev_err(&dev->interface->dev, "There is already an active"
-                                                                " target");
+                nfc_dev_err(&dev->interface->dev,
+                            "There is already an active target");
                 return -EBUSY;
         }
 
         if (!dev->tgt_available_prots) {
-                nfc_dev_err(&dev->interface->dev, "There is no available target"
-                                                                " to activate");
+                nfc_dev_err(&dev->interface->dev,
+                            "There is no available target to activate");
                 return -EINVAL;
         }
 
         if (!(dev->tgt_available_prots & (1 << protocol))) {
-                nfc_dev_err(&dev->interface->dev, "The target does not support"
-                                        " the requested protocol %u", protocol);
+                nfc_dev_err(&dev->interface->dev,
+                            "Target doesn't support requested proto %u",
+                            protocol);
                 return -EINVAL;
         }
 
         if (protocol == NFC_PROTO_NFC_DEP) {
                 rc = pn533_activate_target_nfcdep(dev);
                 if (rc) {
-                        nfc_dev_err(&dev->interface->dev, "Error %d when"
-                                                " activating target with"
-                                                " NFC_DEP protocol", rc);
+                        nfc_dev_err(&dev->interface->dev,
+                                    "Activating target with DEP failed %d", rc);
                         return rc;
                 }
         }
@@ -1637,8 +1790,10 @@ static void pn533_deactivate_target(struct nfc_dev *nfc_dev,
                                     struct nfc_target *target)
 {
         struct pn533 *dev = nfc_get_drvdata(nfc_dev);
-        u8 tg;
-        u8 status;
+
+        struct sk_buff *skb;
+        struct sk_buff *resp;
+
         int rc;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
@@ -1649,83 +1804,69 @@ static void pn533_deactivate_target(struct nfc_dev *nfc_dev,
         }
 
         dev->tgt_active_prot = 0;
-
         skb_queue_purge(&dev->resp_q);
 
-        pn533_tx_frame_init(dev->out_frame, PN533_CMD_IN_RELEASE);
-
-        tg = 1;
-        memcpy(PN533_FRAME_CMD_PARAMS_PTR(dev->out_frame), &tg, sizeof(u8));
-        dev->out_frame->datalen += sizeof(u8);
+        skb = pn533_alloc_skb(dev, sizeof(u8));
+        if (!skb)
+                return;
 
-        pn533_tx_frame_finish(dev->out_frame);
+        *skb_put(skb, 1) = 1; /* TG*/
 
-        rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame,
-                                                                dev->in_maxlen);
-        if (rc) {
-                nfc_dev_err(&dev->interface->dev, "Error when sending release"
-                                                " command to the controller");
+        resp = pn533_send_cmd_sync(dev, PN533_CMD_IN_RELEASE, skb);
+        if (IS_ERR(resp))
                 return;
-        }
 
-        status = PN533_FRAME_CMD_PARAMS_PTR(dev->in_frame)[0];
-        rc = status & PN533_CMD_RET_MASK;
+        rc = resp->data[0] & PN533_CMD_RET_MASK;
         if (rc != PN533_CMD_RET_SUCCESS)
-                nfc_dev_err(&dev->interface->dev, "Error 0x%x when releasing"
-                                                        " the target", rc);
+                nfc_dev_err(&dev->interface->dev,
+                            "Error 0x%x when releasing the target", rc);
 
+        dev_kfree_skb(resp);
         return;
 }
 
 
 static int pn533_in_dep_link_up_complete(struct pn533 *dev, void *arg,
-                                                u8 *params, int params_len)
+                                         struct sk_buff *resp)
 {
-        struct pn533_cmd_jump_dep_response *resp;
-        struct nfc_target nfc_target;
+        struct pn533_cmd_jump_dep_response *rsp;
         u8 target_gt_len;
         int rc;
-        struct pn533_cmd_jump_dep *cmd = (struct pn533_cmd_jump_dep *)arg;
-        u8 active = cmd->active;
+        u8 active = *(u8 *)arg;
 
         kfree(arg);
 
-        if (params_len == -ENOENT) {
-                nfc_dev_dbg(&dev->interface->dev, "");
-                return 0;
-        }
-
-        if (params_len < 0) {
-                nfc_dev_err(&dev->interface->dev,
-                                "Error %d when bringing DEP link up",
-                                                                params_len);
-                return 0;
-        }
+        if (IS_ERR(resp))
+                return PTR_ERR(resp);
 
         if (dev->tgt_available_prots &&
             !(dev->tgt_available_prots & (1 << NFC_PROTO_NFC_DEP))) {
                 nfc_dev_err(&dev->interface->dev,
-                        "The target does not support DEP");
-                return -EINVAL;
+                            "The target does not support DEP");
+                rc =  -EINVAL;
+                goto error;
         }
 
-        resp = (struct pn533_cmd_jump_dep_response *) params;
-        rc = resp->status & PN533_CMD_RET_MASK;
+        rsp = (struct pn533_cmd_jump_dep_response *)resp->data;
+
+        rc = rsp->status & PN533_CMD_RET_MASK;
         if (rc != PN533_CMD_RET_SUCCESS) {
                 nfc_dev_err(&dev->interface->dev,
-                                "Bringing DEP link up failed %d", rc);
-                return 0;
+                            "Bringing DEP link up failed %d", rc);
+                goto error;
         }
 
         if (!dev->tgt_available_prots) {
+                struct nfc_target nfc_target;
+
                 nfc_dev_dbg(&dev->interface->dev, "Creating new target");
 
                 nfc_target.supported_protocols = NFC_PROTO_NFC_DEP_MASK;
                 nfc_target.nfcid1_len = 10;
-                memcpy(nfc_target.nfcid1, resp->nfcid3t, nfc_target.nfcid1_len);
+                memcpy(nfc_target.nfcid1, rsp->nfcid3t, nfc_target.nfcid1_len);
                 rc = nfc_targets_found(dev->nfc_dev, &nfc_target, 1);
                 if (rc)
-                        return 0;
+                        goto error;
 
                 dev->tgt_available_prots = 0;
         }
@@ -1733,15 +1874,17 @@ static int pn533_in_dep_link_up_complete(struct pn533 *dev, void *arg,
         dev->tgt_active_prot = NFC_PROTO_NFC_DEP;
 
         /* ATR_RES general bytes are located at offset 17 */
-        target_gt_len = PN533_FRAME_CMD_PARAMS_LEN(dev->in_frame) - 17;
+        target_gt_len = resp->len - 17;
         rc = nfc_set_remote_general_bytes(dev->nfc_dev,
-                                                resp->gt, target_gt_len);
+                                          rsp->gt, target_gt_len);
         if (rc == 0)
                 rc = nfc_dep_link_is_up(dev->nfc_dev,
-                                                dev->nfc_dev->targets[0].idx,
-                                                !active, NFC_RF_INITIATOR);
+                                        dev->nfc_dev->targets[0].idx,
+                                        !active, NFC_RF_INITIATOR);
 
-        return 0;
+error:
+        dev_kfree_skb(resp);
+        return rc;
 }
 
 static int pn533_mod_to_baud(struct pn533 *dev)
@@ -1760,25 +1903,26 @@ static int pn533_mod_to_baud(struct pn533 *dev)
 
 #define PASSIVE_DATA_LEN 5
 static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target,
-                             u8 comm_mode, u8* gb, size_t gb_len)
+                             u8 comm_mode, u8 *gb, size_t gb_len)
 {
         struct pn533 *dev = nfc_get_drvdata(nfc_dev);
-        struct pn533_cmd_jump_dep *cmd;
-        u8 cmd_len, *data_ptr;
+        struct sk_buff *skb;
+        int rc, baud, skb_len;
+        u8 *next, *arg;
+
         u8 passive_data[PASSIVE_DATA_LEN] = {0x00, 0xff, 0xff, 0x00, 0x3};
-        int rc, baud;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
         if (dev->poll_mod_count) {
                 nfc_dev_err(&dev->interface->dev,
-                                "Cannot bring the DEP link up while polling");
+                            "Cannot bring the DEP link up while polling");
                 return -EBUSY;
         }
 
         if (dev->tgt_active_prot) {
                 nfc_dev_err(&dev->interface->dev,
-                                "There is already an active target");
+                            "There is already an active target");
                 return -EBUSY;
         }
 
@@ -1789,43 +1933,48 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target,
                 return baud;
         }
 
-        cmd_len = sizeof(struct pn533_cmd_jump_dep) + gb_len;
+        skb_len = 3 + gb_len; /* ActPass + BR + Next */
         if (comm_mode == NFC_COMM_PASSIVE)
-                cmd_len += PASSIVE_DATA_LEN;
+                skb_len += PASSIVE_DATA_LEN;
 
-        cmd = kzalloc(cmd_len, GFP_KERNEL);
-        if (cmd == NULL)
+        skb = pn533_alloc_skb(dev, skb_len);
+        if (!skb)
                 return -ENOMEM;
 
-        pn533_tx_frame_init(dev->out_frame, PN533_CMD_IN_JUMP_FOR_DEP);
+        *skb_put(skb, 1) = !comm_mode;  /* ActPass */
+        *skb_put(skb, 1) = baud;  /* Baud rate */
 
-        cmd->active = !comm_mode;
-        cmd->next = 0;
-        cmd->baud = baud;
-        data_ptr = cmd->data;
-        if (comm_mode == NFC_COMM_PASSIVE && cmd->baud > 0) {
-                memcpy(data_ptr, passive_data, PASSIVE_DATA_LEN);
-                cmd->next |= 1;
-                data_ptr += PASSIVE_DATA_LEN;
+        next = skb_put(skb, 1);  /* Next */
+        *next = 0;
+
+        if (comm_mode == NFC_COMM_PASSIVE && baud > 0) {
+                memcpy(skb_put(skb, PASSIVE_DATA_LEN), passive_data,
+                       PASSIVE_DATA_LEN);
+                *next |= 1;
         }
 
         if (gb != NULL && gb_len > 0) {
-                cmd->next |= 4; /* We have some Gi */
-                memcpy(data_ptr, gb, gb_len);
+                memcpy(skb_put(skb, gb_len), gb, gb_len);
+                *next |= 4; /* We have some Gi */
         } else {
-                cmd->next = 0;
+                *next = 0;
         }
 
-        memcpy(PN533_FRAME_CMD_PARAMS_PTR(dev->out_frame), cmd, cmd_len);
-        dev->out_frame->datalen += cmd_len;
+        arg = kmalloc(sizeof(*arg), GFP_KERNEL);
+        if (!arg) {
+                dev_kfree_skb(skb);
+                return -ENOMEM;
+        }
 
-        pn533_tx_frame_finish(dev->out_frame);
+        *arg = !comm_mode;
 
-        rc = pn533_send_cmd_frame_async(dev, dev->out_frame, dev->in_frame,
-                                dev->in_maxlen, pn533_in_dep_link_up_complete,
-                                cmd, GFP_KERNEL);
-        if (rc < 0)
-                kfree(cmd);
+        rc = pn533_send_cmd_async(dev, PN533_CMD_IN_JUMP_FOR_DEP, skb,
+                                  pn533_in_dep_link_up_complete, arg);
+
+        if (rc < 0) {
+                dev_kfree_skb(skb);
+                kfree(arg);
+        }
 
         return rc;
 }
@@ -1834,6 +1983,8 @@ static int pn533_dep_link_down(struct nfc_dev *nfc_dev)
 {
         struct pn533 *dev = nfc_get_drvdata(nfc_dev);
 
+        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
+
         pn533_poll_reset_mod_list(dev);
 
         if (dev->tgt_mode || dev->tgt_active_prot) {
@@ -1849,68 +2000,7 @@ static int pn533_dep_link_down(struct nfc_dev *nfc_dev)
         return 0;
 }
 
-static int pn533_build_tx_frame(struct pn533 *dev, struct sk_buff *skb,
-                                bool target)
-{
-        int payload_len = skb->len;
-        struct pn533_frame *out_frame;
-        u8 tg;
-
-        nfc_dev_dbg(&dev->interface->dev, "%s - Sending %d bytes", __func__,
-                                                                payload_len);
-
-        if (payload_len > PN533_CMD_DATAEXCH_DATA_MAXLEN) {
-                /* TODO: Implement support to multi-part data exchange */
-                nfc_dev_err(&dev->interface->dev, "Data length greater than the"
-                                                " max allowed: %d",
-                                                PN533_CMD_DATAEXCH_DATA_MAXLEN);
-                return -ENOSYS;
-        }
-
-        if (target == true) {
-                switch (dev->device_type) {
-                case PN533_DEVICE_PASORI:
-                        if (dev->tgt_active_prot == NFC_PROTO_FELICA) {
-                                skb_push(skb, PN533_CMD_DATAEXCH_HEAD_LEN - 1);
-                                out_frame = (struct pn533_frame *) skb->data;
-                                pn533_tx_frame_init(out_frame,
-                                                    PN533_CMD_IN_COMM_THRU);
-
-                                break;
-                        }
-
-                default:
-                        skb_push(skb, PN533_CMD_DATAEXCH_HEAD_LEN);
-                        out_frame = (struct pn533_frame *) skb->data;
-                        pn533_tx_frame_init(out_frame,
-                                            PN533_CMD_IN_DATA_EXCHANGE);
-                        tg = 1;
-                        memcpy(PN533_FRAME_CMD_PARAMS_PTR(out_frame),
-                               &tg, sizeof(u8));
-                        out_frame->datalen += sizeof(u8);
-
-                        break;
-                }
-
-        } else {
-                skb_push(skb, PN533_CMD_DATAEXCH_HEAD_LEN - 1);
-                out_frame = (struct pn533_frame *) skb->data;
-                pn533_tx_frame_init(out_frame, PN533_CMD_TG_SET_DATA);
-        }
-
-
-        /* The data is already in the out_frame, just update the datalen */
-        out_frame->datalen += payload_len;
-
-        pn533_tx_frame_finish(out_frame);
-        skb_put(skb, PN533_FRAME_TAIL_SIZE);
-
-        return 0;
-}
-
 struct pn533_data_exchange_arg {
-        struct sk_buff *skb_resp;
-        struct sk_buff *skb_out;
         data_exchange_cb_t cb;
         void *cb_context;
 };
@@ -1920,7 +2010,7 @@ static struct sk_buff *pn533_build_response(struct pn533 *dev)
         struct sk_buff *skb, *tmp, *t;
         unsigned int skb_len = 0, tmp_len = 0;
 
-        nfc_dev_dbg(&dev->interface->dev, "%s\n", __func__);
+        nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
         if (skb_queue_empty(&dev->resp_q))
                 return NULL;
@@ -1954,46 +2044,44 @@ out:
 }
 
 static int pn533_data_exchange_complete(struct pn533 *dev, void *_arg,
-                                                u8 *params, int params_len)
+                                        struct sk_buff *resp)
 {
         struct pn533_data_exchange_arg *arg = _arg;
-        struct sk_buff *skb = NULL, *skb_resp = arg->skb_resp;
-        struct pn533_frame *in_frame = (struct pn533_frame *) skb_resp->data;
-        int err = 0;
-        u8 status;
-        u8 cmd_ret;
+        struct sk_buff *skb;
+        int rc = 0;
+        u8 status, ret, mi;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        dev_kfree_skb(arg->skb_out);
-
-        if (params_len < 0) { /* error */
-                err = params_len;
-                goto error;
+        if (IS_ERR(resp)) {
+                rc = PTR_ERR(resp);
+                goto _error;
         }
 
-        status = params[0];
+        status = resp->data[0];
+        ret = status & PN533_CMD_RET_MASK;
+        mi = status & PN533_CMD_MI_MASK;
+
+        skb_pull(resp, sizeof(status));
 
-        cmd_ret = status & PN533_CMD_RET_MASK;
-        if (cmd_ret != PN533_CMD_RET_SUCCESS) {
-                nfc_dev_err(&dev->interface->dev, "PN533 reported error %d when"
-                                                " exchanging data", cmd_ret);
-                err = -EIO;
+        if (ret != PN533_CMD_RET_SUCCESS) {
+                nfc_dev_err(&dev->interface->dev,
+                            "PN533 reported error %d when exchanging data",
+                            ret);
+                rc = -EIO;
                 goto error;
         }
 
-        skb_put(skb_resp, PN533_FRAME_SIZE(in_frame));
-        skb_pull(skb_resp, PN533_CMD_DATAEXCH_HEAD_LEN);
-        skb_trim(skb_resp, skb_resp->len - PN533_FRAME_TAIL_SIZE);
-        skb_queue_tail(&dev->resp_q, skb_resp);
+        skb_queue_tail(&dev->resp_q, resp);
 
-        if (status & PN533_CMD_MI_MASK) {
+        if (mi) {
+                dev->cmd_complete_mi_arg = arg;
                 queue_work(dev->wq, &dev->mi_work);
                 return -EINPROGRESS;
         }
 
         skb = pn533_build_response(dev);
-        if (skb == NULL)
+        if (!skb)
                 goto error;
 
         arg->cb(arg->cb_context, skb, 0);
@@ -2001,11 +2089,12 @@ static int pn533_data_exchange_complete(struct pn533 *dev, void *_arg,
         return 0;
 
 error:
+        dev_kfree_skb(resp);
+_error:
         skb_queue_purge(&dev->resp_q);
-        dev_kfree_skb(skb_resp);
-        arg->cb(arg->cb_context, NULL, err);
+        arg->cb(arg->cb_context, NULL, rc);
         kfree(arg);
-        return 0;
+        return rc;
 }
 
 static int pn533_transceive(struct nfc_dev *nfc_dev,
@@ -2013,87 +2102,82 @@ static int pn533_transceive(struct nfc_dev *nfc_dev,
                             data_exchange_cb_t cb, void *cb_context)
 {
         struct pn533 *dev = nfc_get_drvdata(nfc_dev);
-        struct pn533_frame *out_frame, *in_frame;
-        struct pn533_data_exchange_arg *arg;
-        struct sk_buff *skb_resp;
-        int skb_resp_len;
+        struct pn533_data_exchange_arg *arg = NULL;
         int rc;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        if (!dev->tgt_active_prot) {
-                nfc_dev_err(&dev->interface->dev, "Cannot exchange data if"
-                                                " there is no active target");
-                rc = -EINVAL;
+        if (skb->len > PN533_CMD_DATAEXCH_DATA_MAXLEN) {
+                /* TODO: Implement support to multi-part data exchange */
+                nfc_dev_err(&dev->interface->dev,
+                            "Data length greater than the max allowed: %d",
+                            PN533_CMD_DATAEXCH_DATA_MAXLEN);
+                rc = -ENOSYS;
                 goto error;
         }
 
-        rc = pn533_build_tx_frame(dev, skb, true);
-        if (rc)
-                goto error;
-
-        skb_resp_len = PN533_CMD_DATAEXCH_HEAD_LEN +
-                        PN533_CMD_DATAEXCH_DATA_MAXLEN +
-                        PN533_FRAME_TAIL_SIZE;
-
-        skb_resp = nfc_alloc_recv_skb(skb_resp_len, GFP_KERNEL);
-        if (!skb_resp) {
-                rc = -ENOMEM;
+        if (!dev->tgt_active_prot) {
+                nfc_dev_err(&dev->interface->dev,
+                            "Can't exchange data if there is no active target");
+                rc = -EINVAL;
                 goto error;
         }
 
-        in_frame = (struct pn533_frame *) skb_resp->data;
-        out_frame = (struct pn533_frame *) skb->data;
-
-        arg = kmalloc(sizeof(struct pn533_data_exchange_arg), GFP_KERNEL);
+        arg = kmalloc(sizeof(*arg), GFP_KERNEL);
         if (!arg) {
                 rc = -ENOMEM;
-                goto free_skb_resp;
+                goto error;
         }
 
-        arg->skb_resp = skb_resp;
-        arg->skb_out = skb;
         arg->cb = cb;
         arg->cb_context = cb_context;
 
-        rc = pn533_send_cmd_frame_async(dev, out_frame, in_frame, skb_resp_len,
-                                        pn533_data_exchange_complete, arg,
-                                        GFP_KERNEL);
-        if (rc) {
-                nfc_dev_err(&dev->interface->dev, "Error %d when trying to"
-                                                " perform data_exchange", rc);
-                goto free_arg;
+        switch (dev->device_type) {
+        case PN533_DEVICE_PASORI:
+                if (dev->tgt_active_prot == NFC_PROTO_FELICA) {
+                        rc = pn533_send_data_async(dev, PN533_CMD_IN_COMM_THRU,
+                                                   skb,
+                                                   pn533_data_exchange_complete,
+                                                   arg);
+
+                        break;
+                }
+        default:
+                *skb_push(skb, sizeof(u8)) =  1; /*TG*/
+
+                rc = pn533_send_data_async(dev, PN533_CMD_IN_DATA_EXCHANGE,
+                                           skb, pn533_data_exchange_complete,
+                                           arg);
+
+                break;
         }
 
+        if (rc < 0) /* rc from send_async */
+                goto error;
+
         return 0;
 
-free_arg:
-        kfree(arg);
-free_skb_resp:
-        kfree_skb(skb_resp);
 error:
-        kfree_skb(skb);
+        kfree(arg);
+        dev_kfree_skb(skb);
         return rc;
 }
 
 static int pn533_tm_send_complete(struct pn533 *dev, void *arg,
-                                  u8 *params, int params_len)
+                                  struct sk_buff *resp)
 {
-        struct sk_buff *skb_out = arg;
+        u8 status;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        dev_kfree_skb(skb_out);
+        if (IS_ERR(resp))
+                return PTR_ERR(resp);
 
-        if (params_len < 0) {
-                nfc_dev_err(&dev->interface->dev,
-                            "Error %d when sending data",
-                            params_len);
+        status = resp->data[0];
 
-                return params_len;
-        }
+        dev_kfree_skb(resp);
 
-        if (params_len > 0 && params[0] != 0) {
+        if (status != 0) {
                 nfc_tm_deactivated(dev->nfc_dev);
 
                 dev->tgt_mode = 0;
@@ -2109,30 +2193,21 @@ static int pn533_tm_send_complete(struct pn533 *dev, void *arg,
 static int pn533_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb)
 {
         struct pn533 *dev = nfc_get_drvdata(nfc_dev);
-        struct pn533_frame *out_frame;
         int rc;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        rc = pn533_build_tx_frame(dev, skb, false);
-        if (rc)
-                goto error;
-
-        out_frame = (struct pn533_frame *) skb->data;
-
-        rc = pn533_send_cmd_frame_async(dev, out_frame, dev->in_frame,
-                                        dev->in_maxlen, pn533_tm_send_complete,
-                                        skb, GFP_KERNEL);
-        if (rc) {
+        if (skb->len > PN533_CMD_DATAEXCH_DATA_MAXLEN) {
                 nfc_dev_err(&dev->interface->dev,
-                            "Error %d when trying to send data", rc);
-                goto error;
+                            "Data length greater than the max allowed: %d",
+                            PN533_CMD_DATAEXCH_DATA_MAXLEN);
+                return -ENOSYS;
         }
 
-        return 0;
-
-error:
-        kfree_skb(skb);
+        rc = pn533_send_data_async(dev, PN533_CMD_TG_SET_DATA, skb,
+                                   pn533_tm_send_complete, NULL);
+        if (rc < 0)
+                dev_kfree_skb(skb);
 
         return rc;
 }
@@ -2140,107 +2215,123 @@ error:
 static void pn533_wq_mi_recv(struct work_struct *work)
 {
         struct pn533 *dev = container_of(work, struct pn533, mi_work);
-        struct sk_buff *skb_cmd;
-        struct pn533_data_exchange_arg *arg = dev->cmd_complete_arg;
-        struct pn533_frame *out_frame, *in_frame;
-        struct sk_buff *skb_resp;
-        int skb_resp_len;
+
+        struct sk_buff *skb;
         int rc;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        /* This is a zero payload size skb */
-        skb_cmd = alloc_skb(PN533_CMD_DATAEXCH_HEAD_LEN + PN533_FRAME_TAIL_SIZE,
-                            GFP_KERNEL);
-        if (skb_cmd == NULL)
-                goto error_cmd;
-
-        skb_reserve(skb_cmd, PN533_CMD_DATAEXCH_HEAD_LEN);
+        skb = pn533_alloc_skb(dev, PN533_CMD_DATAEXCH_HEAD_LEN);
+        if (!skb)
+                goto error;
 
-        rc = pn533_build_tx_frame(dev, skb_cmd, true);
-        if (rc)
-                goto error_frame;
+        switch (dev->device_type) {
+        case PN533_DEVICE_PASORI:
+                if (dev->tgt_active_prot == NFC_PROTO_FELICA) {
+                        rc = pn533_send_cmd_direct_async(dev,
+                                                PN533_CMD_IN_COMM_THRU,
+                                                skb,
+                                                pn533_data_exchange_complete,
+                                                 dev->cmd_complete_mi_arg);
 
-        skb_resp_len = PN533_CMD_DATAEXCH_HEAD_LEN +
-                        PN533_CMD_DATAEXCH_DATA_MAXLEN +
-                        PN533_FRAME_TAIL_SIZE;
-        skb_resp = alloc_skb(skb_resp_len, GFP_KERNEL);
-        if (!skb_resp) {
-                rc = -ENOMEM;
-                goto error_frame;
-        }
+                        break;
+                }
+        default:
+                *skb_put(skb, sizeof(u8)) =  1; /*TG*/
 
-        in_frame = (struct pn533_frame *) skb_resp->data;
-        out_frame = (struct pn533_frame *) skb_cmd->data;
+                rc = pn533_send_cmd_direct_async(dev,
+                                                 PN533_CMD_IN_DATA_EXCHANGE,
+                                                 skb,
+                                                 pn533_data_exchange_complete,
+                                                 dev->cmd_complete_mi_arg);
 
-        arg->skb_resp = skb_resp;
-        arg->skb_out = skb_cmd;
+                break;
+        }
 
-        rc = __pn533_send_cmd_frame_async(dev, out_frame, in_frame,
-                                          skb_resp_len,
-                                          pn533_data_exchange_complete,
-                                          dev->cmd_complete_arg, GFP_KERNEL);
-        if (!rc)
+        if (rc == 0) /* success */
                 return;
 
-        nfc_dev_err(&dev->interface->dev, "Error %d when trying to"
-                                                " perform data_exchange", rc);
-
-        kfree_skb(skb_resp);
+        nfc_dev_err(&dev->interface->dev,
+                    "Error %d when trying to perform data_exchange", rc);
 
-error_frame:
-        kfree_skb(skb_cmd);
+        dev_kfree_skb(skb);
+        kfree(dev->cmd_complete_arg);
 
-error_cmd:
+error:
         pn533_send_ack(dev, GFP_KERNEL);
-
-        kfree(arg);
-
         queue_work(dev->wq, &dev->cmd_work);
 }
 
 static int pn533_set_configuration(struct pn533 *dev, u8 cfgitem, u8 *cfgdata,
                                                                 u8 cfgdata_len)
 {
-        int rc;
-        u8 *params;
+        struct sk_buff *skb;
+        struct sk_buff *resp;
+
+        int skb_len;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        pn533_tx_frame_init(dev->out_frame, PN533_CMD_RF_CONFIGURATION);
+        skb_len = sizeof(cfgitem) + cfgdata_len; /* cfgitem + cfgdata */
 
-        params = PN533_FRAME_CMD_PARAMS_PTR(dev->out_frame);
-        params[0] = cfgitem;
-        memcpy(&params[1], cfgdata, cfgdata_len);
-        dev->out_frame->datalen += (1 + cfgdata_len);
+        skb = pn533_alloc_skb(dev, skb_len);
+        if (!skb)
+                return -ENOMEM;
 
-        pn533_tx_frame_finish(dev->out_frame);
+        *skb_put(skb, sizeof(cfgitem)) = cfgitem;
+        memcpy(skb_put(skb, cfgdata_len), cfgdata, cfgdata_len);
 
-        rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame,
-                                                                dev->in_maxlen);
+        resp = pn533_send_cmd_sync(dev, PN533_CMD_RF_CONFIGURATION, skb);
+        if (IS_ERR(resp))
+                return PTR_ERR(resp);
 
-        return rc;
+        dev_kfree_skb(resp);
+        return 0;
+}
+
+static int pn533_get_firmware_version(struct pn533 *dev,
+                                      struct pn533_fw_version *fv)
+{
+        struct sk_buff *skb;
+        struct sk_buff *resp;
+
+        skb = pn533_alloc_skb(dev, 0);
+        if (!skb)
+                return -ENOMEM;
+
+        resp = pn533_send_cmd_sync(dev, PN533_CMD_GET_FIRMWARE_VERSION, skb);
+        if (IS_ERR(resp))
+                return PTR_ERR(resp);
+
+        fv->ic = resp->data[0];
+        fv->ver = resp->data[1];
+        fv->rev = resp->data[2];
+        fv->support = resp->data[3];
+
+        dev_kfree_skb(resp);
+        return 0;
 }
 
 static int pn533_fw_reset(struct pn533 *dev)
 {
-        int rc;
-        u8 *params;
+        struct sk_buff *skb;
+        struct sk_buff *resp;
 
         nfc_dev_dbg(&dev->interface->dev, "%s", __func__);
 
-        pn533_tx_frame_init(dev->out_frame, 0x18);
+        skb = pn533_alloc_skb(dev, sizeof(u8));
+        if (!skb)
+                return -ENOMEM;
 
-        params = PN533_FRAME_CMD_PARAMS_PTR(dev->out_frame);
-        params[0] = 0x1;
-        dev->out_frame->datalen += 1;
+        *skb_put(skb, sizeof(u8)) = 0x1;
 
-        pn533_tx_frame_finish(dev->out_frame);
+        resp = pn533_send_cmd_sync(dev, 0x18, skb);
+        if (IS_ERR(resp))
+                return PTR_ERR(resp);
 
-        rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame,
-                                       dev->in_maxlen);
+        dev_kfree_skb(resp);
 
-        return rc;
+        return 0;
 }
 
 static struct nfc_ops pn533_nfc_ops = {
@@ -2337,7 +2428,7 @@ static int pn533_setup(struct pn533 *dev)
 static int pn533_probe(struct usb_interface *interface,
                         const struct usb_device_id *id)
 {
-        struct pn533_fw_version *fw_ver;
+        struct pn533_fw_version fw_ver;
         struct pn533 *dev;
         struct usb_host_interface *iface_desc;
         struct usb_endpoint_descriptor *endpoint;
@@ -2359,41 +2450,32 @@ static int pn533_probe(struct usb_interface *interface,
         for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
                 endpoint = &iface_desc->endpoint[i].desc;
 
-                if (!in_endpoint && usb_endpoint_is_bulk_in(endpoint)) {
-                        dev->in_maxlen = le16_to_cpu(endpoint->wMaxPacketSize);
+                if (!in_endpoint && usb_endpoint_is_bulk_in(endpoint))
                         in_endpoint = endpoint->bEndpointAddress;
-                }
 
-                if (!out_endpoint && usb_endpoint_is_bulk_out(endpoint)) {
-                        dev->out_maxlen =
-                                le16_to_cpu(endpoint->wMaxPacketSize);
+                if (!out_endpoint && usb_endpoint_is_bulk_out(endpoint))
                         out_endpoint = endpoint->bEndpointAddress;
-                }
         }
 
         if (!in_endpoint || !out_endpoint) {
-                nfc_dev_err(&interface->dev, "Could not find bulk-in or"
-                                                        " bulk-out endpoint");
+                nfc_dev_err(&interface->dev,
+                            "Could not find bulk-in or bulk-out endpoint");
                 rc = -ENODEV;
                 goto error;
         }
 
-        dev->in_frame = kmalloc(PN533_NORMAL_FRAME_MAX_LEN, GFP_KERNEL);
         dev->in_urb = usb_alloc_urb(0, GFP_KERNEL);
-        dev->out_frame = kmalloc(PN533_NORMAL_FRAME_MAX_LEN, GFP_KERNEL);
         dev->out_urb = usb_alloc_urb(0, GFP_KERNEL);
 
-        if (!dev->in_frame || !dev->out_frame ||
-                !dev->in_urb || !dev->out_urb)
+        if (!dev->in_urb || !dev->out_urb)
                 goto error;
 
         usb_fill_bulk_urb(dev->in_urb, dev->udev,
-                        usb_rcvbulkpipe(dev->udev, in_endpoint),
-                        NULL, 0, NULL, dev);
+                          usb_rcvbulkpipe(dev->udev, in_endpoint),
+                          NULL, 0, NULL, dev);
         usb_fill_bulk_urb(dev->out_urb, dev->udev,
-                        usb_sndbulkpipe(dev->udev, out_endpoint),
-                        NULL, 0,
-                        pn533_send_complete, dev);
+                          usb_sndbulkpipe(dev->udev, out_endpoint),
+                          NULL, 0, pn533_send_complete, dev);
 
         INIT_WORK(&dev->cmd_work, pn533_wq_cmd);
         INIT_WORK(&dev->cmd_complete_work, pn533_wq_cmd_complete);
@@ -2414,18 +2496,7 @@ static int pn533_probe(struct usb_interface *interface,
 
         usb_set_intfdata(interface, dev);
 
-        pn533_tx_frame_init(dev->out_frame, PN533_CMD_GET_FIRMWARE_VERSION);
-        pn533_tx_frame_finish(dev->out_frame);
-
-        rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame,
-                                                                dev->in_maxlen);
-        if (rc)
-                goto destroy_wq;
-
-        fw_ver = (struct pn533_fw_version *)
-                                PN533_FRAME_CMD_PARAMS_PTR(dev->in_frame);
-        nfc_dev_info(&dev->interface->dev, "NXP PN533 firmware ver %d.%d now"
-                                        " attached", fw_ver->ver, fw_ver->rev);
+        dev->ops = &pn533_std_frame_ops;
 
         dev->device_type = id->driver_info;
         switch (dev->device_type) {
@@ -2444,9 +2515,21 @@ static int pn533_probe(struct usb_interface *interface,
                 goto destroy_wq;
         }
 
+        memset(&fw_ver, 0, sizeof(fw_ver));
+        rc = pn533_get_firmware_version(dev, &fw_ver);
+        if (rc < 0)
+                goto destroy_wq;
+
+        nfc_dev_info(&dev->interface->dev,
+                     "NXP PN533 firmware ver %d.%d now attached",
+                     fw_ver.ver, fw_ver.rev);
+
+
         dev->nfc_dev = nfc_allocate_device(&pn533_nfc_ops, protocols,
+                                           NFC_SE_NONE,
+                                           dev->ops->tx_header_len +
                                            PN533_CMD_DATAEXCH_HEAD_LEN,
-                                           PN533_FRAME_TAIL_SIZE);
+                                           dev->ops->tx_tail_len);
         if (!dev->nfc_dev)
                 goto destroy_wq;
 
@@ -2472,9 +2555,7 @@ free_nfc_dev:
 destroy_wq:
         destroy_workqueue(dev->wq);
 error:
-        kfree(dev->in_frame);
         usb_free_urb(dev->in_urb);
-        kfree(dev->out_frame);
         usb_free_urb(dev->out_urb);
         kfree(dev);
         return rc;
@@ -2505,9 +2586,7 @@ static void pn533_disconnect(struct usb_interface *interface)
                 kfree(cmd);
         }
 
-        kfree(dev->in_frame);
         usb_free_urb(dev->in_urb);
-        kfree(dev->out_frame);
         usb_free_urb(dev->out_urb);
         kfree(dev);
 
diff --git a/drivers/nfc/pn544/Kconfig b/drivers/nfc/pn544/Kconfig
new file mode 100644
index 000000000000..c277790ac71c
--- /dev/null
+++ b/drivers/nfc/pn544/Kconfig
@@ -0,0 +1,23 @@
+config NFC_PN544
+        tristate "NXP PN544 NFC driver"
+        depends on NFC_HCI
+        select CRC_CCITT
+        default n
+        ---help---
+          NXP PN544 core driver.
+          This is a driver based on the HCI NFC kernel layers and
+          will thus not work with NXP libnfc library.
+
+          To compile this driver as a module, choose m here. The module will
+          be called pn544.
+          Say N if unsure.
+
+config NFC_PN544_I2C
+        tristate "NFC PN544 i2c support"
+        depends on NFC_PN544 && I2C && NFC_SHDLC
+        ---help---
+          This module adds support for the NXP pn544 i2c interface.
+          Select this if your platform is using the i2c bus.
+
+          If you choose to build a module, it'll be called pn544_i2c.
+          Say N if unsure.
\ No newline at end of file
diff --git a/drivers/nfc/pn544/Makefile b/drivers/nfc/pn544/Makefile
index 725733881eb3..ac076793687d 100644
--- a/drivers/nfc/pn544/Makefile
+++ b/drivers/nfc/pn544/Makefile
@@ -2,6 +2,7 @@
 # Makefile for PN544 HCI based NFC driver
 #
 
-obj-$(CONFIG_PN544_HCI_NFC)     += pn544_i2c.o
+pn544_i2c-objs  = i2c.o
 
-pn544_i2c-y             := pn544.o i2c.o
+obj-$(CONFIG_NFC_PN544)     += pn544.o
+obj-$(CONFIG_NFC_PN544_I2C) += pn544_i2c.o
diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c
index 2a9c8d93d2e8..8cf64c19f022 100644
--- a/drivers/nfc/pn544/i2c.c
+++ b/drivers/nfc/pn544/i2c.c
@@ -376,12 +376,12 @@ static int pn544_hci_i2c_probe(struct i2c_client *client,
                 return -ENODEV;
         }
 
-        phy = kzalloc(sizeof(struct pn544_i2c_phy), GFP_KERNEL);
+        phy = devm_kzalloc(&client->dev, sizeof(struct pn544_i2c_phy),
+                           GFP_KERNEL);
         if (!phy) {
                 dev_err(&client->dev,
                         "Cannot allocate memory for pn544 i2c phy.\n");
-                r = -ENOMEM;
-                goto err_phy_alloc;
+                return -ENOMEM;
         }
 
         phy->i2c_dev = client;
@@ -390,20 +390,18 @@ static int pn544_hci_i2c_probe(struct i2c_client *client,
         pdata = client->dev.platform_data;
         if (pdata == NULL) {
                 dev_err(&client->dev, "No platform data\n");
-                r = -EINVAL;
-                goto err_pdata;
+                return -EINVAL;
         }
 
         if (pdata->request_resources == NULL) {
                 dev_err(&client->dev, "request_resources() missing\n");
-                r = -EINVAL;
-                goto err_pdata;
+                return -EINVAL;
         }
 
         r = pdata->request_resources(client);
         if (r) {
                 dev_err(&client->dev, "Cannot get platform resources\n");
-                goto err_pdata;
+                return r;
         }
 
         phy->gpio_en = pdata->get_gpio(NFC_GPIO_ENABLE);
@@ -435,10 +433,6 @@ err_rti:
         if (pdata->free_resources != NULL)
                 pdata->free_resources();
 
-err_pdata:
-        kfree(phy);
-
-err_phy_alloc:
         return r;
 }
 
@@ -458,8 +452,6 @@ static int pn544_hci_i2c_remove(struct i2c_client *client)
         if (pdata->free_resources)
                 pdata->free_resources();
 
-        kfree(phy);
-
         return 0;
 }
 
@@ -472,29 +464,7 @@ static struct i2c_driver pn544_hci_i2c_driver = {
         .remove = pn544_hci_i2c_remove,
 };
 
-static int __init pn544_hci_i2c_init(void)
-{
-        int r;
-
-        pr_debug(DRIVER_DESC ": %s\n", __func__);
-
-        r = i2c_add_driver(&pn544_hci_i2c_driver);
-        if (r) {
-                pr_err(PN544_HCI_I2C_DRIVER_NAME
-                       ": driver registration failed\n");
-                return r;
-        }
-
-        return 0;
-}
-
-static void __exit pn544_hci_i2c_exit(void)
-{
-        i2c_del_driver(&pn544_hci_i2c_driver);
-}
-
-module_init(pn544_hci_i2c_init);
-module_exit(pn544_hci_i2c_exit);
+module_i2c_driver(pn544_hci_i2c_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/nfc/pn544/pn544.c b/drivers/nfc/pn544/pn544.c
index cc666de3b8e5..9c5f16e7baef 100644
--- a/drivers/nfc/pn544/pn544.c
+++ b/drivers/nfc/pn544/pn544.c
@@ -20,6 +20,7 @@
 
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 
 #include <linux/nfc.h>
 #include <net/nfc/hci.h>
@@ -675,11 +676,17 @@ static int pn544_hci_im_transceive(struct nfc_hci_dev *hdev,
 
 static int pn544_hci_tm_send(struct nfc_hci_dev *hdev, struct sk_buff *skb)
 {
+        int r;
+
         /* Set default false for multiple information chaining */
         *skb_push(skb, 1) = 0;
 
-        return nfc_hci_send_event(hdev, PN544_RF_READER_NFCIP1_TARGET_GATE,
-                                PN544_HCI_EVT_SND_DATA, skb->data, skb->len);
+        r = nfc_hci_send_event(hdev, PN544_RF_READER_NFCIP1_TARGET_GATE,
+                               PN544_HCI_EVT_SND_DATA, skb->data, skb->len);
+
+        kfree_skb(skb);
+
+        return r;
 }
 
 static int pn544_hci_check_presence(struct nfc_hci_dev *hdev,
@@ -714,35 +721,40 @@ static int pn544_hci_check_presence(struct nfc_hci_dev *hdev,
         return 0;
 }
 
-static void pn544_hci_event_received(struct nfc_hci_dev *hdev, u8 gate,
-                                        u8 event, struct sk_buff *skb)
+/*
+ * Returns:
+ * <= 0: driver handled the event, skb consumed
+ *    1: driver does not handle the event, please do standard processing
+ */
+static int pn544_hci_event_received(struct nfc_hci_dev *hdev, u8 gate, u8 event,
+                                    struct sk_buff *skb)
 {
         struct sk_buff *rgb_skb = NULL;
-        int r = 0;
+        int r;
 
         pr_debug("hci event %d", event);
         switch (event) {
         case PN544_HCI_EVT_ACTIVATED:
-                if (gate == PN544_RF_READER_NFCIP1_INITIATOR_GATE)
-                        nfc_hci_target_discovered(hdev, gate);
-                else if (gate == PN544_RF_READER_NFCIP1_TARGET_GATE) {
+                if (gate == PN544_RF_READER_NFCIP1_INITIATOR_GATE) {
+                        r = nfc_hci_target_discovered(hdev, gate);
+                } else if (gate == PN544_RF_READER_NFCIP1_TARGET_GATE) {
                         r = nfc_hci_get_param(hdev, gate, PN544_DEP_ATR_REQ,
-                                                &rgb_skb);
-
+                                              &rgb_skb);
                         if (r < 0)
                                 goto exit;
 
-                        nfc_tm_activated(hdev->ndev, NFC_PROTO_NFC_DEP_MASK,
-                                        NFC_COMM_PASSIVE, rgb_skb->data,
-                                        rgb_skb->len);
+                        r = nfc_tm_activated(hdev->ndev, NFC_PROTO_NFC_DEP_MASK,
+                                             NFC_COMM_PASSIVE, rgb_skb->data,
+                                             rgb_skb->len);
 
                         kfree_skb(rgb_skb);
+                } else {
+                        r = -EINVAL;
                 }
-
                 break;
         case PN544_HCI_EVT_DEACTIVATED:
-                nfc_hci_send_event(hdev, gate,
-                        NFC_HCI_EVT_END_OPERATION, NULL, 0);
+                r = nfc_hci_send_event(hdev, gate, NFC_HCI_EVT_END_OPERATION,
+                                       NULL, 0);
                 break;
         case PN544_HCI_EVT_RCV_DATA:
                 if (skb->len < 2) {
@@ -757,15 +769,15 @@ static void pn544_hci_event_received(struct nfc_hci_dev *hdev, u8 gate,
                 }
 
                 skb_pull(skb, 2);
-                nfc_tm_data_received(hdev->ndev, skb);
-
-                return;
+                return nfc_tm_data_received(hdev->ndev, skb);
         default:
-                break;
+                return 1;
         }
 
 exit:
         kfree_skb(skb);
+
+        return r;
 }
 
 static struct nfc_hci_ops pn544_hci_ops = {
@@ -789,7 +801,7 @@ int pn544_hci_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name,
                     struct nfc_hci_dev **hdev)
 {
         struct pn544_hci_info *info;
-        u32 protocols;
+        u32 protocols, se;
         struct nfc_hci_init_data init_data;
         int r;
 
@@ -822,8 +834,10 @@ int pn544_hci_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name,
                     NFC_PROTO_ISO14443_B_MASK |
                     NFC_PROTO_NFC_DEP_MASK;
 
-        info->hdev = nfc_hci_allocate_device(&pn544_hci_ops, &init_data,
-                                             protocols, llc_name,
+        se = NFC_SE_UICC | NFC_SE_EMBEDDED;
+
+        info->hdev = nfc_hci_allocate_device(&pn544_hci_ops, &init_data, 0,
+                                             protocols, se, llc_name,
                                              phy_headroom + PN544_CMDS_HEADROOM,
                                              phy_tailroom, phy_payload);
         if (!info->hdev) {
@@ -851,6 +865,7 @@ err_alloc_hdev:
 err_info_alloc:
         return r;
 }
+EXPORT_SYMBOL(pn544_hci_probe);
 
 void pn544_hci_remove(struct nfc_hci_dev *hdev)
 {
@@ -860,3 +875,7 @@ void pn544_hci_remove(struct nfc_hci_dev *hdev)
         nfc_hci_free_device(hdev);
         kfree(info);
 }
+EXPORT_SYMBOL(pn544_hci_remove);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index 5d6f2ec1c705..5ff3a4f19443 100644
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -136,6 +136,11 @@ config SSB_DRIVER_MIPS
 
           If unsure, say N
 
+config SSB_SFLASH
+        bool "SSB serial flash support"
+        depends on SSB_DRIVER_MIPS && BROKEN
+        default y
+
 # Assumption: We are on embedded, if we compile the MIPS core.
 config SSB_EMBEDDED
         bool
diff --git a/drivers/ssb/Makefile b/drivers/ssb/Makefile
index 9159ba77c388..b1ddc116d387 100644
--- a/drivers/ssb/Makefile
+++ b/drivers/ssb/Makefile
@@ -11,6 +11,7 @@ ssb-$(CONFIG_SSB_SDIOHOST)		+= sdio.o
 # built-in drivers
 ssb-y                                   += driver_chipcommon.o
 ssb-y                                   += driver_chipcommon_pmu.o
+ssb-$(CONFIG_SSB_SFLASH)                += driver_chipcommon_sflash.o
 ssb-$(CONFIG_SSB_DRIVER_MIPS)           += driver_mipscore.o
 ssb-$(CONFIG_SSB_DRIVER_EXTIF)          += driver_extif.o
 ssb-$(CONFIG_SSB_DRIVER_PCICORE)        += driver_pcicore.o
diff --git a/drivers/ssb/driver_chipcommon_sflash.c b/drivers/ssb/driver_chipcommon_sflash.c
new file mode 100644
index 000000000000..720665ca2bb1
--- /dev/null
+++ b/drivers/ssb/driver_chipcommon_sflash.c
@@ -0,0 +1,140 @@
+/*
+ * Sonics Silicon Backplane
+ * ChipCommon serial flash interface
+ *
+ * Licensed under the GNU/GPL. See COPYING for details.
+ */
+
+#include <linux/ssb/ssb.h>
+
+#include "ssb_private.h"
+
+struct ssb_sflash_tbl_e {
+        char *name;
+        u32 id;
+        u32 blocksize;
+        u16 numblocks;
+};
+
+static struct ssb_sflash_tbl_e ssb_sflash_st_tbl[] = {
+        { "M25P20", 0x11, 0x10000, 4, },
+        { "M25P40", 0x12, 0x10000, 8, },
+
+        { "M25P16", 0x14, 0x10000, 32, },
+        { "M25P32", 0x15, 0x10000, 64, },
+        { "M25P64", 0x16, 0x10000, 128, },
+        { "M25FL128", 0x17, 0x10000, 256, },
+        { 0 },
+};
+
+static struct ssb_sflash_tbl_e ssb_sflash_sst_tbl[] = {
+        { "SST25WF512", 1, 0x1000, 16, },
+        { "SST25VF512", 0x48, 0x1000, 16, },
+        { "SST25WF010", 2, 0x1000, 32, },
+        { "SST25VF010", 0x49, 0x1000, 32, },
+        { "SST25WF020", 3, 0x1000, 64, },
+        { "SST25VF020", 0x43, 0x1000, 64, },
+        { "SST25WF040", 4, 0x1000, 128, },
+        { "SST25VF040", 0x44, 0x1000, 128, },
+        { "SST25VF040B", 0x8d, 0x1000, 128, },
+        { "SST25WF080", 5, 0x1000, 256, },
+        { "SST25VF080B", 0x8e, 0x1000, 256, },
+        { "SST25VF016", 0x41, 0x1000, 512, },
+        { "SST25VF032", 0x4a, 0x1000, 1024, },
+        { "SST25VF064", 0x4b, 0x1000, 2048, },
+        { 0 },
+};
+
+static struct ssb_sflash_tbl_e ssb_sflash_at_tbl[] = {
+        { "AT45DB011", 0xc, 256, 512, },
+        { "AT45DB021", 0x14, 256, 1024, },
+        { "AT45DB041", 0x1c, 256, 2048, },
+        { "AT45DB081", 0x24, 256, 4096, },
+        { "AT45DB161", 0x2c, 512, 4096, },
+        { "AT45DB321", 0x34, 512, 8192, },
+        { "AT45DB642", 0x3c, 1024, 8192, },
+        { 0 },
+};
+
+static void ssb_sflash_cmd(struct ssb_chipcommon *cc, u32 opcode)
+{
+        int i;
+        chipco_write32(cc, SSB_CHIPCO_FLASHCTL,
+                       SSB_CHIPCO_FLASHCTL_START | opcode);
+        for (i = 0; i < 1000; i++) {
+                if (!(chipco_read32(cc, SSB_CHIPCO_FLASHCTL) &
+                      SSB_CHIPCO_FLASHCTL_BUSY))
+                        return;
+                cpu_relax();
+        }
+        pr_err("SFLASH control command failed (timeout)!\n");
+}
+
+/* Initialize serial flash access */
+int ssb_sflash_init(struct ssb_chipcommon *cc)
+{
+        struct ssb_sflash_tbl_e *e;
+        u32 id, id2;
+
+        switch (cc->capabilities & SSB_CHIPCO_CAP_FLASHT) {
+        case SSB_CHIPCO_FLASHT_STSER:
+                ssb_sflash_cmd(cc, SSB_CHIPCO_FLASHCTL_ST_DP);
+
+                chipco_write32(cc, SSB_CHIPCO_FLASHADDR, 0);
+                ssb_sflash_cmd(cc, SSB_CHIPCO_FLASHCTL_ST_RES);
+                id = chipco_read32(cc, SSB_CHIPCO_FLASHDATA);
+
+                chipco_write32(cc, SSB_CHIPCO_FLASHADDR, 1);
+                ssb_sflash_cmd(cc, SSB_CHIPCO_FLASHCTL_ST_RES);
+                id2 = chipco_read32(cc, SSB_CHIPCO_FLASHDATA);
+
+                switch (id) {
+                case 0xbf:
+                        for (e = ssb_sflash_sst_tbl; e->name; e++) {
+                                if (e->id == id2)
+                                        break;
+                        }
+                        break;
+                case 0x13:
+                        return -ENOTSUPP;
+                default:
+                        for (e = ssb_sflash_st_tbl; e->name; e++) {
+                                if (e->id == id)
+                                        break;
+                        }
+                        break;
+                }
+                if (!e->name) {
+                        pr_err("Unsupported ST serial flash (id: 0x%X, id2: 0x%X)\n",
+                               id, id2);
+                        return -ENOTSUPP;
+                }
+
+                break;
+        case SSB_CHIPCO_FLASHT_ATSER:
+                ssb_sflash_cmd(cc, SSB_CHIPCO_FLASHCTL_AT_STATUS);
+                id = chipco_read32(cc, SSB_CHIPCO_FLASHDATA) & 0x3c;
+
+                for (e = ssb_sflash_at_tbl; e->name; e++) {
+                        if (e->id == id)
+                                break;
+                }
+                if (!e->name) {
+                        pr_err("Unsupported Atmel serial flash (id: 0x%X)\n",
+                               id);
+                        return -ENOTSUPP;
+                }
+
+                break;
+        default:
+                pr_err("Unsupported flash type\n");
+                return -ENOTSUPP;
+        }
+
+        pr_info("Found %s serial flash (blocksize: 0x%X, blocks: %d)\n",
+                e->name, e->blocksize, e->numblocks);
+
+        pr_err("Serial flash support is not implemented yet!\n");
+
+        return -ENOTSUPP;
+}
diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c
index 5bd05b136d22..2a7684c90243 100644
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
@@ -203,7 +203,8 @@ static void ssb_mips_flash_detect(struct ssb_mipscore *mcore)
         switch (bus->chipco.capabilities & SSB_CHIPCO_CAP_FLASHT) {
         case SSB_CHIPCO_FLASHT_STSER:
         case SSB_CHIPCO_FLASHT_ATSER:
-                pr_err("Serial flash not supported\n");
+                pr_debug("Found serial flash\n");
+                ssb_sflash_init(&bus->chipco);
                 break;
         case SSB_CHIPCO_FLASHT_PARA:
                 pr_debug("Found parallel flash\n");
diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h
index 6c10b66c796c..77d942630750 100644
--- a/drivers/ssb/ssb_private.h
+++ b/drivers/ssb/ssb_private.h
@@ -217,6 +217,17 @@ extern u32 ssb_chipco_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt,
                                              u32 ticks);
 extern u32 ssb_chipco_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);
 
+/* driver_chipcommon_sflash.c */
+#ifdef CONFIG_SSB_SFLASH
+int ssb_sflash_init(struct ssb_chipcommon *cc);
+#else
+static inline int ssb_sflash_init(struct ssb_chipcommon *cc)
+{
+        pr_err("Serial flash not supported\n");
+        return 0;
+}
+#endif /* CONFIG_SSB_SFLASH */
+
 #ifdef CONFIG_SSB_DRIVER_EXTIF
 extern u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks);
 extern u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);
diff --git a/include/linux/bcma/bcma_driver_mips.h b/include/linux/bcma/bcma_driver_mips.h
index 0baf8a56b794..0d1ea297851a 100644
--- a/include/linux/bcma/bcma_driver_mips.h
+++ b/include/linux/bcma/bcma_driver_mips.h
@@ -28,6 +28,7 @@
 #define BCMA_MIPS_MIPS74K_GPIOEN        0x0048
 #define BCMA_MIPS_MIPS74K_CLKCTLST      0x01E0
 
+#define BCMA_MIPS_OOBSELINA74           0x004
 #define BCMA_MIPS_OOBSELOUTA30          0x100
 
 struct bcma_device;
@@ -36,7 +37,6 @@ struct bcma_drv_mips {
         struct bcma_device *core;
         u8 setup_done:1;
         u8 early_setup_done:1;
-        unsigned int assigned_irqs;
 };
 
 #ifdef CONFIG_BCMA_DRIVER_MIPS
@@ -49,6 +49,6 @@ static inline void bcma_core_mips_early_init(struct bcma_drv_mips *mcore) { }
 
 extern u32 bcma_cpu_clock(struct bcma_drv_mips *mcore);
 
-extern unsigned int bcma_core_mips_irq(struct bcma_device *dev);
+extern unsigned int bcma_core_irq(struct bcma_device *core);
 
 #endif /* LINUX_BCMA_DRIVER_MIPS_H_ */
diff --git a/include/linux/bcma/bcma_driver_pci.h b/include/linux/bcma/bcma_driver_pci.h
index c48d98d27b77..424760f01b9d 100644
--- a/include/linux/bcma/bcma_driver_pci.h
+++ b/include/linux/bcma/bcma_driver_pci.h
@@ -179,6 +179,8 @@ struct pci_dev;
 #define BCMA_CORE_PCI_CFG_FUN_MASK              7       /* Function mask */
 #define BCMA_CORE_PCI_CFG_OFF_MASK              0xfff   /* Register mask */
 
+#define BCMA_CORE_PCI_CFG_DEVCTRL               0xd8
+
 /* PCIE Root Capability Register bits (Host mode only) */
 #define BCMA_CORE_PCI_RC_CRS_VISIBILITY         0x0001
 
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index f0859cc73861..ccf9ee1dca8c 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -180,7 +180,7 @@ struct ieee80211_hdr {
         u8 addr3[6];
         __le16 seq_ctrl;
         u8 addr4[6];
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee80211_hdr_3addr {
         __le16 frame_control;
@@ -189,7 +189,7 @@ struct ieee80211_hdr_3addr {
         u8 addr2[6];
         u8 addr3[6];
         __le16 seq_ctrl;
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee80211_qos_hdr {
         __le16 frame_control;
@@ -199,7 +199,7 @@ struct ieee80211_qos_hdr {
         u8 addr3[6];
         __le16 seq_ctrl;
         __le16 qos_ctrl;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * ieee80211_has_tods - check if IEEE80211_FCTL_TODS is set
@@ -576,7 +576,7 @@ struct ieee80211s_hdr {
         __le32 seqnum;
         u8 eaddr1[6];
         u8 eaddr2[6];
-} __attribute__ ((packed));
+} __packed;
 
 /* Mesh flags */
 #define MESH_FLAGS_AE_A4        0x1
@@ -614,7 +614,7 @@ struct ieee80211_quiet_ie {
         u8 period;
         __le16 duration;
         __le16 offset;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct ieee80211_msrment_ie
@@ -626,7 +626,7 @@ struct ieee80211_msrment_ie {
         u8 mode;
         u8 type;
         u8 request[0];
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct ieee80211_channel_sw_ie
@@ -637,7 +637,7 @@ struct ieee80211_channel_sw_ie {
         u8 mode;
         u8 new_ch_num;
         u8 count;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct ieee80211_tim
@@ -650,7 +650,7 @@ struct ieee80211_tim_ie {
         u8 bitmap_ctrl;
         /* variable size: 1 - 251 bytes */
         u8 virtual_map[1];
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * struct ieee80211_meshconf_ie
@@ -665,7 +665,7 @@ struct ieee80211_meshconf_ie {
         u8 meshconf_auth;
         u8 meshconf_form;
         u8 meshconf_cap;
-} __attribute__ ((packed));
+} __packed;
 
 /**
  * enum mesh_config_capab_flags - Mesh Configuration IE capability field flags
@@ -695,12 +695,17 @@ struct ieee80211_rann_ie {
         __le32 rann_seq;
         __le32 rann_interval;
         __le32 rann_metric;
-} __attribute__ ((packed));
+} __packed;
 
 enum ieee80211_rann_flags {
         RANN_FLAG_IS_GATE = 1 << 0,
 };
 
+enum ieee80211_ht_chanwidth_values {
+        IEEE80211_HT_CHANWIDTH_20MHZ = 0,
+        IEEE80211_HT_CHANWIDTH_ANY = 1,
+};
+
 #define WLAN_SA_QUERY_TR_ID_LEN 2
 
 struct ieee80211_mgmt {
@@ -717,33 +722,33 @@ struct ieee80211_mgmt {
                         __le16 status_code;
                         /* possibly followed by Challenge text */
                         u8 variable[0];
-                } __attribute__ ((packed)) auth;
+                } __packed auth;
                 struct {
                         __le16 reason_code;
-                } __attribute__ ((packed)) deauth;
+                } __packed deauth;
                 struct {
                         __le16 capab_info;
                         __le16 listen_interval;
                         /* followed by SSID and Supported rates */
                         u8 variable[0];
-                } __attribute__ ((packed)) assoc_req;
+                } __packed assoc_req;
                 struct {
                         __le16 capab_info;
                         __le16 status_code;
                         __le16 aid;
                         /* followed by Supported rates */
                         u8 variable[0];
-                } __attribute__ ((packed)) assoc_resp, reassoc_resp;
+                } __packed assoc_resp, reassoc_resp;
                 struct {
                         __le16 capab_info;
                         __le16 listen_interval;
                         u8 current_ap[6];
                         /* followed by SSID and Supported rates */
                         u8 variable[0];
-                } __attribute__ ((packed)) reassoc_req;
+                } __packed reassoc_req;
                 struct {
                         __le16 reason_code;
-                } __attribute__ ((packed)) disassoc;
+                } __packed disassoc;
                 struct {
                         __le64 timestamp;
                         __le16 beacon_int;
@@ -751,11 +756,11 @@ struct ieee80211_mgmt {
                         /* followed by some of SSID, Supported rates,
                          * FH Params, DS Params, CF Params, IBSS Params, TIM */
                         u8 variable[0];
-                } __attribute__ ((packed)) beacon;
+                } __packed beacon;
                 struct {
                         /* only variable items: SSID, Supported rates */
                         u8 variable[0];
-                } __attribute__ ((packed)) probe_req;
+                } __packed probe_req;
                 struct {
                         __le64 timestamp;
                         __le16 beacon_int;
@@ -763,7 +768,7 @@ struct ieee80211_mgmt {
                         /* followed by some of SSID, Supported rates,
                          * FH Params, DS Params, CF Params, IBSS Params */
                         u8 variable[0];
-                } __attribute__ ((packed)) probe_resp;
+                } __packed probe_resp;
                 struct {
                         u8 category;
                         union {
@@ -772,55 +777,59 @@ struct ieee80211_mgmt {
                                         u8 dialog_token;
                                         u8 status_code;
                                         u8 variable[0];
-                                } __attribute__ ((packed)) wme_action;
+                                } __packed wme_action;
                                 struct{
                                         u8 action_code;
                                         u8 element_id;
                                         u8 length;
                                         struct ieee80211_channel_sw_ie sw_elem;
-                                } __attribute__((packed)) chan_switch;
+                                } __packed chan_switch;
                                 struct{
                                         u8 action_code;
                                         u8 dialog_token;
                                         u8 element_id;
                                         u8 length;
                                         struct ieee80211_msrment_ie msr_elem;
-                                } __attribute__((packed)) measurement;
+                                } __packed measurement;
                                 struct{
                                         u8 action_code;
                                         u8 dialog_token;
                                         __le16 capab;
                                         __le16 timeout;
                                         __le16 start_seq_num;
-                                } __attribute__((packed)) addba_req;
+                                } __packed addba_req;
                                 struct{
                                         u8 action_code;
                                         u8 dialog_token;
                                         __le16 status;
                                         __le16 capab;
                                         __le16 timeout;
-                                } __attribute__((packed)) addba_resp;
+                                } __packed addba_resp;
                                 struct{
                                         u8 action_code;
                                         __le16 params;
                                         __le16 reason_code;
-                                } __attribute__((packed)) delba;
+                                } __packed delba;
                                 struct {
                                         u8 action_code;
                                         u8 variable[0];
-                                } __attribute__((packed)) self_prot;
+                                } __packed self_prot;
                                 struct{
                                         u8 action_code;
                                         u8 variable[0];
-                                } __attribute__((packed)) mesh_action;
+                                } __packed mesh_action;
                                 struct {
                                         u8 action;
                                         u8 trans_id[WLAN_SA_QUERY_TR_ID_LEN];
-                                } __attribute__ ((packed)) sa_query;
+                                } __packed sa_query;
                                 struct {
                                         u8 action;
                                         u8 smps_control;
-                                } __attribute__ ((packed)) ht_smps;
+                                } __packed ht_smps;
+                                struct {
+                                        u8 action_code;
+                                        u8 chanwidth;
+                                } __packed ht_notify_cw;
                                 struct {
                                         u8 action_code;
                                         u8 dialog_token;
@@ -828,9 +837,9 @@ struct ieee80211_mgmt {
                                         u8 variable[0];
                                 } __packed tdls_discover_resp;
                         } u;
-                } __attribute__ ((packed)) action;
+                } __packed action;
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 /* Supported Rates value encodings in 802.11n-2009 7.3.2.2 */
 #define BSS_MEMBERSHIP_SELECTOR_HT_PHY  127
@@ -846,7 +855,7 @@ struct ieee80211_mmie {
         __le16 key_id;
         u8 sequence_number[6];
         u8 mic[8];
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee80211_vendor_ie {
         u8 element_id;
@@ -861,20 +870,20 @@ struct ieee80211_rts {
         __le16 duration;
         u8 ra[6];
         u8 ta[6];
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee80211_cts {
         __le16 frame_control;
         __le16 duration;
         u8 ra[6];
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee80211_pspoll {
         __le16 frame_control;
         __le16 aid;
         u8 bssid[6];
         u8 ta[6];
-} __attribute__ ((packed));
+} __packed;
 
 /* TDLS */
 
@@ -967,7 +976,7 @@ struct ieee80211_bar {
         __u8 ta[6];
         __le16 control;
         __le16 start_seq_num;
-} __attribute__((packed));
+} __packed;
 
 /* 802.11 BAR control masks */
 #define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL    0x0000
@@ -992,7 +1001,7 @@ struct ieee80211_mcs_info {
         __le16 rx_highest;
         u8 tx_params;
         u8 reserved[3];
-} __attribute__((packed));
+} __packed;
 
 /* 802.11n HT capability MSC set */
 #define IEEE80211_HT_MCS_RX_HIGHEST_MASK        0x3ff
@@ -1031,7 +1040,7 @@ struct ieee80211_ht_cap {
         __le16 extended_ht_cap_info;
         __le32 tx_BF_cap_info;
         u8 antenna_selection_info;
-} __attribute__ ((packed));
+} __packed;
 
 /* 802.11n HT capabilities masks (for cap_info) */
 #define IEEE80211_HT_CAP_LDPC_CODING            0x0001
@@ -1102,7 +1111,7 @@ struct ieee80211_ht_operation {
         __le16 operation_mode;
         __le16 stbc_param;
         u8 basic_set[16];
-} __attribute__ ((packed));
+} __packed;
 
 /* for ht_param */
 #define IEEE80211_HT_PARAM_CHA_SEC_OFFSET               0x03
@@ -1311,16 +1320,21 @@ struct ieee80211_vht_operation {
 #define WLAN_CAPABILITY_SPECTRUM_MGMT   (1<<8)
 #define WLAN_CAPABILITY_QOS             (1<<9)
 #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
+#define WLAN_CAPABILITY_APSD            (1<<11)
+#define WLAN_CAPABILITY_RADIO_MEASURE   (1<<12)
 #define WLAN_CAPABILITY_DSSS_OFDM       (1<<13)
+#define WLAN_CAPABILITY_DEL_BACK        (1<<14)
+#define WLAN_CAPABILITY_IMM_BACK        (1<<15)
 
 /* DMG (60gHz) 802.11ad */
 /* type - bits 0..1 */
+#define WLAN_CAPABILITY_DMG_TYPE_MASK           (3<<0)
 #define WLAN_CAPABILITY_DMG_TYPE_IBSS           (1<<0) /* Tx by: STA */
 #define WLAN_CAPABILITY_DMG_TYPE_PBSS           (2<<0) /* Tx by: PCP */
 #define WLAN_CAPABILITY_DMG_TYPE_AP             (3<<0) /* Tx by: AP */
 
 #define WLAN_CAPABILITY_DMG_CBAP_ONLY           (1<<2)
-#define WLAN_CAPABILITY_DMG_CBAP_SOURCE (1<<3)
+#define WLAN_CAPABILITY_DMG_CBAP_SOURCE         (1<<3)
 #define WLAN_CAPABILITY_DMG_PRIVACY             (1<<4)
 #define WLAN_CAPABILITY_DMG_ECPAC               (1<<5)
 
@@ -1834,14 +1848,14 @@ struct ieee80211_country_ie_triplet {
                         u8 first_channel;
                         u8 num_channels;
                         s8 max_power;
-                } __attribute__ ((packed)) chans;
+                } __packed chans;
                 struct {
                         u8 reg_extension_id;
                         u8 reg_class;
                         u8 coverage_class;
-                } __attribute__ ((packed)) ext;
+                } __packed ext;
         };
-} __attribute__ ((packed));
+} __packed;
 
 enum ieee80211_timeout_interval_type {
         WLAN_TIMEOUT_REASSOC_DEADLINE = 1 /* 802.11r */,
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index f78fa19a07b0..1b9830ebe6c6 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -281,9 +281,13 @@ struct ieee80211_supported_band {
 /**
  * struct vif_params - describes virtual interface parameters
  * @use_4addr: use 4-address frames
+ * @macaddr: address to use for this virtual interface. This will only
+ *      be used for non-netdevice interfaces. If this parameter is set
+ *      to zero address the driver may determine the address as needed.
  */
 struct vif_params {
        int use_4addr;
+       u8 macaddr[ETH_ALEN];
 };
 
 /**
@@ -326,7 +330,7 @@ struct cfg80211_chan_def {
  * cfg80211_get_chandef_type - return old channel type from chandef
  * @chandef: the channel definition
  *
- * Returns the old channel type (NOHT, HT20, HT40+/-) from a given
+ * Return: The old channel type (NOHT, HT20, HT40+/-) from a given
  * chandef, which must have a bandwidth allowing this conversion.
  */
 static inline enum nl80211_channel_type
@@ -364,7 +368,7 @@ void cfg80211_chandef_create(struct cfg80211_chan_def *chandef,
  * @chandef1: first channel definition
  * @chandef2: second channel definition
  *
- * Returns %true if the channels defined by the channel definitions are
+ * Return: %true if the channels defined by the channel definitions are
  * identical, %false otherwise.
  */
 static inline bool
@@ -382,7 +386,7 @@ cfg80211_chandef_identical(const struct cfg80211_chan_def *chandef1,
  * @chandef1: first channel definition
  * @chandef2: second channel definition
  *
- * Returns %NULL if the given channel definitions are incompatible,
+ * Return: %NULL if the given channel definitions are incompatible,
  * chandef1 or chandef2 otherwise.
  */
 const struct cfg80211_chan_def *
@@ -392,6 +396,7 @@ cfg80211_chandef_compatible(const struct cfg80211_chan_def *chandef1,
 /**
  * cfg80211_chandef_valid - check if a channel definition is valid
  * @chandef: the channel definition to check
+ * Return: %true if the channel definition is valid. %false otherwise.
  */
 bool cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef);
 
@@ -399,7 +404,8 @@ bool cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef);
  * cfg80211_chandef_usable - check if secondary channels can be used
  * @wiphy: the wiphy to validate against
  * @chandef: the channel definition to check
- * @prohibited_flags: the regulatory chanenl flags that must not be set
+ * @prohibited_flags: the regulatory channel flags that must not be set
+ * Return: %true if secondary channels are usable. %false otherwise.
  */
 bool cfg80211_chandef_usable(struct wiphy *wiphy,
                              const struct cfg80211_chan_def *chandef,
@@ -608,6 +614,8 @@ enum station_parameters_apply_mask {
  * @sta_modify_mask: bitmap indicating which parameters changed
  *      (for those that don't have a natural "no change" value),
  *      see &enum station_parameters_apply_mask
+ * @local_pm: local link-specific mesh power save mode (no change when set
+ *      to unknown)
  */
 struct station_parameters {
         u8 *supported_rates;
@@ -623,6 +631,7 @@ struct station_parameters {
         struct ieee80211_vht_cap *vht_capa;
         u8 uapsd_queues;
         u8 max_sp;
+        enum nl80211_mesh_power_mode local_pm;
 };
 
 /**
@@ -653,6 +662,9 @@ struct station_parameters {
  * @STATION_INFO_STA_FLAGS: @sta_flags filled
  * @STATION_INFO_BEACON_LOSS_COUNT: @beacon_loss_count filled
  * @STATION_INFO_T_OFFSET: @t_offset filled
+ * @STATION_INFO_LOCAL_PM: @local_pm filled
+ * @STATION_INFO_PEER_PM: @peer_pm filled
+ * @STATION_INFO_NONPEER_PM: @nonpeer_pm filled
  */
 enum station_info_flags {
         STATION_INFO_INACTIVE_TIME      = 1<<0,
@@ -676,6 +688,9 @@ enum station_info_flags {
         STATION_INFO_STA_FLAGS          = 1<<18,
         STATION_INFO_BEACON_LOSS_COUNT  = 1<<19,
         STATION_INFO_T_OFFSET           = 1<<20,
+        STATION_INFO_LOCAL_PM           = 1<<21,
+        STATION_INFO_PEER_PM            = 1<<22,
+        STATION_INFO_NONPEER_PM         = 1<<23,
 };
 
 /**
@@ -789,6 +804,9 @@ struct sta_bss_parameters {
  * @sta_flags: station flags mask & values
  * @beacon_loss_count: Number of times beacon loss event has triggered.
  * @t_offset: Time offset of the station relative to this host.
+ * @local_pm: local mesh STA power save mode
+ * @peer_pm: peer mesh STA power save mode
+ * @nonpeer_pm: non-peer mesh STA power save mode
  */
 struct station_info {
         u32 filled;
@@ -818,6 +836,9 @@ struct station_info {
 
         u32 beacon_loss_count;
         s64 t_offset;
+        enum nl80211_mesh_power_mode local_pm;
+        enum nl80211_mesh_power_mode peer_pm;
+        enum nl80211_mesh_power_mode nonpeer_pm;
 
         /*
          * Note: Add a new enum station_info_flags value for each new field and
@@ -993,6 +1014,10 @@ struct bss_parameters {
  * @dot11MeshHWMPconfirmationInterval: The minimum interval of time (in TUs)
  *      during which a mesh STA can send only one Action frame containing
  *      a PREQ element for root path confirmation.
+ * @power_mode: The default mesh power save mode which will be the initial
+ *      setting for new peer links.
+ * @dot11MeshAwakeWindowDuration: The duration in TUs the STA will remain awake
+ *      after transmitting its beacon.
  */
 struct mesh_config {
         u16 dot11MeshRetryTimeout;
@@ -1020,6 +1045,8 @@ struct mesh_config {
         u32 dot11MeshHWMPactivePathToRootTimeout;
         u16 dot11MeshHWMProotInterval;
         u16 dot11MeshHWMPconfirmationInterval;
+        enum nl80211_mesh_power_mode power_mode;
+        u16 dot11MeshAwakeWindowDuration;
 };
 
 /**
@@ -1034,6 +1061,8 @@ struct mesh_config {
  * @ie_len: length of vendor information elements
  * @is_authenticated: this mesh requires authentication
  * @is_secure: this mesh uses security
+ * @dtim_period: DTIM period to use
+ * @beacon_interval: beacon interval to use
  * @mcast_rate: multicat rate for Mesh Node [6Mbps is the default for 802.11a]
  *
  * These parameters are fixed when the mesh is created.
@@ -1049,6 +1078,8 @@ struct mesh_setup {
         u8 ie_len;
         bool is_authenticated;
         bool is_secure;
+        u8 dtim_period;
+        u16 beacon_interval;
         int mcast_rate[IEEE80211_NUM_BANDS];
 };
 
@@ -1256,7 +1287,7 @@ struct cfg80211_bss {
 
         u8 bssid[ETH_ALEN];
 
-        u8 priv[0] __attribute__((__aligned__(sizeof(void *))));
+        u8 priv[0] __aligned(sizeof(void *));
 };
 
 /**
@@ -1266,7 +1297,7 @@ struct cfg80211_bss {
  *
  * Note that the return value is an RCU-protected pointer, so
  * rcu_read_lock() must be held when calling this function.
- * Returns %NULL if not found.
+ * Return: %NULL if not found.
  */
 const u8 *ieee80211_bss_get_ie(struct cfg80211_bss *bss, u8 ie);
 
@@ -1434,6 +1465,7 @@ struct cfg80211_ibss_params {
  * @ie: IEs for association request
  * @ie_len: Length of assoc_ie in octets
  * @privacy: indicates whether privacy-enabled APs should be used
+ * @mfp: indicate whether management frame protection is used
  * @crypto: crypto settings
  * @key_len: length of WEP key for shared key authentication
  * @key_idx: index of WEP key for shared key authentication
@@ -1454,6 +1486,7 @@ struct cfg80211_connect_params {
         u8 *ie;
         size_t ie_len;
         bool privacy;
+        enum nl80211_mfp mfp;
         struct cfg80211_crypto_settings crypto;
         const u8 *key;
         u8 key_len, key_idx;
@@ -2092,6 +2125,7 @@ struct ieee80211_iface_limit {
  * @beacon_int_infra_match: In this combination, the beacon intervals
  *      between infrastructure and AP types must match. This is required
  *      only in special cases.
+ * @radar_detect_widths: bitmap of channel widths supported for radar detection
  *
  * These examples can be expressed as follows:
  *
@@ -2144,6 +2178,7 @@ struct ieee80211_iface_combination {
         u16 max_interfaces;
         u8 n_limits;
         bool beacon_int_infra_match;
+        u8 radar_detect_widths;
 };
 
 struct mac_address {
@@ -2364,12 +2399,12 @@ struct wiphy {
         struct ieee80211_supported_band *bands[IEEE80211_NUM_BANDS];
 
         /* Lets us get back the wiphy on the callback */
-        int (*reg_notifier)(struct wiphy *wiphy,
-                            struct regulatory_request *request);
+        void (*reg_notifier)(struct wiphy *wiphy,
+                             struct regulatory_request *request);
 
         /* fields below are read-only, assigned by cfg80211 */
 
-        const struct ieee80211_regdomain *regd;
+        const struct ieee80211_regdomain __rcu *regd;
 
         /* the item in /sys/class/ieee80211/ points to this,
          * you need use set_wiphy_dev() (see below) */
@@ -2392,7 +2427,7 @@ struct wiphy {
         const struct iw_handler_def *wext;
 #endif
 
-        char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
+        char priv[0] __aligned(NETDEV_ALIGN);
 };
 
 static inline struct net *wiphy_net(struct wiphy *wiphy)
@@ -2409,6 +2444,7 @@ static inline void wiphy_net_set(struct wiphy *wiphy, struct net *net)
  * wiphy_priv - return priv from wiphy
  *
  * @wiphy: the wiphy whose priv pointer to return
+ * Return: The priv of @wiphy.
  */
 static inline void *wiphy_priv(struct wiphy *wiphy)
 {
@@ -2420,6 +2456,7 @@ static inline void *wiphy_priv(struct wiphy *wiphy)
  * priv_to_wiphy - return the wiphy containing the priv
  *
  * @priv: a pointer previously returned by wiphy_priv
+ * Return: The wiphy of @priv.
  */
 static inline struct wiphy *priv_to_wiphy(void *priv)
 {
@@ -2442,6 +2479,7 @@ static inline void set_wiphy_dev(struct wiphy *wiphy, struct device *dev)
  * wiphy_dev - get wiphy dev pointer
  *
  * @wiphy: The wiphy whose device struct to look up
+ * Return: The dev of @wiphy.
  */
 static inline struct device *wiphy_dev(struct wiphy *wiphy)
 {
@@ -2452,6 +2490,7 @@ static inline struct device *wiphy_dev(struct wiphy *wiphy)
  * wiphy_name - get wiphy name
  *
  * @wiphy: The wiphy whose name to return
+ * Return: The name of @wiphy.
  */
 static inline const char *wiphy_name(const struct wiphy *wiphy)
 {
@@ -2467,8 +2506,8 @@ static inline const char *wiphy_name(const struct wiphy *wiphy)
  * Create a new wiphy and associate the given operations with it.
  * @sizeof_priv bytes are allocated for private use.
  *
- * The returned pointer must be assigned to each netdev's
- * ieee80211_ptr for proper operation.
+ * Return: A pointer to the new wiphy. This pointer must be
+ * assigned to each netdev's ieee80211_ptr for proper operation.
  */
 struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv);
 
@@ -2477,7 +2516,7 @@ struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv);
  *
  * @wiphy: The wiphy to register.
  *
- * Returns a non-negative wiphy index or a negative error code.
+ * Return: A non-negative wiphy index or a negative error code.
  */
 extern int wiphy_register(struct wiphy *wiphy);
 
@@ -2626,6 +2665,7 @@ static inline u8 *wdev_address(struct wireless_dev *wdev)
  * wdev_priv - return wiphy priv from wireless_dev
  *
  * @wdev: The wireless device whose wiphy's priv pointer to return
+ * Return: The wiphy priv of @wdev.
  */
 static inline void *wdev_priv(struct wireless_dev *wdev)
 {
@@ -2643,12 +2683,14 @@ static inline void *wdev_priv(struct wireless_dev *wdev)
  * ieee80211_channel_to_frequency - convert channel number to frequency
  * @chan: channel number
  * @band: band, necessary due to channel number overlap
+ * Return: The corresponding frequency (in MHz), or 0 if the conversion failed.
  */
 extern int ieee80211_channel_to_frequency(int chan, enum ieee80211_band band);
 
 /**
  * ieee80211_frequency_to_channel - convert frequency to channel number
  * @freq: center frequency
+ * Return: The corresponding channel, or 0 if the conversion failed.
  */
 extern int ieee80211_frequency_to_channel(int freq);
 
@@ -2665,6 +2707,7 @@ extern struct ieee80211_channel *__ieee80211_get_channel(struct wiphy *wiphy,
  * ieee80211_get_channel - get channel struct from wiphy for specified frequency
  * @wiphy: the struct wiphy to get the channel for
  * @freq: the center frequency of the channel
+ * Return: The channel struct from @wiphy at @freq.
  */
 static inline struct ieee80211_channel *
 ieee80211_get_channel(struct wiphy *wiphy, int freq)
@@ -2679,10 +2722,10 @@ ieee80211_get_channel(struct wiphy *wiphy, int freq)
  * @basic_rates: bitmap of basic rates
  * @bitrate: the bitrate for which to find the basic rate
  *
- * This function returns the basic rate corresponding to a given
- * bitrate, that is the next lower bitrate contained in the basic
- * rate map, which is, for this function, given as a bitmap of
- * indices of rates in the band's bitrate table.
+ * Return: The basic rate corresponding to a given bitrate, that
+ * is the next lower bitrate contained in the basic rate map,
+ * which is, for this function, given as a bitmap of indices of
+ * rates in the band's bitrate table.
  */
 struct ieee80211_rate *
 ieee80211_get_response_rate(struct ieee80211_supported_band *sband,
@@ -2775,18 +2818,21 @@ extern const unsigned char bridge_tunnel_header[6];
 /**
  * ieee80211_get_hdrlen_from_skb - get header length from data
  *
+ * @skb: the frame
+ *
  * Given an skb with a raw 802.11 header at the data pointer this function
- * returns the 802.11 header length in bytes (not including encryption
- * headers). If the data in the sk_buff is too short to contain a valid 802.11
- * header the function returns 0.
+ * returns the 802.11 header length.
  *
- * @skb: the frame
+ * Return: The 802.11 header length in bytes (not including encryption
+ * headers). Or 0 if the data in the sk_buff is too short to contain a valid
+ * 802.11 header.
  */
 unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb);
 
 /**
  * ieee80211_hdrlen - get header length in bytes from frame control
  * @fc: frame control field in little-endian format
+ * Return: The header length in bytes.
  */
 unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc);
 
@@ -2794,7 +2840,7 @@ unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc);
  * ieee80211_get_mesh_hdrlen - get mesh extension header length
  * @meshhdr: the mesh extension header, only the flags field
  *      (first byte) will be accessed
- * Returns the length of the extension header, which is always at
+ * Return: The length of the extension header, which is always at
  * least 6 bytes and at most 18 if address 5 and 6 are present.
  */
 unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr);
@@ -2812,6 +2858,7 @@ unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr);
  * @skb: the 802.11 data frame
  * @addr: the device MAC address
  * @iftype: the virtual interface type
+ * Return: 0 on success. Non-zero on error.
  */
 int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
                            enum nl80211_iftype iftype);
@@ -2823,6 +2870,7 @@ int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
  * @iftype: the virtual interface type
  * @bssid: the network bssid (used only for iftype STATION and ADHOC)
  * @qos: build 802.11 QoS data frame
+ * Return: 0 on success, or a negative error code.
  */
 int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr,
                              enum nl80211_iftype iftype, u8 *bssid, bool qos);
@@ -2850,6 +2898,7 @@ void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list,
 /**
  * cfg80211_classify8021d - determine the 802.1p/1d tag for a data frame
  * @skb: the data frame
+ * Return: The 802.1p/1d tag.
  */
 unsigned int cfg80211_classify8021d(struct sk_buff *skb);
 
@@ -2860,12 +2909,13 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb);
  * @ies: data consisting of IEs
  * @len: length of data
  *
- * This function will return %NULL if the element ID could
- * not be found or if the element is invalid (claims to be
- * longer than the given data), or a pointer to the first byte
- * of the requested element, that is the byte containing the
- * element ID. There are no checks on the element length
- * other than having to fit into the given data.
+ * Return: %NULL if the element ID could not be found or if
+ * the element is invalid (claims to be longer than the given
+ * data), or a pointer to the first byte of the requested
+ * element, that is the byte containing the element ID.
+ *
+ * Note: There are no checks on the element length other than
+ * having to fit into the given data.
  */
 const u8 *cfg80211_find_ie(u8 eid, const u8 *ies, int len);
 
@@ -2877,12 +2927,13 @@ const u8 *cfg80211_find_ie(u8 eid, const u8 *ies, int len);
  * @ies: data consisting of IEs
  * @len: length of data
  *
- * This function will return %NULL if the vendor specific element ID
- * could not be found or if the element is invalid (claims to be
- * longer than the given data), or a pointer to the first byte
- * of the requested element, that is the byte containing the
- * element ID. There are no checks on the element length
- * other than having to fit into the given data.
+ * Return: %NULL if the vendor specific element ID could not be found or if the
+ * element is invalid (claims to be longer than the given data), or a pointer to
+ * the first byte of the requested element, that is the byte containing the
+ * element ID.
+ *
+ * Note: There are no checks on the element length other than having to fit into
+ * the given data.
  */
 const u8 *cfg80211_find_vendor_ie(unsigned int oui, u8 oui_type,
                                   const u8 *ies, int len);
@@ -2915,6 +2966,8 @@ const u8 *cfg80211_find_vendor_ie(unsigned int oui, u8 oui_type,
  *
  * Drivers should check the return value, its possible you can get
  * an -ENOMEM.
+ *
+ * Return: 0 on success. -ENOMEM.
  */
 extern int regulatory_hint(struct wiphy *wiphy, const char *alpha2);
 
@@ -2938,28 +2991,22 @@ extern void wiphy_apply_custom_regulatory(
  * freq_reg_info - get regulatory information for the given frequency
  * @wiphy: the wiphy for which we want to process this rule for
  * @center_freq: Frequency in KHz for which we want regulatory information for
- * @desired_bw_khz: the desired max bandwidth you want to use per
- *      channel. Note that this is still 20 MHz if you want to use HT40
- *      as HT40 makes use of two channels for its 40 MHz width bandwidth.
- *      If set to 0 we'll assume you want the standard 20 MHz.
- * @reg_rule: the regulatory rule which we have for this frequency
  *
  * Use this function to get the regulatory rule for a specific frequency on
  * a given wireless device. If the device has a specific regulatory domain
  * it wants to follow we respect that unless a country IE has been received
  * and processed already.
  *
- * Returns 0 if it was able to find a valid regulatory rule which does
- * apply to the given center_freq otherwise it returns non-zero. It will
- * also return -ERANGE if we determine the given center_freq does not even have
- * a regulatory rule for a frequency range in the center_freq's band. See
- * freq_in_rule_band() for our current definition of a band -- this is purely
- * subjective and right now its 802.11 specific.
+ * Return: A valid pointer, or, when an error occurs, for example if no rule
+ * can be found, the return value is encoded using ERR_PTR(). Use IS_ERR() to
+ * check and PTR_ERR() to obtain the numeric return value. The numeric return
+ * value will be -ERANGE if we determine the given center_freq does not even
+ * have a regulatory rule for a frequency range in the center_freq's band.
+ * See freq_in_rule_band() for our current definition of a band -- this is
+ * purely subjective and right now it's 802.11 specific.
  */
-extern int freq_reg_info(struct wiphy *wiphy,
-                         u32 center_freq,
-                         u32 desired_bw_khz,
-                         const struct ieee80211_reg_rule **reg_rule);
+const struct ieee80211_reg_rule *freq_reg_info(struct wiphy *wiphy,
+                                               u32 center_freq);
 
 /*
  * callbacks for asynchronous cfg80211 methods, notification
@@ -3006,7 +3053,8 @@ void cfg80211_sched_scan_stopped(struct wiphy *wiphy);
  * This informs cfg80211 that BSS information was found and
  * the BSS should be updated/added.
  *
- * NOTE: Returns a referenced struct, must be released with cfg80211_put_bss()!
+ * Return: A referenced struct, must be released with cfg80211_put_bss()!
+ * Or %NULL on error.
  */
 struct cfg80211_bss * __must_check
 cfg80211_inform_bss_frame(struct wiphy *wiphy,
@@ -3031,7 +3079,8 @@ cfg80211_inform_bss_frame(struct wiphy *wiphy,
  * This informs cfg80211 that BSS information was found and
  * the BSS should be updated/added.
  *
- * NOTE: Returns a referenced struct, must be released with cfg80211_put_bss()!
+ * Return: A referenced struct, must be released with cfg80211_put_bss()!
+ * Or %NULL on error.
  */
 struct cfg80211_bss * __must_check
 cfg80211_inform_bss(struct wiphy *wiphy,
@@ -3308,16 +3357,18 @@ void wiphy_rfkill_stop_polling(struct wiphy *wiphy);
  * the testmode command. Since it is intended for a reply, calling
  * it outside of the @testmode_cmd operation is invalid.
  *
- * The returned skb (or %NULL if any errors happen) is pre-filled
- * with the wiphy index and set up in a way that any data that is
- * put into the skb (with skb_put(), nla_put() or similar) will end
- * up being within the %NL80211_ATTR_TESTDATA attribute, so all that
- * needs to be done with the skb is adding data for the corresponding
- * userspace tool which can then read that data out of the testdata
- * attribute. You must not modify the skb in any other way.
+ * The returned skb is pre-filled with the wiphy index and set up in
+ * a way that any data that is put into the skb (with skb_put(),
+ * nla_put() or similar) will end up being within the
+ * %NL80211_ATTR_TESTDATA attribute, so all that needs to be done
+ * with the skb is adding data for the corresponding userspace tool
+ * which can then read that data out of the testdata attribute. You
+ * must not modify the skb in any other way.
  *
  * When done, call cfg80211_testmode_reply() with the skb and return
  * its error code as the result of the @testmode_cmd operation.
+ *
+ * Return: An allocated and pre-filled skb. %NULL if any errors happen.
  */
 struct sk_buff *cfg80211_testmode_alloc_reply_skb(struct wiphy *wiphy,
                                                   int approxlen);
@@ -3327,11 +3378,12 @@ struct sk_buff *cfg80211_testmode_alloc_reply_skb(struct wiphy *wiphy,
  * @skb: The skb, must have been allocated with
  *      cfg80211_testmode_alloc_reply_skb()
  *
- * Returns an error code or 0 on success, since calling this
- * function will usually be the last thing before returning
- * from the @testmode_cmd you should return the error code.
- * Note that this function consumes the skb regardless of the
- * return value.
+ * Since calling this function will usually be the last thing
+ * before returning from the @testmode_cmd you should return
+ * the error code.  Note that this function consumes the skb
+ * regardless of the return value.
+ *
+ * Return: An error code or 0 on success.
  */
 int cfg80211_testmode_reply(struct sk_buff *skb);
 
@@ -3345,14 +3397,16 @@ int cfg80211_testmode_reply(struct sk_buff *skb);
  * This function allocates and pre-fills an skb for an event on the
  * testmode multicast group.
  *
- * The returned skb (or %NULL if any errors happen) is set up in the
- * same way as with cfg80211_testmode_alloc_reply_skb() but prepared
- * for an event. As there, you should simply add data to it that will
- * then end up in the %NL80211_ATTR_TESTDATA attribute. Again, you must
- * not modify the skb in any other way.
+ * The returned skb is set up in the same way as with
+ * cfg80211_testmode_alloc_reply_skb() but prepared for an event. As
+ * there, you should simply add data to it that will then end up in the
+ * %NL80211_ATTR_TESTDATA attribute. Again, you must not modify the skb
+ * in any other way.
  *
  * When done filling the skb, call cfg80211_testmode_event() with the
  * skb to send the event.
+ *
+ * Return: An allocated and pre-filled skb. %NULL if any errors happen.
  */
 struct sk_buff *cfg80211_testmode_alloc_event_skb(struct wiphy *wiphy,
                                                   int approxlen, gfp_t gfp);
@@ -3533,13 +3587,13 @@ void cfg80211_conn_failed(struct net_device *dev, const u8 *mac_addr,
  * @len: length of the frame data
  * @gfp: context flags
  *
- * Returns %true if a user space application has registered for this frame.
+ * This function is called whenever an Action frame is received for a station
+ * mode interface, but is not processed in kernel.
+ *
+ * Return: %true if a user space application has registered for this frame.
  * For action frames, that makes it responsible for rejecting unrecognized
  * action frames; %false otherwise, in which case for action frames the
  * driver is responsible for rejecting the frame.
- *
- * This function is called whenever an Action frame is received for a station
- * mode interface, but is not processed in kernel.
  */
 bool cfg80211_rx_mgmt(struct wireless_dev *wdev, int freq, int sig_dbm,
                       const u8 *buf, size_t len, gfp_t gfp);
@@ -3631,7 +3685,7 @@ void cfg80211_pmksa_candidate_notify(struct net_device *dev, int index,
  * This function is used in AP mode (only!) to inform userspace that
  * a spurious class 3 frame was received, to be able to deauth the
  * sender.
- * Returns %true if the frame was passed to userspace (or this failed
+ * Return: %true if the frame was passed to userspace (or this failed
  * for a reason other than not having a subscription.)
  */
 bool cfg80211_rx_spurious_frame(struct net_device *dev,
@@ -3647,7 +3701,7 @@ bool cfg80211_rx_spurious_frame(struct net_device *dev,
  * an associated station sent a 4addr frame but that wasn't expected.
  * It is allowed and desirable to send this event only once for each
  * station to avoid event flooding.
- * Returns %true if the frame was passed to userspace (or this failed
+ * Return: %true if the frame was passed to userspace (or this failed
  * for a reason other than not having a subscription.)
  */
 bool cfg80211_rx_unexpected_4addr_frame(struct net_device *dev,
@@ -3685,8 +3739,8 @@ void cfg80211_report_obss_beacon(struct wiphy *wiphy,
  * @wiphy: the wiphy
  * @chandef: the channel definition
  *
- * This function returns true if there is no secondary channel or the secondary
- * channel(s) can be used for beaconing (i.e. is not a radar channel etc.)
+ * Return: %true if there is no secondary channel or the secondary channel(s)
+ * can be used for beaconing (i.e. is not a radar channel etc.)
  */
 bool cfg80211_reg_can_beacon(struct wiphy *wiphy,
                              struct cfg80211_chan_def *chandef);
@@ -3756,9 +3810,9 @@ void cfg80211_unregister_wdev(struct wireless_dev *wdev);
  * The function finds a given P2P attribute in the (vendor) IEs and
  * copies its contents to the given buffer.
  *
- * The return value is a negative error code (-%EILSEQ or -%ENOENT) if
- * the data is malformed or the attribute can't be found (respectively),
- * or the length of the found attribute (which can be zero).
+ * Return: A negative error code (-%EILSEQ or -%ENOENT) if the data is
+ * malformed or the attribute can't be found (respectively), or the
+ * length of the found attribute (which can be zero).
  */
 int cfg80211_get_p2p_attr(const u8 *ies, unsigned int len,
                           enum ieee80211_p2p_attr_id attr,
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index ee50c5eba50c..3037f49e51c8 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -173,7 +173,7 @@ struct ieee80211_chanctx_conf {
 
         u8 rx_chains_static, rx_chains_dynamic;
 
-        u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
+        u8 drv_priv[0] __aligned(sizeof(void *));
 };
 
 /**
@@ -1059,7 +1059,7 @@ struct ieee80211_vif {
         u32 driver_flags;
 
         /* must be last */
-        u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
+        u8 drv_priv[0] __aligned(sizeof(void *));
 };
 
 static inline bool ieee80211_vif_is_mesh(struct ieee80211_vif *vif)
@@ -1209,7 +1209,7 @@ struct ieee80211_sta {
         u8 max_sp;
 
         /* must be last */
-        u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
+        u8 drv_priv[0] __aligned(sizeof(void *));
 };
 
 /**
@@ -1522,6 +1522,8 @@ struct ieee80211_hw {
  * structure can then access it via hw->priv. Note that mac802111 drivers should
  * not use wiphy_priv() to try to get their private driver structure as this
  * is already used internally by mac80211.
+ *
+ * Return: The mac80211 driver hw struct of @wiphy.
  */
 struct ieee80211_hw *wiphy_to_ieee80211_hw(struct wiphy *wiphy);
 
@@ -2033,17 +2035,29 @@ enum ieee80211_filter_flags {
  * calling ieee80211_start_tx_ba_cb_irqsafe, because the peer
  * might receive the addBA frame and send a delBA right away!
  *
- * @IEEE80211_AMPDU_RX_START: start Rx aggregation
- * @IEEE80211_AMPDU_RX_STOP: stop Rx aggregation
- * @IEEE80211_AMPDU_TX_START: start Tx aggregation
- * @IEEE80211_AMPDU_TX_STOP: stop Tx aggregation
+ * @IEEE80211_AMPDU_RX_START: start RX aggregation
+ * @IEEE80211_AMPDU_RX_STOP: stop RX aggregation
+ * @IEEE80211_AMPDU_TX_START: start TX aggregation
  * @IEEE80211_AMPDU_TX_OPERATIONAL: TX aggregation has become operational
+ * @IEEE80211_AMPDU_TX_STOP_CONT: stop TX aggregation but continue transmitting
+ *      queued packets, now unaggregated. After all packets are transmitted the
+ *      driver has to call ieee80211_stop_tx_ba_cb_irqsafe().
+ * @IEEE80211_AMPDU_TX_STOP_FLUSH: stop TX aggregation and flush all packets,
+ *      called when the station is removed. There's no need or reason to call
+ *      ieee80211_stop_tx_ba_cb_irqsafe() in this case as mac80211 assumes the
+ *      session is gone and removes the station.
+ * @IEEE80211_AMPDU_TX_STOP_FLUSH_CONT: called when TX aggregation is stopped
+ *      but the driver hasn't called ieee80211_stop_tx_ba_cb_irqsafe() yet and
+ *      now the connection is dropped and the station will be removed. Drivers
+ *      should clean up and drop remaining packets when this is called.
  */
 enum ieee80211_ampdu_mlme_action {
         IEEE80211_AMPDU_RX_START,
         IEEE80211_AMPDU_RX_STOP,
         IEEE80211_AMPDU_TX_START,
-        IEEE80211_AMPDU_TX_STOP,
+        IEEE80211_AMPDU_TX_STOP_CONT,
+        IEEE80211_AMPDU_TX_STOP_FLUSH,
+        IEEE80211_AMPDU_TX_STOP_FLUSH_CONT,
         IEEE80211_AMPDU_TX_OPERATIONAL,
 };
 
@@ -2474,7 +2488,10 @@ enum ieee80211_rate_control_changed {
  *
  * @restart_complete: Called after a call to ieee80211_restart_hw(), when the
  *      reconfiguration has completed. This can help the driver implement the
- *      reconfiguration step. This callback may sleep.
+ *      reconfiguration step. Also called when reconfiguring because the
+ *      driver's resume function returned 1, as this is just like an "inline"
+ *      hardware restart. This callback may sleep.
+ *
  */
 struct ieee80211_ops {
         void (*tx)(struct ieee80211_hw *hw,
@@ -2661,6 +2678,8 @@ struct ieee80211_ops {
  *
  * @priv_data_len: length of private data
  * @ops: callbacks for this device
+ *
+ * Return: A pointer to the new hardware device, or %NULL on error.
  */
 struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
                                         const struct ieee80211_ops *ops);
@@ -2673,6 +2692,8 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
  * need to fill the contained wiphy's information.
  *
  * @hw: the device to register as returned by ieee80211_alloc_hw()
+ *
+ * Return: 0 on success. An error code otherwise.
  */
 int ieee80211_register_hw(struct ieee80211_hw *hw);
 
@@ -2719,6 +2740,8 @@ extern char *__ieee80211_create_tpt_led_trigger(
  * of the trigger so you can automatically link the LED device.
  *
  * @hw: the hardware to get the LED trigger name for
+ *
+ * Return: The name of the LED trigger. %NULL if not configured for LEDs.
  */
 static inline char *ieee80211_get_tx_led_name(struct ieee80211_hw *hw)
 {
@@ -2738,6 +2761,8 @@ static inline char *ieee80211_get_tx_led_name(struct ieee80211_hw *hw)
  * of the trigger so you can automatically link the LED device.
  *
  * @hw: the hardware to get the LED trigger name for
+ *
+ * Return: The name of the LED trigger. %NULL if not configured for LEDs.
  */
 static inline char *ieee80211_get_rx_led_name(struct ieee80211_hw *hw)
 {
@@ -2757,6 +2782,8 @@ static inline char *ieee80211_get_rx_led_name(struct ieee80211_hw *hw)
  * of the trigger so you can automatically link the LED device.
  *
  * @hw: the hardware to get the LED trigger name for
+ *
+ * Return: The name of the LED trigger. %NULL if not configured for LEDs.
  */
 static inline char *ieee80211_get_assoc_led_name(struct ieee80211_hw *hw)
 {
@@ -2776,6 +2803,8 @@ static inline char *ieee80211_get_assoc_led_name(struct ieee80211_hw *hw)
  * of the trigger so you can automatically link the LED device.
  *
  * @hw: the hardware to get the LED trigger name for
+ *
+ * Return: The name of the LED trigger. %NULL if not configured for LEDs.
  */
 static inline char *ieee80211_get_radio_led_name(struct ieee80211_hw *hw)
 {
@@ -2793,9 +2822,10 @@ static inline char *ieee80211_get_radio_led_name(struct ieee80211_hw *hw)
  * @blink_table: the blink table -- needs to be ordered by throughput
  * @blink_table_len: size of the blink table
  *
- * This function returns %NULL (in case of error, or if no LED
- * triggers are configured) or the name of the new trigger.
- * This function must be called before ieee80211_register_hw().
+ * Return: %NULL (in case of error, or if no LED triggers are
+ * configured) or the name of the new trigger.
+ *
+ * Note: This function must be called before ieee80211_register_hw().
  */
 static inline char *
 ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw, unsigned int flags,
@@ -2928,10 +2958,10 @@ static inline void ieee80211_rx_ni(struct ieee80211_hw *hw,
  * Calls to this function for a single hardware must be synchronized against
  * each other.
  *
- * The function returns -EINVAL when the requested PS mode is already set.
- *
  * @sta: currently connected sta
  * @start: start or stop PS
+ *
+ * Return: 0 on success. -EINVAL when the requested PS mode is already set.
  */
 int ieee80211_sta_ps_transition(struct ieee80211_sta *sta, bool start);
 
@@ -2945,6 +2975,8 @@ int ieee80211_sta_ps_transition(struct ieee80211_sta *sta, bool start);
  *
  * @sta: currently connected sta
  * @start: start or stop PS
+ *
+ * Return: Like ieee80211_sta_ps_transition().
  */
 static inline int ieee80211_sta_ps_transition_ni(struct ieee80211_sta *sta,
                                                   bool start)
@@ -3082,6 +3114,8 @@ void ieee80211_report_low_ack(struct ieee80211_sta *sta, u32 num_packets);
  * according to the current DTIM parameters/TIM bitmap.
  *
  * The driver is responsible for freeing the returned skb.
+ *
+ * Return: The beacon template. %NULL on error.
  */
 struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
                                          struct ieee80211_vif *vif,
@@ -3093,6 +3127,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
  *
  * See ieee80211_beacon_get_tim().
+ *
+ * Return: See ieee80211_beacon_get_tim().
  */
 static inline struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
                                                    struct ieee80211_vif *vif)
@@ -3109,6 +3145,8 @@ static inline struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
  * hardware. The destination address should be set by the caller.
  *
  * Can only be called in AP mode.
+ *
+ * Return: The Probe Response template. %NULL on error.
  */
 struct sk_buff *ieee80211_proberesp_get(struct ieee80211_hw *hw,
                                         struct ieee80211_vif *vif);
@@ -3124,6 +3162,8 @@ struct sk_buff *ieee80211_proberesp_get(struct ieee80211_hw *hw,
  *
  * Note: Caller (or hardware) is responsible for setting the
  * &IEEE80211_FCTL_PM bit.
+ *
+ * Return: The PS Poll template. %NULL on error.
  */
 struct sk_buff *ieee80211_pspoll_get(struct ieee80211_hw *hw,
                                      struct ieee80211_vif *vif);
@@ -3139,6 +3179,8 @@ struct sk_buff *ieee80211_pspoll_get(struct ieee80211_hw *hw,
  *
  * Note: Caller (or hardware) is responsible for setting the
  * &IEEE80211_FCTL_PM bit as well as Duration and Sequence Control fields.
+ *
+ * Return: The nullfunc template. %NULL on error.
  */
 struct sk_buff *ieee80211_nullfunc_get(struct ieee80211_hw *hw,
                                        struct ieee80211_vif *vif);
@@ -3153,6 +3195,8 @@ struct sk_buff *ieee80211_nullfunc_get(struct ieee80211_hw *hw,
  *
  * Creates a Probe Request template which can, for example, be uploaded to
  * hardware.
+ *
+ * Return: The Probe Request template. %NULL on error.
  */
 struct sk_buff *ieee80211_probereq_get(struct ieee80211_hw *hw,
                                        struct ieee80211_vif *vif,
@@ -3188,6 +3232,8 @@ void ieee80211_rts_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
  * If the RTS is generated in firmware, but the host system must provide
  * the duration field, the low-level driver uses this function to receive
  * the duration field value in little-endian byteorder.
+ *
+ * Return: The duration.
  */
 __le16 ieee80211_rts_duration(struct ieee80211_hw *hw,
                               struct ieee80211_vif *vif, size_t frame_len,
@@ -3223,6 +3269,8 @@ void ieee80211_ctstoself_get(struct ieee80211_hw *hw,
  * If the CTS-to-self is generated in firmware, but the host system must provide
  * the duration field, the low-level driver uses this function to receive
  * the duration field value in little-endian byteorder.
+ *
+ * Return: The duration.
  */
 __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
                                     struct ieee80211_vif *vif,
@@ -3239,6 +3287,8 @@ __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
  *
  * Calculate the duration field of some generic frame, given its
  * length and transmission rate (in 100kbps).
+ *
+ * Return: The duration.
  */
 __le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
                                         struct ieee80211_vif *vif,
@@ -3255,9 +3305,10 @@ __le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
  * hardware/firmware does not implement buffering of broadcast/multicast
  * frames when power saving is used, 802.11 code buffers them in the host
  * memory. The low-level driver uses this function to fetch next buffered
- * frame. In most cases, this is used when generating beacon frame. This
- * function returns a pointer to the next buffered skb or NULL if no more
- * buffered frames are available.
+ * frame. In most cases, this is used when generating beacon frame.
+ *
+ * Return: A pointer to the next buffered skb or NULL if no more buffered
+ * frames are available.
  *
  * Note: buffered frames are returned only after DTIM beacon frame was
  * generated with ieee80211_beacon_get() and the low-level driver must thus
@@ -3437,6 +3488,8 @@ void ieee80211_stop_queue(struct ieee80211_hw *hw, int queue);
  * @queue: queue number (counted from zero).
  *
  * Drivers should use this function instead of netif_stop_queue.
+ *
+ * Return: %true if the queue is stopped. %false otherwise.
  */
 
 int ieee80211_queue_stopped(struct ieee80211_hw *hw, int queue);
@@ -3634,7 +3687,9 @@ void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, const u8 *ra,
  * @vif: virtual interface to look for station on
  * @addr: station's address
  *
- * This function must be called under RCU lock and the
+ * Return: The station, if found. %NULL otherwise.
+ *
+ * Note: This function must be called under RCU lock and the
  * resulting pointer is only valid under RCU lock as well.
  */
 struct ieee80211_sta *ieee80211_find_sta(struct ieee80211_vif *vif,
@@ -3647,7 +3702,9 @@ struct ieee80211_sta *ieee80211_find_sta(struct ieee80211_vif *vif,
  * @addr: remote station's address
  * @localaddr: local address (vif->sdata->vif.addr). Use NULL for 'any'.
  *
- * This function must be called under RCU lock and the
+ * Return: The station, if found. %NULL otherwise.
+ *
+ * Note: This function must be called under RCU lock and the
  * resulting pointer is only valid under RCU lock as well.
  *
  * NOTE: You may pass NULL for localaddr, but then you will just get
@@ -3754,6 +3811,11 @@ void ieee80211_iter_keys(struct ieee80211_hw *hw,
  * The iterator will not find a context that's being added (during
  * the driver callback to add it) but will find it while it's being
  * removed.
+ *
+ * Note that during hardware restart, all contexts that existed
+ * before the restart are considered already present so will be
+ * found while iterating, whether they've been re-added already
+ * or not.
  */
 void ieee80211_iter_chan_contexts_atomic(
         struct ieee80211_hw *hw,
@@ -3772,7 +3834,9 @@ void ieee80211_iter_chan_contexts_atomic(
  * information. This function must only be called from within the
  * .bss_info_changed callback function and only in managed mode. The function
  * is only useful when the interface is associated, otherwise it will return
- * NULL.
+ * %NULL.
+ *
+ * Return: The Probe Request template. %NULL on error.
  */
 struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw,
                                           struct ieee80211_vif *vif);
@@ -4119,12 +4183,14 @@ void ieee80211_enable_rssi_reports(struct ieee80211_vif *vif,
 void ieee80211_disable_rssi_reports(struct ieee80211_vif *vif);
 
 /**
- * ieee80211_ave_rssi - report the average rssi for the specified interface
+ * ieee80211_ave_rssi - report the average RSSI for the specified interface
  *
  * @vif: the specified virtual interface
  *
- * This function return the average rssi value for the requested interface.
- * It assumes that the given vif is valid.
+ * Note: This function assumes that the given vif is valid.
+ *
+ * Return: The average RSSI value for the requested interface, or 0 if not
+ * applicable.
  */
 int ieee80211_ave_rssi(struct ieee80211_vif *vif);
 
diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h
index 671953e11575..b87a1692b086 100644
--- a/include/net/nfc/hci.h
+++ b/include/net/nfc/hci.h
@@ -57,8 +57,10 @@ struct nfc_hci_ops {
         int (*tm_send)(struct nfc_hci_dev *hdev, struct sk_buff *skb);
         int (*check_presence)(struct nfc_hci_dev *hdev,
                               struct nfc_target *target);
-        void (*event_received)(struct nfc_hci_dev *hdev, u8 gate, u8 event,
-                                struct sk_buff *skb);
+        int (*event_received)(struct nfc_hci_dev *hdev, u8 gate, u8 event,
+                              struct sk_buff *skb);
+        int (*enable_se)(struct nfc_dev *dev, u32 secure_element);
+        int (*disable_se)(struct nfc_dev *dev, u32 secure_element);
 };
 
 /* Pipes */
@@ -82,11 +84,23 @@ typedef int (*xmit) (struct sk_buff *skb, void *cb_data);
 
 #define NFC_HCI_MAX_GATES               256
 
+/*
+ * These values can be specified by a driver to indicate it requires some
+ * adaptation of the HCI standard.
+ *
+ * NFC_HCI_QUIRK_SHORT_CLEAR - send HCI_ADM_CLEAR_ALL_PIPE cmd with no params
+ */
+enum {
+        NFC_HCI_QUIRK_SHORT_CLEAR       = 0,
+};
+
 struct nfc_hci_dev {
         struct nfc_dev *ndev;
 
         u32 max_data_link_payload;
 
+        bool shutting_down;
+
         struct mutex msg_tx_mutex;
 
         struct list_head msg_tx_queue;
@@ -129,12 +143,16 @@ struct nfc_hci_dev {
 
         u8 *gb;
         size_t gb_len;
+
+        unsigned long quirks;
 };
 
 /* hci device allocation */
 struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,
                                             struct nfc_hci_init_data *init_data,
+                                            unsigned long quirks,
                                             u32 protocols,
+                                            u32 supported_se,
                                             const char *llc_name,
                                             int tx_headroom,
                                             int tx_tailroom,
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h
index d705d8674949..5bc0c460edc0 100644
--- a/include/net/nfc/nci_core.h
+++ b/include/net/nfc/nci_core.h
@@ -147,6 +147,7 @@ struct nci_dev {
 /* ----- NCI Devices ----- */
 struct nci_dev *nci_allocate_device(struct nci_ops *ops,
                                     __u32 supported_protocols,
+                                    __u32 supported_se,
                                     int tx_headroom,
                                     int tx_tailroom);
 void nci_free_device(struct nci_dev *ndev);
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h
index fce80b2f9be7..87a6417fc934 100644
--- a/include/net/nfc/nfc.h
+++ b/include/net/nfc/nfc.h
@@ -68,6 +68,8 @@ struct nfc_ops {
                              void *cb_context);
         int (*tm_send)(struct nfc_dev *dev, struct sk_buff *skb);
         int (*check_presence)(struct nfc_dev *dev, struct nfc_target *target);
+        int (*enable_se)(struct nfc_dev *dev, u32 secure_element);
+        int (*disable_se)(struct nfc_dev *dev, u32 secure_element);
 };
 
 #define NFC_TARGET_IDX_ANY -1
@@ -109,12 +111,17 @@ struct nfc_dev {
         struct nfc_genl_data genl_data;
         u32 supported_protocols;
 
+        u32 supported_se;
+        u32 active_se;
+
         int tx_headroom;
         int tx_tailroom;
 
         struct timer_list check_pres_timer;
         struct work_struct check_pres_work;
 
+        bool shutting_down;
+
         struct nfc_ops *ops;
 };
 #define to_nfc_dev(_dev) container_of(_dev, struct nfc_dev, dev)
@@ -123,6 +130,7 @@ extern struct class nfc_class;
 
 struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
                                     u32 supported_protocols,
+                                    u32 supported_se,
                                     int tx_headroom,
                                     int tx_tailroom);
 
diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 7dcaa2794fde..f17ed590d64a 100644
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -18,6 +18,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/rcupdate.h>
 
 /**
  * enum environment_cap - Environment parsed from country IE
@@ -35,6 +36,7 @@ enum environment_cap {
 /**
  * struct regulatory_request - used to keep track of regulatory requests
  *
+ * @rcu_head: RCU head struct used to free the request
  * @wiphy_idx: this is set if this request's initiator is
  *      %REGDOM_SET_BY_COUNTRY_IE or %REGDOM_SET_BY_DRIVER. This
  *      can be used by the wireless core to deal with conflicts
@@ -72,6 +74,7 @@ enum environment_cap {
  * @list: used to insert into the reg_requests_list linked list
  */
 struct regulatory_request {
+        struct rcu_head rcu_head;
         int wiphy_idx;
         enum nl80211_reg_initiator initiator;
         enum nl80211_user_reg_hint_type user_reg_hint_type;
@@ -101,6 +104,7 @@ struct ieee80211_reg_rule {
 };
 
 struct ieee80211_regdomain {
+        struct rcu_head rcu_head;
         u32 n_reg_rules;
         char alpha2[2];
         u8 dfs_region;
diff --git a/include/uapi/linux/nfc.h b/include/uapi/linux/nfc.h
index 0e63cee8d810..7969f46f1bb3 100644
--- a/include/uapi/linux/nfc.h
+++ b/include/uapi/linux/nfc.h
@@ -5,20 +5,17 @@
  *    Lauro Ramos Venancio <lauro.venancio@openbossa.org>
  *    Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * 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.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #ifndef __LINUX_NFC_H
@@ -67,6 +64,11 @@
  *      subsequent CONNECT and CC messages.
  *      If one of the passed parameters is wrong none is set and -EINVAL is
  *      returned.
+ * @NFC_CMD_ENABLE_SE: Enable the physical link to a specific secure element.
+ *      Once enabled a secure element will handle card emulation mode, i.e.
+ *      starting a poll from a device which has a secure element enabled means
+ *      we want to do SE based card emulation.
+ * @NFC_CMD_DISABLE_SE: Disable the physical link to a specific secure element.
  */
 enum nfc_commands {
         NFC_CMD_UNSPEC,
@@ -86,6 +88,8 @@ enum nfc_commands {
         NFC_EVENT_TM_DEACTIVATED,
         NFC_CMD_LLC_GET_PARAMS,
         NFC_CMD_LLC_SET_PARAMS,
+        NFC_CMD_ENABLE_SE,
+        NFC_CMD_DISABLE_SE,
 /* private: internal use only */
         __NFC_CMD_AFTER_LAST
 };
@@ -114,6 +118,7 @@ enum nfc_commands {
  * @NFC_ATTR_LLC_PARAM_LTO: Link TimeOut parameter
  * @NFC_ATTR_LLC_PARAM_RW: Receive Window size parameter
  * @NFC_ATTR_LLC_PARAM_MIUX: MIU eXtension parameter
+ * @NFC_ATTR_SE: Available Secure Elements
  */
 enum nfc_attrs {
         NFC_ATTR_UNSPEC,
@@ -134,6 +139,7 @@ enum nfc_attrs {
         NFC_ATTR_LLC_PARAM_LTO,
         NFC_ATTR_LLC_PARAM_RW,
         NFC_ATTR_LLC_PARAM_MIUX,
+        NFC_ATTR_SE,
 /* private: internal use only */
         __NFC_ATTR_AFTER_LAST
 };
@@ -172,6 +178,11 @@ enum nfc_attrs {
 #define NFC_PROTO_NFC_DEP_MASK    (1 << NFC_PROTO_NFC_DEP)
 #define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)
 
+/* NFC Secure Elements */
+#define NFC_SE_NONE     0x0
+#define NFC_SE_UICC     0x1
+#define NFC_SE_EMBEDDED 0x2
+
 struct sockaddr_nfc {
         sa_family_t sa_family;
         __u32 dev_idx;
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index e3e19f8b16f2..e6eeb4ba5dc5 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -374,8 +374,8 @@
  *      requests to connect to a specified network but without separating
  *      auth and assoc steps. For this, you need to specify the SSID in a
  *      %NL80211_ATTR_SSID attribute, and can optionally specify the association
- *      IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_MAC,
- *      %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
+ *      IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP,
+ *      %NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
  *      %NL80211_ATTR_CONTROL_PORT_ETHERTYPE and
  *      %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT.
  *      Background scan period can optionally be
@@ -958,7 +958,7 @@ enum nl80211_commands {
  * @NL80211_ATTR_USE_MFP: Whether management frame protection (IEEE 802.11w) is
  *      used for the association (&enum nl80211_mfp, represented as a u32);
  *      this attribute can be used
- *      with %NL80211_CMD_ASSOCIATE request
+ *      with %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests
  *
  * @NL80211_ATTR_STA_FLAGS2: Attribute containing a
  *      &struct nl80211_sta_flag_update.
@@ -1310,6 +1310,9 @@ enum nl80211_commands {
  *      if not given in START_AP 0 is assumed, if not given in SET_BSS
  *      no change is made.
  *
+ * @NL80211_ATTR_LOCAL_MESH_POWER_MODE: local mesh STA link-specific power mode
+ *      defined in &enum nl80211_mesh_power_mode.
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -1580,6 +1583,8 @@ enum nl80211_attrs {
         NL80211_ATTR_P2P_CTWINDOW,
         NL80211_ATTR_P2P_OPPPS,
 
+        NL80211_ATTR_LOCAL_MESH_POWER_MODE,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -1697,6 +1702,9 @@ enum nl80211_iftype {
  *      flag can't be changed, it is only valid while adding a station, and
  *      attempts to change it will silently be ignored (rather than rejected
  *      as errors.)
+ * @NL80211_STA_FLAG_ASSOCIATED: station is associated; used with drivers
+ *      that support %NL80211_FEATURE_FULL_AP_CLIENT_STATE to transition a
+ *      previously added station into associated state
  * @NL80211_STA_FLAG_MAX: highest station flag number currently defined
  * @__NL80211_STA_FLAG_AFTER_LAST: internal use
  */
@@ -1708,6 +1716,7 @@ enum nl80211_sta_flags {
         NL80211_STA_FLAG_MFP,
         NL80211_STA_FLAG_AUTHENTICATED,
         NL80211_STA_FLAG_TDLS_PEER,
+        NL80211_STA_FLAG_ASSOCIATED,
 
         /* keep last */
         __NL80211_STA_FLAG_AFTER_LAST,
@@ -1834,6 +1843,10 @@ enum nl80211_sta_bss_param {
  * @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update.
  * @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32)
  * @NL80211_STA_INFO_T_OFFSET: timing offset with respect to this STA (s64)
+ * @NL80211_STA_INFO_LOCAL_PM: local mesh STA link-specific power mode
+ * @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode
+ * @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards
+ *      non-peer STA
  * @__NL80211_STA_INFO_AFTER_LAST: internal
  * @NL80211_STA_INFO_MAX: highest possible station info attribute
  */
@@ -1858,6 +1871,9 @@ enum nl80211_sta_info {
         NL80211_STA_INFO_STA_FLAGS,
         NL80211_STA_INFO_BEACON_LOSS,
         NL80211_STA_INFO_T_OFFSET,
+        NL80211_STA_INFO_LOCAL_PM,
+        NL80211_STA_INFO_PEER_PM,
+        NL80211_STA_INFO_NONPEER_PM,
 
         /* keep last */
         __NL80211_STA_INFO_AFTER_LAST,
@@ -2249,6 +2265,34 @@ enum nl80211_mntr_flags {
 };
 
 /**
+ * enum nl80211_mesh_power_mode - mesh power save modes
+ *
+ * @NL80211_MESH_POWER_UNKNOWN: The mesh power mode of the mesh STA is
+ *      not known or has not been set yet.
+ * @NL80211_MESH_POWER_ACTIVE: Active mesh power mode. The mesh STA is
+ *      in Awake state all the time.
+ * @NL80211_MESH_POWER_LIGHT_SLEEP: Light sleep mode. The mesh STA will
+ *      alternate between Active and Doze states, but will wake up for
+ *      neighbor's beacons.
+ * @NL80211_MESH_POWER_DEEP_SLEEP: Deep sleep mode. The mesh STA will
+ *      alternate between Active and Doze states, but may not wake up
+ *      for neighbor's beacons.
+ *
+ * @__NL80211_MESH_POWER_AFTER_LAST - internal use
+ * @NL80211_MESH_POWER_MAX - highest possible power save level
+ */
+
+enum nl80211_mesh_power_mode {
+        NL80211_MESH_POWER_UNKNOWN,
+        NL80211_MESH_POWER_ACTIVE,
+        NL80211_MESH_POWER_LIGHT_SLEEP,
+        NL80211_MESH_POWER_DEEP_SLEEP,
+
+        __NL80211_MESH_POWER_AFTER_LAST,
+        NL80211_MESH_POWER_MAX = __NL80211_MESH_POWER_AFTER_LAST - 1
+};
+
+/**
  * enum nl80211_meshconf_params - mesh configuration parameters
  *
  * Mesh configuration parameters. These can be changed while the mesh is
@@ -2342,6 +2386,11 @@ enum nl80211_mntr_flags {
  *      (in TUs) during which a mesh STA can send only one Action frame
  *      containing a PREQ element for root path confirmation.
  *
+ * @NL80211_MESHCONF_POWER_MODE: Default mesh power mode for new peer links.
+ *      type &enum nl80211_mesh_power_mode (u32)
+ *
+ * @NL80211_MESHCONF_AWAKE_WINDOW: awake window duration (in TUs)
+ *
  * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
  */
 enum nl80211_meshconf_params {
@@ -2371,6 +2420,8 @@ enum nl80211_meshconf_params {
         NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,
         NL80211_MESHCONF_HWMP_ROOT_INTERVAL,
         NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
+        NL80211_MESHCONF_POWER_MODE,
+        NL80211_MESHCONF_AWAKE_WINDOW,
 
         /* keep last */
         __NL80211_MESHCONF_ATTR_AFTER_LAST,
@@ -2933,6 +2984,8 @@ enum nl80211_iface_limit_attrs {
  *      the infrastructure network's beacon interval.
  * @NL80211_IFACE_COMB_NUM_CHANNELS: u32 attribute specifying how many
  *      different channels may be used within this group.
+ * @NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS: u32 attribute containing the bitmap
+ *      of supported channel widths for radar detection.
  * @NUM_NL80211_IFACE_COMB: number of attributes
  * @MAX_NL80211_IFACE_COMB: highest attribute number
  *
@@ -2965,6 +3018,7 @@ enum nl80211_if_combination_attrs {
         NL80211_IFACE_COMB_MAXNUM,
         NL80211_IFACE_COMB_STA_AP_BI_MATCH,
         NL80211_IFACE_COMB_NUM_CHANNELS,
+        NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,
 
         /* keep last */
         NUM_NL80211_IFACE_COMB,
@@ -3140,6 +3194,17 @@ enum nl80211_ap_sme_features {
  *      setting
  * @NL80211_FEATURE_P2P_GO_OPPPS: P2P GO implementation supports opportunistic
  *      powersave
+ * @NL80211_FEATURE_FULL_AP_CLIENT_STATE: The driver supports full state
+ *      transitions for AP clients. Without this flag (and if the driver
+ *      doesn't have the AP SME in the device) the driver supports adding
+ *      stations only when they're associated and adds them in associated
+ *      state (to later be transitioned into authorized), with this flag
+ *      they should be added before even sending the authentication reply
+ *      and then transitioned into authenticated, associated and authorized
+ *      states using station flags.
+ *      Note that even for drivers that support this, the default is to add
+ *      stations in authenticated/associated state, so to add unauthenticated
+ *      stations the authenticated/associated bits have to be set in the mask.
  */
 enum nl80211_feature_flags {
         NL80211_FEATURE_SK_TX_STATUS                    = 1 << 0,
@@ -3155,6 +3220,7 @@ enum nl80211_feature_flags {
         NL80211_FEATURE_NEED_OBSS_SCAN                  = 1 << 10,
         NL80211_FEATURE_P2P_GO_CTWIN                    = 1 << 11,
         NL80211_FEATURE_P2P_GO_OPPPS                    = 1 << 12,
+        NL80211_FEATURE_FULL_AP_CLIENT_STATE            = 1 << 13,
 };
 
 /**
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 596660d37c5e..0f78e34220c9 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2810,14 +2810,6 @@ static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
         if (conn) {
                 hci_conn_enter_active_mode(conn, BT_POWER_FORCE_ACTIVE_OFF);
 
-                hci_dev_lock(hdev);
-                if (test_bit(HCI_MGMT, &hdev->dev_flags) &&
-                    !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags))
-                        mgmt_device_connected(hdev, &conn->dst, conn->type,
-                                              conn->dst_type, 0, NULL, 0,
-                                              conn->dev_class);
-                hci_dev_unlock(hdev);
-
                 /* Send to upper protocol */
                 l2cap_recv_acldata(conn, skb, flags);
                 return;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 705078a0cc39..81b44481d0d9 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2688,7 +2688,7 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
         if (ev->opcode != HCI_OP_NOP)
                 del_timer(&hdev->cmd_timer);
 
-        if (ev->ncmd) {
+        if (ev->ncmd && !test_bit(HCI_RESET, &hdev->flags)) {
                 atomic_set(&hdev->cmd_cnt, 1);
                 if (!skb_queue_empty(&hdev->cmd_q))
                         queue_work(hdev->workqueue, &hdev->cmd_work);
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index b2bcbe2dc328..a7352ff3fd1e 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -931,7 +931,7 @@ static int hidp_setup_hid(struct hidp_session *session,
         hid->version = req->version;
         hid->country = req->country;
 
-        strncpy(hid->name, req->name, 128);
+        strncpy(hid->name, req->name, sizeof(req->name) - 1);
 
         snprintf(hid->phys, sizeof(hid->phys), "%pMR",
                  &bt_sk(session->ctrl_sock->sk)->src);
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 2c78208d793e..22e658322845 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -3727,6 +3727,17 @@ sendresp:
 static int l2cap_connect_req(struct l2cap_conn *conn,
                              struct l2cap_cmd_hdr *cmd, u8 *data)
 {
+        struct hci_dev *hdev = conn->hcon->hdev;
+        struct hci_conn *hcon = conn->hcon;
+
+        hci_dev_lock(hdev);
+        if (test_bit(HCI_MGMT, &hdev->dev_flags) &&
+            !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &hcon->flags))
+                mgmt_device_connected(hdev, &hcon->dst, hcon->type,
+                                      hcon->dst_type, 0, NULL, 0,
+                                      hcon->dev_class);
+        hci_dev_unlock(hdev);
+
         l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP, 0);
         return 0;
 }
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 531a93d613d4..57f250c20e39 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -352,7 +352,7 @@ static void __sco_sock_close(struct sock *sk)
 
         case BT_CONNECTED:
         case BT_CONFIG:
-                if (sco_pi(sk)->conn) {
+                if (sco_pi(sk)->conn->hcon) {
                         sk->sk_state = BT_DISCONN;
                         sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT);
                         hci_conn_put(sco_pi(sk)->conn->hcon);
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index eb9df22418f0..2f0ccbc5f13e 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -149,16 +149,133 @@ void ieee80211_assign_tid_tx(struct sta_info *sta, int tid,
         rcu_assign_pointer(sta->ampdu_mlme.tid_tx[tid], tid_tx);
 }
 
+static inline int ieee80211_ac_from_tid(int tid)
+{
+        return ieee802_1d_to_ac[tid & 7];
+}
+
+/*
+ * When multiple aggregation sessions on multiple stations
+ * are being created/destroyed simultaneously, we need to
+ * refcount the global queue stop caused by that in order
+ * to not get into a situation where one of the aggregation
+ * setup or teardown re-enables queues before the other is
+ * ready to handle that.
+ *
+ * These two functions take care of this issue by keeping
+ * a global "agg_queue_stop" refcount.
+ */
+static void __acquires(agg_queue)
+ieee80211_stop_queue_agg(struct ieee80211_sub_if_data *sdata, int tid)
+{
+        int queue = sdata->vif.hw_queue[ieee80211_ac_from_tid(tid)];
+
+        if (atomic_inc_return(&sdata->local->agg_queue_stop[queue]) == 1)
+                ieee80211_stop_queue_by_reason(
+                        &sdata->local->hw, queue,
+                        IEEE80211_QUEUE_STOP_REASON_AGGREGATION);
+        __acquire(agg_queue);
+}
+
+static void __releases(agg_queue)
+ieee80211_wake_queue_agg(struct ieee80211_sub_if_data *sdata, int tid)
+{
+        int queue = sdata->vif.hw_queue[ieee80211_ac_from_tid(tid)];
+
+        if (atomic_dec_return(&sdata->local->agg_queue_stop[queue]) == 0)
+                ieee80211_wake_queue_by_reason(
+                        &sdata->local->hw, queue,
+                        IEEE80211_QUEUE_STOP_REASON_AGGREGATION);
+        __release(agg_queue);
+}
+
+/*
+ * splice packets from the STA's pending to the local pending,
+ * requires a call to ieee80211_agg_splice_finish later
+ */
+static void __acquires(agg_queue)
+ieee80211_agg_splice_packets(struct ieee80211_sub_if_data *sdata,
+                             struct tid_ampdu_tx *tid_tx, u16 tid)
+{
+        struct ieee80211_local *local = sdata->local;
+        int queue = sdata->vif.hw_queue[ieee80211_ac_from_tid(tid)];
+        unsigned long flags;
+
+        ieee80211_stop_queue_agg(sdata, tid);
+
+        if (WARN(!tid_tx,
+                 "TID %d gone but expected when splicing aggregates from the pending queue\n",
+                 tid))
+                return;
+
+        if (!skb_queue_empty(&tid_tx->pending)) {
+                spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
+                /* copy over remaining packets */
+                skb_queue_splice_tail_init(&tid_tx->pending,
+                                           &local->pending[queue]);
+                spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
+        }
+}
+
+static void __releases(agg_queue)
+ieee80211_agg_splice_finish(struct ieee80211_sub_if_data *sdata, u16 tid)
+{
+        ieee80211_wake_queue_agg(sdata, tid);
+}
+
+static void ieee80211_remove_tid_tx(struct sta_info *sta, int tid)
+{
+        struct tid_ampdu_tx *tid_tx;
+
+        lockdep_assert_held(&sta->ampdu_mlme.mtx);
+        lockdep_assert_held(&sta->lock);
+
+        tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
+
+        /*
+         * When we get here, the TX path will not be lockless any more wrt.
+         * aggregation, since the OPERATIONAL bit has long been cleared.
+         * Thus it will block on getting the lock, if it occurs. So if we
+         * stop the queue now, we will not get any more packets, and any
+         * that might be being processed will wait for us here, thereby
+         * guaranteeing that no packets go to the tid_tx pending queue any
+         * more.
+         */
+
+        ieee80211_agg_splice_packets(sta->sdata, tid_tx, tid);
+
+        /* future packets must not find the tid_tx struct any more */
+        ieee80211_assign_tid_tx(sta, tid, NULL);
+
+        ieee80211_agg_splice_finish(sta->sdata, tid);
+
+        kfree_rcu(tid_tx, rcu_head);
+}
+
 int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
-                                    enum ieee80211_back_parties initiator,
-                                    bool tx)
+                                    enum ieee80211_agg_stop_reason reason)
 {
         struct ieee80211_local *local = sta->local;
         struct tid_ampdu_tx *tid_tx;
+        enum ieee80211_ampdu_mlme_action action;
         int ret;
 
         lockdep_assert_held(&sta->ampdu_mlme.mtx);
 
+        switch (reason) {
+        case AGG_STOP_DECLINED:
+        case AGG_STOP_LOCAL_REQUEST:
+        case AGG_STOP_PEER_REQUEST:
+                action = IEEE80211_AMPDU_TX_STOP_CONT;
+                break;
+        case AGG_STOP_DESTROY_STA:
+                action = IEEE80211_AMPDU_TX_STOP_FLUSH;
+                break;
+        default:
+                WARN_ON_ONCE(1);
+                return -EINVAL;
+        }
+
         spin_lock_bh(&sta->lock);
 
         tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
@@ -167,10 +284,19 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
                 return -ENOENT;
         }
 
-        /* if we're already stopping ignore any new requests to stop */
+        /*
+         * if we're already stopping ignore any new requests to stop
+         * unless we're destroying it in which case notify the driver
+         */
         if (test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
                 spin_unlock_bh(&sta->lock);
-                return -EALREADY;
+                if (reason != AGG_STOP_DESTROY_STA)
+                        return -EALREADY;
+                ret = drv_ampdu_action(local, sta->sdata,
+                                       IEEE80211_AMPDU_TX_STOP_FLUSH_CONT,
+                                       &sta->sta, tid, NULL, 0);
+                WARN_ON_ONCE(ret);
+                goto remove_tid_tx;
         }
 
         if (test_bit(HT_AGG_STATE_WANT_START, &tid_tx->state)) {
@@ -212,11 +338,12 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
          */
         synchronize_net();
 
-        tid_tx->stop_initiator = initiator;
-        tid_tx->tx_stop = tx;
+        tid_tx->stop_initiator = reason == AGG_STOP_PEER_REQUEST ?
+                                        WLAN_BACK_RECIPIENT :
+                                        WLAN_BACK_INITIATOR;
+        tid_tx->tx_stop = reason == AGG_STOP_LOCAL_REQUEST;
 
-        ret = drv_ampdu_action(local, sta->sdata,
-                               IEEE80211_AMPDU_TX_STOP,
+        ret = drv_ampdu_action(local, sta->sdata, action,
                                &sta->sta, tid, NULL, 0);
 
         /* HW shall not deny going back to legacy */
@@ -227,7 +354,14 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
                  */
         }
 
-        return ret;
+        if (reason == AGG_STOP_DESTROY_STA) {
+ remove_tid_tx:
+                spin_lock_bh(&sta->lock);
+                ieee80211_remove_tid_tx(sta, tid);
+                spin_unlock_bh(&sta->lock);
+        }
+
+        return 0;
 }
 
 /*
@@ -264,80 +398,6 @@ static void sta_addba_resp_timer_expired(unsigned long data)
         rcu_read_unlock();
 }
 
-static inline int ieee80211_ac_from_tid(int tid)
-{
-        return ieee802_1d_to_ac[tid & 7];
-}
-
-/*
- * When multiple aggregation sessions on multiple stations
- * are being created/destroyed simultaneously, we need to
- * refcount the global queue stop caused by that in order
- * to not get into a situation where one of the aggregation
- * setup or teardown re-enables queues before the other is
- * ready to handle that.
- *
- * These two functions take care of this issue by keeping
- * a global "agg_queue_stop" refcount.
- */
-static void __acquires(agg_queue)
-ieee80211_stop_queue_agg(struct ieee80211_sub_if_data *sdata, int tid)
-{
-        int queue = sdata->vif.hw_queue[ieee80211_ac_from_tid(tid)];
-
-        if (atomic_inc_return(&sdata->local->agg_queue_stop[queue]) == 1)
-                ieee80211_stop_queue_by_reason(
-                        &sdata->local->hw, queue,
-                        IEEE80211_QUEUE_STOP_REASON_AGGREGATION);
-        __acquire(agg_queue);
-}
-
-static void __releases(agg_queue)
-ieee80211_wake_queue_agg(struct ieee80211_sub_if_data *sdata, int tid)
-{
-        int queue = sdata->vif.hw_queue[ieee80211_ac_from_tid(tid)];
-
-        if (atomic_dec_return(&sdata->local->agg_queue_stop[queue]) == 0)
-                ieee80211_wake_queue_by_reason(
-                        &sdata->local->hw, queue,
-                        IEEE80211_QUEUE_STOP_REASON_AGGREGATION);
-        __release(agg_queue);
-}
-
-/*
- * splice packets from the STA's pending to the local pending,
- * requires a call to ieee80211_agg_splice_finish later
- */
-static void __acquires(agg_queue)
-ieee80211_agg_splice_packets(struct ieee80211_sub_if_data *sdata,
-                             struct tid_ampdu_tx *tid_tx, u16 tid)
-{
-        struct ieee80211_local *local = sdata->local;
-        int queue = sdata->vif.hw_queue[ieee80211_ac_from_tid(tid)];
-        unsigned long flags;
-
-        ieee80211_stop_queue_agg(sdata, tid);
-
-        if (WARN(!tid_tx,
-                 "TID %d gone but expected when splicing aggregates from the pending queue\n",
-                 tid))
-                return;
-
-        if (!skb_queue_empty(&tid_tx->pending)) {
-                spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
-                /* copy over remaining packets */
-                skb_queue_splice_tail_init(&tid_tx->pending,
-                                           &local->pending[queue]);
-                spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
-        }
-}
-
-static void __releases(agg_queue)
-ieee80211_agg_splice_finish(struct ieee80211_sub_if_data *sdata, u16 tid)
-{
-        ieee80211_wake_queue_agg(sdata, tid);
-}
-
 void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
 {
         struct tid_ampdu_tx *tid_tx;
@@ -660,14 +720,13 @@ void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif,
 EXPORT_SYMBOL(ieee80211_start_tx_ba_cb_irqsafe);
 
 int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
-                                   enum ieee80211_back_parties initiator,
-                                   bool tx)
+                                   enum ieee80211_agg_stop_reason reason)
 {
         int ret;
 
         mutex_lock(&sta->ampdu_mlme.mtx);
 
-        ret = ___ieee80211_stop_tx_ba_session(sta, tid, initiator, tx);
+        ret = ___ieee80211_stop_tx_ba_session(sta, tid, reason);
 
         mutex_unlock(&sta->ampdu_mlme.mtx);
 
@@ -751,24 +810,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
                 ieee80211_send_delba(sta->sdata, ra, tid,
                         WLAN_BACK_INITIATOR, WLAN_REASON_QSTA_NOT_USE);
 
-        /*
-         * When we get here, the TX path will not be lockless any more wrt.
-         * aggregation, since the OPERATIONAL bit has long been cleared.
-         * Thus it will block on getting the lock, if it occurs. So if we
-         * stop the queue now, we will not get any more packets, and any
-         * that might be being processed will wait for us here, thereby
-         * guaranteeing that no packets go to the tid_tx pending queue any
-         * more.
-         */
-
-        ieee80211_agg_splice_packets(sta->sdata, tid_tx, tid);
-
-        /* future packets must not find the tid_tx struct any more */
-        ieee80211_assign_tid_tx(sta, tid, NULL);
-
-        ieee80211_agg_splice_finish(sta->sdata, tid);
-
-        kfree_rcu(tid_tx, rcu_head);
+        ieee80211_remove_tid_tx(sta, tid);
 
  unlock_sta:
         spin_unlock_bh(&sta->lock);
@@ -868,8 +910,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
                 }
 
         } else {
-                ___ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_INITIATOR,
-                                                false);
+                ___ieee80211_stop_tx_ba_session(sta, tid, AGG_STOP_DECLINED);
         }
 
  out:
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 47e0aca614b7..661b878bd19c 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -164,7 +164,17 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
                         sta = sta_info_get(sdata, mac_addr);
                 else
                         sta = sta_info_get_bss(sdata, mac_addr);
-                if (!sta) {
+                /*
+                 * The ASSOC test makes sure the driver is ready to
+                 * receive the key. When wpa_supplicant has roamed
+                 * using FT, it attempts to set the key before
+                 * association has completed, this rejects that attempt
+                 * so it will set the key again after assocation.
+                 *
+                 * TODO: accept the key if we have a station entry and
+                 *       add it to the device after the station.
+                 */
+                if (!sta || !test_sta_flag(sta, WLAN_STA_ASSOC)) {
                         ieee80211_key_free(sdata->local, key);
                         err = -ENOENT;
                         goto out_unlock;
@@ -510,6 +520,7 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
                                 BIT(NL80211_STA_FLAG_WME) |
                                 BIT(NL80211_STA_FLAG_MFP) |
                                 BIT(NL80211_STA_FLAG_AUTHENTICATED) |
+                                BIT(NL80211_STA_FLAG_ASSOCIATED) |
                                 BIT(NL80211_STA_FLAG_TDLS_PEER);
         if (test_sta_flag(sta, WLAN_STA_AUTHORIZED))
                 sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_AUTHORIZED);
@@ -521,6 +532,8 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
                 sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_MFP);
         if (test_sta_flag(sta, WLAN_STA_AUTH))
                 sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_AUTHENTICATED);
+        if (test_sta_flag(sta, WLAN_STA_ASSOC))
+                sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_ASSOCIATED);
         if (test_sta_flag(sta, WLAN_STA_TDLS_PEER))
                 sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_TDLS_PEER);
 }
@@ -930,6 +943,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
 
         sdata->vif.bss_conf.beacon_int = params->beacon_interval;
         sdata->vif.bss_conf.dtim_period = params->dtim_period;
+        sdata->vif.bss_conf.enable_beacon = true;
 
         sdata->vif.bss_conf.ssid_len = params->ssid_len;
         if (params->ssid_len)
@@ -1010,8 +1024,15 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
                 kfree_rcu(old_probe_resp, rcu_head);
 
         list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
-                sta_info_flush(local, vlan);
-        sta_info_flush(local, sdata);
+                sta_info_flush_defer(vlan);
+        sta_info_flush_defer(sdata);
+        rcu_barrier();
+        list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
+                sta_info_flush_cleanup(vlan);
+        sta_info_flush_cleanup(sdata);
+
+        sdata->vif.bss_conf.enable_beacon = false;
+        clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);
         ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
 
         drv_stop_ap(sdata->local, sdata);
@@ -1069,6 +1090,58 @@ static void ieee80211_send_layer2_update(struct sta_info *sta)
         netif_rx_ni(skb);
 }
 
+static int sta_apply_auth_flags(struct ieee80211_local *local,
+                                struct sta_info *sta,
+                                u32 mask, u32 set)
+{
+        int ret;
+
+        if (mask & BIT(NL80211_STA_FLAG_AUTHENTICATED) &&
+            set & BIT(NL80211_STA_FLAG_AUTHENTICATED) &&
+            !test_sta_flag(sta, WLAN_STA_AUTH)) {
+                ret = sta_info_move_state(sta, IEEE80211_STA_AUTH);
+                if (ret)
+                        return ret;
+        }
+
+        if (mask & BIT(NL80211_STA_FLAG_ASSOCIATED) &&
+            set & BIT(NL80211_STA_FLAG_ASSOCIATED) &&
+            !test_sta_flag(sta, WLAN_STA_ASSOC)) {
+                ret = sta_info_move_state(sta, IEEE80211_STA_ASSOC);
+                if (ret)
+                        return ret;
+        }
+
+        if (mask & BIT(NL80211_STA_FLAG_AUTHORIZED)) {
+                if (set & BIT(NL80211_STA_FLAG_AUTHORIZED))
+                        ret = sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
+                else if (test_sta_flag(sta, WLAN_STA_AUTHORIZED))
+                        ret = sta_info_move_state(sta, IEEE80211_STA_ASSOC);
+                else
+                        ret = 0;
+                if (ret)
+                        return ret;
+        }
+
+        if (mask & BIT(NL80211_STA_FLAG_ASSOCIATED) &&
+            !(set & BIT(NL80211_STA_FLAG_ASSOCIATED)) &&
+            test_sta_flag(sta, WLAN_STA_ASSOC)) {
+                ret = sta_info_move_state(sta, IEEE80211_STA_AUTH);
+                if (ret)
+                        return ret;
+        }
+
+        if (mask & BIT(NL80211_STA_FLAG_AUTHENTICATED) &&
+            !(set & BIT(NL80211_STA_FLAG_AUTHENTICATED)) &&
+            test_sta_flag(sta, WLAN_STA_AUTH)) {
+                ret = sta_info_move_state(sta, IEEE80211_STA_NONE);
+                if (ret)
+                        return ret;
+        }
+
+        return 0;
+}
+
 static int sta_apply_parameters(struct ieee80211_local *local,
                                 struct sta_info *sta,
                                 struct station_parameters *params)
@@ -1086,52 +1159,20 @@ static int sta_apply_parameters(struct ieee80211_local *local,
         mask = params->sta_flags_mask;
         set = params->sta_flags_set;
 
-        /*
-         * In mesh mode, we can clear AUTHENTICATED flag but must
-         * also make ASSOCIATED follow appropriately for the driver
-         * API. See also below, after AUTHORIZED changes.
-         */
-        if (mask & BIT(NL80211_STA_FLAG_AUTHENTICATED)) {
-                /* cfg80211 should not allow this in non-mesh modes */
-                if (WARN_ON(!ieee80211_vif_is_mesh(&sdata->vif)))
-                        return -EINVAL;
-
-                if (set & BIT(NL80211_STA_FLAG_AUTHENTICATED) &&
-                    !test_sta_flag(sta, WLAN_STA_AUTH)) {
-                        ret = sta_info_move_state(sta, IEEE80211_STA_AUTH);
-                        if (ret)
-                                return ret;
-                        ret = sta_info_move_state(sta, IEEE80211_STA_ASSOC);
-                        if (ret)
-                                return ret;
-                }
-        }
-
-        if (mask & BIT(NL80211_STA_FLAG_AUTHORIZED)) {
-                if (set & BIT(NL80211_STA_FLAG_AUTHORIZED))
-                        ret = sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
-                else if (test_sta_flag(sta, WLAN_STA_AUTHORIZED))
-                        ret = sta_info_move_state(sta, IEEE80211_STA_ASSOC);
-                if (ret)
-                        return ret;
-        }
-
-        if (mask & BIT(NL80211_STA_FLAG_AUTHENTICATED)) {
-                /* cfg80211 should not allow this in non-mesh modes */
-                if (WARN_ON(!ieee80211_vif_is_mesh(&sdata->vif)))
-                        return -EINVAL;
-
-                if (!(set & BIT(NL80211_STA_FLAG_AUTHENTICATED)) &&
-                    test_sta_flag(sta, WLAN_STA_AUTH)) {
-                        ret = sta_info_move_state(sta, IEEE80211_STA_AUTH);
-                        if (ret)
-                                return ret;
-                        ret = sta_info_move_state(sta, IEEE80211_STA_NONE);
-                        if (ret)
-                                return ret;
-                }
+        if (ieee80211_vif_is_mesh(&sdata->vif)) {
+                /*
+                 * In mesh mode, ASSOCIATED isn't part of the nl80211
+                 * API but must follow AUTHENTICATED for driver state.
+                 */
+                if (mask & BIT(NL80211_STA_FLAG_AUTHENTICATED))
+                        mask |= BIT(NL80211_STA_FLAG_ASSOCIATED);
+                if (set & BIT(NL80211_STA_FLAG_AUTHENTICATED))
+                        set |= BIT(NL80211_STA_FLAG_ASSOCIATED);
         }
 
+        ret = sta_apply_auth_flags(local, sta, mask, set);
+        if (ret)
+                return ret;
 
         if (mask & BIT(NL80211_STA_FLAG_SHORT_PREAMBLE)) {
                 if (set & BIT(NL80211_STA_FLAG_SHORT_PREAMBLE))
@@ -1177,10 +1218,11 @@ static int sta_apply_parameters(struct ieee80211_local *local,
                 sta->sta.aid = params->aid;
 
         /*
-         * FIXME: updating the following information is racy when this
-         *        function is called from ieee80211_change_station().
-         *        However, all this information should be static so
-         *        maybe we should just reject attemps to change it.
+         * Some of the following updates would be racy if called on an
+         * existing station, via ieee80211_change_station(). However,
+         * all such changes are rejected by cfg80211 except for updates
+         * changing the supported rates on an existing but not yet used
+         * TDLS peer.
          */
 
         if (params->listen_interval >= 0)
@@ -1211,18 +1253,33 @@ static int sta_apply_parameters(struct ieee80211_local *local,
 
         if (ieee80211_vif_is_mesh(&sdata->vif)) {
 #ifdef CONFIG_MAC80211_MESH
-                if (sdata->u.mesh.security & IEEE80211_MESH_SEC_SECURED)
+                if (sdata->u.mesh.security & IEEE80211_MESH_SEC_SECURED) {
+                        u32 changed = 0;
+
                         switch (params->plink_state) {
-                        case NL80211_PLINK_LISTEN:
                         case NL80211_PLINK_ESTAB:
+                                if (sta->plink_state != NL80211_PLINK_ESTAB)
+                                        changed = mesh_plink_inc_estab_count(
+                                                        sdata);
+                                sta->plink_state = params->plink_state;
+                                break;
+                        case NL80211_PLINK_LISTEN:
                         case NL80211_PLINK_BLOCKED:
+                        case NL80211_PLINK_OPN_SNT:
+                        case NL80211_PLINK_OPN_RCVD:
+                        case NL80211_PLINK_CNF_RCVD:
+                        case NL80211_PLINK_HOLDING:
+                                if (sta->plink_state == NL80211_PLINK_ESTAB)
+                                        changed = mesh_plink_dec_estab_count(
+                                                        sdata);
                                 sta->plink_state = params->plink_state;
                                 break;
                         default:
                                 /*  nothing  */
                                 break;
                         }
-                else
+                        ieee80211_bss_info_change_notify(sdata, changed);
+                } else {
                         switch (params->plink_action) {
                         case PLINK_ACTION_OPEN:
                                 mesh_plink_open(sta);
@@ -1231,6 +1288,7 @@ static int sta_apply_parameters(struct ieee80211_local *local,
                                 mesh_plink_block(sta);
                                 break;
                         }
+                }
 #endif
         }
 
@@ -1265,6 +1323,10 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
         if (!sta)
                 return -ENOMEM;
 
+        /*
+         * defaults -- if userspace wants something else we'll
+         * change it accordingly in sta_apply_parameters()
+         */
         sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
         sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
 
@@ -1301,7 +1363,6 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
 static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev,
                                  u8 *mac)
 {
-        struct ieee80211_local *local = wiphy_priv(wiphy);
         struct ieee80211_sub_if_data *sdata;
 
         sdata = IEEE80211_DEV_TO_SUB_IF(dev);
@@ -1309,7 +1370,7 @@ static int ieee80211_del_station(struct wiphy *wiphy, struct net_device *dev,
         if (mac)
                 return sta_info_destroy_addr_bss(sdata, mac);
 
-        sta_info_flush(local, sdata);
+        sta_info_flush(sdata);
         return 0;
 }
 
@@ -1615,6 +1676,9 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh,
         memcpy(sdata->vif.bss_conf.mcast_rate, setup->mcast_rate,
                                                 sizeof(setup->mcast_rate));
 
+        sdata->vif.bss_conf.beacon_int = setup->beacon_interval;
+        sdata->vif.bss_conf.dtim_period = setup->dtim_period;
+
         return 0;
 }
 
@@ -2197,7 +2261,8 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
 
-        if (sdata->vif.type != NL80211_IFTYPE_STATION)
+        if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+            sdata->vif.type != NL80211_IFTYPE_MESH_POINT)
                 return -EOPNOTSUPP;
 
         if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_PS))
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 80e55527504b..1bfe0a8b19d2 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -381,7 +381,8 @@ void ieee80211_iter_chan_contexts_atomic(
 
         rcu_read_lock();
         list_for_each_entry_rcu(ctx, &local->chanctx_list, list)
-                iter(hw, &ctx->conf, iter_data);
+                if (ctx->driver_present)
+                        iter(hw, &ctx->conf, iter_data);
         rcu_read_unlock();
 }
 EXPORT_SYMBOL_GPL(ieee80211_iter_chan_contexts_atomic);
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 698dc7e6f309..0c07f94c5378 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -207,6 +207,14 @@ static inline void drv_bss_info_changed(struct ieee80211_local *local,
 {
         might_sleep();
 
+        WARN_ON_ONCE(changed & (BSS_CHANGED_BEACON |
+                                BSS_CHANGED_BEACON_ENABLED) &&
+                     sdata->vif.type != NL80211_IFTYPE_AP &&
+                     sdata->vif.type != NL80211_IFTYPE_ADHOC &&
+                     sdata->vif.type != NL80211_IFTYPE_MESH_POINT);
+        WARN_ON_ONCE(sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE &&
+                     changed & ~BSS_CHANGED_IDLE);
+
         check_sdata_in_driver(sdata);
 
         trace_drv_bss_info_changed(local, sdata, info, changed);
@@ -913,6 +921,8 @@ static inline int drv_add_chanctx(struct ieee80211_local *local,
         if (local->ops->add_chanctx)
                 ret = local->ops->add_chanctx(&local->hw, &ctx->conf);
         trace_drv_return_int(local, ret);
+        if (!ret)
+                ctx->driver_present = true;
 
         return ret;
 }
@@ -924,6 +934,7 @@ static inline void drv_remove_chanctx(struct ieee80211_local *local,
         if (local->ops->remove_chanctx)
                 local->ops->remove_chanctx(&local->hw, &ctx->conf);
         trace_drv_return_void(local);
+        ctx->driver_present = false;
 }
 
 static inline void drv_change_chanctx(struct ieee80211_local *local,
@@ -931,8 +942,10 @@ static inline void drv_change_chanctx(struct ieee80211_local *local,
                                       u32 changed)
 {
         trace_drv_change_chanctx(local, ctx, changed);
-        if (local->ops->change_chanctx)
+        if (local->ops->change_chanctx) {
+                WARN_ON_ONCE(!ctx->driver_present);
                 local->ops->change_chanctx(&local->hw, &ctx->conf, changed);
+        }
         trace_drv_return_void(local);
 }
 
@@ -945,10 +958,12 @@ static inline int drv_assign_vif_chanctx(struct ieee80211_local *local,
         check_sdata_in_driver(sdata);
 
         trace_drv_assign_vif_chanctx(local, sdata, ctx);
-        if (local->ops->assign_vif_chanctx)
+        if (local->ops->assign_vif_chanctx) {
+                WARN_ON_ONCE(!ctx->driver_present);
                 ret = local->ops->assign_vif_chanctx(&local->hw,
                                                      &sdata->vif,
                                                      &ctx->conf);
+        }
         trace_drv_return_int(local, ret);
 
         return ret;
@@ -961,10 +976,12 @@ static inline void drv_unassign_vif_chanctx(struct ieee80211_local *local,
         check_sdata_in_driver(sdata);
 
         trace_drv_unassign_vif_chanctx(local, sdata, ctx);
-        if (local->ops->unassign_vif_chanctx)
+        if (local->ops->unassign_vif_chanctx) {
+                WARN_ON_ONCE(!ctx->driver_present);
                 local->ops->unassign_vif_chanctx(&local->hw,
                                                  &sdata->vif,
                                                  &ctx->conf);
+        }
         trace_drv_return_void(local);
 }
 
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index a71d891794a4..61ac7c48ac0c 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -62,6 +62,9 @@ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata,
         __check_htcap_disable(sdata, ht_cap, IEEE80211_HT_CAP_SUP_WIDTH_20_40);
         __check_htcap_disable(sdata, ht_cap, IEEE80211_HT_CAP_SGI_40);
 
+        /* Allow user to disable SGI-20 (SGI-40 is handled above) */
+        __check_htcap_disable(sdata, ht_cap, IEEE80211_HT_CAP_SGI_20);
+
         /* Allow user to disable the max-AMSDU bit. */
         __check_htcap_disable(sdata, ht_cap, IEEE80211_HT_CAP_MAX_AMSDU);
 
@@ -117,6 +120,21 @@ void ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_sub_if_data *sdata,
                    IEEE80211_HT_CAP_SGI_20 |
                    IEEE80211_HT_CAP_SGI_40 |
                    IEEE80211_HT_CAP_DSSSCCK40));
+
+        /* Unset 40 MHz if we're not using a 40 MHz channel */
+        switch (sdata->vif.bss_conf.chandef.width) {
+        case NL80211_CHAN_WIDTH_20_NOHT:
+        case NL80211_CHAN_WIDTH_20:
+                ht_cap->cap &= ~IEEE80211_HT_CAP_SGI_40;
+                ht_cap->cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+                break;
+        case NL80211_CHAN_WIDTH_40:
+        case NL80211_CHAN_WIDTH_80:
+        case NL80211_CHAN_WIDTH_80P80:
+        case NL80211_CHAN_WIDTH_160:
+                break;
+        }
+
         /*
          * The STBC bits are asymmetric -- if we don't have
          * TX then mask out the peer's RX and vice versa.
@@ -179,16 +197,19 @@ void ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_sub_if_data *sdata,
         ieee80211_apply_htcap_overrides(sdata, ht_cap);
 }
 
-void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta, bool tx)
+void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta,
+                                         enum ieee80211_agg_stop_reason reason)
 {
         int i;
 
         cancel_work_sync(&sta->ampdu_mlme.work);
 
         for (i = 0; i <  IEEE80211_NUM_TIDS; i++) {
-                __ieee80211_stop_tx_ba_session(sta, i, WLAN_BACK_INITIATOR, tx);
+                __ieee80211_stop_tx_ba_session(sta, i, reason);
                 __ieee80211_stop_rx_ba_session(sta, i, WLAN_BACK_RECIPIENT,
-                                               WLAN_REASON_QSTA_LEAVE_QBSS, tx);
+                                               WLAN_REASON_QSTA_LEAVE_QBSS,
+                                               reason != AGG_STOP_DESTROY_STA &&
+                                               reason != AGG_STOP_PEER_REQUEST);
         }
 }
 
@@ -245,8 +266,7 @@ void ieee80211_ba_session_work(struct work_struct *work)
                 if (tid_tx && test_and_clear_bit(HT_AGG_STATE_WANT_STOP,
                                                  &tid_tx->state))
                         ___ieee80211_stop_tx_ba_session(sta, tid,
-                                                        WLAN_BACK_INITIATOR,
-                                                        true);
+                                                        AGG_STOP_LOCAL_REQUEST);
         }
         mutex_unlock(&sta->ampdu_mlme.mtx);
 }
@@ -314,8 +334,7 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
                 __ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_INITIATOR, 0,
                                                true);
         else
-                __ieee80211_stop_tx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,
-                                               true);
+                __ieee80211_stop_tx_ba_session(sta, tid, AGG_STOP_PEER_REQUEST);
 }
 
 int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata,
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 6b7644e818d8..b4b866f41919 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -67,7 +67,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
         skb_reserve(skb, sdata->local->hw.extra_tx_headroom);
 
         if (!ether_addr_equal(ifibss->bssid, bssid))
-                sta_info_flush(sdata->local, sdata);
+                sta_info_flush(sdata);
 
         /* if merging, indicate to driver that we leave the old IBSS */
         if (sdata->vif.bss_conf.ibss_joined) {
@@ -191,6 +191,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
 
         rcu_assign_pointer(ifibss->presp, skb);
 
+        sdata->vif.bss_conf.enable_beacon = true;
         sdata->vif.bss_conf.beacon_int = beacon_int;
         sdata->vif.bss_conf.basic_rates = basic_rates;
         bss_change = BSS_CHANGED_BEACON_INT;
@@ -425,11 +426,9 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
 }
 
 static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
-                                  struct ieee80211_mgmt *mgmt,
-                                  size_t len,
+                                  struct ieee80211_mgmt *mgmt, size_t len,
                                   struct ieee80211_rx_status *rx_status,
-                                  struct ieee802_11_elems *elems,
-                                  bool beacon)
+                                  struct ieee802_11_elems *elems)
 {
         struct ieee80211_local *local = sdata->local;
         int freq;
@@ -530,7 +529,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
         }
 
         bss = ieee80211_bss_info_update(local, rx_status, mgmt, len, elems,
-                                        channel, beacon);
+                                        channel);
         if (!bss)
                 return;
 
@@ -877,14 +876,21 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
         ieee80211_tx_skb(sdata, skb);
 }
 
-static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
-                                         struct ieee80211_mgmt *mgmt,
-                                         size_t len,
-                                         struct ieee80211_rx_status *rx_status)
+static
+void ieee80211_rx_mgmt_probe_beacon(struct ieee80211_sub_if_data *sdata,
+                                    struct ieee80211_mgmt *mgmt, size_t len,
+                                    struct ieee80211_rx_status *rx_status)
 {
         size_t baselen;
         struct ieee802_11_elems elems;
 
+        BUILD_BUG_ON(offsetof(typeof(mgmt->u.probe_resp), variable) !=
+                     offsetof(typeof(mgmt->u.beacon), variable));
+
+        /*
+         * either beacon or probe_resp but the variable field is at the
+         * same offset
+         */
         baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
         if (baselen > len)
                 return;
@@ -892,25 +898,7 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
         ieee802_11_parse_elems(mgmt->u.probe_resp.variable, len - baselen,
                                 &elems);
 
-        ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems, false);
-}
-
-static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
-                                     struct ieee80211_mgmt *mgmt,
-                                     size_t len,
-                                     struct ieee80211_rx_status *rx_status)
-{
-        size_t baselen;
-        struct ieee802_11_elems elems;
-
-        /* Process beacon from the current BSS */
-        baselen = (u8 *) mgmt->u.beacon.variable - (u8 *) mgmt;
-        if (baselen > len)
-                return;
-
-        ieee802_11_parse_elems(mgmt->u.beacon.variable, len - baselen, &elems);
-
-        ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems, true);
+        ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems);
 }
 
 void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
@@ -934,12 +922,9 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
                 ieee80211_rx_mgmt_probe_req(sdata, skb);
                 break;
         case IEEE80211_STYPE_PROBE_RESP:
-                ieee80211_rx_mgmt_probe_resp(sdata, mgmt, skb->len,
-                                             rx_status);
-                break;
         case IEEE80211_STYPE_BEACON:
-                ieee80211_rx_mgmt_beacon(sdata, mgmt, skb->len,
-                                         rx_status);
+                ieee80211_rx_mgmt_probe_beacon(sdata, mgmt, skb->len,
+                                               rx_status);
                 break;
         case IEEE80211_STYPE_AUTH:
                 ieee80211_rx_mgmt_auth_ibss(sdata, mgmt, skb->len);
@@ -1182,7 +1167,7 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
         memset(ifibss->bssid, 0, ETH_ALEN);
         ifibss->ssid_len = 0;
 
-        sta_info_flush(sdata->local, sdata);
+        sta_info_flush(sdata);
 
         spin_lock_bh(&ifibss->incomplete_lock);
         while (!list_empty(&ifibss->incomplete_stations)) {
@@ -1205,6 +1190,8 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
         RCU_INIT_POINTER(sdata->u.ibss.presp, NULL);
         sdata->vif.bss_conf.ibss_joined = false;
         sdata->vif.bss_conf.ibss_creator = false;
+        sdata->vif.bss_conf.enable_beacon = false;
+        clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);
         ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED |
                                                 BSS_CHANGED_IBSS);
         synchronize_rcu();
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 8563b9a5cac3..63f0430c131e 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -405,6 +405,8 @@ struct ieee80211_mgd_assoc_data {
 
         u8 ap_ht_param;
 
+        struct ieee80211_vht_cap ap_vht_cap;
+
         size_t ie_len;
         u8 ie[];
 };
@@ -659,10 +661,13 @@ enum ieee80211_sub_if_data_flags {
  *      change handling while the interface is up
  * @SDATA_STATE_OFFCHANNEL: This interface is currently in offchannel
  *      mode, so queues are stopped
+ * @SDATA_STATE_OFFCHANNEL_BEACON_STOPPED: Beaconing was stopped due
+ *      to offchannel, reset when offchannel returns
  */
 enum ieee80211_sdata_state_bits {
         SDATA_STATE_RUNNING,
         SDATA_STATE_OFFCHANNEL,
+        SDATA_STATE_OFFCHANNEL_BEACON_STOPPED,
 };
 
 /**
@@ -685,6 +690,7 @@ struct ieee80211_chanctx {
 
         enum ieee80211_chanctx_mode mode;
         int refcount;
+        bool driver_present;
 
         struct ieee80211_chanctx_conf conf;
 };
@@ -783,6 +789,11 @@ struct ieee80211_sub_if_data {
                 struct dentry *default_mgmt_key;
         } debugfs;
 #endif
+
+#ifdef CONFIG_PM
+        struct ieee80211_bss_conf suspend_bss_conf;
+#endif
+
         /* must be last, dynamically sized area in this! */
         struct ieee80211_vif vif;
 };
@@ -1346,8 +1357,7 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
                           struct ieee80211_mgmt *mgmt,
                           size_t len,
                           struct ieee802_11_elems *elems,
-                          struct ieee80211_channel *channel,
-                          bool beacon);
+                          struct ieee80211_channel *channel);
 void ieee80211_rx_bss_put(struct ieee80211_local *local,
                           struct ieee80211_bss *bss);
 
@@ -1358,10 +1368,8 @@ int ieee80211_request_sched_scan_stop(struct ieee80211_sub_if_data *sdata);
 void ieee80211_sched_scan_stopped_work(struct work_struct *work);
 
 /* off-channel helpers */
-void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,
-                                    bool offchannel_ps_enable);
-void ieee80211_offchannel_return(struct ieee80211_local *local,
-                                 bool offchannel_ps_disable);
+void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local);
+void ieee80211_offchannel_return(struct ieee80211_local *local);
 void ieee80211_roc_setup(struct ieee80211_local *local);
 void ieee80211_start_next_roc(struct ieee80211_local *local);
 void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata);
@@ -1422,7 +1430,8 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
                                      u16 initiator, u16 reason, bool stop);
 void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
                                     u16 initiator, u16 reason, bool stop);
-void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta, bool tx);
+void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta,
+                                         enum ieee80211_agg_stop_reason reason);
 void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
                              struct sta_info *sta,
                              struct ieee80211_mgmt *mgmt, size_t len);
@@ -1436,11 +1445,9 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
                                      size_t len);
 
 int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
-                                   enum ieee80211_back_parties initiator,
-                                   bool tx);
+                                   enum ieee80211_agg_stop_reason reason);
 int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
-                                    enum ieee80211_back_parties initiator,
-                                    bool tx);
+                                    enum ieee80211_agg_stop_reason reason);
 void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid);
 void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid);
 void ieee80211_ba_session_work(struct work_struct *work);
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 8be854e86cd9..06fac2991d40 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -747,7 +747,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
         unsigned long flags;
         struct sk_buff *skb, *tmp;
         u32 hw_reconf_flags = 0;
-        int i;
+        int i, flushed;
 
         clear_bit(SDATA_STATE_RUNNING, &sdata->state);
 
@@ -772,11 +772,15 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
          * (because if we remove a STA after ops->remove_interface()
          * the driver will have removed the vif info already!)
          *
-         * This is relevant only in AP, WDS and mesh modes, since in
-         * all other modes we've already removed all stations when
-         * disconnecting etc.
+         * This is relevant only in WDS mode, in all other modes we've
+         * already removed all stations when disconnecting or similar,
+         * so warn otherwise.
+         *
+         * We call sta_info_flush_cleanup() later, to combine RCU waits.
          */
-        sta_info_flush(local, sdata);
+        flushed = sta_info_flush_defer(sdata);
+        WARN_ON_ONCE((sdata->vif.type != NL80211_IFTYPE_WDS && flushed > 0) ||
+                     (sdata->vif.type == NL80211_IFTYPE_WDS && flushed != 1));
 
         /*
          * Don't count this interface for promisc/allmulti while it
@@ -859,11 +863,17 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
                 cancel_work_sync(&sdata->work);
                 /*
                  * When we get here, the interface is marked down.
-                 * Call synchronize_rcu() to wait for the RX path
-                 * should it be using the interface and enqueuing
-                 * frames at this very time on another CPU.
+                 *
+                 * sta_info_flush_cleanup() requires rcu_barrier()
+                 * first to wait for the station call_rcu() calls
+                 * to complete, here we need at least sychronize_rcu()
+                 * it to wait for the RX path in case it is using the
+                 * interface and enqueuing frames at this very time on
+                 * another CPU.
                  */
-                synchronize_rcu();
+                rcu_barrier();
+                sta_info_flush_cleanup(sdata);
+
                 skb_queue_purge(&sdata->skb_queue);
 
                 /*
@@ -961,7 +971,6 @@ static void ieee80211_set_multicast_list(struct net_device *dev)
  */
 static void ieee80211_teardown_sdata(struct ieee80211_sub_if_data *sdata)
 {
-        struct ieee80211_local *local = sdata->local;
         int flushed;
         int i;
 
@@ -977,7 +986,7 @@ static void ieee80211_teardown_sdata(struct ieee80211_sub_if_data *sdata)
         if (ieee80211_vif_is_mesh(&sdata->vif))
                 mesh_rmc_free(sdata);
 
-        flushed = sta_info_flush(local, sdata);
+        flushed = sta_info_flush(sdata);
         WARN_ON(flushed);
 }
 
@@ -1218,6 +1227,7 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
         case NL80211_IFTYPE_AP:
                 skb_queue_head_init(&sdata->u.ap.ps.bc_buf);
                 INIT_LIST_HEAD(&sdata->u.ap.vlans);
+                sdata->vif.bss_conf.bssid = sdata->vif.addr;
                 break;
         case NL80211_IFTYPE_P2P_CLIENT:
                 type = NL80211_IFTYPE_STATION;
@@ -1225,9 +1235,11 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
                 sdata->vif.p2p = true;
                 /* fall through */
         case NL80211_IFTYPE_STATION:
+                sdata->vif.bss_conf.bssid = sdata->u.mgd.bssid;
                 ieee80211_sta_setup_sdata(sdata);
                 break;
         case NL80211_IFTYPE_ADHOC:
+                sdata->vif.bss_conf.bssid = sdata->u.ibss.bssid;
                 ieee80211_ibss_setup_sdata(sdata);
                 break;
         case NL80211_IFTYPE_MESH_POINT:
@@ -1241,8 +1253,12 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
                                       MONITOR_FLAG_OTHER_BSS;
                 break;
         case NL80211_IFTYPE_WDS:
+                sdata->vif.bss_conf.bssid = NULL;
+                break;
         case NL80211_IFTYPE_AP_VLAN:
+                break;
         case NL80211_IFTYPE_P2P_DEVICE:
+                sdata->vif.bss_conf.bssid = sdata->vif.addr;
                 break;
         case NL80211_IFTYPE_UNSPECIFIED:
         case NUM_NL80211_IFTYPES:
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 1b087fff93e7..39cfe8f10ad2 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -207,76 +207,10 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
                                       u32 changed)
 {
         struct ieee80211_local *local = sdata->local;
-        static const u8 zero[ETH_ALEN] = { 0 };
 
         if (!changed)
                 return;
 
-        if (sdata->vif.type == NL80211_IFTYPE_STATION) {
-                sdata->vif.bss_conf.bssid = sdata->u.mgd.bssid;
-        } else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
-                sdata->vif.bss_conf.bssid = sdata->u.ibss.bssid;
-        else if (sdata->vif.type == NL80211_IFTYPE_AP)
-                sdata->vif.bss_conf.bssid = sdata->vif.addr;
-        else if (sdata->vif.type == NL80211_IFTYPE_WDS)
-                sdata->vif.bss_conf.bssid = NULL;
-        else if (ieee80211_vif_is_mesh(&sdata->vif)) {
-                sdata->vif.bss_conf.bssid = zero;
-        } else if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE) {
-                sdata->vif.bss_conf.bssid = sdata->vif.addr;
-                WARN_ONCE(changed & ~(BSS_CHANGED_IDLE),
-                          "P2P Device BSS changed %#x", changed);
-        } else {
-                WARN_ON(1);
-                return;
-        }
-
-        switch (sdata->vif.type) {
-        case NL80211_IFTYPE_AP:
-        case NL80211_IFTYPE_ADHOC:
-        case NL80211_IFTYPE_WDS:
-        case NL80211_IFTYPE_MESH_POINT:
-                break;
-        default:
-                /* do not warn to simplify caller in scan.c */
-                changed &= ~BSS_CHANGED_BEACON_ENABLED;
-                if (WARN_ON(changed & BSS_CHANGED_BEACON))
-                        return;
-                break;
-        }
-
-        if (changed & BSS_CHANGED_BEACON_ENABLED) {
-                if (local->quiescing || !ieee80211_sdata_running(sdata) ||
-                    test_bit(SDATA_STATE_OFFCHANNEL, &sdata->state)) {
-                        sdata->vif.bss_conf.enable_beacon = false;
-                } else {
-                        /*
-                         * Beacon should be enabled, but AP mode must
-                         * check whether there is a beacon configured.
-                         */
-                        switch (sdata->vif.type) {
-                        case NL80211_IFTYPE_AP:
-                                sdata->vif.bss_conf.enable_beacon =
-                                        !!sdata->u.ap.beacon;
-                                break;
-                        case NL80211_IFTYPE_ADHOC:
-                                sdata->vif.bss_conf.enable_beacon =
-                                        !!sdata->u.ibss.presp;
-                                break;
-#ifdef CONFIG_MAC80211_MESH
-                        case NL80211_IFTYPE_MESH_POINT:
-                                sdata->vif.bss_conf.enable_beacon =
-                                        !!sdata->u.mesh.mesh_id_len;
-                                break;
-#endif
-                        default:
-                                /* not reached */
-                                WARN_ON(1);
-                                break;
-                        }
-                }
-        }
-
         drv_bss_info_changed(local, sdata, &sdata->vif.bss_conf, changed);
 }
 
@@ -537,6 +471,7 @@ static const struct ieee80211_ht_cap mac80211_ht_capa_mod_mask = {
 
         .cap_info = cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40 |
                                 IEEE80211_HT_CAP_MAX_AMSDU |
+                                IEEE80211_HT_CAP_SGI_20 |
                                 IEEE80211_HT_CAP_SGI_40),
         .mcs = {
                 .rx_mask = { 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -606,7 +541,8 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
         wiphy->features |= NL80211_FEATURE_SK_TX_STATUS |
                            NL80211_FEATURE_SAE |
                            NL80211_FEATURE_HT_IBSS |
-                           NL80211_FEATURE_VIF_TXPOWER;
+                           NL80211_FEATURE_VIF_TXPOWER |
+                           NL80211_FEATURE_FULL_AP_CLIENT_STATE;
 
         if (!ops->hw_scan)
                 wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN |
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 649ad513547f..694e27376afa 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -20,16 +20,11 @@
 int mesh_allocated;
 static struct kmem_cache *rm_cache;
 
-#ifdef CONFIG_MAC80211_MESH
 bool mesh_action_is_path_sel(struct ieee80211_mgmt *mgmt)
 {
         return (mgmt->u.action.u.mesh_action.action_code ==
                         WLAN_MESH_ACTION_HWMP_PATH_SELECTION);
 }
-#else
-bool mesh_action_is_path_sel(struct ieee80211_mgmt *mgmt)
-{ return false; }
-#endif
 
 void ieee80211s_init(void)
 {
@@ -607,6 +602,12 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
         struct ieee80211_local *local = sdata->local;
+        u32 changed = BSS_CHANGED_BEACON |
+                      BSS_CHANGED_BEACON_ENABLED |
+                      BSS_CHANGED_HT |
+                      BSS_CHANGED_BASIC_RATES |
+                      BSS_CHANGED_BEACON_INT;
+        enum ieee80211_band band = ieee80211_get_sdata_band(sdata);
 
         local->fif_other_bss++;
         /* mesh ifaces must set allmulti to forward mcast traffic */
@@ -624,15 +625,16 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)
         ieee80211_queue_work(&local->hw, &sdata->work);
         sdata->vif.bss_conf.ht_operation_mode =
                                 ifmsh->mshcfg.ht_opmode;
-        sdata->vif.bss_conf.beacon_int = MESH_DEFAULT_BEACON_INTERVAL;
+        sdata->vif.bss_conf.enable_beacon = true;
         sdata->vif.bss_conf.basic_rates =
-                ieee80211_mandatory_rates(sdata->local,
-                                          ieee80211_get_sdata_band(sdata));
-        ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON |
-                                                BSS_CHANGED_BEACON_ENABLED |
-                                                BSS_CHANGED_HT |
-                                                BSS_CHANGED_BASIC_RATES |
-                                                BSS_CHANGED_BEACON_INT);
+                ieee80211_mandatory_rates(local, band);
+
+        if (band == IEEE80211_BAND_5GHZ) {
+                sdata->vif.bss_conf.use_short_slot = true;
+                changed |= BSS_CHANGED_ERP_SLOT;
+        }
+
+        ieee80211_bss_info_change_notify(sdata, changed);
 
         netif_carrier_on(sdata->dev);
 }
@@ -646,10 +648,12 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
 
         /* stop the beacon */
         ifmsh->mesh_id_len = 0;
+        sdata->vif.bss_conf.enable_beacon = false;
+        clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);
         ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
 
         /* flush STAs and mpaths on this iface */
-        sta_info_flush(sdata->local, sdata);
+        sta_info_flush(sdata);
         mesh_path_flush_by_iface(sdata);
 
         del_timer_sync(&sdata->u.mesh.housekeeping_timer);
@@ -805,6 +809,7 @@ void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local)
 void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
+        static u8 zero_addr[ETH_ALEN] = {};
 
         setup_timer(&ifmsh->housekeeping_timer,
                     ieee80211_mesh_housekeeping_timer,
@@ -830,4 +835,6 @@ void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)
         INIT_LIST_HEAD(&ifmsh->preq_queue.list);
         spin_lock_init(&ifmsh->mesh_preq_queue_lock);
         spin_lock_init(&ifmsh->sync_offset_lock);
+
+        sdata->vif.bss_conf.bssid = zero_addr;
 }
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index 84c28c6101cd..aff301544c7f 100644
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -191,8 +191,6 @@ struct mesh_rmc {
 #define IEEE80211_MESH_PEER_INACTIVITY_LIMIT (1800 * HZ)
 #define IEEE80211_MESH_HOUSEKEEPING_INTERVAL (60 * HZ)
 
-#define MESH_DEFAULT_BEACON_INTERVAL            1000    /* in 1024 us units */
-
 #define MESH_PATH_EXPIRE (600 * HZ)
 
 /* Default maximum number of plinks per interface */
@@ -307,6 +305,20 @@ extern int mesh_paths_generation;
 #ifdef CONFIG_MAC80211_MESH
 extern int mesh_allocated;
 
+static inline
+u32 mesh_plink_inc_estab_count(struct ieee80211_sub_if_data *sdata)
+{
+        atomic_inc(&sdata->u.mesh.estab_plinks);
+        return mesh_accept_plinks_update(sdata);
+}
+
+static inline
+u32 mesh_plink_dec_estab_count(struct ieee80211_sub_if_data *sdata)
+{
+        atomic_dec(&sdata->u.mesh.estab_plinks);
+        return mesh_accept_plinks_update(sdata);
+}
+
 static inline int mesh_plink_free_count(struct ieee80211_sub_if_data *sdata)
 {
         return sdata->u.mesh.mshcfg.dot11MeshMaxPeerLinks -
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 47aeee2d8db1..6b4603a90031 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -215,16 +215,19 @@ static void prepare_frame_for_deferred_tx(struct ieee80211_sub_if_data *sdata,
         skb->priority = 7;
 
         info->control.vif = &sdata->vif;
+        info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
         ieee80211_set_qos_hdr(sdata, skb);
 }
 
 /**
- * mesh_send_path error - Sends a PERR mesh management frame
+ * mesh_path_error_tx - Sends a PERR mesh management frame
  *
+ * @ttl: allowed remaining hops
  * @target: broken destination
  * @target_sn: SN of the broken destination
  * @target_rcode: reason code for this PERR
  * @ra: node this frame is addressed to
+ * @sdata: local mesh subif
  *
  * Note: This function may be called with driver locks taken that the driver
  * also acquires in the TX path.  To avoid a deadlock we don't transmit the
@@ -246,11 +249,13 @@ int mesh_path_error_tx(u8 ttl, u8 *target, __le32 target_sn,
                 return -EAGAIN;
 
         skb = dev_alloc_skb(local->tx_headroom +
+                            IEEE80211_ENCRYPT_HEADROOM +
+                            IEEE80211_ENCRYPT_TAILROOM +
                             hdr_len +
                             2 + 15 /* PERR IE */);
         if (!skb)
                 return -1;
-        skb_reserve(skb, local->tx_headroom);
+        skb_reserve(skb, local->tx_headroom + IEEE80211_ENCRYPT_HEADROOM);
         mgmt = (struct ieee80211_mgmt *) skb_put(skb, hdr_len);
         memset(mgmt, 0, hdr_len);
         mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
@@ -350,6 +355,7 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local,
  * @sdata: local mesh subif
  * @mgmt: mesh management frame
  * @hwmp_ie: hwmp information element (PREP or PREQ)
+ * @action: type of hwmp ie
  *
  * This function updates the path routing information to the originator and the
  * transmitter of a HWMP PREQ or PREP frame.
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 4b274e9c91a5..9e0416696a83 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -41,20 +41,6 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
                 enum ieee80211_self_protected_actioncode action,
                 u8 *da, __le16 llid, __le16 plid, __le16 reason);
 
-static inline
-u32 mesh_plink_inc_estab_count(struct ieee80211_sub_if_data *sdata)
-{
-        atomic_inc(&sdata->u.mesh.estab_plinks);
-        return mesh_accept_plinks_update(sdata);
-}
-
-static inline
-u32 mesh_plink_dec_estab_count(struct ieee80211_sub_if_data *sdata)
-{
-        atomic_dec(&sdata->u.mesh.estab_plinks);
-        return mesh_accept_plinks_update(sdata);
-}
-
 /**
  * mesh_plink_fsm_restart - restart a mesh peer link finite state machine
  *
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index a3552929a21d..e930175771ff 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -199,11 +199,11 @@ static u32 ieee80211_config_ht_tx(struct ieee80211_sub_if_data *sdata,
         case NL80211_CHAN_WIDTH_40:
                 if (sdata->vif.bss_conf.chandef.chan->center_freq >
                                 sdata->vif.bss_conf.chandef.center_freq1 &&
-                    chan->flags & IEEE80211_CHAN_NO_HT40PLUS)
+                    chan->flags & IEEE80211_CHAN_NO_HT40MINUS)
                         disable_40 = true;
                 if (sdata->vif.bss_conf.chandef.chan->center_freq <
                                 sdata->vif.bss_conf.chandef.center_freq1 &&
-                    chan->flags & IEEE80211_CHAN_NO_HT40MINUS)
+                    chan->flags & IEEE80211_CHAN_NO_HT40PLUS)
                         disable_40 = true;
                 break;
         default:
@@ -341,11 +341,13 @@ static void ieee80211_add_ht_ie(struct ieee80211_sub_if_data *sdata,
 
 static void ieee80211_add_vht_ie(struct ieee80211_sub_if_data *sdata,
                                  struct sk_buff *skb,
-                                 struct ieee80211_supported_band *sband)
+                                 struct ieee80211_supported_band *sband,
+                                 struct ieee80211_vht_cap *ap_vht_cap)
 {
         u8 *pos;
         u32 cap;
         struct ieee80211_sta_vht_cap vht_cap;
+        int i;
 
         BUILD_BUG_ON(sizeof(vht_cap) != sizeof(sband->vht_cap));
 
@@ -364,6 +366,42 @@ static void ieee80211_add_vht_ie(struct ieee80211_sub_if_data *sdata,
                 cap &= ~IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;
         }
 
+        /*
+         * Some APs apparently get confused if our capabilities are better
+         * than theirs, so restrict what we advertise in the assoc request.
+         */
+        if (!(ap_vht_cap->vht_cap_info &
+                        cpu_to_le32(IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE)))
+                cap &= ~IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE;
+
+        if (!(ap_vht_cap->vht_cap_info &
+                        cpu_to_le32(IEEE80211_VHT_CAP_TXSTBC)))
+                cap &= ~(IEEE80211_VHT_CAP_RXSTBC_1 |
+                         IEEE80211_VHT_CAP_RXSTBC_3 |
+                         IEEE80211_VHT_CAP_RXSTBC_4);
+
+        for (i = 0; i < 8; i++) {
+                int shift = i * 2;
+                u16 mask = IEEE80211_VHT_MCS_NOT_SUPPORTED << shift;
+                u16 ap_mcs, our_mcs;
+
+                ap_mcs = (le16_to_cpu(ap_vht_cap->supp_mcs.tx_mcs_map) &
+                                                                mask) >> shift;
+                our_mcs = (le16_to_cpu(vht_cap.vht_mcs.rx_mcs_map) &
+                                                                mask) >> shift;
+
+                switch (ap_mcs) {
+                default:
+                        if (our_mcs <= ap_mcs)
+                                break;
+                        /* fall through */
+                case IEEE80211_VHT_MCS_NOT_SUPPORTED:
+                        vht_cap.vht_mcs.rx_mcs_map &= cpu_to_le16(~mask);
+                        vht_cap.vht_mcs.rx_mcs_map |=
+                                cpu_to_le16(ap_mcs << shift);
+                }
+        }
+
         /* reserve and fill IE */
         pos = skb_put(skb, sizeof(struct ieee80211_vht_cap) + 2);
         ieee80211_ie_build_vht_cap(pos, &vht_cap, cap);
@@ -562,7 +600,8 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
                                     sband, chan, sdata->smps_mode);
 
         if (!(ifmgd->flags & IEEE80211_STA_DISABLE_VHT))
-                ieee80211_add_vht_ie(sdata, skb, sband);
+                ieee80211_add_vht_ie(sdata, skb, sband,
+                                     &assoc_data->ap_vht_cap);
 
         /* if present, add any custom non-vendor IEs that go after HT */
         if (assoc_data->ie_len && assoc_data->ie) {
@@ -1486,7 +1525,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
         sta = sta_info_get(sdata, ifmgd->bssid);
         if (sta) {
                 set_sta_flag(sta, WLAN_STA_BLOCK_BA);
-                ieee80211_sta_tear_down_BA_sessions(sta, false);
+                ieee80211_sta_tear_down_BA_sessions(sta, AGG_STOP_DESTROY_STA);
         }
         mutex_unlock(&local->sta_mtx);
 
@@ -1521,7 +1560,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
         memset(ifmgd->bssid, 0, ETH_ALEN);
 
         /* remove AP and TDLS peers */
-        sta_info_flush(local, sdata);
+        sta_info_flush_defer(sdata);
 
         /* finally reset all BSS / config parameters */
         changed |= ieee80211_reset_erp_info(sdata);
@@ -2369,8 +2408,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
 static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                                   struct ieee80211_mgmt *mgmt, size_t len,
                                   struct ieee80211_rx_status *rx_status,
-                                  struct ieee802_11_elems *elems,
-                                  bool beacon)
+                                  struct ieee802_11_elems *elems)
 {
         struct ieee80211_local *local = sdata->local;
         int freq;
@@ -2404,7 +2442,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                 return;
 
         bss = ieee80211_bss_info_update(local, rx_status, mgmt, len, elems,
-                                        channel, beacon);
+                                        channel);
         if (bss)
                 ieee80211_rx_bss_put(local, bss);
 
@@ -2447,7 +2485,7 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
         ieee802_11_parse_elems(mgmt->u.probe_resp.variable, len - baselen,
                                 &elems);
 
-        ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems, false);
+        ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems);
 
         if (ifmgd->associated &&
             ether_addr_equal(mgmt->bssid, ifmgd->associated->bssid))
@@ -2528,8 +2566,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
                 ieee802_11_parse_elems(mgmt->u.beacon.variable,
                                        len - baselen, &elems);
 
-                ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems,
-                                      false);
+                ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems);
                 ifmgd->assoc_data->have_beacon = true;
                 ifmgd->assoc_data->sent_assoc = false;
                 /* continue assoc process */
@@ -2682,8 +2719,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
         ifmgd->beacon_crc = ncrc;
         ifmgd->beacon_crc_valid = true;
 
-        ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems,
-                              true);
+        ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems);
 
         if (ieee80211_sta_wmm_params(local, sdata, elems.wmm_param,
                                      elems.wmm_param_len))
@@ -3756,7 +3792,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_bss *bss = (void *)req->bss->priv;
         struct ieee80211_mgd_assoc_data *assoc_data;
         struct ieee80211_supported_band *sband;
-        const u8 *ssidie, *ht_ie;
+        const u8 *ssidie, *ht_ie, *vht_ie;
         int i, err;
 
         assoc_data = kzalloc(sizeof(*assoc_data) + req->ie_len, GFP_KERNEL);
@@ -3875,6 +3911,12 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
                         ((struct ieee80211_ht_operation *)(ht_ie + 2))->ht_param;
         else
                 ifmgd->flags |= IEEE80211_STA_DISABLE_HT;
+        vht_ie = ieee80211_bss_get_ie(req->bss, WLAN_EID_VHT_CAPABILITY);
+        if (vht_ie && vht_ie[1] >= sizeof(struct ieee80211_vht_cap))
+                memcpy(&assoc_data->ap_vht_cap, vht_ie + 2,
+                       sizeof(struct ieee80211_vht_cap));
+        else
+                ifmgd->flags |= IEEE80211_STA_DISABLE_VHT;
         rcu_read_unlock();
 
         if (bss->wmm_used && bss->uapsd_supported &&
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index a5379aea7d09..82baf5b6ecf4 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -102,8 +102,7 @@ static void ieee80211_offchannel_ps_disable(struct ieee80211_sub_if_data *sdata)
         ieee80211_sta_reset_conn_monitor(sdata);
 }
 
-void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,
-                                    bool offchannel_ps_enable)
+void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local)
 {
         struct ieee80211_sub_if_data *sdata;
 
@@ -126,16 +125,17 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,
                         set_bit(SDATA_STATE_OFFCHANNEL, &sdata->state);
 
                 /* Check to see if we should disable beaconing. */
-                if (sdata->vif.type == NL80211_IFTYPE_AP ||
-                    sdata->vif.type == NL80211_IFTYPE_ADHOC ||
-                    sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
+                if (sdata->vif.bss_conf.enable_beacon) {
+                        set_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED,
+                                &sdata->state);
+                        sdata->vif.bss_conf.enable_beacon = false;
                         ieee80211_bss_info_change_notify(
                                 sdata, BSS_CHANGED_BEACON_ENABLED);
+                }
 
                 if (sdata->vif.type != NL80211_IFTYPE_MONITOR) {
                         netif_tx_stop_all_queues(sdata->dev);
-                        if (offchannel_ps_enable &&
-                            (sdata->vif.type == NL80211_IFTYPE_STATION) &&
+                        if (sdata->vif.type == NL80211_IFTYPE_STATION &&
                             sdata->u.mgd.associated)
                                 ieee80211_offchannel_ps_enable(sdata);
                 }
@@ -143,8 +143,7 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,
         mutex_unlock(&local->iflist_mtx);
 }
 
-void ieee80211_offchannel_return(struct ieee80211_local *local,
-                                 bool offchannel_ps_disable)
+void ieee80211_offchannel_return(struct ieee80211_local *local)
 {
         struct ieee80211_sub_if_data *sdata;
 
@@ -163,11 +162,9 @@ void ieee80211_offchannel_return(struct ieee80211_local *local,
                         continue;
 
                 /* Tell AP we're back */
-                if (offchannel_ps_disable &&
-                    sdata->vif.type == NL80211_IFTYPE_STATION) {
-                        if (sdata->u.mgd.associated)
-                                ieee80211_offchannel_ps_disable(sdata);
-                }
+                if (sdata->vif.type == NL80211_IFTYPE_STATION &&
+                    sdata->u.mgd.associated)
+                        ieee80211_offchannel_ps_disable(sdata);
 
                 if (sdata->vif.type != NL80211_IFTYPE_MONITOR) {
                         /*
@@ -183,11 +180,12 @@ void ieee80211_offchannel_return(struct ieee80211_local *local,
                         netif_tx_wake_all_queues(sdata->dev);
                 }
 
-                if (sdata->vif.type == NL80211_IFTYPE_AP ||
-                    sdata->vif.type == NL80211_IFTYPE_ADHOC ||
-                    sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
+                if (test_and_clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED,
+                                       &sdata->state)) {
+                        sdata->vif.bss_conf.enable_beacon = true;
                         ieee80211_bss_info_change_notify(
                                 sdata, BSS_CHANGED_BEACON_ENABLED);
+                }
         }
         mutex_unlock(&local->iflist_mtx);
 }
@@ -385,7 +383,7 @@ void ieee80211_sw_roc_work(struct work_struct *work)
                         local->tmp_channel = NULL;
                         ieee80211_hw_config(local, 0);
 
-                        ieee80211_offchannel_return(local, true);
+                        ieee80211_offchannel_return(local);
                 }
 
                 ieee80211_recalc_idle(local);
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index 79a48f37d409..e45b83610e85 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -7,25 +7,23 @@
 #include "led.h"
 
 /* return value indicates whether the driver should be further notified */
-static bool ieee80211_quiesce(struct ieee80211_sub_if_data *sdata)
+static void ieee80211_quiesce(struct ieee80211_sub_if_data *sdata)
 {
         switch (sdata->vif.type) {
         case NL80211_IFTYPE_STATION:
                 ieee80211_sta_quiesce(sdata);
-                return true;
+                break;
         case NL80211_IFTYPE_ADHOC:
                 ieee80211_ibss_quiesce(sdata);
-                return true;
+                break;
         case NL80211_IFTYPE_MESH_POINT:
                 ieee80211_mesh_quiesce(sdata);
-                return true;
-        case NL80211_IFTYPE_AP_VLAN:
-        case NL80211_IFTYPE_MONITOR:
-                /* don't tell driver about this */
-                return false;
+                break;
         default:
-                return true;
+                break;
         }
+
+        cancel_work_sync(&sdata->work);
 }
 
 int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
@@ -44,7 +42,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
                 mutex_lock(&local->sta_mtx);
                 list_for_each_entry(sta, &local->sta_list, list) {
                         set_sta_flag(sta, WLAN_STA_BLOCK_BA);
-                        ieee80211_sta_tear_down_BA_sessions(sta, true);
+                        ieee80211_sta_tear_down_BA_sessions(
+                                        sta, AGG_STOP_LOCAL_REQUEST);
                 }
                 mutex_unlock(&local->sta_mtx);
         }
@@ -94,10 +93,9 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
                         WARN_ON(err != 1);
                         local->wowlan = false;
                 } else {
-                        list_for_each_entry(sdata, &local->interfaces, list) {
-                                cancel_work_sync(&sdata->work);
-                                ieee80211_quiesce(sdata);
-                        }
+                        list_for_each_entry(sdata, &local->interfaces, list)
+                                if (ieee80211_sdata_running(sdata))
+                                        ieee80211_quiesce(sdata);
                         goto suspend;
                 }
         }
@@ -124,17 +122,43 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
 
         /* remove all interfaces */
         list_for_each_entry(sdata, &local->interfaces, list) {
-                cancel_work_sync(&sdata->work);
+                static u8 zero_addr[ETH_ALEN] = {};
+                u32 changed = 0;
 
-                if (!ieee80211_quiesce(sdata))
+                if (!ieee80211_sdata_running(sdata))
                         continue;
 
-                if (!ieee80211_sdata_running(sdata))
+                switch (sdata->vif.type) {
+                case NL80211_IFTYPE_AP_VLAN:
+                case NL80211_IFTYPE_MONITOR:
+                        /* skip these */
                         continue;
+                case NL80211_IFTYPE_STATION:
+                        if (sdata->vif.bss_conf.assoc)
+                                changed = BSS_CHANGED_ASSOC |
+                                          BSS_CHANGED_BSSID |
+                                          BSS_CHANGED_IDLE;
+                        break;
+                case NL80211_IFTYPE_AP:
+                case NL80211_IFTYPE_ADHOC:
+                case NL80211_IFTYPE_MESH_POINT:
+                        if (sdata->vif.bss_conf.enable_beacon)
+                                changed = BSS_CHANGED_BEACON_ENABLED;
+                        break;
+                default:
+                        break;
+                }
+
+                ieee80211_quiesce(sdata);
+
+                sdata->suspend_bss_conf = sdata->vif.bss_conf;
+                memset(&sdata->vif.bss_conf, 0, sizeof(sdata->vif.bss_conf));
+                sdata->vif.bss_conf.idle = true;
+                if (sdata->suspend_bss_conf.bssid)
+                        sdata->vif.bss_conf.bssid = zero_addr;
 
-                /* disable beaconing */
-                ieee80211_bss_info_change_notify(sdata,
-                        BSS_CHANGED_BEACON_ENABLED);
+                /* disable beaconing or remove association */
+                ieee80211_bss_info_change_notify(sdata, changed);
 
                 if (sdata->vif.type == NL80211_IFTYPE_AP &&
                     rcu_access_pointer(sdata->u.ap.beacon))
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 580704eba8b8..a19089565c4b 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2353,7 +2353,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
                     sdata->vif.type != NL80211_IFTYPE_ADHOC)
                         break;
 
-                /* verify action & smps_control are present */
+                /* verify action & smps_control/chanwidth are present */
                 if (len < IEEE80211_MIN_ACTION_SIZE + 2)
                         goto invalid;
 
@@ -2392,6 +2392,35 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
                                                  IEEE80211_RC_SMPS_CHANGED);
                         goto handled;
                 }
+                case WLAN_HT_ACTION_NOTIFY_CHANWIDTH: {
+                        struct ieee80211_supported_band *sband;
+                        u8 chanwidth = mgmt->u.action.u.ht_notify_cw.chanwidth;
+                        bool old_40mhz, new_40mhz;
+
+                        /* If it doesn't support 40 MHz it can't change ... */
+                        if (!rx->sta->supports_40mhz)
+                                goto handled;
+
+                        old_40mhz = rx->sta->sta.ht_cap.cap &
+                                        IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+                        new_40mhz = chanwidth == IEEE80211_HT_CHANWIDTH_ANY;
+
+                        if (old_40mhz == new_40mhz)
+                                goto handled;
+
+                        if (new_40mhz)
+                                rx->sta->sta.ht_cap.cap |=
+                                        IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+                        else
+                                rx->sta->sta.ht_cap.cap &=
+                                        ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+
+                        sband = rx->local->hw.wiphy->bands[status->band];
+
+                        rate_control_rate_update(local, sband, rx->sta,
+                                                 IEEE80211_RC_BW_CHANGED);
+                        goto handled;
+                }
                 default:
                         goto invalid;
                 }
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index d59fc6818b1c..607684c47d55 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -65,12 +65,11 @@ static bool is_uapsd_supported(struct ieee802_11_elems *elems)
 struct ieee80211_bss *
 ieee80211_bss_info_update(struct ieee80211_local *local,
                           struct ieee80211_rx_status *rx_status,
-                          struct ieee80211_mgmt *mgmt,
-                          size_t len,
+                          struct ieee80211_mgmt *mgmt, size_t len,
                           struct ieee802_11_elems *elems,
-                          struct ieee80211_channel *channel,
-                          bool beacon)
+                          struct ieee80211_channel *channel)
 {
+        bool beacon = ieee80211_is_beacon(mgmt->frame_control);
         struct cfg80211_bss *cbss;
         struct ieee80211_bss *bss;
         int clen, srlen;
@@ -203,7 +202,7 @@ void ieee80211_scan_rx(struct ieee80211_local *local, struct sk_buff *skb)
 
         bss = ieee80211_bss_info_update(local, rx_status,
                                         mgmt, skb->len, &elems,
-                                        channel, beacon);
+                                        channel);
         if (bss)
                 ieee80211_rx_bss_put(local, bss);
 }
@@ -292,7 +291,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted,
         if (!was_hw_scan) {
                 ieee80211_configure_filter(local);
                 drv_sw_scan_complete(local);
-                ieee80211_offchannel_return(local, true);
+                ieee80211_offchannel_return(local);
         }
 
         ieee80211_recalc_idle(local);
@@ -341,7 +340,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local)
         local->next_scan_state = SCAN_DECISION;
         local->scan_channel_idx = 0;
 
-        ieee80211_offchannel_stop_vifs(local, true);
+        ieee80211_offchannel_stop_vifs(local);
 
         ieee80211_configure_filter(local);
 
@@ -678,12 +677,8 @@ static void ieee80211_scan_state_suspend(struct ieee80211_local *local,
         local->scan_channel = NULL;
         ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
 
-        /*
-         * Re-enable vifs and beaconing.  Leave PS
-         * in off-channel state..will put that back
-         * on-channel at the end of scanning.
-         */
-        ieee80211_offchannel_return(local, false);
+        /* disable PS */
+        ieee80211_offchannel_return(local);
 
         *next_delay = HZ / 5;
         /* afterwards, resume scan & go to next channel */
@@ -693,8 +688,7 @@ static void ieee80211_scan_state_suspend(struct ieee80211_local *local,
 static void ieee80211_scan_state_resume(struct ieee80211_local *local,
                                         unsigned long *next_delay)
 {
-        /* PS already is in off-channel mode */
-        ieee80211_offchannel_stop_vifs(local, false);
+        ieee80211_offchannel_stop_vifs(local);
 
         if (local->ops->flush) {
                 drv_flush(local, false);
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index ca9fde198188..9d864ed5f3da 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -104,6 +104,16 @@ static void cleanup_single_sta(struct sta_info *sta)
          * neither mac80211 nor the driver can reference this
          * sta struct any more except by still existing timers
          * associated with this station that we clean up below.
+         *
+         * Note though that this still uses the sdata and even
+         * calls the driver in AP and mesh mode, so interfaces
+         * of those types mush use call sta_info_flush_cleanup()
+         * (typically via sta_info_flush()) before deconfiguring
+         * the driver.
+         *
+         * In station mode, nothing happens here so it doesn't
+         * have to (and doesn't) do that, this is intentional to
+         * speed up roaming.
          */
 
         if (test_sta_flag(sta, WLAN_STA_PS_STA)) {
@@ -774,7 +784,7 @@ int __must_check __sta_info_destroy(struct sta_info *sta)
          * will be sufficient.
          */
         set_sta_flag(sta, WLAN_STA_BLOCK_BA);
-        ieee80211_sta_tear_down_BA_sessions(sta, false);
+        ieee80211_sta_tear_down_BA_sessions(sta, AGG_STOP_DESTROY_STA);
 
         ret = sta_info_hash_del(local, sta);
         if (ret)
@@ -885,20 +895,12 @@ void sta_info_init(struct ieee80211_local *local)
 void sta_info_stop(struct ieee80211_local *local)
 {
         del_timer_sync(&local->sta_cleanup);
-        sta_info_flush(local, NULL);
 }
 
-/**
- * sta_info_flush - flush matching STA entries from the STA table
- *
- * Returns the number of removed STA entries.
- *
- * @local: local interface data
- * @sdata: matching rule for the net device (sta->dev) or %NULL to match all STAs
- */
-int sta_info_flush(struct ieee80211_local *local,
-                   struct ieee80211_sub_if_data *sdata)
+
+int sta_info_flush_defer(struct ieee80211_sub_if_data *sdata)
 {
+        struct ieee80211_local *local = sdata->local;
         struct sta_info *sta, *tmp;
         int ret = 0;
 
@@ -906,30 +908,22 @@ int sta_info_flush(struct ieee80211_local *local,
 
         mutex_lock(&local->sta_mtx);
         list_for_each_entry_safe(sta, tmp, &local->sta_list, list) {
-                if (!sdata || sdata == sta->sdata) {
+                if (sdata == sta->sdata) {
                         WARN_ON(__sta_info_destroy(sta));
                         ret++;
                 }
         }
         mutex_unlock(&local->sta_mtx);
 
-        rcu_barrier();
-
-        if (sdata) {
-                ieee80211_cleanup_sdata_stas(sdata);
-                cancel_work_sync(&sdata->cleanup_stations_wk);
-        } else {
-                mutex_lock(&local->iflist_mtx);
-                list_for_each_entry(sdata, &local->interfaces, list) {
-                        ieee80211_cleanup_sdata_stas(sdata);
-                        cancel_work_sync(&sdata->cleanup_stations_wk);
-                }
-                mutex_unlock(&local->iflist_mtx);
-        }
-
         return ret;
 }
 
+void sta_info_flush_cleanup(struct ieee80211_sub_if_data *sdata)
+{
+        ieee80211_cleanup_sdata_stas(sdata);
+        cancel_work_sync(&sdata->cleanup_stations_wk);
+}
+
 void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,
                           unsigned long exp_time)
 {
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 37c1889afd3a..af7d78aa5523 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -92,6 +92,13 @@ enum ieee80211_sta_info_flags {
 #define HT_AGG_STATE_WANT_START         4
 #define HT_AGG_STATE_WANT_STOP          5
 
+enum ieee80211_agg_stop_reason {
+        AGG_STOP_DECLINED,
+        AGG_STOP_LOCAL_REQUEST,
+        AGG_STOP_PEER_REQUEST,
+        AGG_STOP_DESTROY_STA,
+};
+
 /**
  * struct tid_ampdu_tx - TID aggregation information (Tx).
  *
@@ -548,8 +555,39 @@ void sta_info_recalc_tim(struct sta_info *sta);
 
 void sta_info_init(struct ieee80211_local *local);
 void sta_info_stop(struct ieee80211_local *local);
-int sta_info_flush(struct ieee80211_local *local,
-                   struct ieee80211_sub_if_data *sdata);
+int sta_info_flush_defer(struct ieee80211_sub_if_data *sdata);
+
+/**
+ * sta_info_flush_cleanup - flush the sta_info cleanup queue
+ * @sdata: the interface
+ *
+ * Flushes the sta_info cleanup queue for a given interface;
+ * this is necessary before the interface is removed or, for
+ * AP/mesh interfaces, before it is deconfigured.
+ *
+ * Note an rcu_barrier() must precede the function, after all
+ * stations have been flushed/removed to ensure the call_rcu()
+ * calls that add stations to the cleanup queue have completed.
+ */
+void sta_info_flush_cleanup(struct ieee80211_sub_if_data *sdata);
+
+/**
+ * sta_info_flush - flush matching STA entries from the STA table
+ *
+ * Returns the number of removed STA entries.
+ *
+ * @sdata: sdata to remove all stations from
+ */
+static inline int sta_info_flush(struct ieee80211_sub_if_data *sdata)
+{
+        int ret = sta_info_flush_defer(sdata);
+
+        rcu_barrier();
+        sta_info_flush_cleanup(sdata);
+
+        return ret;
+}
+
 void sta_set_rate_info_tx(struct sta_info *sta,
                           const struct ieee80211_tx_rate *rate,
                           struct rate_info *rinfo);
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index a8270b441a6f..41861b91daa3 100644
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -28,21 +28,27 @@
 #define VIF_PR_FMT      " vif:%s(%d%s)"
 #define VIF_PR_ARG      __get_str(vif_name), __entry->vif_type, __entry->p2p ? "/p2p" : ""
 
-#define CHANCTX_ENTRY   __field(u32, control_freq)                              \
+#define CHANDEF_ENTRY   __field(u32, control_freq)                              \
                         __field(u32, chan_width)                                \
                         __field(u32, center_freq1)                              \
-                        __field(u32, center_freq2)                              \
+                        __field(u32, center_freq2)
+#define CHANDEF_ASSIGN(c)                                                       \
+                        __entry->control_freq = (c)->chan->center_freq;         \
+                        __entry->chan_width = (c)->width;                       \
+                        __entry->center_freq1 = (c)->center_freq1;              \
+                        __entry->center_freq1 = (c)->center_freq2;
+#define CHANDEF_PR_FMT  " control:%d MHz width:%d center: %d/%d MHz"
+#define CHANDEF_PR_ARG  __entry->control_freq, __entry->chan_width,             \
+                        __entry->center_freq1, __entry->center_freq2
+
+#define CHANCTX_ENTRY   CHANDEF_ENTRY                                           \
                         __field(u8, rx_chains_static)                           \
                         __field(u8, rx_chains_dynamic)
-#define CHANCTX_ASSIGN  __entry->control_freq = ctx->conf.def.chan->center_freq;\
-                        __entry->chan_width = ctx->conf.def.width;              \
-                        __entry->center_freq1 = ctx->conf.def.center_freq1;     \
-                        __entry->center_freq2 = ctx->conf.def.center_freq2;     \
+#define CHANCTX_ASSIGN  CHANDEF_ASSIGN(&ctx->conf.def)                          \
                         __entry->rx_chains_static = ctx->conf.rx_chains_static; \
                         __entry->rx_chains_dynamic = ctx->conf.rx_chains_dynamic
-#define CHANCTX_PR_FMT  " control:%d MHz width:%d center: %d/%d MHz chains:%d/%d"
-#define CHANCTX_PR_ARG  __entry->control_freq, __entry->chan_width,             \
-                        __entry->center_freq1, __entry->center_freq2,           \
+#define CHANCTX_PR_FMT  CHANDEF_PR_FMT " chains:%d/%d"
+#define CHANCTX_PR_ARG  CHANDEF_PR_ARG,                                         \
                         __entry->rx_chains_static, __entry->rx_chains_dynamic
 
 
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index e9eadc40c09c..f32d68186dbc 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1673,10 +1673,13 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb,
                         chanctx_conf =
                                 rcu_dereference(tmp_sdata->vif.chanctx_conf);
         }
-        if (!chanctx_conf)
-                goto fail_rcu;
 
-        chan = chanctx_conf->def.chan;
+        if (chanctx_conf)
+                chan = chanctx_conf->def.chan;
+        else if (!local->use_chanctx)
+                chan = local->_oper_channel;
+        else
+                goto fail_rcu;
 
         /*
          * Frame injection is not allowed if beaconing is not allowed
@@ -2261,9 +2264,8 @@ void ieee80211_tx_pending(unsigned long data)
 
 /* functions for drivers to get certain frames */
 
-static void ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata,
-                                     struct ps_data *ps,
-                                     struct sk_buff *skb)
+static void __ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata,
+                                       struct ps_data *ps, struct sk_buff *skb)
 {
         u8 *pos, *tim;
         int aid0 = 0;
@@ -2325,6 +2327,31 @@ static void ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata,
         }
 }
 
+static int ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata,
+                                    struct ps_data *ps, struct sk_buff *skb)
+{
+        struct ieee80211_local *local = sdata->local;
+
+        /*
+         * Not very nice, but we want to allow the driver to call
+         * ieee80211_beacon_get() as a response to the set_tim()
+         * callback. That, however, is already invoked under the
+         * sta_lock to guarantee consistent and race-free update
+         * of the tim bitmap in mac80211 and the driver.
+         */
+        if (local->tim_in_locked_section) {
+                __ieee80211_beacon_add_tim(sdata, ps, skb);
+        } else {
+                unsigned long flags;
+
+                spin_lock_irqsave(&local->tim_lock, flags);
+                __ieee80211_beacon_add_tim(sdata, ps, skb);
+                spin_unlock_irqrestore(&local->tim_lock, flags);
+        }
+
+        return 0;
+}
+
 struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
                                          struct ieee80211_vif *vif,
                                          u16 *tim_offset, u16 *tim_length)
@@ -2369,22 +2396,7 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
                         memcpy(skb_put(skb, beacon->head_len), beacon->head,
                                beacon->head_len);
 
-                        /*
-                         * Not very nice, but we want to allow the driver to call
-                         * ieee80211_beacon_get() as a response to the set_tim()
-                         * callback. That, however, is already invoked under the
-                         * sta_lock to guarantee consistent and race-free update
-                         * of the tim bitmap in mac80211 and the driver.
-                         */
-                        if (local->tim_in_locked_section) {
-                                ieee80211_beacon_add_tim(sdata, &ap->ps, skb);
-                        } else {
-                                unsigned long flags;
-
-                                spin_lock_irqsave(&local->tim_lock, flags);
-                                ieee80211_beacon_add_tim(sdata, &ap->ps, skb);
-                                spin_unlock_irqrestore(&local->tim_lock, flags);
-                        }
+                        ieee80211_beacon_add_tim(sdata, &ap->ps, skb);
 
                         if (tim_offset)
                                 *tim_offset = beacon->head_len;
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index f11e8c540db4..7519018ff71a 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1358,6 +1358,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
         struct ieee80211_chanctx *ctx;
         struct sta_info *sta;
         int res, i;
+        bool reconfig_due_to_wowlan = false;
 
 #ifdef CONFIG_PM
         if (local->suspended)
@@ -1377,6 +1378,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                  * res is 1, which means the driver requested
                  * to go through a regular reset on wakeup.
                  */
+                reconfig_due_to_wowlan = true;
         }
 #endif
         /* everything else happens only if HW was up & running */
@@ -1526,6 +1528,11 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                           BSS_CHANGED_IDLE |
                           BSS_CHANGED_TXPOWER;
 
+#ifdef CONFIG_PM
+                if (local->resuming && !reconfig_due_to_wowlan)
+                        sdata->vif.bss_conf = sdata->suspend_bss_conf;
+#endif
+
                 switch (sdata->vif.type) {
                 case NL80211_IFTYPE_STATION:
                         changed |= BSS_CHANGED_ASSOC |
@@ -1550,9 +1557,11 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 
                         /* fall through */
                 case NL80211_IFTYPE_MESH_POINT:
-                        changed |= BSS_CHANGED_BEACON |
-                                   BSS_CHANGED_BEACON_ENABLED;
-                        ieee80211_bss_info_change_notify(sdata, changed);
+                        if (sdata->vif.bss_conf.enable_beacon) {
+                                changed |= BSS_CHANGED_BEACON |
+                                           BSS_CHANGED_BEACON_ENABLED;
+                                ieee80211_bss_info_change_notify(sdata, changed);
+                        }
                         break;
                 case NL80211_IFTYPE_WDS:
                         break;
@@ -1632,7 +1641,8 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                 mutex_lock(&local->sta_mtx);
 
                 list_for_each_entry(sta, &local->sta_list, list) {
-                        ieee80211_sta_tear_down_BA_sessions(sta, true);
+                        ieee80211_sta_tear_down_BA_sessions(
+                                        sta, AGG_STOP_LOCAL_REQUEST);
                         clear_sta_flag(sta, WLAN_STA_BLOCK_BA);
                 }
 
@@ -1646,10 +1656,11 @@ int ieee80211_reconfig(struct ieee80211_local *local)
          * If this is for hw restart things are still running.
          * We may want to change that later, however.
          */
-        if (!local->suspended) {
+        if (!local->suspended || reconfig_due_to_wowlan)
                 drv_restart_complete(local);
+
+        if (!local->suspended)
                 return 0;
-        }
 
 #ifdef CONFIG_PM
         /* first set suspended false, then resuming */
@@ -1864,7 +1875,7 @@ u8 *ieee80211_ie_build_ht_cap(u8 *pos, struct ieee80211_sta_ht_cap *ht_cap,
 }
 
 u8 *ieee80211_ie_build_vht_cap(u8 *pos, struct ieee80211_sta_vht_cap *vht_cap,
-                                                           u32 cap)
+                               u32 cap)
 {
         __le32 tmp;
 
diff --git a/net/nfc/core.c b/net/nfc/core.c
index aa64ea441676..25522e56d350 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -338,7 +338,7 @@ int nfc_activate_target(struct nfc_dev *dev, u32 target_idx, u32 protocol)
                 dev->active_target = target;
                 dev->rf_mode = NFC_RF_INITIATOR;
 
-                if (dev->ops->check_presence)
+                if (dev->ops->check_presence && !dev->shutting_down)
                         mod_timer(&dev->check_pres_timer, jiffies +
                                   msecs_to_jiffies(NFC_CHECK_PRES_FREQ_MS));
         }
@@ -429,7 +429,7 @@ int nfc_data_exchange(struct nfc_dev *dev, u32 target_idx, struct sk_buff *skb,
                 rc = dev->ops->im_transceive(dev, dev->active_target, skb, cb,
                                              cb_context);
 
-                if (!rc && dev->ops->check_presence)
+                if (!rc && dev->ops->check_presence && !dev->shutting_down)
                         mod_timer(&dev->check_pres_timer, jiffies +
                                   msecs_to_jiffies(NFC_CHECK_PRES_FREQ_MS));
         } else if (dev->rf_mode == NFC_RF_TARGET && dev->ops->tm_send != NULL) {
@@ -684,11 +684,6 @@ static void nfc_release(struct device *d)
 
         pr_debug("dev_name=%s\n", dev_name(&dev->dev));
 
-        if (dev->ops->check_presence) {
-                del_timer_sync(&dev->check_pres_timer);
-                cancel_work_sync(&dev->check_pres_work);
-        }
-
         nfc_genl_data_exit(&dev->genl_data);
         kfree(dev->targets);
         kfree(dev);
@@ -706,15 +701,16 @@ static void nfc_check_pres_work(struct work_struct *work)
                 rc = dev->ops->check_presence(dev, dev->active_target);
                 if (rc == -EOPNOTSUPP)
                         goto exit;
-                if (!rc) {
-                        mod_timer(&dev->check_pres_timer, jiffies +
-                                  msecs_to_jiffies(NFC_CHECK_PRES_FREQ_MS));
-                } else {
+                if (rc) {
                         u32 active_target_idx = dev->active_target->idx;
                         device_unlock(&dev->dev);
                         nfc_target_lost(dev, active_target_idx);
                         return;
                 }
+
+                if (!dev->shutting_down)
+                        mod_timer(&dev->check_pres_timer, jiffies +
+                                  msecs_to_jiffies(NFC_CHECK_PRES_FREQ_MS));
         }
 
 exit:
@@ -761,6 +757,7 @@ struct nfc_dev *nfc_get_device(unsigned int idx)
  */
 struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
                                     u32 supported_protocols,
+                                    u32 supported_se,
                                     int tx_headroom, int tx_tailroom)
 {
         struct nfc_dev *dev;
@@ -778,6 +775,8 @@ struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
 
         dev->ops = ops;
         dev->supported_protocols = supported_protocols;
+        dev->supported_se = supported_se;
+        dev->active_se = NFC_SE_NONE;
         dev->tx_headroom = tx_headroom;
         dev->tx_tailroom = tx_tailroom;
 
@@ -853,26 +852,27 @@ void nfc_unregister_device(struct nfc_dev *dev)
 
         id = dev->idx;
 
-        mutex_lock(&nfc_devlist_mutex);
-        nfc_devlist_generation++;
-
-        /* lock to avoid unregistering a device while an operation
-           is in progress */
-        device_lock(&dev->dev);
-        device_del(&dev->dev);
-        device_unlock(&dev->dev);
+        if (dev->ops->check_presence) {
+                device_lock(&dev->dev);
+                dev->shutting_down = true;
+                device_unlock(&dev->dev);
+                del_timer_sync(&dev->check_pres_timer);
+                cancel_work_sync(&dev->check_pres_work);
+        }
 
-        mutex_unlock(&nfc_devlist_mutex);
+        rc = nfc_genl_device_removed(dev);
+        if (rc)
+                pr_debug("The userspace won't be notified that the device %s "
+                         "was removed\n", dev_name(&dev->dev));
 
         nfc_llcp_unregister_device(dev);
 
-        rc = nfc_genl_device_removed(dev);
-        if (rc)
-                pr_debug("The userspace won't be notified that the device %s was removed\n",
-                         dev_name(&dev->dev));
+        mutex_lock(&nfc_devlist_mutex);
+        nfc_devlist_generation++;
+        device_del(&dev->dev);
+        mutex_unlock(&nfc_devlist_mutex);
 
         ida_simple_remove(&nfc_index_ida, id);
-
 }
 EXPORT_SYMBOL(nfc_unregister_device);
 
diff --git a/net/nfc/hci/command.c b/net/nfc/hci/command.c
index 7d99410e6c1a..64f922be9281 100644
--- a/net/nfc/hci/command.c
+++ b/net/nfc/hci/command.c
@@ -280,14 +280,19 @@ static int nfc_hci_delete_pipe(struct nfc_hci_dev *hdev, u8 pipe)
 static int nfc_hci_clear_all_pipes(struct nfc_hci_dev *hdev)
 {
         u8 param[2];
+        size_t param_len = 2;
 
         /* TODO: Find out what the identity reference data is
          * and fill param with it. HCI spec 6.1.3.5 */
 
         pr_debug("\n");
 
+        if (test_bit(NFC_HCI_QUIRK_SHORT_CLEAR, &hdev->quirks))
+                param_len = 0;
+
         return nfc_hci_execute_cmd(hdev, NFC_HCI_ADMIN_PIPE,
-                                   NFC_HCI_ADM_CLEAR_ALL_PIPE, param, 2, NULL);
+                                   NFC_HCI_ADM_CLEAR_ALL_PIPE, param, param_len,
+                                   NULL);
 }
 
 int nfc_hci_disconnect_gate(struct nfc_hci_dev *hdev, u8 gate)
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index 7bea574d5934..91020b210d87 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -57,6 +57,8 @@ static void nfc_hci_msg_tx_work(struct work_struct *work)
         int r = 0;
 
         mutex_lock(&hdev->msg_tx_mutex);
+        if (hdev->shutting_down)
+                goto exit;
 
         if (hdev->cmd_pending_msg) {
                 if (timer_pending(&hdev->cmd_timer) == 0) {
@@ -295,6 +297,12 @@ void nfc_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, u8 event,
                 goto exit;
         }
 
+        if (hdev->ops->event_received) {
+                r = hdev->ops->event_received(hdev, gate, event, skb);
+                if (r <= 0)
+                        goto exit_noskb;
+        }
+
         switch (event) {
         case NFC_HCI_EVT_TARGET_DISCOVERED:
                 if (skb->len < 1) {     /* no status data? */
@@ -320,17 +328,15 @@ void nfc_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, u8 event,
                 r = nfc_hci_target_discovered(hdev, gate);
                 break;
         default:
-                if (hdev->ops->event_received) {
-                        hdev->ops->event_received(hdev, gate, event, skb);
-                        return;
-                }
-
+                pr_info("Discarded unknown event %x to gate %x\n", event, gate);
+                r = -EINVAL;
                 break;
         }
 
 exit:
         kfree_skb(skb);
 
+exit_noskb:
         if (r) {
                 /* TODO: There was an error dispatching the event,
                  * how to propagate up to nfc core?
@@ -669,8 +675,10 @@ static int hci_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb)
 
         if (hdev->ops->tm_send)
                 return hdev->ops->tm_send(hdev, skb);
-        else
-                return -ENOTSUPP;
+
+        kfree_skb(skb);
+
+        return -ENOTSUPP;
 }
 
 static int hci_check_presence(struct nfc_dev *nfc_dev,
@@ -787,7 +795,9 @@ static struct nfc_ops hci_nfc_ops = {
 
 struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,
                                             struct nfc_hci_init_data *init_data,
+                                            unsigned long quirks,
                                             u32 protocols,
+                                            u32 supported_se,
                                             const char *llc_name,
                                             int tx_headroom,
                                             int tx_tailroom,
@@ -813,7 +823,7 @@ struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,
                 return NULL;
         }
 
-        hdev->ndev = nfc_allocate_device(&hci_nfc_ops, protocols,
+        hdev->ndev = nfc_allocate_device(&hci_nfc_ops, protocols, supported_se,
                                          tx_headroom + HCI_CMDS_HEADROOM,
                                          tx_tailroom);
         if (!hdev->ndev) {
@@ -830,6 +840,8 @@ struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,
 
         memset(hdev->gate2pipe, NFC_HCI_INVALID_PIPE, sizeof(hdev->gate2pipe));
 
+        hdev->quirks = quirks;
+
         return hdev;
 }
 EXPORT_SYMBOL(nfc_hci_allocate_device);
@@ -868,6 +880,28 @@ void nfc_hci_unregister_device(struct nfc_hci_dev *hdev)
 {
         struct hci_msg *msg, *n;
 
+        mutex_lock(&hdev->msg_tx_mutex);
+
+        if (hdev->cmd_pending_msg) {
+                if (hdev->cmd_pending_msg->cb)
+                        hdev->cmd_pending_msg->cb(
+                                             hdev->cmd_pending_msg->cb_context,
+                                             NULL, -ESHUTDOWN);
+                kfree(hdev->cmd_pending_msg);
+                hdev->cmd_pending_msg = NULL;
+        }
+
+        hdev->shutting_down = true;
+
+        mutex_unlock(&hdev->msg_tx_mutex);
+
+        del_timer_sync(&hdev->cmd_timer);
+        cancel_work_sync(&hdev->msg_tx_work);
+
+        cancel_work_sync(&hdev->msg_rx_work);
+
+        nfc_unregister_device(hdev->ndev);
+
         skb_queue_purge(&hdev->rx_hcp_frags);
         skb_queue_purge(&hdev->msg_rx_queue);
 
@@ -876,13 +910,6 @@ void nfc_hci_unregister_device(struct nfc_hci_dev *hdev)
                 skb_queue_purge(&msg->msg_frags);
                 kfree(msg);
         }
-
-        del_timer_sync(&hdev->cmd_timer);
-
-        nfc_unregister_device(hdev->ndev);
-
-        cancel_work_sync(&hdev->msg_tx_work);
-        cancel_work_sync(&hdev->msg_rx_work);
 }
 EXPORT_SYMBOL(nfc_hci_unregister_device);
 
diff --git a/net/nfc/hci/hcp.c b/net/nfc/hci/hcp.c
index bc308a7ca609..b6b4109f2343 100644
--- a/net/nfc/hci/hcp.c
+++ b/net/nfc/hci/hcp.c
@@ -105,6 +105,13 @@ int nfc_hci_hcp_message_tx(struct nfc_hci_dev *hdev, u8 pipe,
         }
 
         mutex_lock(&hdev->msg_tx_mutex);
+
+        if (hdev->shutting_down) {
+                err = -ESHUTDOWN;
+                mutex_unlock(&hdev->msg_tx_mutex);
+                goto out_skb_err;
+        }
+
         list_add_tail(&cmd->msg_l, &hdev->msg_tx_queue);
         mutex_unlock(&hdev->msg_tx_mutex);
 
diff --git a/net/nfc/llcp/commands.c b/net/nfc/llcp/commands.c
index df24be48d4da..c6bc3bd95052 100644
--- a/net/nfc/llcp/commands.c
+++ b/net/nfc/llcp/commands.c
@@ -304,6 +304,8 @@ int nfc_llcp_send_symm(struct nfc_dev *dev)
 
         skb = llcp_add_header(skb, 0, 0, LLCP_PDU_SYMM);
 
+        __net_timestamp(skb);
+
         nfc_llcp_send_to_raw_sock(local, skb, NFC_LLCP_DIRECTION_TX);
 
         return nfc_data_exchange(dev, local->target_idx, skb,
diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c
index ec43914c92a9..85bc75c38dea 100644
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@ -54,7 +54,6 @@ static void nfc_llcp_socket_purge(struct nfc_llcp_sock *sock)
 
         skb_queue_purge(&sock->tx_queue);
         skb_queue_purge(&sock->tx_pending_queue);
-        skb_queue_purge(&sock->tx_backlog_queue);
 
         if (local == NULL)
                 return;
@@ -668,6 +667,8 @@ static void nfc_llcp_tx_work(struct work_struct *work)
                         if (ptype == LLCP_PDU_I)
                                 copy_skb = skb_copy(skb, GFP_ATOMIC);
 
+                        __net_timestamp(skb);
+
                         nfc_llcp_send_to_raw_sock(local, skb,
                                                   NFC_LLCP_DIRECTION_TX);
 
@@ -781,9 +782,15 @@ static void nfc_llcp_recv_ui(struct nfc_llcp_local *local,
 
         /* There is no sequence with UI frames */
         skb_pull(skb, LLCP_HEADER_SIZE);
-        if (sock_queue_rcv_skb(&llcp_sock->sk, skb)) {
-                pr_err("receive queue is full\n");
-                skb_queue_head(&llcp_sock->tx_backlog_queue, skb);
+        if (!sock_queue_rcv_skb(&llcp_sock->sk, skb)) {
+                /*
+                 * UI frames will be freed from the socket layer, so we
+                 * need to keep them alive until someone receives them.
+                 */
+                skb_get(skb);
+        } else {
+                pr_err("Receive queue is full\n");
+                kfree_skb(skb);
         }
 
         nfc_llcp_sock_put(llcp_sock);
@@ -976,9 +983,15 @@ static void nfc_llcp_recv_hdlc(struct nfc_llcp_local *local,
                         pr_err("Received out of sequence I PDU\n");
 
                 skb_pull(skb, LLCP_HEADER_SIZE + LLCP_SEQUENCE_SIZE);
-                if (sock_queue_rcv_skb(&llcp_sock->sk, skb)) {
-                        pr_err("receive queue is full\n");
-                        skb_queue_head(&llcp_sock->tx_backlog_queue, skb);
+                if (!sock_queue_rcv_skb(&llcp_sock->sk, skb)) {
+                        /*
+                         * I frames will be freed from the socket layer, so we
+                         * need to keep them alive until someone receives them.
+                         */
+                        skb_get(skb);
+                } else {
+                        pr_err("Receive queue is full\n");
+                        kfree_skb(skb);
                 }
         }
 
@@ -1245,6 +1258,8 @@ static void nfc_llcp_rx_work(struct work_struct *work)
                 print_hex_dump(KERN_DEBUG, "LLCP Rx: ", DUMP_PREFIX_OFFSET,
                                16, 1, skb->data, skb->len, true);
 
+        __net_timestamp(skb);
+
         nfc_llcp_send_to_raw_sock(local, skb, NFC_LLCP_DIRECTION_RX);
 
         switch (ptype) {
@@ -1296,6 +1311,13 @@ static void nfc_llcp_rx_work(struct work_struct *work)
         local->rx_pending = NULL;
 }
 
+static void __nfc_llcp_recv(struct nfc_llcp_local *local, struct sk_buff *skb)
+{
+        local->rx_pending = skb;
+        del_timer(&local->link_timer);
+        schedule_work(&local->rx_work);
+}
+
 void nfc_llcp_recv(void *data, struct sk_buff *skb, int err)
 {
         struct nfc_llcp_local *local = (struct nfc_llcp_local *) data;
@@ -1306,9 +1328,7 @@ void nfc_llcp_recv(void *data, struct sk_buff *skb, int err)
                 return;
         }
 
-        local->rx_pending = skb_get(skb);
-        del_timer(&local->link_timer);
-        schedule_work(&local->rx_work);
+        __nfc_llcp_recv(local, skb);
 }
 
 int nfc_llcp_data_received(struct nfc_dev *dev, struct sk_buff *skb)
@@ -1319,9 +1339,7 @@ int nfc_llcp_data_received(struct nfc_dev *dev, struct sk_buff *skb)
         if (local == NULL)
                 return -ENODEV;
 
-        local->rx_pending = skb_get(skb);
-        del_timer(&local->link_timer);
-        schedule_work(&local->rx_work);
+        __nfc_llcp_recv(local, skb);
 
         return 0;
 }
diff --git a/net/nfc/llcp/llcp.h b/net/nfc/llcp/llcp.h
index 0d62366f8cc3..0eae5c509504 100644
--- a/net/nfc/llcp/llcp.h
+++ b/net/nfc/llcp/llcp.h
@@ -121,7 +121,6 @@ struct nfc_llcp_sock {
 
         struct sk_buff_head tx_queue;
         struct sk_buff_head tx_pending_queue;
-        struct sk_buff_head tx_backlog_queue;
 
         struct list_head accept_queue;
         struct sock *parent;
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c
index fea22eb41b82..5332751943a9 100644
--- a/net/nfc/llcp/sock.c
+++ b/net/nfc/llcp/sock.c
@@ -672,25 +672,27 @@ static int llcp_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
         copied = min_t(unsigned int, rlen, len);
 
         cskb = skb;
-        if (memcpy_toiovec(msg->msg_iov, cskb->data, copied)) {
+        if (skb_copy_datagram_iovec(cskb, 0, msg->msg_iov, copied)) {
                 if (!(flags & MSG_PEEK))
                         skb_queue_head(&sk->sk_receive_queue, skb);
                 return -EFAULT;
         }
 
+        sock_recv_timestamp(msg, sk, skb);
+
         if (sk->sk_type == SOCK_DGRAM && msg->msg_name) {
                 struct nfc_llcp_ui_cb *ui_cb = nfc_llcp_ui_skb_cb(skb);
-                struct sockaddr_nfc_llcp sockaddr;
+                struct sockaddr_nfc_llcp *sockaddr =
+                        (struct sockaddr_nfc_llcp *) msg->msg_name;
 
-                pr_debug("Datagram socket %d %d\n", ui_cb->dsap, ui_cb->ssap);
+                msg->msg_namelen = sizeof(struct sockaddr_nfc_llcp);
 
-                sockaddr.sa_family = AF_NFC;
-                sockaddr.nfc_protocol = NFC_PROTO_NFC_DEP;
-                sockaddr.dsap = ui_cb->dsap;
-                sockaddr.ssap = ui_cb->ssap;
+                pr_debug("Datagram socket %d %d\n", ui_cb->dsap, ui_cb->ssap);
 
-                memcpy(msg->msg_name, &sockaddr, sizeof(sockaddr));
-                msg->msg_namelen = sizeof(sockaddr);
+                sockaddr->sa_family = AF_NFC;
+                sockaddr->nfc_protocol = NFC_PROTO_NFC_DEP;
+                sockaddr->dsap = ui_cb->dsap;
+                sockaddr->ssap = ui_cb->ssap;
         }
 
         /* Mark read part of skb as used */
@@ -806,7 +808,6 @@ struct sock *nfc_llcp_sock_alloc(struct socket *sock, int type, gfp_t gfp)
         llcp_sock->reserved_ssap = LLCP_SAP_MAX;
         skb_queue_head_init(&llcp_sock->tx_queue);
         skb_queue_head_init(&llcp_sock->tx_pending_queue);
-        skb_queue_head_init(&llcp_sock->tx_backlog_queue);
         INIT_LIST_HEAD(&llcp_sock->accept_queue);
 
         if (sock != NULL)
@@ -821,7 +822,6 @@ void nfc_llcp_sock_free(struct nfc_llcp_sock *sock)
 
         skb_queue_purge(&sock->tx_queue);
         skb_queue_purge(&sock->tx_pending_queue);
-        skb_queue_purge(&sock->tx_backlog_queue);
 
         list_del_init(&sock->accept_queue);
 
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 5f98dc1bf039..48ada0ec749e 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -658,6 +658,7 @@ static struct nfc_ops nci_nfc_ops = {
  */
 struct nci_dev *nci_allocate_device(struct nci_ops *ops,
                                     __u32 supported_protocols,
+                                    __u32 supported_se,
                                     int tx_headroom, int tx_tailroom)
 {
         struct nci_dev *ndev;
@@ -680,6 +681,7 @@ struct nci_dev *nci_allocate_device(struct nci_ops *ops,
 
         ndev->nfc_dev = nfc_allocate_device(&nci_nfc_ops,
                                             supported_protocols,
+                                            supported_se,
                                             tx_headroom + NCI_DATA_HDR_SIZE,
                                             tx_tailroom);
         if (!ndev->nfc_dev)
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 3568ae16786d..504b883439f1 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -366,6 +366,7 @@ static int nfc_genl_send_device(struct sk_buff *msg, struct nfc_dev *dev,
         if (nla_put_string(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev)) ||
             nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx) ||
             nla_put_u32(msg, NFC_ATTR_PROTOCOLS, dev->supported_protocols) ||
+            nla_put_u32(msg, NFC_ATTR_SE, dev->supported_se) ||
             nla_put_u8(msg, NFC_ATTR_DEVICE_POWERED, dev->dev_up) ||
             nla_put_u8(msg, NFC_ATTR_RF_MODE, dev->rf_mode))
                 goto nla_put_failure;
diff --git a/net/wireless/ap.c b/net/wireless/ap.c
index 324e8d851dc4..a4a14e8f55cc 100644
--- a/net/wireless/ap.c
+++ b/net/wireless/ap.c
@@ -46,3 +46,65 @@ int cfg80211_stop_ap(struct cfg80211_registered_device *rdev,
 
         return err;
 }
+
+void cfg80211_ch_switch_notify(struct net_device *dev,
+                               struct cfg80211_chan_def *chandef)
+{
+        struct wireless_dev *wdev = dev->ieee80211_ptr;
+        struct wiphy *wiphy = wdev->wiphy;
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
+
+        trace_cfg80211_ch_switch_notify(dev, chandef);
+
+        wdev_lock(wdev);
+
+        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_AP &&
+                    wdev->iftype != NL80211_IFTYPE_P2P_GO))
+                goto out;
+
+        wdev->channel = chandef->chan;
+        nl80211_ch_switch_notify(rdev, dev, chandef, GFP_KERNEL);
+out:
+        wdev_unlock(wdev);
+        return;
+}
+EXPORT_SYMBOL(cfg80211_ch_switch_notify);
+
+bool cfg80211_rx_spurious_frame(struct net_device *dev,
+                                const u8 *addr, gfp_t gfp)
+{
+        struct wireless_dev *wdev = dev->ieee80211_ptr;
+        bool ret;
+
+        trace_cfg80211_rx_spurious_frame(dev, addr);
+
+        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_AP &&
+                    wdev->iftype != NL80211_IFTYPE_P2P_GO)) {
+                trace_cfg80211_return_bool(false);
+                return false;
+        }
+        ret = nl80211_unexpected_frame(dev, addr, gfp);
+        trace_cfg80211_return_bool(ret);
+        return ret;
+}
+EXPORT_SYMBOL(cfg80211_rx_spurious_frame);
+
+bool cfg80211_rx_unexpected_4addr_frame(struct net_device *dev,
+                                        const u8 *addr, gfp_t gfp)
+{
+        struct wireless_dev *wdev = dev->ieee80211_ptr;
+        bool ret;
+
+        trace_cfg80211_rx_unexpected_4addr_frame(dev, addr);
+
+        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_AP &&
+                    wdev->iftype != NL80211_IFTYPE_P2P_GO &&
+                    wdev->iftype != NL80211_IFTYPE_AP_VLAN)) {
+                trace_cfg80211_return_bool(false);
+                return false;
+        }
+        ret = nl80211_unexpected_4addr_frame(dev, addr, gfp);
+        trace_cfg80211_return_bool(ret);
+        return ret;
+}
+EXPORT_SYMBOL(cfg80211_rx_unexpected_4addr_frame);
diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index a7990bb16529..396373f3ec26 100644
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -76,6 +76,10 @@ bool cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef)
                         return false;
                 if (!chandef->center_freq2)
                         return false;
+                /* adjacent is not allowed -- that's a 160 MHz channel */
+                if (chandef->center_freq1 - chandef->center_freq2 == 80 ||
+                    chandef->center_freq2 - chandef->center_freq1 == 80)
+                        return false;
                 break;
         case NL80211_CHAN_WIDTH_80:
                 if (chandef->center_freq1 != control_freq + 30 &&
diff --git a/net/wireless/core.c b/net/wireless/core.c
index b677eab55b68..9245729694d2 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -57,9 +57,6 @@ struct cfg80211_registered_device *cfg80211_rdev_by_wiphy_idx(int wiphy_idx)
 {
         struct cfg80211_registered_device *result = NULL, *rdev;
 
-        if (!wiphy_idx_valid(wiphy_idx))
-                return NULL;
-
         assert_cfg80211_lock();
 
         list_for_each_entry(rdev, &cfg80211_rdev_list, list) {
@@ -74,10 +71,8 @@ struct cfg80211_registered_device *cfg80211_rdev_by_wiphy_idx(int wiphy_idx)
 
 int get_wiphy_idx(struct wiphy *wiphy)
 {
-        struct cfg80211_registered_device *rdev;
-        if (!wiphy)
-                return WIPHY_IDX_STALE;
-        rdev = wiphy_to_dev(wiphy);
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
+
         return rdev->wiphy_idx;
 }
 
@@ -86,9 +81,6 @@ struct wiphy *wiphy_idx_to_wiphy(int wiphy_idx)
 {
         struct cfg80211_registered_device *rdev;
 
-        if (!wiphy_idx_valid(wiphy_idx))
-                return NULL;
-
         assert_cfg80211_lock();
 
         rdev = cfg80211_rdev_by_wiphy_idx(wiphy_idx);
@@ -309,7 +301,7 @@ struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv)
 
         rdev->wiphy_idx = wiphy_counter++;
 
-        if (unlikely(!wiphy_idx_valid(rdev->wiphy_idx))) {
+        if (unlikely(rdev->wiphy_idx < 0)) {
                 wiphy_counter--;
                 mutex_unlock(&cfg80211_mutex);
                 /* ugh, wrapped! */
@@ -390,8 +382,11 @@ static int wiphy_verify_combinations(struct wiphy *wiphy)
 
                 c = &wiphy->iface_combinations[i];
 
-                /* Combinations with just one interface aren't real */
-                if (WARN_ON(c->max_interfaces < 2))
+                /*
+                 * Combinations with just one interface aren't real,
+                 * however we make an exception for DFS.
+                 */
+                if (WARN_ON((c->max_interfaces < 2) && !c->radar_detect_widths))
                         return -EINVAL;
 
                 /* Need at least one channel */
@@ -406,6 +401,11 @@ static int wiphy_verify_combinations(struct wiphy *wiphy)
                                 CFG80211_MAX_NUM_DIFFERENT_CHANNELS))
                         return -EINVAL;
 
+                /* DFS only works on one channel. */
+                if (WARN_ON(c->radar_detect_widths &&
+                            (c->num_different_channels > 1)))
+                        return -EINVAL;
+
                 if (WARN_ON(!c->n_limits))
                         return -EINVAL;
 
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 3563097169cb..8396f7671c8d 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -18,6 +18,9 @@
 #include <net/cfg80211.h>
 #include "reg.h"
 
+
+#define WIPHY_IDX_INVALID       -1
+
 struct cfg80211_registered_device {
         const struct cfg80211_ops *ops;
         struct list_head list;
@@ -86,7 +89,7 @@ struct cfg80211_registered_device {
 
         /* must be last because of the way we do wiphy_priv(),
          * and it should at least be aligned to NETDEV_ALIGN */
-        struct wiphy wiphy __attribute__((__aligned__(NETDEV_ALIGN)));
+        struct wiphy wiphy __aligned(NETDEV_ALIGN);
 };
 
 static inline
@@ -96,13 +99,6 @@ struct cfg80211_registered_device *wiphy_to_dev(struct wiphy *wiphy)
         return container_of(wiphy, struct cfg80211_registered_device, wiphy);
 }
 
-/* Note 0 is valid, hence phy0 */
-static inline
-bool wiphy_idx_valid(int wiphy_idx)
-{
-        return wiphy_idx >= 0;
-}
-
 static inline void
 cfg80211_rdev_free_wowlan(struct cfg80211_registered_device *rdev)
 {
@@ -126,12 +122,6 @@ static inline void assert_cfg80211_lock(void)
         lockdep_assert_held(&cfg80211_mutex);
 }
 
-/*
- * You can use this to mark a wiphy_idx as not having an associated wiphy.
- * It guarantees cfg80211_rdev_by_wiphy_idx(wiphy_idx) will return NULL
- */
-#define WIPHY_IDX_STALE -1
-
 struct cfg80211_internal_bss {
         struct list_head list;
         struct rb_node rbn;
@@ -435,7 +425,8 @@ int cfg80211_can_use_iftype_chan(struct cfg80211_registered_device *rdev,
                                  struct wireless_dev *wdev,
                                  enum nl80211_iftype iftype,
                                  struct ieee80211_channel *chan,
-                                 enum cfg80211_chan_mode chanmode);
+                                 enum cfg80211_chan_mode chanmode,
+                                 u8 radar_detect);
 
 static inline int
 cfg80211_can_change_interface(struct cfg80211_registered_device *rdev,
@@ -443,7 +434,7 @@ cfg80211_can_change_interface(struct cfg80211_registered_device *rdev,
                               enum nl80211_iftype iftype)
 {
         return cfg80211_can_use_iftype_chan(rdev, wdev, iftype, NULL,
-                                            CHAN_MODE_UNDEFINED);
+                                            CHAN_MODE_UNDEFINED, 0);
 }
 
 static inline int
@@ -460,7 +451,7 @@ cfg80211_can_use_chan(struct cfg80211_registered_device *rdev,
                       enum cfg80211_chan_mode chanmode)
 {
         return cfg80211_can_use_iftype_chan(rdev, wdev, wdev->iftype,
-                                            chan, chanmode);
+                                            chan, chanmode, 0);
 }
 
 void
diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c
index f9d6ce5cfabb..55957a284f6c 100644
--- a/net/wireless/mesh.c
+++ b/net/wireless/mesh.c
@@ -44,6 +44,10 @@
 
 #define MESH_SYNC_NEIGHBOR_OFFSET_MAX 50
 
+#define MESH_DEFAULT_BEACON_INTERVAL    1000    /* in 1024 us units (=TUs) */
+#define MESH_DEFAULT_DTIM_PERIOD        2
+#define MESH_DEFAULT_AWAKE_WINDOW       10      /* in 1024 us units (=TUs) */
+
 const struct mesh_config default_mesh_config = {
         .dot11MeshRetryTimeout = MESH_RET_T,
         .dot11MeshConfirmTimeout = MESH_CONF_T,
@@ -69,6 +73,8 @@ const struct mesh_config default_mesh_config = {
         .dot11MeshHWMPactivePathToRootTimeout = MESH_PATH_TO_ROOT_TIMEOUT,
         .dot11MeshHWMProotInterval = MESH_ROOT_INTERVAL,
         .dot11MeshHWMPconfirmationInterval = MESH_ROOT_CONFIRMATION_INTERVAL,
+        .power_mode = NL80211_MESH_POWER_ACTIVE,
+        .dot11MeshAwakeWindowDuration = MESH_DEFAULT_AWAKE_WINDOW,
 };
 
 const struct mesh_setup default_mesh_setup = {
@@ -79,6 +85,8 @@ const struct mesh_setup default_mesh_setup = {
         .ie = NULL,
         .ie_len = 0,
         .is_secure = false,
+        .beacon_interval = MESH_DEFAULT_BEACON_INTERVAL,
+        .dtim_period = MESH_DEFAULT_DTIM_PERIOD,
 };
 
 int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev,
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index 5e8123ee63fd..461e692cdfec 100644
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -987,65 +987,3 @@ void cfg80211_pmksa_candidate_notify(struct net_device *dev, int index,
         nl80211_pmksa_candidate_notify(rdev, dev, index, bssid, preauth, gfp);
 }
 EXPORT_SYMBOL(cfg80211_pmksa_candidate_notify);
-
-void cfg80211_ch_switch_notify(struct net_device *dev,
-                               struct cfg80211_chan_def *chandef)
-{
-        struct wireless_dev *wdev = dev->ieee80211_ptr;
-        struct wiphy *wiphy = wdev->wiphy;
-        struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
-
-        trace_cfg80211_ch_switch_notify(dev, chandef);
-
-        wdev_lock(wdev);
-
-        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_AP &&
-                    wdev->iftype != NL80211_IFTYPE_P2P_GO))
-                goto out;
-
-        wdev->channel = chandef->chan;
-        nl80211_ch_switch_notify(rdev, dev, chandef, GFP_KERNEL);
-out:
-        wdev_unlock(wdev);
-        return;
-}
-EXPORT_SYMBOL(cfg80211_ch_switch_notify);
-
-bool cfg80211_rx_spurious_frame(struct net_device *dev,
-                                const u8 *addr, gfp_t gfp)
-{
-        struct wireless_dev *wdev = dev->ieee80211_ptr;
-        bool ret;
-
-        trace_cfg80211_rx_spurious_frame(dev, addr);
-
-        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_AP &&
-                    wdev->iftype != NL80211_IFTYPE_P2P_GO)) {
-                trace_cfg80211_return_bool(false);
-                return false;
-        }
-        ret = nl80211_unexpected_frame(dev, addr, gfp);
-        trace_cfg80211_return_bool(ret);
-        return ret;
-}
-EXPORT_SYMBOL(cfg80211_rx_spurious_frame);
-
-bool cfg80211_rx_unexpected_4addr_frame(struct net_device *dev,
-                                        const u8 *addr, gfp_t gfp)
-{
-        struct wireless_dev *wdev = dev->ieee80211_ptr;
-        bool ret;
-
-        trace_cfg80211_rx_unexpected_4addr_frame(dev, addr);
-
-        if (WARN_ON(wdev->iftype != NL80211_IFTYPE_AP &&
-                    wdev->iftype != NL80211_IFTYPE_P2P_GO &&
-                    wdev->iftype != NL80211_IFTYPE_AP_VLAN)) {
-                trace_cfg80211_return_bool(false);
-                return false;
-        }
-        ret = nl80211_unexpected_4addr_frame(dev, addr, gfp);
-        trace_cfg80211_return_bool(ret);
-        return ret;
-}
-EXPORT_SYMBOL(cfg80211_rx_unexpected_4addr_frame);
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index f45706adaf34..33de80364c5c 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -856,6 +856,9 @@ static int nl80211_put_iface_combinations(struct wiphy *wiphy,
                     nla_put_u32(msg, NL80211_IFACE_COMB_MAXNUM,
                                 c->max_interfaces))
                         goto nla_put_failure;
+                if (nla_put_u32(msg, NL80211_IFACE_COMB_RADAR_DETECT_WIDTHS,
+                                c->radar_detect_widths))
+                        goto nla_put_failure;
 
                 nla_nest_end(msg, nl_combi);
         }
@@ -2079,6 +2082,13 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info)
             !(rdev->wiphy.interface_modes & (1 << type)))
                 return -EOPNOTSUPP;
 
+        if (type == NL80211_IFTYPE_P2P_DEVICE && info->attrs[NL80211_ATTR_MAC]) {
+                nla_memcpy(params.macaddr, info->attrs[NL80211_ATTR_MAC],
+                           ETH_ALEN);
+                if (!is_valid_ether_addr(params.macaddr))
+                        return -EADDRNOTAVAIL;
+        }
+
         if (info->attrs[NL80211_ATTR_4ADDR]) {
                 params.use_4addr = !!nla_get_u8(info->attrs[NL80211_ATTR_4ADDR]);
                 err = nl80211_valid_4addr(rdev, NULL, params.use_4addr, type);
@@ -3001,6 +3011,18 @@ static int nl80211_send_station(struct sk_buff *msg, u32 portid, u32 seq,
             nla_put_u32(msg, NL80211_STA_INFO_BEACON_LOSS,
                         sinfo->beacon_loss_count))
                 goto nla_put_failure;
+        if ((sinfo->filled & STATION_INFO_LOCAL_PM) &&
+            nla_put_u32(msg, NL80211_STA_INFO_LOCAL_PM,
+                        sinfo->local_pm))
+                goto nla_put_failure;
+        if ((sinfo->filled & STATION_INFO_PEER_PM) &&
+            nla_put_u32(msg, NL80211_STA_INFO_PEER_PM,
+                        sinfo->peer_pm))
+                goto nla_put_failure;
+        if ((sinfo->filled & STATION_INFO_NONPEER_PM) &&
+            nla_put_u32(msg, NL80211_STA_INFO_NONPEER_PM,
+                        sinfo->nonpeer_pm))
+                goto nla_put_failure;
         if (sinfo->filled & STATION_INFO_BSS_PARAM) {
                 bss_param = nla_nest_start(msg, NL80211_STA_INFO_BSS_PARAM);
                 if (!bss_param)
@@ -3188,13 +3210,9 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
                         nla_len(info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]);
         }
 
-        if (info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL])
-                params.listen_interval =
-                    nla_get_u16(info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL]);
-
-        if (info->attrs[NL80211_ATTR_HT_CAPABILITY])
-                params.ht_capa =
-                        nla_data(info->attrs[NL80211_ATTR_HT_CAPABILITY]);
+        if (info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL] ||
+            info->attrs[NL80211_ATTR_HT_CAPABILITY])
+                return -EINVAL;
 
         if (!rdev->ops->change_station)
                 return -EOPNOTSUPP;
@@ -3210,6 +3228,17 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
                 params.plink_state =
                     nla_get_u8(info->attrs[NL80211_ATTR_STA_PLINK_STATE]);
 
+        if (info->attrs[NL80211_ATTR_LOCAL_MESH_POWER_MODE]) {
+                enum nl80211_mesh_power_mode pm = nla_get_u32(
+                        info->attrs[NL80211_ATTR_LOCAL_MESH_POWER_MODE]);
+
+                if (pm <= NL80211_MESH_POWER_UNKNOWN ||
+                    pm > NL80211_MESH_POWER_MAX)
+                        return -EINVAL;
+
+                params.local_pm = pm;
+        }
+
         switch (dev->ieee80211_ptr->iftype) {
         case NL80211_IFTYPE_AP:
         case NL80211_IFTYPE_AP_VLAN:
@@ -3217,6 +3246,8 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
                 /* disallow mesh-specific things */
                 if (params.plink_action)
                         return -EINVAL;
+                if (params.local_pm)
+                        return -EINVAL;
 
                 /* TDLS can't be set, ... */
                 if (params.sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER))
@@ -3231,11 +3262,25 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
                 /* accept only the listed bits */
                 if (params.sta_flags_mask &
                                 ~(BIT(NL80211_STA_FLAG_AUTHORIZED) |
+                                  BIT(NL80211_STA_FLAG_AUTHENTICATED) |
+                                  BIT(NL80211_STA_FLAG_ASSOCIATED) |
                                   BIT(NL80211_STA_FLAG_SHORT_PREAMBLE) |
                                   BIT(NL80211_STA_FLAG_WME) |
                                   BIT(NL80211_STA_FLAG_MFP)))
                         return -EINVAL;
 
+                /* but authenticated/associated only if driver handles it */
+                if (!(rdev->wiphy.features &
+                                NL80211_FEATURE_FULL_AP_CLIENT_STATE) &&
+                    params.sta_flags_mask &
+                                (BIT(NL80211_STA_FLAG_AUTHENTICATED) |
+                                 BIT(NL80211_STA_FLAG_ASSOCIATED)))
+                        return -EINVAL;
+
+                /* reject other things that can't change */
+                if (params.supported_rates)
+                        return -EINVAL;
+
                 /* must be last in here for error handling */
                 params.vlan = get_vlan(info, rdev);
                 if (IS_ERR(params.vlan))
@@ -3255,9 +3300,7 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
                 /* disallow things sta doesn't support */
                 if (params.plink_action)
                         return -EINVAL;
-                if (params.ht_capa)
-                        return -EINVAL;
-                if (params.listen_interval >= 0)
+                if (params.local_pm)
                         return -EINVAL;
                 /* reject any changes other than AUTHORIZED */
                 if (params.sta_flags_mask & ~BIT(NL80211_STA_FLAG_AUTHORIZED))
@@ -3267,9 +3310,7 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
                 /* disallow things mesh doesn't support */
                 if (params.vlan)
                         return -EINVAL;
-                if (params.ht_capa)
-                        return -EINVAL;
-                if (params.listen_interval >= 0)
+                if (params.supported_rates)
                         return -EINVAL;
                 /*
                  * No special handling for TDLS here -- the userspace
@@ -3393,17 +3434,31 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
                 /* but don't bother the driver with it */
                 params.sta_flags_mask &= ~BIT(NL80211_STA_FLAG_TDLS_PEER);
 
+                /* allow authenticated/associated only if driver handles it */
+                if (!(rdev->wiphy.features &
+                                NL80211_FEATURE_FULL_AP_CLIENT_STATE) &&
+                    params.sta_flags_mask &
+                                (BIT(NL80211_STA_FLAG_AUTHENTICATED) |
+                                 BIT(NL80211_STA_FLAG_ASSOCIATED)))
+                        return -EINVAL;
+
                 /* must be last in here for error handling */
                 params.vlan = get_vlan(info, rdev);
                 if (IS_ERR(params.vlan))
                         return PTR_ERR(params.vlan);
                 break;
         case NL80211_IFTYPE_MESH_POINT:
+                /* associated is disallowed */
+                if (params.sta_flags_mask & BIT(NL80211_STA_FLAG_ASSOCIATED))
+                        return -EINVAL;
                 /* TDLS peers cannot be added */
                 if (params.sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER))
                         return -EINVAL;
                 break;
         case NL80211_IFTYPE_STATION:
+                /* associated is disallowed */
+                if (params.sta_flags_mask & BIT(NL80211_STA_FLAG_ASSOCIATED))
+                        return -EINVAL;
                 /* Only TDLS peers can be added */
                 if (!(params.sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER)))
                         return -EINVAL;
@@ -3787,12 +3842,8 @@ static int nl80211_req_set_reg(struct sk_buff *skb, struct genl_info *info)
          * window between nl80211_init() and regulatory_init(), if that is
          * even possible.
          */
-        mutex_lock(&cfg80211_mutex);
-        if (unlikely(!cfg80211_regdomain)) {
-                mutex_unlock(&cfg80211_mutex);
+        if (unlikely(!rcu_access_pointer(cfg80211_regdomain)))
                 return -EINPROGRESS;
-        }
-        mutex_unlock(&cfg80211_mutex);
 
         if (!info->attrs[NL80211_ATTR_REG_ALPHA2])
                 return -EINVAL;
@@ -3908,7 +3959,11 @@ static int nl80211_get_mesh_config(struct sk_buff *skb,
             nla_put_u16(msg, NL80211_MESHCONF_HWMP_ROOT_INTERVAL,
                         cur_params.dot11MeshHWMProotInterval) ||
             nla_put_u16(msg, NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
-                        cur_params.dot11MeshHWMPconfirmationInterval))
+                        cur_params.dot11MeshHWMPconfirmationInterval) ||
+            nla_put_u32(msg, NL80211_MESHCONF_POWER_MODE,
+                        cur_params.power_mode) ||
+            nla_put_u16(msg, NL80211_MESHCONF_AWAKE_WINDOW,
+                        cur_params.dot11MeshAwakeWindowDuration))
                 goto nla_put_failure;
         nla_nest_end(msg, pinfoattr);
         genlmsg_end(msg, hdr);
@@ -3947,6 +4002,8 @@ static const struct nla_policy nl80211_meshconf_params_policy[NL80211_MESHCONF_A
         [NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT] = { .type = NLA_U32 },
         [NL80211_MESHCONF_HWMP_ROOT_INTERVAL] = { .type = NLA_U16 },
         [NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL] = { .type = NLA_U16 },
+        [NL80211_MESHCONF_POWER_MODE] = { .type = NLA_U32 },
+        [NL80211_MESHCONF_AWAKE_WINDOW] = { .type = NLA_U16 },
 };
 
 static const struct nla_policy
@@ -3967,13 +4024,15 @@ static int nl80211_parse_mesh_config(struct genl_info *info,
         struct nlattr *tb[NL80211_MESHCONF_ATTR_MAX + 1];
         u32 mask = 0;
 
-#define FILL_IN_MESH_PARAM_IF_SET(table, cfg, param, mask, attr_num, nla_fn) \
-do {\
-        if (table[attr_num]) {\
-                cfg->param = nla_fn(table[attr_num]); \
-                mask |= (1 << (attr_num - 1)); \
-        } \
-} while (0);\
+#define FILL_IN_MESH_PARAM_IF_SET(tb, cfg, param, min, max, mask, attr, fn) \
+do {                                                                        \
+        if (tb[attr]) {                                                     \
+                if (fn(tb[attr]) < min || fn(tb[attr]) > max)               \
+                        return -EINVAL;                                     \
+                cfg->param = fn(tb[attr]);                                  \
+                mask |= (1 << (attr - 1));                                  \
+        }                                                                   \
+} while (0)
 
 
         if (!info->attrs[NL80211_ATTR_MESH_CONFIG])
@@ -3988,83 +4047,98 @@ do {\
         BUILD_BUG_ON(NL80211_MESHCONF_ATTR_MAX > 32);
 
         /* Fill in the params struct */
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshRetryTimeout,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshRetryTimeout, 1, 255,
                                   mask, NL80211_MESHCONF_RETRY_TIMEOUT,
                                   nla_get_u16);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshConfirmTimeout,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshConfirmTimeout, 1, 255,
                                   mask, NL80211_MESHCONF_CONFIRM_TIMEOUT,
                                   nla_get_u16);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHoldingTimeout,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHoldingTimeout, 1, 255,
                                   mask, NL80211_MESHCONF_HOLDING_TIMEOUT,
                                   nla_get_u16);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshMaxPeerLinks,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshMaxPeerLinks, 0, 255,
                                   mask, NL80211_MESHCONF_MAX_PEER_LINKS,
                                   nla_get_u16);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshMaxRetries,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshMaxRetries, 0, 16,
                                   mask, NL80211_MESHCONF_MAX_RETRIES,
                                   nla_get_u8);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshTTL,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshTTL, 1, 255,
                                   mask, NL80211_MESHCONF_TTL, nla_get_u8);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, element_ttl,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, element_ttl, 1, 255,
                                   mask, NL80211_MESHCONF_ELEMENT_TTL,
                                   nla_get_u8);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, auto_open_plinks,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, auto_open_plinks, 0, 1,
                                   mask, NL80211_MESHCONF_AUTO_OPEN_PLINKS,
                                   nla_get_u8);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshNbrOffsetMaxNeighbor, mask,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshNbrOffsetMaxNeighbor,
+                                  1, 255, mask,
                                   NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
                                   nla_get_u32);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPmaxPREQretries,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPmaxPREQretries, 0, 255,
                                   mask, NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES,
                                   nla_get_u8);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, path_refresh_time,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, path_refresh_time, 1, 65535,
                                   mask, NL80211_MESHCONF_PATH_REFRESH_TIME,
                                   nla_get_u32);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, min_discovery_timeout,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, min_discovery_timeout, 1, 65535,
                                   mask, NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT,
                                   nla_get_u16);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPactivePathTimeout, mask,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPactivePathTimeout,
+                                  1, 65535, mask,
                                   NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
                                   nla_get_u32);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPpreqMinInterval,
-                                  mask, NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
+                                  1, 65535, mask,
+                                  NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
                                   nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPperrMinInterval,
-                                  mask, NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
+                                  1, 65535, mask,
+                                  NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
                                   nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
-                                  dot11MeshHWMPnetDiameterTraversalTime, mask,
+                                  dot11MeshHWMPnetDiameterTraversalTime,
+                                  1, 65535, mask,
                                   NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
                                   nla_get_u16);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPRootMode, mask,
-                                  NL80211_MESHCONF_HWMP_ROOTMODE, nla_get_u8);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPRannInterval, mask,
-                                  NL80211_MESHCONF_HWMP_RANN_INTERVAL,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPRootMode, 0, 4,
+                                  mask, NL80211_MESHCONF_HWMP_ROOTMODE,
+                                  nla_get_u8);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPRannInterval, 1, 65535,
+                                  mask, NL80211_MESHCONF_HWMP_RANN_INTERVAL,
                                   nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
-                                  dot11MeshGateAnnouncementProtocol, mask,
-                                  NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
+                                  dot11MeshGateAnnouncementProtocol, 0, 1,
+                                  mask, NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
                                   nla_get_u8);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshForwarding,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshForwarding, 0, 1,
                                   mask, NL80211_MESHCONF_FORWARDING,
                                   nla_get_u8);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, rssi_threshold,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, rssi_threshold, 1, 255,
                                   mask, NL80211_MESHCONF_RSSI_THRESHOLD,
                                   nla_get_u32);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, ht_opmode,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, ht_opmode, 0, 16,
                                   mask, NL80211_MESHCONF_HT_OPMODE,
                                   nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPactivePathToRootTimeout,
-                                  mask,
+                                  1, 65535, mask,
                                   NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,
                                   nla_get_u32);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMProotInterval,
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMProotInterval, 1, 65535,
                                   mask, NL80211_MESHCONF_HWMP_ROOT_INTERVAL,
                                   nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
-                                  dot11MeshHWMPconfirmationInterval, mask,
+                                  dot11MeshHWMPconfirmationInterval,
+                                  1, 65535, mask,
                                   NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
                                   nla_get_u16);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, power_mode,
+                                  NL80211_MESH_POWER_ACTIVE,
+                                  NL80211_MESH_POWER_MAX,
+                                  mask, NL80211_MESHCONF_POWER_MODE,
+                                  nla_get_u32);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshAwakeWindowDuration,
+                                  0, 65535, mask,
+                                  NL80211_MESHCONF_AWAKE_WINDOW, nla_get_u16);
         if (mask_out)
                 *mask_out = mask;
 
@@ -4152,6 +4226,7 @@ static int nl80211_update_mesh_config(struct sk_buff *skb,
 
 static int nl80211_get_reg(struct sk_buff *skb, struct genl_info *info)
 {
+        const struct ieee80211_regdomain *regdom;
         struct sk_buff *msg;
         void *hdr = NULL;
         struct nlattr *nl_reg_rules;
@@ -4174,35 +4249,36 @@ static int nl80211_get_reg(struct sk_buff *skb, struct genl_info *info)
         if (!hdr)
                 goto put_failure;
 
-        if (nla_put_string(msg, NL80211_ATTR_REG_ALPHA2,
-                           cfg80211_regdomain->alpha2) ||
-            (cfg80211_regdomain->dfs_region &&
-             nla_put_u8(msg, NL80211_ATTR_DFS_REGION,
-                        cfg80211_regdomain->dfs_region)))
-                goto nla_put_failure;
-
         if (reg_last_request_cell_base() &&
             nla_put_u32(msg, NL80211_ATTR_USER_REG_HINT_TYPE,
                         NL80211_USER_REG_HINT_CELL_BASE))
                 goto nla_put_failure;
 
+        rcu_read_lock();
+        regdom = rcu_dereference(cfg80211_regdomain);
+
+        if (nla_put_string(msg, NL80211_ATTR_REG_ALPHA2, regdom->alpha2) ||
+            (regdom->dfs_region &&
+             nla_put_u8(msg, NL80211_ATTR_DFS_REGION, regdom->dfs_region)))
+                goto nla_put_failure_rcu;
+
         nl_reg_rules = nla_nest_start(msg, NL80211_ATTR_REG_RULES);
         if (!nl_reg_rules)
-                goto nla_put_failure;
+                goto nla_put_failure_rcu;
 
-        for (i = 0; i < cfg80211_regdomain->n_reg_rules; i++) {
+        for (i = 0; i < regdom->n_reg_rules; i++) {
                 struct nlattr *nl_reg_rule;
                 const struct ieee80211_reg_rule *reg_rule;
                 const struct ieee80211_freq_range *freq_range;
                 const struct ieee80211_power_rule *power_rule;
 
-                reg_rule = &cfg80211_regdomain->reg_rules[i];
+                reg_rule = &regdom->reg_rules[i];
                 freq_range = &reg_rule->freq_range;
                 power_rule = &reg_rule->power_rule;
 
                 nl_reg_rule = nla_nest_start(msg, i);
                 if (!nl_reg_rule)
-                        goto nla_put_failure;
+                        goto nla_put_failure_rcu;
 
                 if (nla_put_u32(msg, NL80211_ATTR_REG_RULE_FLAGS,
                                 reg_rule->flags) ||
@@ -4216,10 +4292,11 @@ static int nl80211_get_reg(struct sk_buff *skb, struct genl_info *info)
                                 power_rule->max_antenna_gain) ||
                     nla_put_u32(msg, NL80211_ATTR_POWER_RULE_MAX_EIRP,
                                 power_rule->max_eirp))
-                        goto nla_put_failure;
+                        goto nla_put_failure_rcu;
 
                 nla_nest_end(msg, nl_reg_rule);
         }
+        rcu_read_unlock();
 
         nla_nest_end(msg, nl_reg_rules);
 
@@ -4227,6 +4304,8 @@ static int nl80211_get_reg(struct sk_buff *skb, struct genl_info *info)
         err = genlmsg_reply(msg, info);
         goto out;
 
+nla_put_failure_rcu:
+        rcu_read_unlock();
 nla_put_failure:
         genlmsg_cancel(msg, hdr);
 put_failure:
@@ -4259,27 +4338,18 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
                 dfs_region = nla_get_u8(info->attrs[NL80211_ATTR_DFS_REGION]);
 
         nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
-                        rem_reg_rules) {
+                            rem_reg_rules) {
                 num_rules++;
                 if (num_rules > NL80211_MAX_SUPP_REG_RULES)
                         return -EINVAL;
         }
 
-        mutex_lock(&cfg80211_mutex);
-
-        if (!reg_is_valid_request(alpha2)) {
-                r = -EINVAL;
-                goto bad_reg;
-        }
-
         size_of_regd = sizeof(struct ieee80211_regdomain) +
-                (num_rules * sizeof(struct ieee80211_reg_rule));
+                       num_rules * sizeof(struct ieee80211_reg_rule);
 
         rd = kzalloc(size_of_regd, GFP_KERNEL);
-        if (!rd) {
-                r = -ENOMEM;
-                goto bad_reg;
-        }
+        if (!rd)
+                return -ENOMEM;
 
         rd->n_reg_rules = num_rules;
         rd->alpha2[0] = alpha2[0];
@@ -4293,10 +4363,10 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
                 rd->dfs_region = dfs_region;
 
         nla_for_each_nested(nl_reg_rule, info->attrs[NL80211_ATTR_REG_RULES],
-                        rem_reg_rules) {
+                            rem_reg_rules) {
                 nla_parse(tb, NL80211_REG_RULE_ATTR_MAX,
-                        nla_data(nl_reg_rule), nla_len(nl_reg_rule),
-                        reg_rule_policy);
+                          nla_data(nl_reg_rule), nla_len(nl_reg_rule),
+                          reg_rule_policy);
                 r = parse_reg_rule(tb, &rd->reg_rules[rule_idx]);
                 if (r)
                         goto bad_reg;
@@ -4309,16 +4379,14 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
                 }
         }
 
-        BUG_ON(rule_idx != num_rules);
+        mutex_lock(&cfg80211_mutex);
 
         r = set_regdom(rd);
-
+        /* set_regdom took ownership */
+        rd = NULL;
         mutex_unlock(&cfg80211_mutex);
 
-        return r;
-
  bad_reg:
-        mutex_unlock(&cfg80211_mutex);
         kfree(rd);
         return r;
 }
@@ -5867,6 +5935,15 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info)
                 connect.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
         }
 
+        if (info->attrs[NL80211_ATTR_USE_MFP]) {
+                connect.mfp = nla_get_u32(info->attrs[NL80211_ATTR_USE_MFP]);
+                if (connect.mfp != NL80211_MFP_REQUIRED &&
+                    connect.mfp != NL80211_MFP_NO)
+                        return -EINVAL;
+        } else {
+                connect.mfp = NL80211_MFP_NO;
+        }
+
         if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
                 connect.channel =
                         ieee80211_get_channel(wiphy,
@@ -6652,6 +6729,21 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)
                             nla_get_u32(info->attrs[NL80211_ATTR_MCAST_RATE])))
                         return -EINVAL;
 
+        if (info->attrs[NL80211_ATTR_BEACON_INTERVAL]) {
+                setup.beacon_interval =
+                        nla_get_u32(info->attrs[NL80211_ATTR_BEACON_INTERVAL]);
+                if (setup.beacon_interval < 10 ||
+                    setup.beacon_interval > 10000)
+                        return -EINVAL;
+        }
+
+        if (info->attrs[NL80211_ATTR_DTIM_PERIOD]) {
+                setup.dtim_period =
+                        nla_get_u32(info->attrs[NL80211_ATTR_DTIM_PERIOD]);
+                if (setup.dtim_period < 1 || setup.dtim_period > 100)
+                        return -EINVAL;
+        }
+
         if (info->attrs[NL80211_ATTR_MESH_SETUP]) {
                 /* parse additional setup parameters if given */
                 err = nl80211_parse_mesh_setup(info, &setup);
@@ -8051,7 +8143,7 @@ void nl80211_send_reg_change_event(struct regulatory_request *request)
                         goto nla_put_failure;
         }
 
-        if (wiphy_idx_valid(request->wiphy_idx) &&
+        if (request->wiphy_idx != WIPHY_IDX_INVALID &&
             nla_put_u32(msg, NL80211_ATTR_WIPHY, request->wiphy_idx))
                 goto nla_put_failure;
 
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 82c4fc7c994c..de02d633c212 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -48,7 +48,6 @@
 #include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/list.h>
-#include <linux/random.h>
 #include <linux/ctype.h>
 #include <linux/nl80211.h>
 #include <linux/platform_device.h>
@@ -66,6 +65,13 @@
 #define REG_DBG_PRINT(args...)
 #endif
 
+enum reg_request_treatment {
+        REG_REQ_OK,
+        REG_REQ_IGNORE,
+        REG_REQ_INTERSECT,
+        REG_REQ_ALREADY_SET,
+};
+
 static struct regulatory_request core_request_world = {
         .initiator = NL80211_REGDOM_SET_BY_CORE,
         .alpha2[0] = '0',
@@ -76,7 +82,8 @@ static struct regulatory_request core_request_world = {
 };
 
 /* Receipt of information from last regulatory request */
-static struct regulatory_request *last_request = &core_request_world;
+static struct regulatory_request __rcu *last_request =
+        (void __rcu *)&core_request_world;
 
 /* To trigger userspace events */
 static struct platform_device *reg_pdev;
@@ -88,16 +95,16 @@ static struct device_type reg_device_type = {
 /*
  * Central wireless core regulatory domains, we only need two,
  * the current one and a world regulatory domain in case we have no
- * information to give us an alpha2
+ * information to give us an alpha2.
  */
-const struct ieee80211_regdomain *cfg80211_regdomain;
+const struct ieee80211_regdomain __rcu *cfg80211_regdomain;
 
 /*
  * Protects static reg.c components:
- *     - cfg80211_world_regdom
- *     - cfg80211_regdom
- *     - last_request
- *     - reg_num_devs_support_basehint
+ *      - cfg80211_regdomain (if not used with RCU)
+ *      - cfg80211_world_regdom
+ *      - last_request (if not used with RCU)
+ *      - reg_num_devs_support_basehint
  */
 static DEFINE_MUTEX(reg_mutex);
 
@@ -112,6 +119,31 @@ static inline void assert_reg_lock(void)
         lockdep_assert_held(&reg_mutex);
 }
 
+static const struct ieee80211_regdomain *get_cfg80211_regdom(void)
+{
+        return rcu_dereference_protected(cfg80211_regdomain,
+                                         lockdep_is_held(&reg_mutex));
+}
+
+static const struct ieee80211_regdomain *get_wiphy_regdom(struct wiphy *wiphy)
+{
+        return rcu_dereference_protected(wiphy->regd,
+                                         lockdep_is_held(&reg_mutex));
+}
+
+static void rcu_free_regdom(const struct ieee80211_regdomain *r)
+{
+        if (!r)
+                return;
+        kfree_rcu((struct ieee80211_regdomain *)r, rcu_head);
+}
+
+static struct regulatory_request *get_last_request(void)
+{
+        return rcu_dereference_check(last_request,
+                                     lockdep_is_held(&reg_mutex));
+}
+
 /* Used to queue up regulatory hints */
 static LIST_HEAD(reg_requests_list);
 static spinlock_t reg_requests_lock;
@@ -177,28 +209,37 @@ static char user_alpha2[2];
 module_param(ieee80211_regdom, charp, 0444);
 MODULE_PARM_DESC(ieee80211_regdom, "IEEE 802.11 regulatory domain code");
 
-static void reset_regdomains(bool full_reset)
+static void reset_regdomains(bool full_reset,
+                             const struct ieee80211_regdomain *new_regdom)
 {
+        const struct ieee80211_regdomain *r;
+        struct regulatory_request *lr;
+
+        assert_reg_lock();
+
+        r = get_cfg80211_regdom();
+
         /* avoid freeing static information or freeing something twice */
-        if (cfg80211_regdomain == cfg80211_world_regdom)
-                cfg80211_regdomain = NULL;
+        if (r == cfg80211_world_regdom)
+                r = NULL;
         if (cfg80211_world_regdom == &world_regdom)
                 cfg80211_world_regdom = NULL;
-        if (cfg80211_regdomain == &world_regdom)
-                cfg80211_regdomain = NULL;
+        if (r == &world_regdom)
+                r = NULL;
 
-        kfree(cfg80211_regdomain);
-        kfree(cfg80211_world_regdom);
+        rcu_free_regdom(r);
+        rcu_free_regdom(cfg80211_world_regdom);
 
         cfg80211_world_regdom = &world_regdom;
-        cfg80211_regdomain = NULL;
+        rcu_assign_pointer(cfg80211_regdomain, new_regdom);
 
         if (!full_reset)
                 return;
 
-        if (last_request != &core_request_world)
-                kfree(last_request);
-        last_request = &core_request_world;
+        lr = get_last_request();
+        if (lr != &core_request_world && lr)
+                kfree_rcu(lr, rcu_head);
+        rcu_assign_pointer(last_request, &core_request_world);
 }
 
 /*
@@ -207,30 +248,29 @@ static void reset_regdomains(bool full_reset)
  */
 static void update_world_regdomain(const struct ieee80211_regdomain *rd)
 {
-        BUG_ON(!last_request);
+        struct regulatory_request *lr;
+
+        lr = get_last_request();
+
+        WARN_ON(!lr);
 
-        reset_regdomains(false);
+        reset_regdomains(false, rd);
 
         cfg80211_world_regdom = rd;
-        cfg80211_regdomain = rd;
 }
 
 bool is_world_regdom(const char *alpha2)
 {
         if (!alpha2)
                 return false;
-        if (alpha2[0] == '0' && alpha2[1] == '0')
-                return true;
-        return false;
+        return alpha2[0] == '0' && alpha2[1] == '0';
 }
 
 static bool is_alpha2_set(const char *alpha2)
 {
         if (!alpha2)
                 return false;
-        if (alpha2[0] != 0 && alpha2[1] != 0)
-                return true;
-        return false;
+        return alpha2[0] && alpha2[1];
 }
 
 static bool is_unknown_alpha2(const char *alpha2)
@@ -241,9 +281,7 @@ static bool is_unknown_alpha2(const char *alpha2)
          * Special case where regulatory domain was built by driver
          * but a specific alpha2 cannot be determined
          */
-        if (alpha2[0] == '9' && alpha2[1] == '9')
-                return true;
-        return false;
+        return alpha2[0] == '9' && alpha2[1] == '9';
 }
 
 static bool is_intersected_alpha2(const char *alpha2)
@@ -255,39 +293,30 @@ static bool is_intersected_alpha2(const char *alpha2)
          * result of an intersection between two regulatory domain
          * structures
          */
-        if (alpha2[0] == '9' && alpha2[1] == '8')
-                return true;
-        return false;
+        return alpha2[0] == '9' && alpha2[1] == '8';
 }
 
 static bool is_an_alpha2(const char *alpha2)
 {
         if (!alpha2)
                 return false;
-        if (isalpha(alpha2[0]) && isalpha(alpha2[1]))
-                return true;
-        return false;
+        return isalpha(alpha2[0]) && isalpha(alpha2[1]);
 }
 
 static bool alpha2_equal(const char *alpha2_x, const char *alpha2_y)
 {
         if (!alpha2_x || !alpha2_y)
                 return false;
-        if (alpha2_x[0] == alpha2_y[0] &&
-                alpha2_x[1] == alpha2_y[1])
-                return true;
-        return false;
+        return alpha2_x[0] == alpha2_y[0] && alpha2_x[1] == alpha2_y[1];
 }
 
 static bool regdom_changes(const char *alpha2)
 {
-        assert_cfg80211_lock();
+        const struct ieee80211_regdomain *r = get_cfg80211_regdom();
 
-        if (!cfg80211_regdomain)
+        if (!r)
                 return true;
-        if (alpha2_equal(cfg80211_regdomain->alpha2, alpha2))
-                return false;
-        return true;
+        return !alpha2_equal(r->alpha2, alpha2);
 }
 
 /*
@@ -301,38 +330,36 @@ static bool is_user_regdom_saved(void)
                 return false;
 
         /* This would indicate a mistake on the design */
-        if (WARN((!is_world_regdom(user_alpha2) &&
-                  !is_an_alpha2(user_alpha2)),
+        if (WARN(!is_world_regdom(user_alpha2) && !is_an_alpha2(user_alpha2),
                  "Unexpected user alpha2: %c%c\n",
-                 user_alpha2[0],
-                 user_alpha2[1]))
+                 user_alpha2[0], user_alpha2[1]))
                 return false;
 
         return true;
 }
 
-static int reg_copy_regd(const struct ieee80211_regdomain **dst_regd,
-                         const struct ieee80211_regdomain *src_regd)
+static const struct ieee80211_regdomain *
+reg_copy_regd(const struct ieee80211_regdomain *src_regd)
 {
         struct ieee80211_regdomain *regd;
-        int size_of_regd = 0;
+        int size_of_regd;
         unsigned int i;
 
-        size_of_regd = sizeof(struct ieee80211_regdomain) +
-          ((src_regd->n_reg_rules + 1) * sizeof(struct ieee80211_reg_rule));
+        size_of_regd =
+                sizeof(struct ieee80211_regdomain) +
+                src_regd->n_reg_rules * sizeof(struct ieee80211_reg_rule);
 
         regd = kzalloc(size_of_regd, GFP_KERNEL);
         if (!regd)
-                return -ENOMEM;
+                return ERR_PTR(-ENOMEM);
 
         memcpy(regd, src_regd, sizeof(struct ieee80211_regdomain));
 
         for (i = 0; i < src_regd->n_reg_rules; i++)
                 memcpy(&regd->reg_rules[i], &src_regd->reg_rules[i],
-                        sizeof(struct ieee80211_reg_rule));
+                       sizeof(struct ieee80211_reg_rule));
 
-        *dst_regd = regd;
-        return 0;
+        return regd;
 }
 
 #ifdef CONFIG_CFG80211_INTERNAL_REGDB
@@ -347,9 +374,8 @@ static DEFINE_MUTEX(reg_regdb_search_mutex);
 static void reg_regdb_search(struct work_struct *work)
 {
         struct reg_regdb_search_request *request;
-        const struct ieee80211_regdomain *curdom, *regdom;
-        int i, r;
-        bool set_reg = false;
+        const struct ieee80211_regdomain *curdom, *regdom = NULL;
+        int i;
 
         mutex_lock(&cfg80211_mutex);
 
@@ -360,14 +386,11 @@ static void reg_regdb_search(struct work_struct *work)
                                            list);
                 list_del(&request->list);
 
-                for (i=0; i<reg_regdb_size; i++) {
+                for (i = 0; i < reg_regdb_size; i++) {
                         curdom = reg_regdb[i];
 
-                        if (!memcmp(request->alpha2, curdom->alpha2, 2)) {
-                                r = reg_copy_regd(&regdom, curdom);
-                                if (r)
-                                        break;
-                                set_reg = true;
+                        if (alpha2_equal(request->alpha2, curdom->alpha2)) {
+                                regdom = reg_copy_regd(curdom);
                                 break;
                         }
                 }
@@ -376,7 +399,7 @@ static void reg_regdb_search(struct work_struct *work)
         }
         mutex_unlock(&reg_regdb_search_mutex);
 
-        if (set_reg)
+        if (!IS_ERR_OR_NULL(regdom))
                 set_regdom(regdom);
 
         mutex_unlock(&cfg80211_mutex);
@@ -434,15 +457,14 @@ static int call_crda(const char *alpha2)
         return kobject_uevent(&reg_pdev->dev.kobj, KOBJ_CHANGE);
 }
 
-/* Used by nl80211 before kmalloc'ing our regulatory domain */
-bool reg_is_valid_request(const char *alpha2)
+static bool reg_is_valid_request(const char *alpha2)
 {
-        assert_cfg80211_lock();
+        struct regulatory_request *lr = get_last_request();
 
-        if (!last_request)
+        if (!lr || lr->processed)
                 return false;
 
-        return alpha2_equal(last_request->alpha2, alpha2);
+        return alpha2_equal(lr->alpha2, alpha2);
 }
 
 /* Sanity check on a regulatory rule */
@@ -460,7 +482,7 @@ static bool is_valid_reg_rule(const struct ieee80211_reg_rule *rule)
         freq_diff = freq_range->end_freq_khz - freq_range->start_freq_khz;
 
         if (freq_range->end_freq_khz <= freq_range->start_freq_khz ||
-                        freq_range->max_bandwidth_khz > freq_diff)
+            freq_range->max_bandwidth_khz > freq_diff)
                 return false;
 
         return true;
@@ -487,8 +509,7 @@ static bool is_valid_rd(const struct ieee80211_regdomain *rd)
 }
 
 static bool reg_does_bw_fit(const struct ieee80211_freq_range *freq_range,
-                            u32 center_freq_khz,
-                            u32 bw_khz)
+                            u32 center_freq_khz, u32 bw_khz)
 {
         u32 start_freq_khz, end_freq_khz;
 
@@ -518,7 +539,7 @@ static bool reg_does_bw_fit(const struct ieee80211_freq_range *freq_range,
  * regulatory rule support for other "bands".
  **/
 static bool freq_in_rule_band(const struct ieee80211_freq_range *freq_range,
-        u32 freq_khz)
+                              u32 freq_khz)
 {
 #define ONE_GHZ_IN_KHZ  1000000
         /*
@@ -540,10 +561,9 @@ static bool freq_in_rule_band(const struct ieee80211_freq_range *freq_range,
  * Helper for regdom_intersect(), this does the real
  * mathematical intersection fun
  */
-static int reg_rules_intersect(
-        const struct ieee80211_reg_rule *rule1,
-        const struct ieee80211_reg_rule *rule2,
-        struct ieee80211_reg_rule *intersected_rule)
+static int reg_rules_intersect(const struct ieee80211_reg_rule *rule1,
+                               const struct ieee80211_reg_rule *rule2,
+                               struct ieee80211_reg_rule *intersected_rule)
 {
         const struct ieee80211_freq_range *freq_range1, *freq_range2;
         struct ieee80211_freq_range *freq_range;
@@ -560,11 +580,11 @@ static int reg_rules_intersect(
         power_rule = &intersected_rule->power_rule;
 
         freq_range->start_freq_khz = max(freq_range1->start_freq_khz,
-                freq_range2->start_freq_khz);
+                                         freq_range2->start_freq_khz);
         freq_range->end_freq_khz = min(freq_range1->end_freq_khz,
-                freq_range2->end_freq_khz);
+                                       freq_range2->end_freq_khz);
         freq_range->max_bandwidth_khz = min(freq_range1->max_bandwidth_khz,
-                freq_range2->max_bandwidth_khz);
+                                            freq_range2->max_bandwidth_khz);
 
         freq_diff = freq_range->end_freq_khz - freq_range->start_freq_khz;
         if (freq_range->max_bandwidth_khz > freq_diff)
@@ -575,7 +595,7 @@ static int reg_rules_intersect(
         power_rule->max_antenna_gain = min(power_rule1->max_antenna_gain,
                 power_rule2->max_antenna_gain);
 
-        intersected_rule->flags = (rule1->flags | rule2->flags);
+        intersected_rule->flags = rule1->flags | rule2->flags;
 
         if (!is_valid_reg_rule(intersected_rule))
                 return -EINVAL;
@@ -596,9 +616,9 @@ static int reg_rules_intersect(
  * resulting intersection of rules between rd1 and rd2. We will
  * kzalloc() this structure for you.
  */
-static struct ieee80211_regdomain *regdom_intersect(
-        const struct ieee80211_regdomain *rd1,
-        const struct ieee80211_regdomain *rd2)
+static struct ieee80211_regdomain *
+regdom_intersect(const struct ieee80211_regdomain *rd1,
+                 const struct ieee80211_regdomain *rd2)
 {
         int r, size_of_regd;
         unsigned int x, y;
@@ -607,12 +627,7 @@ static struct ieee80211_regdomain *regdom_intersect(
         struct ieee80211_reg_rule *intersected_rule;
         struct ieee80211_regdomain *rd;
         /* This is just a dummy holder to help us count */
-        struct ieee80211_reg_rule irule;
-
-        /* Uses the stack temporarily for counter arithmetic */
-        intersected_rule = &irule;
-
-        memset(intersected_rule, 0, sizeof(struct ieee80211_reg_rule));
+        struct ieee80211_reg_rule dummy_rule;
 
         if (!rd1 || !rd2)
                 return NULL;
@@ -629,11 +644,8 @@ static struct ieee80211_regdomain *regdom_intersect(
                 rule1 = &rd1->reg_rules[x];
                 for (y = 0; y < rd2->n_reg_rules; y++) {
                         rule2 = &rd2->reg_rules[y];
-                        if (!reg_rules_intersect(rule1, rule2,
-                                        intersected_rule))
+                        if (!reg_rules_intersect(rule1, rule2, &dummy_rule))
                                 num_rules++;
-                        memset(intersected_rule, 0,
-                                        sizeof(struct ieee80211_reg_rule));
                 }
         }
 
@@ -641,15 +653,15 @@ static struct ieee80211_regdomain *regdom_intersect(
                 return NULL;
 
         size_of_regd = sizeof(struct ieee80211_regdomain) +
-                ((num_rules + 1) * sizeof(struct ieee80211_reg_rule));
+                       num_rules * sizeof(struct ieee80211_reg_rule);
 
         rd = kzalloc(size_of_regd, GFP_KERNEL);
         if (!rd)
                 return NULL;
 
-        for (x = 0; x < rd1->n_reg_rules; x++) {
+        for (x = 0; x < rd1->n_reg_rules && rule_idx < num_rules; x++) {
                 rule1 = &rd1->reg_rules[x];
-                for (y = 0; y < rd2->n_reg_rules; y++) {
+                for (y = 0; y < rd2->n_reg_rules && rule_idx < num_rules; y++) {
                         rule2 = &rd2->reg_rules[y];
                         /*
                          * This time around instead of using the stack lets
@@ -657,8 +669,7 @@ static struct ieee80211_regdomain *regdom_intersect(
                          * a memcpy()
                          */
                         intersected_rule = &rd->reg_rules[rule_idx];
-                        r = reg_rules_intersect(rule1, rule2,
-                                intersected_rule);
+                        r = reg_rules_intersect(rule1, rule2, intersected_rule);
                         /*
                          * No need to memset here the intersected rule here as
                          * we're not using the stack anymore
@@ -699,34 +710,16 @@ static u32 map_regdom_flags(u32 rd_flags)
         return channel_flags;
 }
 
-static int freq_reg_info_regd(struct wiphy *wiphy,
-                              u32 center_freq,
-                              u32 desired_bw_khz,
-                              const struct ieee80211_reg_rule **reg_rule,
-                              const struct ieee80211_regdomain *custom_regd)
+static const struct ieee80211_reg_rule *
+freq_reg_info_regd(struct wiphy *wiphy, u32 center_freq,
+                   const struct ieee80211_regdomain *regd)
 {
         int i;
         bool band_rule_found = false;
-        const struct ieee80211_regdomain *regd;
         bool bw_fits = false;
 
-        if (!desired_bw_khz)
-                desired_bw_khz = MHZ_TO_KHZ(20);
-
-        regd = custom_regd ? custom_regd : cfg80211_regdomain;
-
-        /*
-         * Follow the driver's regulatory domain, if present, unless a country
-         * IE has been processed or a user wants to help complaince further
-         */
-        if (!custom_regd &&
-            last_request->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
-            last_request->initiator != NL80211_REGDOM_SET_BY_USER &&
-            wiphy->regd)
-                regd = wiphy->regd;
-
         if (!regd)
-                return -EINVAL;
+                return ERR_PTR(-EINVAL);
 
         for (i = 0; i < regd->n_reg_rules; i++) {
                 const struct ieee80211_reg_rule *rr;
@@ -743,33 +736,36 @@ static int freq_reg_info_regd(struct wiphy *wiphy,
                 if (!band_rule_found)
                         band_rule_found = freq_in_rule_band(fr, center_freq);
 
-                bw_fits = reg_does_bw_fit(fr,
-                                          center_freq,
-                                          desired_bw_khz);
+                bw_fits = reg_does_bw_fit(fr, center_freq, MHZ_TO_KHZ(20));
 
-                if (band_rule_found && bw_fits) {
-                        *reg_rule = rr;
-                        return 0;
-                }
+                if (band_rule_found && bw_fits)
+                        return rr;
         }
 
         if (!band_rule_found)
-                return -ERANGE;
+                return ERR_PTR(-ERANGE);
 
-        return -EINVAL;
+        return ERR_PTR(-EINVAL);
 }
 
-int freq_reg_info(struct wiphy *wiphy,
-                  u32 center_freq,
-                  u32 desired_bw_khz,
-                  const struct ieee80211_reg_rule **reg_rule)
+const struct ieee80211_reg_rule *freq_reg_info(struct wiphy *wiphy,
+                                               u32 center_freq)
 {
-        assert_cfg80211_lock();
-        return freq_reg_info_regd(wiphy,
-                                  center_freq,
-                                  desired_bw_khz,
-                                  reg_rule,
-                                  NULL);
+        const struct ieee80211_regdomain *regd;
+        struct regulatory_request *lr = get_last_request();
+
+        /*
+         * Follow the driver's regulatory domain, if present, unless a country
+         * IE has been processed or a user wants to help complaince further
+         */
+        if (lr->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
+            lr->initiator != NL80211_REGDOM_SET_BY_USER &&
+            wiphy->regd)
+                regd = get_wiphy_regdom(wiphy);
+        else
+                regd = get_cfg80211_regdom();
+
+        return freq_reg_info_regd(wiphy, center_freq, regd);
 }
 EXPORT_SYMBOL(freq_reg_info);
 
@@ -792,7 +788,6 @@ static const char *reg_initiator_name(enum nl80211_reg_initiator initiator)
 }
 
 static void chan_reg_rule_print_dbg(struct ieee80211_channel *chan,
-                                    u32 desired_bw_khz,
                                     const struct ieee80211_reg_rule *reg_rule)
 {
         const struct ieee80211_power_rule *power_rule;
@@ -807,21 +802,16 @@ static void chan_reg_rule_print_dbg(struct ieee80211_channel *chan,
         else
                 snprintf(max_antenna_gain, 32, "%d", power_rule->max_antenna_gain);
 
-        REG_DBG_PRINT("Updating information on frequency %d MHz "
-                      "for a %d MHz width channel with regulatory rule:\n",
-                      chan->center_freq,
-                      KHZ_TO_MHZ(desired_bw_khz));
+        REG_DBG_PRINT("Updating information on frequency %d MHz with regulatory rule:\n",
+                      chan->center_freq);
 
         REG_DBG_PRINT("%d KHz - %d KHz @ %d KHz), (%s mBi, %d mBm)\n",
-                      freq_range->start_freq_khz,
-                      freq_range->end_freq_khz,
-                      freq_range->max_bandwidth_khz,
-                      max_antenna_gain,
+                      freq_range->start_freq_khz, freq_range->end_freq_khz,
+                      freq_range->max_bandwidth_khz, max_antenna_gain,
                       power_rule->max_eirp);
 }
 #else
 static void chan_reg_rule_print_dbg(struct ieee80211_channel *chan,
-                                    u32 desired_bw_khz,
                                     const struct ieee80211_reg_rule *reg_rule)
 {
         return;
@@ -831,43 +821,25 @@ static void chan_reg_rule_print_dbg(struct ieee80211_channel *chan,
 /*
  * Note that right now we assume the desired channel bandwidth
  * is always 20 MHz for each individual channel (HT40 uses 20 MHz
- * per channel, the primary and the extension channel). To support
- * smaller custom bandwidths such as 5 MHz or 10 MHz we'll need a
- * new ieee80211_channel.target_bw and re run the regulatory check
- * on the wiphy with the target_bw specified. Then we can simply use
- * that below for the desired_bw_khz below.
+ * per channel, the primary and the extension channel).
  */
 static void handle_channel(struct wiphy *wiphy,
                            enum nl80211_reg_initiator initiator,
-                           enum ieee80211_band band,
-                           unsigned int chan_idx)
+                           struct ieee80211_channel *chan)
 {
-        int r;
         u32 flags, bw_flags = 0;
-        u32 desired_bw_khz = MHZ_TO_KHZ(20);
         const struct ieee80211_reg_rule *reg_rule = NULL;
         const struct ieee80211_power_rule *power_rule = NULL;
         const struct ieee80211_freq_range *freq_range = NULL;
-        struct ieee80211_supported_band *sband;
-        struct ieee80211_channel *chan;
         struct wiphy *request_wiphy = NULL;
+        struct regulatory_request *lr = get_last_request();
 
-        assert_cfg80211_lock();
-
-        request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
-
-        sband = wiphy->bands[band];
-        BUG_ON(chan_idx >= sband->n_channels);
-        chan = &sband->channels[chan_idx];
+        request_wiphy = wiphy_idx_to_wiphy(lr->wiphy_idx);
 
         flags = chan->orig_flags;
 
-        r = freq_reg_info(wiphy,
-                          MHZ_TO_KHZ(chan->center_freq),
-                          desired_bw_khz,
-                          &reg_rule);
-
-        if (r) {
+        reg_rule = freq_reg_info(wiphy, MHZ_TO_KHZ(chan->center_freq));
+        if (IS_ERR(reg_rule)) {
                 /*
                  * We will disable all channels that do not match our
                  * received regulatory rule unless the hint is coming
@@ -879,7 +851,7 @@ static void handle_channel(struct wiphy *wiphy,
                  * while 5 GHz is still supported.
                  */
                 if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE &&
-                    r == -ERANGE)
+                    PTR_ERR(reg_rule) == -ERANGE)
                         return;
 
                 REG_DBG_PRINT("Disabling freq %d MHz\n", chan->center_freq);
@@ -887,7 +859,7 @@ static void handle_channel(struct wiphy *wiphy,
                 return;
         }
 
-        chan_reg_rule_print_dbg(chan, desired_bw_khz, reg_rule);
+        chan_reg_rule_print_dbg(chan, reg_rule);
 
         power_rule = &reg_rule->power_rule;
         freq_range = &reg_rule->freq_range;
@@ -895,7 +867,7 @@ static void handle_channel(struct wiphy *wiphy,
         if (freq_range->max_bandwidth_khz < MHZ_TO_KHZ(40))
                 bw_flags = IEEE80211_CHAN_NO_HT40;
 
-        if (last_request->initiator == NL80211_REGDOM_SET_BY_DRIVER &&
+        if (lr->initiator == NL80211_REGDOM_SET_BY_DRIVER &&
             request_wiphy && request_wiphy == wiphy &&
             request_wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY) {
                 /*
@@ -914,8 +886,9 @@ static void handle_channel(struct wiphy *wiphy,
 
         chan->beacon_found = false;
         chan->flags = flags | bw_flags | map_regdom_flags(reg_rule->flags);
-        chan->max_antenna_gain = min(chan->orig_mag,
-                (int) MBI_TO_DBI(power_rule->max_antenna_gain));
+        chan->max_antenna_gain =
+                min_t(int, chan->orig_mag,
+                      MBI_TO_DBI(power_rule->max_antenna_gain));
         chan->max_reg_power = (int) MBM_TO_DBM(power_rule->max_eirp);
         if (chan->orig_mpwr) {
                 /*
@@ -935,68 +908,65 @@ static void handle_channel(struct wiphy *wiphy,
 }
 
 static void handle_band(struct wiphy *wiphy,
-                        enum ieee80211_band band,
-                        enum nl80211_reg_initiator initiator)
+                        enum nl80211_reg_initiator initiator,
+                        struct ieee80211_supported_band *sband)
 {
         unsigned int i;
-        struct ieee80211_supported_band *sband;
 
-        BUG_ON(!wiphy->bands[band]);
-        sband = wiphy->bands[band];
+        if (!sband)
+                return;
 
         for (i = 0; i < sband->n_channels; i++)
-                handle_channel(wiphy, initiator, band, i);
+                handle_channel(wiphy, initiator, &sband->channels[i]);
 }
 
 static bool reg_request_cell_base(struct regulatory_request *request)
 {
         if (request->initiator != NL80211_REGDOM_SET_BY_USER)
                 return false;
-        if (request->user_reg_hint_type != NL80211_USER_REG_HINT_CELL_BASE)
-                return false;
-        return true;
+        return request->user_reg_hint_type == NL80211_USER_REG_HINT_CELL_BASE;
 }
 
 bool reg_last_request_cell_base(void)
 {
         bool val;
-        assert_cfg80211_lock();
 
         mutex_lock(&reg_mutex);
-        val = reg_request_cell_base(last_request);
+        val = reg_request_cell_base(get_last_request());
         mutex_unlock(&reg_mutex);
+
         return val;
 }
 
 #ifdef CONFIG_CFG80211_CERTIFICATION_ONUS
-
 /* Core specific check */
-static int reg_ignore_cell_hint(struct regulatory_request *pending_request)
+static enum reg_request_treatment
+reg_ignore_cell_hint(struct regulatory_request *pending_request)
 {
+        struct regulatory_request *lr = get_last_request();
+
         if (!reg_num_devs_support_basehint)
-                return -EOPNOTSUPP;
+                return REG_REQ_IGNORE;
 
-        if (reg_request_cell_base(last_request)) {
-                if (!regdom_changes(pending_request->alpha2))
-                        return -EALREADY;
-                return 0;
-        }
-        return 0;
+        if (reg_request_cell_base(lr) &&
+            !regdom_changes(pending_request->alpha2))
+                return REG_REQ_ALREADY_SET;
+
+        return REG_REQ_OK;
 }
 
 /* Device specific check */
 static bool reg_dev_ignore_cell_hint(struct wiphy *wiphy)
 {
-        if (!(wiphy->features & NL80211_FEATURE_CELL_BASE_REG_HINTS))
-                return true;
-        return false;
+        return !(wiphy->features & NL80211_FEATURE_CELL_BASE_REG_HINTS);
 }
 #else
 static int reg_ignore_cell_hint(struct regulatory_request *pending_request)
 {
-        return -EOPNOTSUPP;
+        return REG_REQ_IGNORE;
 }
-static int reg_dev_ignore_cell_hint(struct wiphy *wiphy)
+
+static bool reg_dev_ignore_cell_hint(struct wiphy *wiphy)
 {
         return true;
 }
@@ -1006,18 +976,17 @@ static int reg_dev_ignore_cell_hint(struct wiphy *wiphy)
 static bool ignore_reg_update(struct wiphy *wiphy,
                               enum nl80211_reg_initiator initiator)
 {
-        if (!last_request) {
-                REG_DBG_PRINT("Ignoring regulatory request %s since "
-                              "last_request is not set\n",
+        struct regulatory_request *lr = get_last_request();
+
+        if (!lr) {
+                REG_DBG_PRINT("Ignoring regulatory request %s since last_request is not set\n",
                               reg_initiator_name(initiator));
                 return true;
         }
 
         if (initiator == NL80211_REGDOM_SET_BY_CORE &&
             wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY) {
-                REG_DBG_PRINT("Ignoring regulatory request %s "
-                              "since the driver uses its own custom "
-                              "regulatory domain\n",
+                REG_DBG_PRINT("Ignoring regulatory request %s since the driver uses its own custom regulatory domain\n",
                               reg_initiator_name(initiator));
                 return true;
         }
@@ -1028,22 +997,35 @@ static bool ignore_reg_update(struct wiphy *wiphy,
          */
         if (wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY && !wiphy->regd &&
             initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
-            !is_world_regdom(last_request->alpha2)) {
-                REG_DBG_PRINT("Ignoring regulatory request %s "
-                              "since the driver requires its own regulatory "
-                              "domain to be set first\n",
+            !is_world_regdom(lr->alpha2)) {
+                REG_DBG_PRINT("Ignoring regulatory request %s since the driver requires its own regulatory domain to be set first\n",
                               reg_initiator_name(initiator));
                 return true;
         }
 
-        if (reg_request_cell_base(last_request))
+        if (reg_request_cell_base(lr))
                 return reg_dev_ignore_cell_hint(wiphy);
 
         return false;
 }
 
-static void handle_reg_beacon(struct wiphy *wiphy,
-                              unsigned int chan_idx,
+static bool reg_is_world_roaming(struct wiphy *wiphy)
+{
+        const struct ieee80211_regdomain *cr = get_cfg80211_regdom();
+        const struct ieee80211_regdomain *wr = get_wiphy_regdom(wiphy);
+        struct regulatory_request *lr = get_last_request();
+
+        if (is_world_regdom(cr->alpha2) || (wr && is_world_regdom(wr->alpha2)))
+                return true;
+
+        if (lr && lr->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
+            wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY)
+                return true;
+
+        return false;
+}
+
+static void handle_reg_beacon(struct wiphy *wiphy, unsigned int chan_idx,
                               struct reg_beacon *reg_beacon)
 {
         struct ieee80211_supported_band *sband;
@@ -1051,8 +1033,6 @@ static void handle_reg_beacon(struct wiphy *wiphy,
         bool channel_changed = false;
         struct ieee80211_channel chan_before;
 
-        assert_cfg80211_lock();
-
         sband = wiphy->bands[reg_beacon->chan.band];
         chan = &sband->channels[chan_idx];
 
@@ -1064,6 +1044,9 @@ static void handle_reg_beacon(struct wiphy *wiphy,
 
         chan->beacon_found = true;
 
+        if (!reg_is_world_roaming(wiphy))
+                return;
+
         if (wiphy->flags & WIPHY_FLAG_DISABLE_BEACON_HINTS)
                 return;
 
@@ -1094,8 +1077,6 @@ static void wiphy_update_new_beacon(struct wiphy *wiphy,
         unsigned int i;
         struct ieee80211_supported_band *sband;
 
-        assert_cfg80211_lock();
-
         if (!wiphy->bands[reg_beacon->chan.band])
                 return;
 
@@ -1114,11 +1095,6 @@ static void wiphy_update_beacon_reg(struct wiphy *wiphy)
         struct ieee80211_supported_band *sband;
         struct reg_beacon *reg_beacon;
 
-        assert_cfg80211_lock();
-
-        if (list_empty(&reg_beacon_list))
-                return;
-
         list_for_each_entry(reg_beacon, &reg_beacon_list, list) {
                 if (!wiphy->bands[reg_beacon->chan.band])
                         continue;
@@ -1128,18 +1104,6 @@ static void wiphy_update_beacon_reg(struct wiphy *wiphy)
         }
 }
 
-static bool reg_is_world_roaming(struct wiphy *wiphy)
-{
-        if (is_world_regdom(cfg80211_regdomain->alpha2) ||
-            (wiphy->regd && is_world_regdom(wiphy->regd->alpha2)))
-                return true;
-        if (last_request &&
-            last_request->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
-            wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY)
-                return true;
-        return false;
-}
-
 /* Reap the advantages of previously found beacons */
 static void reg_process_beacons(struct wiphy *wiphy)
 {
@@ -1149,39 +1113,29 @@ static void reg_process_beacons(struct wiphy *wiphy)
          */
         if (!last_request)
                 return;
-        if (!reg_is_world_roaming(wiphy))
-                return;
         wiphy_update_beacon_reg(wiphy);
 }
 
-static bool is_ht40_not_allowed(struct ieee80211_channel *chan)
+static bool is_ht40_allowed(struct ieee80211_channel *chan)
 {
         if (!chan)
-                return true;
+                return false;
         if (chan->flags & IEEE80211_CHAN_DISABLED)
-                return true;
+                return false;
         /* This would happen when regulatory rules disallow HT40 completely */
-        if (IEEE80211_CHAN_NO_HT40 == (chan->flags & (IEEE80211_CHAN_NO_HT40)))
-                return true;
-        return false;
+        if ((chan->flags & IEEE80211_CHAN_NO_HT40) == IEEE80211_CHAN_NO_HT40)
+                return false;
+        return true;
 }
 
 static void reg_process_ht_flags_channel(struct wiphy *wiphy,
-                                         enum ieee80211_band band,
-                                         unsigned int chan_idx)
+                                         struct ieee80211_channel *channel)
 {
-        struct ieee80211_supported_band *sband;
-        struct ieee80211_channel *channel;
+        struct ieee80211_supported_band *sband = wiphy->bands[channel->band];
         struct ieee80211_channel *channel_before = NULL, *channel_after = NULL;
         unsigned int i;
 
-        assert_cfg80211_lock();
-
-        sband = wiphy->bands[band];
-        BUG_ON(chan_idx >= sband->n_channels);
-        channel = &sband->channels[chan_idx];
-
-        if (is_ht40_not_allowed(channel)) {
+        if (!is_ht40_allowed(channel)) {
                 channel->flags |= IEEE80211_CHAN_NO_HT40;
                 return;
         }
@@ -1192,6 +1146,7 @@ static void reg_process_ht_flags_channel(struct wiphy *wiphy,
          */
         for (i = 0; i < sband->n_channels; i++) {
                 struct ieee80211_channel *c = &sband->channels[i];
+
                 if (c->center_freq == (channel->center_freq - 20))
                         channel_before = c;
                 if (c->center_freq == (channel->center_freq + 20))
@@ -1203,28 +1158,27 @@ static void reg_process_ht_flags_channel(struct wiphy *wiphy,
          * if that ever changes we also need to change the below logic
          * to include that as well.
          */
-        if (is_ht40_not_allowed(channel_before))
+        if (!is_ht40_allowed(channel_before))
                 channel->flags |= IEEE80211_CHAN_NO_HT40MINUS;
         else
                 channel->flags &= ~IEEE80211_CHAN_NO_HT40MINUS;
 
-        if (is_ht40_not_allowed(channel_after))
+        if (!is_ht40_allowed(channel_after))
                 channel->flags |= IEEE80211_CHAN_NO_HT40PLUS;
         else
                 channel->flags &= ~IEEE80211_CHAN_NO_HT40PLUS;
 }
 
 static void reg_process_ht_flags_band(struct wiphy *wiphy,
-                                      enum ieee80211_band band)
+                                      struct ieee80211_supported_band *sband)
 {
         unsigned int i;
-        struct ieee80211_supported_band *sband;
 
-        BUG_ON(!wiphy->bands[band]);
-        sband = wiphy->bands[band];
+        if (!sband)
+                return;
 
         for (i = 0; i < sband->n_channels; i++)
-                reg_process_ht_flags_channel(wiphy, band, i);
+                reg_process_ht_flags_channel(wiphy, &sband->channels[i]);
 }
 
 static void reg_process_ht_flags(struct wiphy *wiphy)
@@ -1234,34 +1188,29 @@ static void reg_process_ht_flags(struct wiphy *wiphy)
         if (!wiphy)
                 return;
 
-        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
-                if (wiphy->bands[band])
-                        reg_process_ht_flags_band(wiphy, band);
-        }
-
+        for (band = 0; band < IEEE80211_NUM_BANDS; band++)
+                reg_process_ht_flags_band(wiphy, wiphy->bands[band]);
 }
 
 static void wiphy_update_regulatory(struct wiphy *wiphy,
                                     enum nl80211_reg_initiator initiator)
 {
         enum ieee80211_band band;
-
-        assert_reg_lock();
+        struct regulatory_request *lr = get_last_request();
 
         if (ignore_reg_update(wiphy, initiator))
                 return;
 
-        last_request->dfs_region = cfg80211_regdomain->dfs_region;
+        lr->dfs_region = get_cfg80211_regdom()->dfs_region;
 
-        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
-                if (wiphy->bands[band])
-                        handle_band(wiphy, band, initiator);
-        }
+        for (band = 0; band < IEEE80211_NUM_BANDS; band++)
+                handle_band(wiphy, initiator, wiphy->bands[band]);
 
         reg_process_beacons(wiphy);
         reg_process_ht_flags(wiphy);
+
         if (wiphy->reg_notifier)
-                wiphy->reg_notifier(wiphy, last_request);
+                wiphy->reg_notifier(wiphy, lr);
 }
 
 static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator)
@@ -1269,6 +1218,8 @@ static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator)
         struct cfg80211_registered_device *rdev;
         struct wiphy *wiphy;
 
+        assert_cfg80211_lock();
+
         list_for_each_entry(rdev, &cfg80211_rdev_list, list) {
                 wiphy = &rdev->wiphy;
                 wiphy_update_regulatory(wiphy, initiator);
@@ -1280,47 +1231,30 @@ static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator)
                 if (initiator == NL80211_REGDOM_SET_BY_CORE &&
                     wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY &&
                     wiphy->reg_notifier)
-                        wiphy->reg_notifier(wiphy, last_request);
+                        wiphy->reg_notifier(wiphy, get_last_request());
         }
 }
 
 static void handle_channel_custom(struct wiphy *wiphy,
-                                  enum ieee80211_band band,
-                                  unsigned int chan_idx,
+                                  struct ieee80211_channel *chan,
                                   const struct ieee80211_regdomain *regd)
 {
-        int r;
-        u32 desired_bw_khz = MHZ_TO_KHZ(20);
         u32 bw_flags = 0;
         const struct ieee80211_reg_rule *reg_rule = NULL;
         const struct ieee80211_power_rule *power_rule = NULL;
         const struct ieee80211_freq_range *freq_range = NULL;
-        struct ieee80211_supported_band *sband;
-        struct ieee80211_channel *chan;
-
-        assert_reg_lock();
 
-        sband = wiphy->bands[band];
-        BUG_ON(chan_idx >= sband->n_channels);
-        chan = &sband->channels[chan_idx];
-
-        r = freq_reg_info_regd(wiphy,
-                               MHZ_TO_KHZ(chan->center_freq),
-                               desired_bw_khz,
-                               &reg_rule,
-                               regd);
+        reg_rule = freq_reg_info_regd(wiphy, MHZ_TO_KHZ(chan->center_freq),
+                                      regd);
 
-        if (r) {
-                REG_DBG_PRINT("Disabling freq %d MHz as custom "
-                              "regd has no rule that fits a %d MHz "
-                              "wide channel\n",
-                              chan->center_freq,
-                              KHZ_TO_MHZ(desired_bw_khz));
+        if (IS_ERR(reg_rule)) {
+                REG_DBG_PRINT("Disabling freq %d MHz as custom regd has no rule that fits it\n",
+                              chan->center_freq);
                 chan->flags = IEEE80211_CHAN_DISABLED;
                 return;
         }
 
-        chan_reg_rule_print_dbg(chan, desired_bw_khz, reg_rule);
+        chan_reg_rule_print_dbg(chan, reg_rule);
 
         power_rule = &reg_rule->power_rule;
         freq_range = &reg_rule->freq_range;
@@ -1334,17 +1268,17 @@ static void handle_channel_custom(struct wiphy *wiphy,
                 (int) MBM_TO_DBM(power_rule->max_eirp);
 }
 
-static void handle_band_custom(struct wiphy *wiphy, enum ieee80211_band band,
+static void handle_band_custom(struct wiphy *wiphy,
+                               struct ieee80211_supported_band *sband,
                                const struct ieee80211_regdomain *regd)
 {
         unsigned int i;
-        struct ieee80211_supported_band *sband;
 
-        BUG_ON(!wiphy->bands[band]);
-        sband = wiphy->bands[band];
+        if (!sband)
+                return;
 
         for (i = 0; i < sband->n_channels; i++)
-                handle_channel_custom(wiphy, band, i, regd);
+                handle_channel_custom(wiphy, &sband->channels[i], regd);
 }
 
 /* Used by drivers prior to wiphy registration */
@@ -1354,60 +1288,50 @@ void wiphy_apply_custom_regulatory(struct wiphy *wiphy,
         enum ieee80211_band band;
         unsigned int bands_set = 0;
 
-        mutex_lock(&reg_mutex);
         for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
                 if (!wiphy->bands[band])
                         continue;
-                handle_band_custom(wiphy, band, regd);
+                handle_band_custom(wiphy, wiphy->bands[band], regd);
                 bands_set++;
         }
-        mutex_unlock(&reg_mutex);
 
         /*
          * no point in calling this if it won't have any effect
-         * on your device's supportd bands.
+         * on your device's supported bands.
          */
         WARN_ON(!bands_set);
 }
 EXPORT_SYMBOL(wiphy_apply_custom_regulatory);
 
-/*
- * Return value which can be used by ignore_request() to indicate
- * it has been determined we should intersect two regulatory domains
- */
-#define REG_INTERSECT   1
-
 /* This has the logic which determines when a new request
  * should be ignored. */
-static int ignore_request(struct wiphy *wiphy,
+static enum reg_request_treatment
+get_reg_request_treatment(struct wiphy *wiphy,
                           struct regulatory_request *pending_request)
 {
         struct wiphy *last_wiphy = NULL;
-
-        assert_cfg80211_lock();
+        struct regulatory_request *lr = get_last_request();
 
         /* All initial requests are respected */
-        if (!last_request)
-                return 0;
+        if (!lr)
+                return REG_REQ_OK;
 
         switch (pending_request->initiator) {
         case NL80211_REGDOM_SET_BY_CORE:
-                return 0;
+                return REG_REQ_OK;
         case NL80211_REGDOM_SET_BY_COUNTRY_IE:
-
-                if (reg_request_cell_base(last_request)) {
+                if (reg_request_cell_base(lr)) {
                         /* Trust a Cell base station over the AP's country IE */
                         if (regdom_changes(pending_request->alpha2))
-                                return -EOPNOTSUPP;
-                        return -EALREADY;
+                                return REG_REQ_IGNORE;
+                        return REG_REQ_ALREADY_SET;
                 }
 
-                last_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
+                last_wiphy = wiphy_idx_to_wiphy(lr->wiphy_idx);
 
                 if (unlikely(!is_an_alpha2(pending_request->alpha2)))
                         return -EINVAL;
-                if (last_request->initiator ==
-                    NL80211_REGDOM_SET_BY_COUNTRY_IE) {
+                if (lr->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) {
                         if (last_wiphy != wiphy) {
                                 /*
                                  * Two cards with two APs claiming different
@@ -1416,23 +1340,23 @@ static int ignore_request(struct wiphy *wiphy,
                                  * to be correct. Reject second one for now.
                                  */
                                 if (regdom_changes(pending_request->alpha2))
-                                        return -EOPNOTSUPP;
-                                return -EALREADY;
+                                        return REG_REQ_IGNORE;
+                                return REG_REQ_ALREADY_SET;
                         }
                         /*
                          * Two consecutive Country IE hints on the same wiphy.
                          * This should be picked up early by the driver/stack
                          */
                         if (WARN_ON(regdom_changes(pending_request->alpha2)))
-                                return 0;
-                        return -EALREADY;
+                                return REG_REQ_OK;
+                        return REG_REQ_ALREADY_SET;
                 }
                 return 0;
         case NL80211_REGDOM_SET_BY_DRIVER:
-                if (last_request->initiator == NL80211_REGDOM_SET_BY_CORE) {
+                if (lr->initiator == NL80211_REGDOM_SET_BY_CORE) {
                         if (regdom_changes(pending_request->alpha2))
-                                return 0;
-                        return -EALREADY;
+                                return REG_REQ_OK;
+                        return REG_REQ_ALREADY_SET;
                 }
 
                 /*
@@ -1440,59 +1364,59 @@ static int ignore_request(struct wiphy *wiphy,
                  * back in or if you add a new device for which the previously
                  * loaded card also agrees on the regulatory domain.
                  */
-                if (last_request->initiator == NL80211_REGDOM_SET_BY_DRIVER &&
+                if (lr->initiator == NL80211_REGDOM_SET_BY_DRIVER &&
                     !regdom_changes(pending_request->alpha2))
-                        return -EALREADY;
+                        return REG_REQ_ALREADY_SET;
 
-                return REG_INTERSECT;
+                return REG_REQ_INTERSECT;
         case NL80211_REGDOM_SET_BY_USER:
                 if (reg_request_cell_base(pending_request))
                         return reg_ignore_cell_hint(pending_request);
 
-                if (reg_request_cell_base(last_request))
-                        return -EOPNOTSUPP;
+                if (reg_request_cell_base(lr))
+                        return REG_REQ_IGNORE;
 
-                if (last_request->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE)
-                        return REG_INTERSECT;
+                if (lr->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE)
+                        return REG_REQ_INTERSECT;
                 /*
                  * If the user knows better the user should set the regdom
                  * to their country before the IE is picked up
                  */
-                if (last_request->initiator == NL80211_REGDOM_SET_BY_USER &&
-                          last_request->intersect)
-                        return -EOPNOTSUPP;
+                if (lr->initiator == NL80211_REGDOM_SET_BY_USER &&
+                    lr->intersect)
+                        return REG_REQ_IGNORE;
                 /*
                  * Process user requests only after previous user/driver/core
                  * requests have been processed
                  */
-                if (last_request->initiator == NL80211_REGDOM_SET_BY_CORE ||
-                    last_request->initiator == NL80211_REGDOM_SET_BY_DRIVER ||
-                    last_request->initiator == NL80211_REGDOM_SET_BY_USER) {
-                        if (regdom_changes(last_request->alpha2))
-                                return -EAGAIN;
-                }
+                if ((lr->initiator == NL80211_REGDOM_SET_BY_CORE ||
+                     lr->initiator == NL80211_REGDOM_SET_BY_DRIVER ||
+                     lr->initiator == NL80211_REGDOM_SET_BY_USER) &&
+                    regdom_changes(lr->alpha2))
+                        return REG_REQ_IGNORE;
 
                 if (!regdom_changes(pending_request->alpha2))
-                        return -EALREADY;
+                        return REG_REQ_ALREADY_SET;
 
-                return 0;
+                return REG_REQ_OK;
         }
 
-        return -EINVAL;
+        return REG_REQ_IGNORE;
 }
 
 static void reg_set_request_processed(void)
 {
         bool need_more_processing = false;
+        struct regulatory_request *lr = get_last_request();
 
-        last_request->processed = true;
+        lr->processed = true;
 
         spin_lock(&reg_requests_lock);
         if (!list_empty(&reg_requests_list))
                 need_more_processing = true;
         spin_unlock(&reg_requests_lock);
 
-        if (last_request->initiator == NL80211_REGDOM_SET_BY_USER)
+        if (lr->initiator == NL80211_REGDOM_SET_BY_USER)
                 cancel_delayed_work(&reg_timeout);
 
         if (need_more_processing)
@@ -1508,116 +1432,122 @@ static void reg_set_request_processed(void)
  * The Wireless subsystem can use this function to hint to the wireless core
  * what it believes should be the current regulatory domain.
  *
- * Returns zero if all went fine, %-EALREADY if a regulatory domain had
- * already been set or other standard error codes.
+ * Returns one of the different reg request treatment values.
  *
- * Caller must hold &cfg80211_mutex and &reg_mutex
+ * Caller must hold &reg_mutex
  */
-static int __regulatory_hint(struct wiphy *wiphy,
-                             struct regulatory_request *pending_request)
+static enum reg_request_treatment
+__regulatory_hint(struct wiphy *wiphy,
+                  struct regulatory_request *pending_request)
 {
+        const struct ieee80211_regdomain *regd;
         bool intersect = false;
-        int r = 0;
-
-        assert_cfg80211_lock();
+        enum reg_request_treatment treatment;
+        struct regulatory_request *lr;
 
-        r = ignore_request(wiphy, pending_request);
+        treatment = get_reg_request_treatment(wiphy, pending_request);
 
-        if (r == REG_INTERSECT) {
+        switch (treatment) {
+        case REG_REQ_INTERSECT:
                 if (pending_request->initiator ==
                     NL80211_REGDOM_SET_BY_DRIVER) {
-                        r = reg_copy_regd(&wiphy->regd, cfg80211_regdomain);
-                        if (r) {
+                        regd = reg_copy_regd(get_cfg80211_regdom());
+                        if (IS_ERR(regd)) {
                                 kfree(pending_request);
-                                return r;
+                                return PTR_ERR(regd);
                         }
+                        rcu_assign_pointer(wiphy->regd, regd);
                 }
                 intersect = true;
-        } else if (r) {
+                break;
+        case REG_REQ_OK:
+                break;
+        default:
                 /*
                  * If the regulatory domain being requested by the
                  * driver has already been set just copy it to the
                  * wiphy
                  */
-                if (r == -EALREADY &&
-                    pending_request->initiator ==
-                    NL80211_REGDOM_SET_BY_DRIVER) {
-                        r = reg_copy_regd(&wiphy->regd, cfg80211_regdomain);
-                        if (r) {
+                if (treatment == REG_REQ_ALREADY_SET &&
+                    pending_request->initiator == NL80211_REGDOM_SET_BY_DRIVER) {
+                        regd = reg_copy_regd(get_cfg80211_regdom());
+                        if (IS_ERR(regd)) {
                                 kfree(pending_request);
-                                return r;
+                                return REG_REQ_IGNORE;
                         }
-                        r = -EALREADY;
+                        treatment = REG_REQ_ALREADY_SET;
+                        rcu_assign_pointer(wiphy->regd, regd);
                         goto new_request;
                 }
                 kfree(pending_request);
-                return r;
+                return treatment;
         }
 
 new_request:
-        if (last_request != &core_request_world)
-                kfree(last_request);
+        lr = get_last_request();
+        if (lr != &core_request_world && lr)
+                kfree_rcu(lr, rcu_head);
 
-        last_request = pending_request;
-        last_request->intersect = intersect;
+        pending_request->intersect = intersect;
+        pending_request->processed = false;
+        rcu_assign_pointer(last_request, pending_request);
+        lr = pending_request;
 
         pending_request = NULL;
 
-        if (last_request->initiator == NL80211_REGDOM_SET_BY_USER) {
-                user_alpha2[0] = last_request->alpha2[0];
-                user_alpha2[1] = last_request->alpha2[1];
+        if (lr->initiator == NL80211_REGDOM_SET_BY_USER) {
+                user_alpha2[0] = lr->alpha2[0];
+                user_alpha2[1] = lr->alpha2[1];
         }
 
-        /* When r == REG_INTERSECT we do need to call CRDA */
-        if (r < 0) {
+        /* When r == REG_REQ_INTERSECT we do need to call CRDA */
+        if (treatment != REG_REQ_OK && treatment != REG_REQ_INTERSECT) {
                 /*
                  * Since CRDA will not be called in this case as we already
                  * have applied the requested regulatory domain before we just
                  * inform userspace we have processed the request
                  */
-                if (r == -EALREADY) {
-                        nl80211_send_reg_change_event(last_request);
+                if (treatment == REG_REQ_ALREADY_SET) {
+                        nl80211_send_reg_change_event(lr);
                         reg_set_request_processed();
                 }
-                return r;
+                return treatment;
         }
 
-        return call_crda(last_request->alpha2);
+        if (call_crda(lr->alpha2))
+                return REG_REQ_IGNORE;
+        return REG_REQ_OK;
 }
 
 /* This processes *all* regulatory hints */
 static void reg_process_hint(struct regulatory_request *reg_request,
                              enum nl80211_reg_initiator reg_initiator)
 {
-        int r = 0;
         struct wiphy *wiphy = NULL;
 
-        BUG_ON(!reg_request->alpha2);
+        if (WARN_ON(!reg_request->alpha2))
+                return;
 
-        if (wiphy_idx_valid(reg_request->wiphy_idx))
+        if (reg_request->wiphy_idx != WIPHY_IDX_INVALID)
                 wiphy = wiphy_idx_to_wiphy(reg_request->wiphy_idx);
 
-        if (reg_initiator == NL80211_REGDOM_SET_BY_DRIVER &&
-            !wiphy) {
+        if (reg_initiator == NL80211_REGDOM_SET_BY_DRIVER && !wiphy) {
                 kfree(reg_request);
                 return;
         }
 
-        r = __regulatory_hint(wiphy, reg_request);
-        /* This is required so that the orig_* parameters are saved */
-        if (r == -EALREADY && wiphy &&
-            wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY) {
-                wiphy_update_regulatory(wiphy, reg_initiator);
-                return;
+        switch (__regulatory_hint(wiphy, reg_request)) {
+        case REG_REQ_ALREADY_SET:
+                /* This is required so that the orig_* parameters are saved */
+                if (wiphy && wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY)
+                        wiphy_update_regulatory(wiphy, reg_initiator);
+                break;
+        default:
+                if (reg_initiator == NL80211_REGDOM_SET_BY_USER)
+                        schedule_delayed_work(&reg_timeout,
+                                              msecs_to_jiffies(3142));
+                break;
         }
-
-        /*
-         * We only time out user hints, given that they should be the only
-         * source of bogus requests.
-         */
-        if (r != -EALREADY &&
-            reg_initiator == NL80211_REGDOM_SET_BY_USER)
-                schedule_delayed_work(&reg_timeout, msecs_to_jiffies(3142));
 }
 
 /*
@@ -1627,15 +1557,15 @@ static void reg_process_hint(struct regulatory_request *reg_request,
  */
 static void reg_process_pending_hints(void)
 {
-        struct regulatory_request *reg_request;
+        struct regulatory_request *reg_request, *lr;
 
         mutex_lock(&cfg80211_mutex);
         mutex_lock(&reg_mutex);
+        lr = get_last_request();
 
         /* When last_request->processed becomes true this will be rescheduled */
-        if (last_request && !last_request->processed) {
-                REG_DBG_PRINT("Pending regulatory request, waiting "
-                              "for it to be processed...\n");
+        if (lr && !lr->processed) {
+                REG_DBG_PRINT("Pending regulatory request, waiting for it to be processed...\n");
                 goto out;
         }
 
@@ -1666,23 +1596,14 @@ static void reg_process_pending_beacon_hints(void)
         struct cfg80211_registered_device *rdev;
         struct reg_beacon *pending_beacon, *tmp;
 
-        /*
-         * No need to hold the reg_mutex here as we just touch wiphys
-         * and do not read or access regulatory variables.
-         */
         mutex_lock(&cfg80211_mutex);
+        mutex_lock(&reg_mutex);
 
         /* This goes through the _pending_ beacon list */
         spin_lock_bh(&reg_pending_beacons_lock);
 
-        if (list_empty(&reg_pending_beacons)) {
-                spin_unlock_bh(&reg_pending_beacons_lock);
-                goto out;
-        }
-
         list_for_each_entry_safe(pending_beacon, tmp,
                                  &reg_pending_beacons, list) {
-
                 list_del_init(&pending_beacon->list);
 
                 /* Applies the beacon hint to current wiphys */
@@ -1694,7 +1615,7 @@ static void reg_process_pending_beacon_hints(void)
         }
 
         spin_unlock_bh(&reg_pending_beacons_lock);
-out:
+        mutex_unlock(&reg_mutex);
         mutex_unlock(&cfg80211_mutex);
 }
 
@@ -1706,10 +1627,8 @@ static void reg_todo(struct work_struct *work)
 
 static void queue_regulatory_request(struct regulatory_request *request)
 {
-        if (isalpha(request->alpha2[0]))
-                request->alpha2[0] = toupper(request->alpha2[0]);
-        if (isalpha(request->alpha2[1]))
-                request->alpha2[1] = toupper(request->alpha2[1]);
+        request->alpha2[0] = toupper(request->alpha2[0]);
+        request->alpha2[1] = toupper(request->alpha2[1]);
 
         spin_lock(&reg_requests_lock);
         list_add_tail(&request->list, &reg_requests_list);
@@ -1726,8 +1645,7 @@ static int regulatory_hint_core(const char *alpha2)
 {
         struct regulatory_request *request;
 
-        request = kzalloc(sizeof(struct regulatory_request),
-                          GFP_KERNEL);
+        request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL);
         if (!request)
                 return -ENOMEM;
 
@@ -1746,13 +1664,14 @@ int regulatory_hint_user(const char *alpha2,
 {
         struct regulatory_request *request;
 
-        BUG_ON(!alpha2);
+        if (WARN_ON(!alpha2))
+                return -EINVAL;
 
         request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL);
         if (!request)
                 return -ENOMEM;
 
-        request->wiphy_idx = WIPHY_IDX_STALE;
+        request->wiphy_idx = WIPHY_IDX_INVALID;
         request->alpha2[0] = alpha2[0];
         request->alpha2[1] = alpha2[1];
         request->initiator = NL80211_REGDOM_SET_BY_USER;
@@ -1768,8 +1687,8 @@ int regulatory_hint(struct wiphy *wiphy, const char *alpha2)
 {
         struct regulatory_request *request;
 
-        BUG_ON(!alpha2);
-        BUG_ON(!wiphy);
+        if (WARN_ON(!alpha2 || !wiphy))
+                return -EINVAL;
 
         request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL);
         if (!request)
@@ -1777,9 +1696,6 @@ int regulatory_hint(struct wiphy *wiphy, const char *alpha2)
 
         request->wiphy_idx = get_wiphy_idx(wiphy);
 
-        /* Must have registered wiphy first */
-        BUG_ON(!wiphy_idx_valid(request->wiphy_idx));
-
         request->alpha2[0] = alpha2[0];
         request->alpha2[1] = alpha2[1];
         request->initiator = NL80211_REGDOM_SET_BY_DRIVER;
@@ -1794,18 +1710,17 @@ EXPORT_SYMBOL(regulatory_hint);
  * We hold wdev_lock() here so we cannot hold cfg80211_mutex() and
  * therefore cannot iterate over the rdev list here.
  */
-void regulatory_hint_11d(struct wiphy *wiphy,
-                         enum ieee80211_band band,
-                         const u8 *country_ie,
-                         u8 country_ie_len)
+void regulatory_hint_11d(struct wiphy *wiphy, enum ieee80211_band band,
+                         const u8 *country_ie, u8 country_ie_len)
 {
         char alpha2[2];
         enum environment_cap env = ENVIRON_ANY;
-        struct regulatory_request *request;
+        struct regulatory_request *request, *lr;
 
         mutex_lock(&reg_mutex);
+        lr = get_last_request();
 
-        if (unlikely(!last_request))
+        if (unlikely(!lr))
                 goto out;
 
         /* IE len must be evenly divisible by 2 */
@@ -1828,9 +1743,8 @@ void regulatory_hint_11d(struct wiphy *wiphy,
          * We leave conflict resolution to the workqueue, where can hold
          * cfg80211_mutex.
          */
-        if (likely(last_request->initiator ==
-            NL80211_REGDOM_SET_BY_COUNTRY_IE &&
-            wiphy_idx_valid(last_request->wiphy_idx)))
+        if (lr->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE &&
+            lr->wiphy_idx != WIPHY_IDX_INVALID)
                 goto out;
 
         request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL);
@@ -1843,12 +1757,7 @@ void regulatory_hint_11d(struct wiphy *wiphy,
         request->initiator = NL80211_REGDOM_SET_BY_COUNTRY_IE;
         request->country_ie_env = env;
 
-        mutex_unlock(&reg_mutex);
-
         queue_regulatory_request(request);
-
-        return;
-
 out:
         mutex_unlock(&reg_mutex);
 }
@@ -1863,8 +1772,7 @@ static void restore_alpha2(char *alpha2, bool reset_user)
         if (is_user_regdom_saved()) {
                 /* Unless we're asked to ignore it and reset it */
                 if (reset_user) {
-                        REG_DBG_PRINT("Restoring regulatory settings "
-                               "including user preference\n");
+                        REG_DBG_PRINT("Restoring regulatory settings including user preference\n");
                         user_alpha2[0] = '9';
                         user_alpha2[1] = '7';
 
@@ -1874,26 +1782,20 @@ static void restore_alpha2(char *alpha2, bool reset_user)
                          * back as they were for a full restore.
                          */
                         if (!is_world_regdom(ieee80211_regdom)) {
-                                REG_DBG_PRINT("Keeping preference on "
-                                       "module parameter ieee80211_regdom: %c%c\n",
-                                       ieee80211_regdom[0],
-                                       ieee80211_regdom[1]);
+                                REG_DBG_PRINT("Keeping preference on module parameter ieee80211_regdom: %c%c\n",
+                                              ieee80211_regdom[0], ieee80211_regdom[1]);
                                 alpha2[0] = ieee80211_regdom[0];
                                 alpha2[1] = ieee80211_regdom[1];
                         }
                 } else {
-                        REG_DBG_PRINT("Restoring regulatory settings "
-                               "while preserving user preference for: %c%c\n",
-                               user_alpha2[0],
-                               user_alpha2[1]);
+                        REG_DBG_PRINT("Restoring regulatory settings while preserving user preference for: %c%c\n",
+                                      user_alpha2[0], user_alpha2[1]);
                         alpha2[0] = user_alpha2[0];
                         alpha2[1] = user_alpha2[1];
                 }
         } else if (!is_world_regdom(ieee80211_regdom)) {
-                REG_DBG_PRINT("Keeping preference on "
-                       "module parameter ieee80211_regdom: %c%c\n",
-                       ieee80211_regdom[0],
-                       ieee80211_regdom[1]);
+                REG_DBG_PRINT("Keeping preference on module parameter ieee80211_regdom: %c%c\n",
+                              ieee80211_regdom[0], ieee80211_regdom[1]);
                 alpha2[0] = ieee80211_regdom[0];
                 alpha2[1] = ieee80211_regdom[1];
         } else
@@ -1948,7 +1850,7 @@ static void restore_regulatory_settings(bool reset_user)
         mutex_lock(&cfg80211_mutex);
         mutex_lock(&reg_mutex);
 
-        reset_regdomains(true);
+        reset_regdomains(true, &world_regdom);
         restore_alpha2(alpha2, reset_user);
 
         /*
@@ -1958,49 +1860,35 @@ static void restore_regulatory_settings(bool reset_user)
          * settings.
          */
         spin_lock(&reg_requests_lock);
-        if (!list_empty(&reg_requests_list)) {
-                list_for_each_entry_safe(reg_request, tmp,
-                                         &reg_requests_list, list) {
-                        if (reg_request->initiator !=
-                            NL80211_REGDOM_SET_BY_USER)
-                                continue;
-                        list_move_tail(&reg_request->list, &tmp_reg_req_list);
-                }
+        list_for_each_entry_safe(reg_request, tmp, &reg_requests_list, list) {
+                if (reg_request->initiator != NL80211_REGDOM_SET_BY_USER)
+                        continue;
+                list_move_tail(&reg_request->list, &tmp_reg_req_list);
         }
         spin_unlock(&reg_requests_lock);
 
         /* Clear beacon hints */
         spin_lock_bh(&reg_pending_beacons_lock);
-        if (!list_empty(&reg_pending_beacons)) {
-                list_for_each_entry_safe(reg_beacon, btmp,
-                                         &reg_pending_beacons, list) {
-                        list_del(&reg_beacon->list);
-                        kfree(reg_beacon);
-                }
+        list_for_each_entry_safe(reg_beacon, btmp, &reg_pending_beacons, list) {
+                list_del(&reg_beacon->list);
+                kfree(reg_beacon);
         }
         spin_unlock_bh(&reg_pending_beacons_lock);
 
-        if (!list_empty(&reg_beacon_list)) {
-                list_for_each_entry_safe(reg_beacon, btmp,
-                                         &reg_beacon_list, list) {
-                        list_del(&reg_beacon->list);
-                        kfree(reg_beacon);
-                }
+        list_for_each_entry_safe(reg_beacon, btmp, &reg_beacon_list, list) {
+                list_del(&reg_beacon->list);
+                kfree(reg_beacon);
         }
 
         /* First restore to the basic regulatory settings */
-        cfg80211_regdomain = cfg80211_world_regdom;
-        world_alpha2[0] = cfg80211_regdomain->alpha2[0];
-        world_alpha2[1] = cfg80211_regdomain->alpha2[1];
+        world_alpha2[0] = cfg80211_world_regdom->alpha2[0];
+        world_alpha2[1] = cfg80211_world_regdom->alpha2[1];
 
         list_for_each_entry(rdev, &cfg80211_rdev_list, list) {
                 if (rdev->wiphy.flags & WIPHY_FLAG_CUSTOM_REGULATORY)
                         restore_custom_reg_settings(&rdev->wiphy);
         }
 
-        mutex_unlock(&reg_mutex);
-        mutex_unlock(&cfg80211_mutex);
-
         regulatory_hint_core(world_alpha2);
 
         /*
@@ -2011,20 +1899,8 @@ static void restore_regulatory_settings(bool reset_user)
         if (is_an_alpha2(alpha2))
                 regulatory_hint_user(user_alpha2, NL80211_USER_REG_HINT_USER);
 
-        if (list_empty(&tmp_reg_req_list))
-                return;
-
-        mutex_lock(&cfg80211_mutex);
-        mutex_lock(&reg_mutex);
-
         spin_lock(&reg_requests_lock);
-        list_for_each_entry_safe(reg_request, tmp, &tmp_reg_req_list, list) {
-                REG_DBG_PRINT("Adding request for country %c%c back "
-                              "into the queue\n",
-                              reg_request->alpha2[0],
-                              reg_request->alpha2[1]);
-                list_move_tail(&reg_request->list, &reg_requests_list);
-        }
+        list_splice_tail_init(&tmp_reg_req_list, &reg_requests_list);
         spin_unlock(&reg_requests_lock);
 
         mutex_unlock(&reg_mutex);
@@ -2037,8 +1913,7 @@ static void restore_regulatory_settings(bool reset_user)
 
 void regulatory_hint_disconnect(void)
 {
-        REG_DBG_PRINT("All devices are disconnected, going to "
-                      "restore regulatory settings\n");
+        REG_DBG_PRINT("All devices are disconnected, going to restore regulatory settings\n");
         restore_regulatory_settings(false);
 }
 
@@ -2051,31 +1926,48 @@ static bool freq_is_chan_12_13_14(u16 freq)
         return false;
 }
 
+static bool pending_reg_beacon(struct ieee80211_channel *beacon_chan)
+{
+        struct reg_beacon *pending_beacon;
+
+        list_for_each_entry(pending_beacon, &reg_pending_beacons, list)
+                if (beacon_chan->center_freq ==
+                    pending_beacon->chan.center_freq)
+                        return true;
+        return false;
+}
+
 int regulatory_hint_found_beacon(struct wiphy *wiphy,
                                  struct ieee80211_channel *beacon_chan,
                                  gfp_t gfp)
 {
         struct reg_beacon *reg_beacon;
+        bool processing;
 
-        if (likely((beacon_chan->beacon_found ||
-            (beacon_chan->flags & IEEE80211_CHAN_RADAR) ||
+        if (beacon_chan->beacon_found ||
+            beacon_chan->flags & IEEE80211_CHAN_RADAR ||
             (beacon_chan->band == IEEE80211_BAND_2GHZ &&
-             !freq_is_chan_12_13_14(beacon_chan->center_freq)))))
+             !freq_is_chan_12_13_14(beacon_chan->center_freq)))
+                return 0;
+
+        spin_lock_bh(&reg_pending_beacons_lock);
+        processing = pending_reg_beacon(beacon_chan);
+        spin_unlock_bh(&reg_pending_beacons_lock);
+
+        if (processing)
                 return 0;
 
         reg_beacon = kzalloc(sizeof(struct reg_beacon), gfp);
         if (!reg_beacon)
                 return -ENOMEM;
 
-        REG_DBG_PRINT("Found new beacon on "
-                      "frequency: %d MHz (Ch %d) on %s\n",
+        REG_DBG_PRINT("Found new beacon on frequency: %d MHz (Ch %d) on %s\n",
                       beacon_chan->center_freq,
                       ieee80211_frequency_to_channel(beacon_chan->center_freq),
                       wiphy_name(wiphy));
 
         memcpy(&reg_beacon->chan, beacon_chan,
-                sizeof(struct ieee80211_channel));
-
+               sizeof(struct ieee80211_channel));
 
         /*
          * Since we can be called from BH or and non-BH context
@@ -2155,21 +2047,19 @@ static void print_dfs_region(u8 dfs_region)
                 pr_info(" DFS Master region JP");
                 break;
         default:
-                pr_info(" DFS Master region Uknown");
+                pr_info(" DFS Master region Unknown");
                 break;
         }
 }
 
 static void print_regdomain(const struct ieee80211_regdomain *rd)
 {
+        struct regulatory_request *lr = get_last_request();
 
         if (is_intersected_alpha2(rd->alpha2)) {
-
-                if (last_request->initiator ==
-                    NL80211_REGDOM_SET_BY_COUNTRY_IE) {
+                if (lr->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) {
                         struct cfg80211_registered_device *rdev;
-                        rdev = cfg80211_rdev_by_wiphy_idx(
-                                last_request->wiphy_idx);
+                        rdev = cfg80211_rdev_by_wiphy_idx(lr->wiphy_idx);
                         if (rdev) {
                                 pr_info("Current regulatory domain updated by AP to: %c%c\n",
                                         rdev->country_ie_alpha2[0],
@@ -2178,22 +2068,21 @@ static void print_regdomain(const struct ieee80211_regdomain *rd)
                                 pr_info("Current regulatory domain intersected:\n");
                 } else
                         pr_info("Current regulatory domain intersected:\n");
-        } else if (is_world_regdom(rd->alpha2))
+        } else if (is_world_regdom(rd->alpha2)) {
                 pr_info("World regulatory domain updated:\n");
-        else {
+        } else {
                 if (is_unknown_alpha2(rd->alpha2))
                         pr_info("Regulatory domain changed to driver built-in settings (unknown country)\n");
                 else {
-                        if (reg_request_cell_base(last_request))
-                                pr_info("Regulatory domain changed "
-                                        "to country: %c%c by Cell Station\n",
+                        if (reg_request_cell_base(lr))
+                                pr_info("Regulatory domain changed to country: %c%c by Cell Station\n",
                                         rd->alpha2[0], rd->alpha2[1]);
                         else
-                                pr_info("Regulatory domain changed "
-                                        "to country: %c%c\n",
+                                pr_info("Regulatory domain changed to country: %c%c\n",
                                         rd->alpha2[0], rd->alpha2[1]);
                 }
         }
+
         print_dfs_region(rd->dfs_region);
         print_rd_rules(rd);
 }
@@ -2207,22 +2096,23 @@ static void print_regdomain_info(const struct ieee80211_regdomain *rd)
 /* Takes ownership of rd only if it doesn't fail */
 static int __set_regdom(const struct ieee80211_regdomain *rd)
 {
+        const struct ieee80211_regdomain *regd;
         const struct ieee80211_regdomain *intersected_rd = NULL;
         struct wiphy *request_wiphy;
+        struct regulatory_request *lr = get_last_request();
+
         /* Some basic sanity checks first */
 
+        if (!reg_is_valid_request(rd->alpha2))
+                return -EINVAL;
+
         if (is_world_regdom(rd->alpha2)) {
-                if (WARN_ON(!reg_is_valid_request(rd->alpha2)))
-                        return -EINVAL;
                 update_world_regdomain(rd);
                 return 0;
         }
 
         if (!is_alpha2_set(rd->alpha2) && !is_an_alpha2(rd->alpha2) &&
-                        !is_unknown_alpha2(rd->alpha2))
-                return -EINVAL;
-
-        if (!last_request)
+            !is_unknown_alpha2(rd->alpha2))
                 return -EINVAL;
 
         /*
@@ -2230,7 +2120,7 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
          * rd is non static (it means CRDA was present and was used last)
          * and the pending request came in from a country IE
          */
-        if (last_request->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {
+        if (lr->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {
                 /*
                  * If someone else asked us to change the rd lets only bother
                  * checking if the alpha2 changes if CRDA was already called
@@ -2246,29 +2136,23 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
          * internal EEPROM data
          */
 
-        if (WARN_ON(!reg_is_valid_request(rd->alpha2)))
-                return -EINVAL;
-
         if (!is_valid_rd(rd)) {
                 pr_err("Invalid regulatory domain detected:\n");
                 print_regdomain_info(rd);
                 return -EINVAL;
         }
 
-        request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
+        request_wiphy = wiphy_idx_to_wiphy(lr->wiphy_idx);
         if (!request_wiphy &&
-            (last_request->initiator == NL80211_REGDOM_SET_BY_DRIVER ||
-             last_request->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE)) {
+            (lr->initiator == NL80211_REGDOM_SET_BY_DRIVER ||
+             lr->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE)) {
                 schedule_delayed_work(&reg_timeout, 0);
                 return -ENODEV;
         }
 
-        if (!last_request->intersect) {
-                int r;
-
-                if (last_request->initiator != NL80211_REGDOM_SET_BY_DRIVER) {
-                        reset_regdomains(false);
-                        cfg80211_regdomain = rd;
+        if (!lr->intersect) {
+                if (lr->initiator != NL80211_REGDOM_SET_BY_DRIVER) {
+                        reset_regdomains(false, rd);
                         return 0;
                 }
 
@@ -2284,20 +2168,19 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
                 if (request_wiphy->regd)
                         return -EALREADY;
 
-                r = reg_copy_regd(&request_wiphy->regd, rd);
-                if (r)
-                        return r;
+                regd = reg_copy_regd(rd);
+                if (IS_ERR(regd))
+                        return PTR_ERR(regd);
 
-                reset_regdomains(false);
-                cfg80211_regdomain = rd;
+                rcu_assign_pointer(request_wiphy->regd, regd);
+                reset_regdomains(false, rd);
                 return 0;
         }
 
         /* Intersection requires a bit more work */
 
-        if (last_request->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {
-
-                intersected_rd = regdom_intersect(rd, cfg80211_regdomain);
+        if (lr->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {
+                intersected_rd = regdom_intersect(rd, get_cfg80211_regdom());
                 if (!intersected_rd)
                         return -EINVAL;
 
@@ -2306,15 +2189,14 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
                  * However if a driver requested this specific regulatory
                  * domain we keep it for its private use
                  */
-                if (last_request->initiator == NL80211_REGDOM_SET_BY_DRIVER)
-                        request_wiphy->regd = rd;
+                if (lr->initiator == NL80211_REGDOM_SET_BY_DRIVER)
+                        rcu_assign_pointer(request_wiphy->regd, rd);
                 else
                         kfree(rd);
 
                 rd = NULL;
 
-                reset_regdomains(false);
-                cfg80211_regdomain = intersected_rd;
+                reset_regdomains(false, intersected_rd);
 
                 return 0;
         }
@@ -2326,15 +2208,15 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
 /*
  * Use this call to set the current regulatory domain. Conflicts with
  * multiple drivers can be ironed out later. Caller must've already
- * kmalloc'd the rd structure. Caller must hold cfg80211_mutex
+ * kmalloc'd the rd structure.
  */
 int set_regdom(const struct ieee80211_regdomain *rd)
 {
+        struct regulatory_request *lr;
         int r;
 
-        assert_cfg80211_lock();
-
         mutex_lock(&reg_mutex);
+        lr = get_last_request();
 
         /* Note that this doesn't update the wiphys, this is done below */
         r = __set_regdom(rd);
@@ -2343,23 +2225,25 @@ int set_regdom(const struct ieee80211_regdomain *rd)
                         reg_set_request_processed();
 
                 kfree(rd);
-                mutex_unlock(&reg_mutex);
-                return r;
+                goto out;
         }
 
         /* This would make this whole thing pointless */
-        if (!last_request->intersect)
-                BUG_ON(rd != cfg80211_regdomain);
+        if (WARN_ON(!lr->intersect && rd != get_cfg80211_regdom())) {
+                r = -EINVAL;
+                goto out;
+        }
 
         /* update all wiphys now with the new established regulatory domain */
-        update_all_wiphy_regulatory(last_request->initiator);
+        update_all_wiphy_regulatory(lr->initiator);
 
-        print_regdomain(cfg80211_regdomain);
+        print_regdomain(get_cfg80211_regdom());
 
-        nl80211_send_reg_change_event(last_request);
+        nl80211_send_reg_change_event(lr);
 
         reg_set_request_processed();
 
+ out:
         mutex_unlock(&reg_mutex);
 
         return r;
@@ -2367,20 +2251,26 @@ int set_regdom(const struct ieee80211_regdomain *rd)
 
 int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
-        if (last_request && !last_request->processed) {
-                if (add_uevent_var(env, "COUNTRY=%c%c",
-                                   last_request->alpha2[0],
-                                   last_request->alpha2[1]))
-                        return -ENOMEM;
+        struct regulatory_request *lr;
+        u8 alpha2[2];
+        bool add = false;
+
+        rcu_read_lock();
+        lr = get_last_request();
+        if (lr && !lr->processed) {
+                memcpy(alpha2, lr->alpha2, 2);
+                add = true;
         }
+        rcu_read_unlock();
 
+        if (add)
+                return add_uevent_var(env, "COUNTRY=%c%c",
+                                      alpha2[0], alpha2[1]);
         return 0;
 }
 
 void wiphy_regulatory_register(struct wiphy *wiphy)
 {
-        assert_cfg80211_lock();
-
         mutex_lock(&reg_mutex);
 
         if (!reg_dev_ignore_cell_hint(wiphy))
@@ -2395,32 +2285,32 @@ void wiphy_regulatory_register(struct wiphy *wiphy)
 void wiphy_regulatory_deregister(struct wiphy *wiphy)
 {
         struct wiphy *request_wiphy = NULL;
-
-        assert_cfg80211_lock();
+        struct regulatory_request *lr;
 
         mutex_lock(&reg_mutex);
+        lr = get_last_request();
 
         if (!reg_dev_ignore_cell_hint(wiphy))
                 reg_num_devs_support_basehint--;
 
-        kfree(wiphy->regd);
+        rcu_free_regdom(get_wiphy_regdom(wiphy));
+        rcu_assign_pointer(wiphy->regd, NULL);
 
-        if (last_request)
-                request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
+        if (lr)
+                request_wiphy = wiphy_idx_to_wiphy(lr->wiphy_idx);
 
         if (!request_wiphy || request_wiphy != wiphy)
                 goto out;
 
-        last_request->wiphy_idx = WIPHY_IDX_STALE;
-        last_request->country_ie_env = ENVIRON_ANY;
+        lr->wiphy_idx = WIPHY_IDX_INVALID;
+        lr->country_ie_env = ENVIRON_ANY;
 out:
         mutex_unlock(&reg_mutex);
 }
 
 static void reg_timeout_work(struct work_struct *work)
 {
-        REG_DBG_PRINT("Timeout while waiting for CRDA to reply, "
-                      "restoring regulatory settings\n");
+        REG_DBG_PRINT("Timeout while waiting for CRDA to reply, restoring regulatory settings\n");
         restore_regulatory_settings(true);
 }
 
@@ -2439,13 +2329,13 @@ int __init regulatory_init(void)
 
         reg_regdb_size_check();
 
-        cfg80211_regdomain = cfg80211_world_regdom;
+        rcu_assign_pointer(cfg80211_regdomain, cfg80211_world_regdom);
 
         user_alpha2[0] = '9';
         user_alpha2[1] = '7';
 
         /* We always try to get an update for the static regdomain */
-        err = regulatory_hint_core(cfg80211_regdomain->alpha2);
+        err = regulatory_hint_core(cfg80211_world_regdom->alpha2);
         if (err) {
                 if (err == -ENOMEM)
                         return err;
@@ -2457,10 +2347,6 @@ int __init regulatory_init(void)
                  * errors as non-fatal.
                  */
                 pr_err("kobject_uevent_env() was unable to call CRDA during init\n");
-#ifdef CONFIG_CFG80211_REG_DEBUG
-                /* We want to find out exactly why when debugging */
-                WARN_ON(err);
-#endif
         }
 
         /*
@@ -2474,7 +2360,7 @@ int __init regulatory_init(void)
         return 0;
 }
 
-void /* __init_or_exit */ regulatory_exit(void)
+void regulatory_exit(void)
 {
         struct regulatory_request *reg_request, *tmp;
         struct reg_beacon *reg_beacon, *btmp;
@@ -2482,43 +2368,27 @@ void /* __init_or_exit */ regulatory_exit(void)
         cancel_work_sync(&reg_work);
         cancel_delayed_work_sync(&reg_timeout);
 
-        mutex_lock(&cfg80211_mutex);
+        /* Lock to suppress warnings */
         mutex_lock(&reg_mutex);
-
-        reset_regdomains(true);
+        reset_regdomains(true, NULL);
+        mutex_unlock(&reg_mutex);
 
         dev_set_uevent_suppress(&reg_pdev->dev, true);
 
         platform_device_unregister(reg_pdev);
 
-        spin_lock_bh(&reg_pending_beacons_lock);
-        if (!list_empty(&reg_pending_beacons)) {
-                list_for_each_entry_safe(reg_beacon, btmp,
-                                         &reg_pending_beacons, list) {
-                        list_del(&reg_beacon->list);
-                        kfree(reg_beacon);
-                }
+        list_for_each_entry_safe(reg_beacon, btmp, &reg_pending_beacons, list) {
+                list_del(&reg_beacon->list);
+                kfree(reg_beacon);
         }
-        spin_unlock_bh(&reg_pending_beacons_lock);
 
-        if (!list_empty(&reg_beacon_list)) {
-                list_for_each_entry_safe(reg_beacon, btmp,
-                                         &reg_beacon_list, list) {
-                        list_del(&reg_beacon->list);
-                        kfree(reg_beacon);
-                }
+        list_for_each_entry_safe(reg_beacon, btmp, &reg_beacon_list, list) {
+                list_del(&reg_beacon->list);
+                kfree(reg_beacon);
         }
 
-        spin_lock(&reg_requests_lock);
-        if (!list_empty(&reg_requests_list)) {
-                list_for_each_entry_safe(reg_request, tmp,
-                                         &reg_requests_list, list) {
-                        list_del(&reg_request->list);
-                        kfree(reg_request);
-                }
+        list_for_each_entry_safe(reg_request, tmp, &reg_requests_list, list) {
+                list_del(&reg_request->list);
+                kfree(reg_request);
         }
-        spin_unlock(&reg_requests_lock);
-
-        mutex_unlock(&reg_mutex);
-        mutex_unlock(&cfg80211_mutex);
 }
diff --git a/net/wireless/reg.h b/net/wireless/reg.h
index 4c0a32ffd530..af2d5f8a5d82 100644
--- a/net/wireless/reg.h
+++ b/net/wireless/reg.h
@@ -16,10 +16,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-extern const struct ieee80211_regdomain *cfg80211_regdomain;
+extern const struct ieee80211_regdomain __rcu *cfg80211_regdomain;
 
 bool is_world_regdom(const char *alpha2);
-bool reg_is_valid_request(const char *alpha2);
 bool reg_supported_dfs_region(u8 dfs_region);
 
 int regulatory_hint_user(const char *alpha2,
@@ -55,8 +54,8 @@ bool reg_last_request_cell_base(void);
  * set the wiphy->disable_beacon_hints to true.
  */
 int regulatory_hint_found_beacon(struct wiphy *wiphy,
-                                        struct ieee80211_channel *beacon_chan,
-                                        gfp_t gfp);
+                                 struct ieee80211_channel *beacon_chan,
+                                 gfp_t gfp);
 
 /**
  * regulatory_hint_11d - hints a country IE as a regulatory domain
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index f2431e41a373..a825dfe12cf7 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -192,7 +192,8 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev)
                                             prev_bssid,
                                             params->ssid, params->ssid_len,
                                             params->ie, params->ie_len,
-                                            false, &params->crypto,
+                                            params->mfp != NL80211_MFP_NO,
+                                            &params->crypto,
                                             params->flags, &params->ht_capa,
                                             &params->ht_capa_mask);
                 if (err)
@@ -519,10 +520,8 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
          * - country_ie + 2, the start of the country ie data, and
          * - and country_ie[1] which is the IE length
          */
-        regulatory_hint_11d(wdev->wiphy,
-                            bss->channel->band,
-                            country_ie + 2,
-                            country_ie[1]);
+        regulatory_hint_11d(wdev->wiphy, bss->channel->band,
+                            country_ie + 2, country_ie[1]);
         kfree(country_ie);
 }
 
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 16d76a807c2f..1c2795d52db0 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1184,7 +1184,8 @@ int cfg80211_can_use_iftype_chan(struct cfg80211_registered_device *rdev,
                                  struct wireless_dev *wdev,
                                  enum nl80211_iftype iftype,
                                  struct ieee80211_channel *chan,
-                                 enum cfg80211_chan_mode chanmode)
+                                 enum cfg80211_chan_mode chanmode,
+                                 u8 radar_detect)
 {
         struct wireless_dev *wdev_iter;
         u32 used_iftypes = BIT(iftype);
@@ -1195,14 +1196,45 @@ int cfg80211_can_use_iftype_chan(struct cfg80211_registered_device *rdev,
         enum cfg80211_chan_mode chmode;
         int num_different_channels = 0;
         int total = 1;
+        bool radar_required;
         int i, j;
 
         ASSERT_RTNL();
         lockdep_assert_held(&rdev->devlist_mtx);
 
+        if (WARN_ON(hweight32(radar_detect) > 1))
+                return -EINVAL;
+
+        switch (iftype) {
+        case NL80211_IFTYPE_ADHOC:
+        case NL80211_IFTYPE_AP:
+        case NL80211_IFTYPE_AP_VLAN:
+        case NL80211_IFTYPE_MESH_POINT:
+        case NL80211_IFTYPE_P2P_GO:
+        case NL80211_IFTYPE_WDS:
+                radar_required = !!(chan->flags & IEEE80211_CHAN_RADAR);
+                break;
+        case NL80211_IFTYPE_P2P_CLIENT:
+        case NL80211_IFTYPE_STATION:
+        case NL80211_IFTYPE_MONITOR:
+                radar_required = false;
+                break;
+        case NL80211_IFTYPE_P2P_DEVICE:
+        case NUM_NL80211_IFTYPES:
+        case NL80211_IFTYPE_UNSPECIFIED:
+        default:
+                return -EINVAL;
+        }
+
+        if (radar_required && !radar_detect)
+                return -EINVAL;
+
         /* Always allow software iftypes */
-        if (rdev->wiphy.software_iftypes & BIT(iftype))
+        if (rdev->wiphy.software_iftypes & BIT(iftype)) {
+                if (radar_detect)
+                        return -EINVAL;
                 return 0;
+        }
 
         memset(num, 0, sizeof(num));
         memset(used_channels, 0, sizeof(used_channels));
@@ -1275,7 +1307,7 @@ int cfg80211_can_use_iftype_chan(struct cfg80211_registered_device *rdev,
                 used_iftypes |= BIT(wdev_iter->iftype);
         }
 
-        if (total == 1)
+        if (total == 1 && !radar_detect)
                 return 0;
 
         for (i = 0; i < rdev->wiphy.n_iface_combinations; i++) {
@@ -1308,6 +1340,9 @@ int cfg80211_can_use_iftype_chan(struct cfg80211_registered_device *rdev,
                         }
                 }
 
+                if (radar_detect && !(c->radar_detect_widths & radar_detect))
+                        goto cont;
+
                 /*
                  * Finally check that all iftypes that we're currently
                  * using are actually part of this combination. If they